修改

app.json

@@ -24,10 +24,13 @@
     "pages/add/index",
     "pages/password/index",
     "pages/meMatch/index",
+    "pages/meMatch/detail",
     "pages/auditTeam/index",
     "pages/match/index",
     "pages/dissolution/index",
     "pages/dissolution/detail",
+    "pages/maintain/index",
+    "pages/lays/index",
     "pages/match/detail",
     "pages/logs/logs"
   ],

pages/auditTeam/index.wxss

@@ -44,7 +44,6 @@
 } */
 
 .btn1 {
-
     width: 80px !important;
     height: 30px !important;
     background-color: rgba(136, 136, 136, 0.4);

pages/lays/index.js

@@ -0,0 +1,66 @@
+// pages/lays/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/lays/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/lays/index.wxml

@@ -0,0 +1,2 @@
+<!--pages/lays/index.wxml-->
+<text>pages/lays/index.wxml</text>

pages/lays/index.wxss

@@ -0,0 +1 @@
+/* pages/lays/index.wxss */

pages/maintain/index.js

@@ -0,0 +1,196 @@
+// pages/login/login.js
+import WxValidate from '../../utils/wxValidate'
+const app = getApp()
+var type = "";//用来保存picker组件选中的类别id
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    frameStyle: { useTop: true, name: '比赛修改', leftArrow: true, useBar: false },
+    // 主体高度
+    infoHeight: '',
+    ids: '',
+    form: {},
+    cateArray: [
+      { id: '0', type: '未开始' }, { id: '1', type: '报名中' }, { id: '2', type: '待比赛' }, { id: '3', type: '进行中' }, { id: '4', type: '已结束' }],
+    cateIndex: 0,
+  },
+  //当用户点击确定时，执行的事件
+  bindCatePickerChange: function (e) {
+    var cid = this.data.cateArray[e.detail.value].id;
+    type = cid
+    //下面重新赋值必须有，页面显示的信息才会改为刚刚选中的值
+    this.setData({
+      cateIndex: e.detail.value,
+    })
+  },
+  //提交
+  formSubmit: function (e) {
+    const value = e.detail.value;
+    var form = this.data.form
+    var id = this.ids;
+    var name = value.name;
+    var match_time = value.match_time;
+    var single_time = value.single_time;
+    var address = value.address;
+    var format = form.format;
+    // var match_team = this.form.match_team;
+    const params = {
+      "id": id,
+      "name": name,
+      "match_time": match_time,
+      "single_time": single_time,
+      "address": address,
+      "format": format,
+      "match_team": [],
+      "status": type
+    };
+    if (!this.WxValidate.checkForm(params)) {
+      const error = this.WxValidate.errorList[0];
+      wx.showToast({ title: `${error.msg}`, icon: 'error', duration: 2000 })
+      return false
+    } else {
+      wx.getStorage({
+        key: 'token',
+        success: function (res) {
+          wx.request({
+            url: `${app.globalData.publicUrl}/courtAdmin/api/match/${id}`, //接口地址
+            method: 'post',
+            data: params,
+            success(res) {
+              console.log(res.data);
+              if (res.data.errcode == 0) {
+                wx.showToast({ title: `修改比赛成功`, icon: 'success', duration: 2000 }) //创建成功提示
+                // wx.navigateTo({ url: '/pages/administration/index' })// 跳转页面
+              } else {
+                wx.showToast({
+                  title: res.data.errmsg,
+                  icon: 'none',
+                  duration: 2000
+                })
+              }
+            }
+          })
+        }
+      })
+    }
+  },
+  back: function () {
+    wx.navigateBack({ url: '/pages/home/index' })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.ids = options.id;
+    //选择器
+    var cindex = this.data.cateIndex
+    type = this.data.cateArray[cindex].id
+    // 监听用户是否登录
+    this.watchLogin();
+    //验证规则函数
+    this.initValidate()
+    // 计算高度
+    this.searchHeight()
+  },
+  //验证是否输入
+  initValidate() {
+    const rules = { name: { required: true }, match_time: { required: true, }, single_time: { required: true }, address: { required: true, }, format: { required: true } }
+    // 验证字段的提示信息，若不传则调用默认的信息
+    const messages = { name: { required: '请输入比赛名称', }, match_time: { required: '请输入时间', }, single_time: { required: '请输入单场时间', }, address: { required: '请输入地点', }, format: { required: '请选择赛制', } };
+    this.WxValidate = new WxValidate(rules, messages)
+  },
+  // 监听用户是否登录
+  watchLogin: function () {
+    wx.getStorage({
+      key: 'token',
+      success: res => {
+        var that = this;
+        var id = that.ids;
+        wx.request({
+          url: `${app.globalData.publicUrl}/courtAdmin/api/match/${id}`, //接口地址
+          method: 'get',
+          // data: {},
+          success(res) {
+            console.log('res', res.data);
+            if (res.data.errcode == 0) {
+              let datas = res.data.data
+              that.setData({
+                form: datas,
+              });
+            } else {
+              wx.showToast({
+                title: res.data.errmsg,
+                icon: 'none',
+                duration: 2000
+              })
+            }
+          }
+        })
+      },
+      fail: res => {
+        return wx.redirectTo({ url: '/pages/login/index', })
+      }
+    })
+  },
+  // 计算高度
+  searchHeight: function () {
+    let frameStyle = this.data.frameStyle;
+    let client = app.globalData.client;
+    // 减去状态栏
+    let infoHeight = client.windowHeight - (client.statusBarHeight + client.getMenu.height + (client.getMenu.top - client.statusBarHeight) * 2);
+    // 是否减去底部菜单
+    if (frameStyle.useBar) infoHeight = infoHeight - 50;
+    if (infoHeight) this.setData({ infoHeight: infoHeight })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/maintain/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "mobile-main": "/commpents/mobile-frame/mobile-main"
+  }
+}

pages/maintain/index.wxml

@@ -0,0 +1,53 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+  <view slot="info" class="main" style="height:{{infoHeight}}px;">
+    <form catchsubmit="formSubmit" catchreset="formReset">
+      <view class="ming">
+        <view class="one">
+          <view class="text">比赛名称</view>
+          <input class="input" name="name" value="{{form.name}}" placeholder="请输入比赛名称" />
+        </view>
+      </view>
+      <view class="ming">
+        <view class="one">
+          <view class="text">时间</view>
+          <input class="input" name="match_time" value="{{form.match_time}}" placeholder="请输入时间" />
+        </view>
+      </view>
+      <view class="ming">
+        <view class="one">
+          <view class="text">单场时间</view>
+          <input class="input" name="single_time" value="{{form.single_time}}" placeholder="请输入单场时间" />
+        </view>
+      </view>
+      <view class="ming">
+        <view class="one">
+          <view class="text">地点</view>
+          <input class="input" name="address" value="{{form.address}}" placeholder="请输入地点" />
+        </view>
+      </view>
+      <view class="ming">
+        <view class="one" wx:for="{{form.format}}" wx:key="item">
+          <view class="text">赛制</view>
+          <input class="input" name="format" value="{{item.type}}-{{item.name}}" placeholder="请输入赛制" />
+        </view>
+      </view>
+      <view class="page">
+        <view class="multone">
+          <view class="mult1">
+            <view class="mult">状态</view>
+            <picker mode="selector" bindchange="bindCatePickerChange" value="{{cateIndex}}" range-key="type" range="{{cateArray}}">
+              <view class="mults">{{cateArray[cateIndex].type}}</view>
+            </picker>
+          </view>
+        </view>
+        <view>
+        </view>
+      </view>
+      <view class="team">
+        <view class="two">
+          <button class="button" formType="submit" bindtap="onSubmit">比赛修改</button>
+        </view>
+      </view>
+    </form>
+  </view>
+</mobile-main>

pages/maintain/index.wxss

@@ -0,0 +1,212 @@
+.main {
+  position: relative;
+  width: 100%;
+}
+
+.page1 {
+  float: left;
+  width: 40%;
+  padding-left: 15px;
+  font-size: 14px;
+  line-height: 80rpx;
+  background-color: white;
+  font-weight: 500;
+}
+
+/* 日期选择 */
+.picker_group {
+  background-color: white;
+  height: 80rpx;
+  line-height: 80rpx;
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+}
+
+.picker_group picker {
+  height: 55rpx;
+  line-height: 60rpx;
+  margin: 0 2%;
+  padding: 0 2%;
+  border-radius: 30rpx;
+}
+
+.van-cell {
+  margin-top: -1px;
+  font-weight: 500;
+  color: #000 !important;
+}
+
+.adress {
+  font-size: 14px;
+  font-weight: 600;
+}
+
+.section {
+  font-size: 14px;
+  font-weight: 500;
+  width: 96%;
+  margin-top: 0.8px;
+  padding-left: 13px;
+  line-height: 80rpx;
+  background-color: white;
+}
+
+.section__title {
+  float: left;
+  width: 65%;
+}
+
+.picker {
+  font-weight: 500;
+}
+
+.picker1 {
+  float: left;
+  width: 22%;
+}
+
+.team {
+  margin-top: 12%;
+  background-color: white;
+}
+
+.one {
+  padding: 10px 5px 15px 5px;
+}
+
+.tuan {
+  margin-left: 11px;
+  font-size: 16px;
+  font-weight: 550;
+  margin-right: 10px;
+}
+
+.two {
+  position: absolute;
+  bottom: 9%;
+  left: 9%;
+}
+
+.mult {
+  float: left;
+  width: 65%;
+  padding-left: 15px;
+  font-size: 14px;
+  line-height: 80rpx;
+  background-color: white;
+  font-weight: 500;
+}
+
+.mult11 {
+  padding-left: 15px;
+  font-size: 14px;
+  line-height: 80rpx;
+  background-color: white;
+  font-weight: 500;
+}
+
+.mults {
+  margin-top: -1px;
+  background-color: white;
+  line-height: 85rpx;
+  text-align: center;
+}
+
+.multone {
+  margin-top: 0.5%;
+  margin-bottom: 1.8px;
+  font-size: 14px;
+}
+
+.mult88 {
+  float: left;
+  width: 63%;
+  line-height: 80rpx;
+  background-color: white;
+  text-align: right;
+  padding: 0 9px 0 0;
+}
+
+.mult00 {
+  padding-left: 15px;
+  float: left;
+  width: 30%;
+  line-height: 80rpx;
+  background-color: white;
+}
+.zero {
+  border-bottom: 1px solid #dddddd;
+  margin: 0 20px;
+  height: 50px;
+}
+.ming{
+  background-color: white;
+}
+
+.one {
+  border-bottom: 1px solid #dddddd;
+  margin: 0 10px;
+  height: 20px;
+}
+.van-uploader__upload {
+  border-radius: 50%;
+  align-items: center;
+  background-color: var(--uploader-upload-background-color,#f7f8fa);
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  height: var(--uploader-size,50px);
+  justify-content: center;
+  margin: 0 8px 8px 0;
+  position: relative;
+  width: var(--uploader-size,50px);
+  width: 50px !important;
+  height: 50px !important;
+}
+
+.van-uploader__preview-image {
+  border-radius: 50%;
+  display: block;
+  height: var(--uploader-size,50px);
+  overflow: hidden;
+  width: var(--uploader-size,50px);
+  width: 50px !important;
+  height: 50px !important;
+}
+
+
+
+.text {
+  position: relative;
+  top: 4px;
+  width: 40%;
+}
+
+.tou {
+  width: 50px;
+  height: 50px;
+  position: relative;
+  left: 280px;
+  top: -30px;
+}
+
+.input {
+  position: relative;
+  text-align: right;
+  left: 130px;
+  top: -20px;
+  width: 60%;
+  font-size: 14px;
+}
+
+.button {
+  position: relative;
+  top: 50px;
+  width: 300px !important;
+  background-image: linear-gradient(to right, #fd3c1e, #c74df0);
+  border-radius: 30px;
+  color: #ffffff;
+  text-align: center;
+  font-size: small;
+}

pages/manage/index.js

@@ -78,22 +78,14 @@ Page({
     wx.getStorage({
       key: 'token',
       success: res => {
-        var list = that.data.list;
-        var match_id = that.ids;
-        var match_name = list.name;
-        var match_time = list.match_time;
         wx.request({
           url: `${app.globalData.publicUrl}/courtAdmin/api/matchteam`, //接口地址
           method: 'get',
-          data: {
-            "match_id": match_id,
-            "match_name": match_name,
-            "match_time": match_time,
-          },
+          data: {},
           success(res) {
             if (res.data.errcode == 0) {
               let datasai = res.data.data
-              console.log('datasai', datasai);
+              console.log('参赛队伍', datasai);
               that.setData({
                 listbisai: datasai,
               });

pages/manage/index.wxml

@@ -19,17 +19,17 @@
         </van-tab>
         <van-tab title="参赛团队">
           <view>
-            <view class="list" wx:key="item" wx:for="{{listbisai}}" data-name="{{item._id}}" bindtap='shen'>
+            <view class="list" wx:key="item" wx:for="{{listbisai}}" data-id="{{item._id}}" data-name="{{item._id}}" bindtap='shen'>
               <view class="two">
                 <view class="left">
                   <image class="head" src="{{item.logo[0].url}}"></image>
-                  <text class="group" bindtap="tiao">{{item.team_name}} <text class="resaon">{{item.status}}</text> </text>
-                  <text class="person" wx:if="{{!item.status}}">共{{item.match_num}}人</text>
+                  <text class="group" bindtap="tiao">{{item.team_name}}</text>
+                  <text class="person">共{{item.match_num}}人</text>
                   <view class="fou"><text>创建人：{{item.create_user}}</text></view>
                   <view class="time"><text class="date">{{item.create_time}}创建</text></view>
                 </view>
                 <view class="right">
-                  <button class="{{item.status == '解散团队' ? 'button' : 'buttons'}}" data-name="{{item._id}}" bindtap='shen'>通过</button>
+                  <button class="button" data-name="{{item._id}}" bindtap='shen'>通过</button>
                 </view>
               </view>
             </view>

pages/me/index.js

@@ -78,6 +78,12 @@ Page({
       url: `/pages/meMatch/index`,
     })
   },
+  //比赛管理
+  manage: function (e) {
+    wx.navigateTo({
+      url: `/pages/meMatch/detail`,
+    })
+  },
 
   //已上传图片
   Uploaded: function () {

pages/me/index.wxml

@@ -222,6 +222,14 @@
           <text class="six-text">比赛管理</text>
         </view>
       </view>
+      <view class="six-5" bindtap="manage" wx:if="{{item1.type=='0'}}">
+        <view class="six-left">
+          <text class=" icon iconfont icon-bisaiguanli"></text>
+        </view>
+        <view class="six-right">
+          <text class="six-text">比赛管理</text>
+        </view>
+      </view>
       <!-- <view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
       <view class="modalDlg" wx:if="{{showModal}}">
         <text class="modal_text1">解散团队</text>

pages/meMatch/detail.js

@@ -0,0 +1,202 @@
+// pages/login/login.js
+import WxValidate from '../../utils/wxValidate'
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    frameStyle: { useTop: true, name: '查询比赛', leftArrow: true, useBar: false },
+    // 主体高度
+    infoHeight: '',
+    list: [],
+    listend: [],
+  },
+
+  //维护
+  maintain: function (e) {
+    let id = e.currentTarget.dataset.id;
+    wx.navigateTo({
+      url: `/pages/maintain/index?id=` + id,
+    })
+  },
+  //编排
+  layout: function (e) {
+    let id = e.currentTarget.dataset.id;
+    wx.navigateTo({
+      url: `/pages/lays/index?id=` + id,
+    })
+  },
+  back: function () {
+    wx.navigateBack({ url: '/pages/me/index' })
+  },
+  tabPath(e) {
+    let query = e.detail.detail;
+    if (query) wx.redirectTo({ url: `/pages/${query}/index` })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    // 计算高度
+    this.searchHeight();
+    // 监听用户是否登录
+    this.watchLogin();
+  },
+  // 监听用户是否登录
+  watchLogin: function () {
+    var that = this;
+    wx.getStorage({
+      key: 'token',
+      success: res => {
+        var that = this;
+        wx.request({
+          url: `${app.globalData.publicUrl}/courtAdmin/api/match`, //接口地址
+          method: 'get',
+          data: {},
+          success(res) {
+            console.log('res', res.data);
+            if (res.data.errcode == 0) {
+              let datas = res.data.data
+              let datass = []
+              let datasss = []
+              for (let i = 0; i < datas.length; i++) {
+                if (datas[i].status == 0) {
+                  datas[i].status = '未开始'
+                  datass.push(datas[i])
+                } else if (datas[i].status == 1) {
+                  datas[i].status = '报名中'
+                } else if (datas[i].status == 2) {
+                  datas[i].status = '待比赛'
+                } else if (datas[i].status == 3) {
+                  datas[i].status = '进行中'
+                  datasss.push(datas[i])
+                } else if (datas[i].status == 4) {
+                  datas[i].status = '已结束'
+                }
+              }
+              that.setData({
+                list: datass,
+                listend: datasss,
+              });
+            } else {
+              wx.showToast({
+                title: res.data.errmsg,
+                icon: 'none',
+                duration: 2000
+              })
+            }
+          }
+        })
+      },
+      fail: res => {
+        return wx.redirectTo({ url: '/pages/login/index', })
+      }
+    })
+  },// 监听用户是否登录
+  watchLogin: function () {
+    var that = this;
+    wx.getStorage({
+      key: 'token',
+      success: res => {
+        wx.request({
+          url: `${app.globalData.publicUrl}/courtAdmin/api/match`, //接口地址
+          method: 'get',
+          data: {},
+          success(res) {
+            console.log('res', res.data);
+            if (res.data.errcode == 0) {
+              let datas = res.data.data
+              for (let i = 0; i < datas.length; i++) {
+                if (datas[i].status == 0) {
+                  datas[i].status = '未开始'
+                } else if (datas[i].status == 1) {
+                  datas[i].status = '报名中'
+                } else if (datas[i].status == 2) {
+                  datas[i].status = '待比赛'
+                } else if (datas[i].status == 3) {
+                  datas[i].status = '进行中'
+                } else if (datas[i].status == 4) {
+                  datas[i].status = '已结束'
+                }
+              }
+              that.setData({
+                list: datas,
+              });
+            } else {
+              wx.showToast({
+                title: res.data.errmsg,
+                icon: 'none',
+                duration: 2000
+              })
+            }
+          }
+        })
+      },
+      fail: res => {
+        return wx.redirectTo({ url: '/pages/login/index', })
+      }
+    })
+  },
+  // 计算高度
+  searchHeight: function () {
+    let frameStyle = this.data.frameStyle;
+    let client = app.globalData.client;
+    let infoHeight = client.windowHeight;
+    // 减去状态栏
+    if (frameStyle.useTop) infoHeight = infoHeight - (client.statusBarHeight + client.getMenu.height + (client.getMenu.top - client.statusBarHeight) * 2)
+    // 是否减去底部菜单
+    if (frameStyle.useBar) infoHeight = infoHeight - 50;
+    if (infoHeight) this.setData({ infoHeight: infoHeight })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/meMatch/detail.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "mobile-main": "/commpents/mobile-frame/mobile-main"
+  }
+}

pages/meMatch/detail.wxml

@@ -0,0 +1,29 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+  <view slot="info" class="main" style="height:{{infoHeight}}px;">
+    <view class="beijing1">
+      <view class="list1" wx:key="item" wx:for="{{list}}">
+      <view class="annns">
+      <view>
+          <view class="names" data-name="{{item._id}}" bindtap="tiao">{{item.name}}</view>
+          <view class="listbut"> <button class="button" size="mini" style="background:rgb(238, 147, 28);" wx:if="{{item.status == '未开始'}}">{{item.status}}</button>
+            <button class="button" size="mini" style="background:rgb(238, 88, 28);" wx:if="{{item.status == '待比赛'}}">{{item.status}}</button>
+            <button class="button" size="mini" style="background:rgb(54, 233, 48)" wx:if="{{item.status == '报名中'}}">{{item.status}}</button>
+            <button class="button" size="mini" style="background:rgb(54, 233, 48)" wx:if="{{item.status == '进行中'}}">{{item.status}}</button>
+            <button class="button" size="mini" style="background:rgb(136, 136, 136);" wx:if="{{item.status == '已结束'}}">{{item.status}}</button>
+          </view> 
+          <view class="leftmueen">
+          <view class="otherInfos">
+            <text class="text9">{{item.single_time}}</text>
+          </view>
+          <view class="otherInfo textOver"><text class="text3">{{item.address}}</text></view>
+        </view>
+        </view>
+      </view> 
+        <view class="annn">
+          <button size="mini" bindtap="maintain" data-id="{{item._id}}" class="btn1">维护</button>
+          <button size="mini" bindtap="layout" data-id="{{item._id}}" class="btn2">编排</button>
+        </view>
+      </view>
+    </view>
+  </view>
+</mobile-main>

pages/meMatch/detail.wxss

@@ -0,0 +1,182 @@
+.main {
+  position: relative;
+  width: 100%;
+  background-color: #f1f1f1;
+}
+
+.list1 {
+  width: 100%;
+  float: left;
+  background-color: white;
+  margin-top: 2%;
+}
+
+.two {
+  float: left;
+  width: 100%;
+}
+
+.right1 {
+  float: left;
+  width: 100%;
+  background-color: #fff;
+}
+
+.text1 {
+  margin-top: 3%;
+  margin-right: 5px;
+  font-size: 13px;
+  color: rgb(185, 185, 185);
+}
+
+.text4 {
+  margin-right: 5px;
+  font-size: 13px;
+  color: rgb(185, 185, 185);
+}
+
+.text6 {
+  font-size: 23px;
+  color: rgb(46, 46, 245);
+  font-weight: 500;
+}
+
+.text7 {
+  font-size: 23px;
+  color: rgb(243, 19, 19);
+  font-weight: 500;
+}
+
+.text8 {
+  font-size: 23px;
+  font-weight: 500;
+  margin-right: 5px;
+  margin-left: 5px;
+}
+
+.text9 {
+  font-weight: 500;
+  margin-right: 3px;
+  font-size: 14px;
+  color: #5e5e5e;
+}
+
+.leftmueen {
+  margin: 5px;
+  border-radius: 25px;
+}
+
+.text10 {
+  font-size: 14px;
+  margin-left: 2px;
+  margin-right: 3px;
+  color: #5e5e5e;
+}
+
+.right1_1 {
+  float: left;
+  width: 40%;
+  margin-left: 15px;
+  text-align: left;
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-right: 5px;
+}
+
+.left1 {
+  margin-left: 15px;
+  text-align: left;
+  font-size: 13px;
+  color: rgb(185, 185, 185);
+}
+
+
+.name {
+  font-size: 15px;
+}
+
+.names {
+  float: left;
+  /* width: 35%; */
+  margin: 6px;
+  margin-left: 10px;
+  font-size: 16px;
+  color: #0034cf;
+  font-weight: bold;
+}
+
+button {
+  margin-top: 5px;
+  background-color: rgb(238, 147, 28);
+  border-radius: 15px;
+  font-size: 13px !important;
+  color: #fff;
+}
+
+.right1_2 {
+  float: left;
+  width: 50%;
+}
+
+.otherInfo {
+  text-align: left;
+  padding: 0 0 15px 5px;
+}
+.otherInfos {
+  padding: 0 0 0px 5px;
+}
+
+.text3 {
+  font-weight: 500;
+  font-size: 13px;
+  color: #adadad;
+}
+
+.right1_2t {
+  font-size: 14px;
+  color: rgb(122, 122, 122);
+}
+
+.right1_2o {
+  float: left;
+  width: 30%;
+}
+
+.right1_2os {
+  float: left;
+  width: 30%;
+}
+
+.right1_2i {
+  float: left;
+  padding: 15px;
+  width: 20%;
+}
+.annns{
+  width: 60%;
+  float: left;
+}
+.annn{
+  width: 30%;
+  float: left;
+}
+.btn1 {
+  width: 80px !important;
+  height: 30px !important;
+  line-height: 30px !important;
+  background-color:#61c0bf;
+  border-radius: 30px;
+  color: #ffffff;
+  margin: 15px 0px 4px 40px;
+}
+
+.btn2 {
+  width: 80px !important;
+  height: 30px !important;
+  line-height: 30px !important;
+  background-color:#ff8c94;
+  border-radius: 30px;
+  color: #ffffff;
+  text-align: center;
+  margin: 2px 0 4px 40px;
+}