修改

pages/home/index.wxss

@@ -160,12 +160,14 @@ button {
   width: 100%;
   height: 39.2px;
   overflow: hidden;
+  border-radius: 90px;
 }
 
 .head2 {
   width: 100%;
   height: 39.2px;
   overflow: hidden;
+  border-radius: 90px;
 }
 
 .right1_2 .right1_2t {

pages/match/detail.js

@@ -8,25 +8,29 @@ Page({
    */
   data: {
     frameStyle: { useTop: true, name: '比赛信息', leftArrow: true, useBar: false },
-    src: '/image/detail.jpg',
-    src1: '/image/head1.png',
-    // 上传图片
-    fileList: [],
     // 主体高度
     infoHeight: '',
+    // 数据id
     id: '',
-    time:'',
-    //修改比分
-    form: [],
     //详情数据
-    schedulelist: [],
+    info: {},
+    // 现场图片
+    match_file: [],
     showModal: false,
+    //修改比分
+    form: [],
+    //判断用户类别
+    type: '',
+    //用户信息
+    userdata: {},
+    //团队id
+    team_id: '',
   },
   //验证是否输入
   initValidate() {
-    const rules = { blue_branch: { required: true }, red_branch: { required: true, } }
+    const rules = { blue_branch: { required: true }, red_branch: { required: true, }, blue_integral: { required: true }, red_integral: { required: true, } }
     // 验证字段的提示信息，若不传则调用默认的信息
-    const messages = { blue_branch: { required: '请输入蓝方比分', }, red_branch: { required: '请输入红方比分', } };
+    const messages = { blue_branch: { required: '请输入蓝方比分', }, red_branch: { required: '请输入红方比分', }, blue_integral: { required: '请输入蓝方积分', }, red_integral: { required: '请输入红方积分', } };
     this.WxValidate = new WxValidate(rules, messages)
   },
   back: function () {
@@ -47,57 +51,195 @@ Page({
   //上传图片
   imgUpload: function (e) {
     const that = this;
-    let data = that.data.fileList;
-    let id = that.data.id;
-    data.push(e.detail)
-    wx.request({
-      url: `${app.globalData.publicUrl}/courtAdmin/api/schedule/${id}`, //接口地址
-      method: 'post',
-      data: { match_file: data },
-      success(res) {
-        if (res.data.errcode == 0) {
-          wx.showToast({
-            title: '添加成功',
-            duration: 2000,
-            icon: 'success',
-          })
-          that.setData({ fileList: data })
-        } else {
-          wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+    if (that.data.type == '0') {
+      return wx.showToast({
+        title: '不可上传',
+        duration: 2000,
+        icon: 'error',
+      })
+    } else if (that.data.type == '1') {
+      let id = that.data.team_id
+      let user_id = that.data.userdata.id
+      //查询数据
+      wx.request({
+        url: `${app.globalData.publicUrl}/courtAdmin/api/team/${id}`, //接口地址
+        method: 'get',
+        data: '',
+        success(res) {
+          if (res.data.errcode == 0) {
+            let create_id = res.data.data.create_id;
+            if (create_id == user_id) {
+              let data = that.data.match_file;
+              let id = that.data.id;
+              data.push(e.detail)
+              wx.request({
+                url: `${app.globalData.publicUrl}/courtAdmin/api/schedule/${id}`, //接口地址
+                method: 'post',
+                data: { match_file: data },
+                success(res) {
+                  if (res.data.errcode == 0) {
+                    wx.showToast({
+                      title: '添加成功',
+                      duration: 2000,
+                      icon: 'success',
+                    })
+                    that.setData({ match_file: data })
+                  } else {
+                    wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+                  }
+                }
+              })
+            } else {
+              return wx.showToast({
+                title: '不可上传',
+                duration: 2000,
+                icon: 'error',
+              })
+            }
+          } else {
+            wx.showToast({
+              title: res.data.errmsg,
+              icon: 'none',
+              duration: 2000
+            })
+          }
         }
+      })
+    } else if (that.data.type == '2') {
+      let userid = that.data.userdata.id
+      let red_members = that.data.info.red_members;
+      let blue_members = that.data.info.blue_members;
+      var item = red_members.find(item => item.id == userid)
+      var items = blue_members.find(item => item.id == userid)
+      if (item || items) {
+        let data = that.data.match_file;
+        let id = that.data.id;
+        data.push(e.detail)
+        wx.request({
+          url: `${app.globalData.publicUrl}/courtAdmin/api/schedule/${id}`, //接口地址
+          method: 'post',
+          data: { match_file: data },
+          success(res) {
+            if (res.data.errcode == 0) {
+              wx.showToast({
+                title: '添加成功',
+                duration: 2000,
+                icon: 'success',
+              })
+              that.setData({ match_file: data })
+            } else {
+              wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+            }
+          }
+        })
+      } else {
+        return wx.showToast({
+          title: '不可上传',
+          duration: 2000,
+          icon: 'error',
+        })
       }
-    })
+    }
   },
   //删除图片
   imgDel: function (e) {
     const that = this;
-    let data = that.data.fileList;
-    let id = that.data.id;
-    let arr = data.filter((i, index) => index != e.detail.index)
-    wx.request({
-      url: `${app.globalData.publicUrl}/courtAdmin/api/schedule/${id}`, //接口地址
-      method: 'post',
-      data: { match_file: arr },
-      success(res) {
-        if (res.data.errcode == 0) {
-          wx.showToast({
-            title: '删除成功',
-            duration: 2000,
-            icon: 'success',
-          })
-          that.setData({ fileList: arr })
-        } else {
-          wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+    if (that.data.type == '0') {
+      return wx.showToast({
+        title: '不可删除',
+        duration: 2000,
+        icon: 'error',
+      })
+    } else if (that.data.type == '1') {
+      let id = that.data.team_id
+      let user_id = that.data.userdata.id
+      //查询数据
+      wx.request({
+        url: `${app.globalData.publicUrl}/courtAdmin/api/team/${id}`, //接口地址
+        method: 'get',
+        data: '',
+        success(res) {
+          if (res.data.errcode == 0) {
+            let create_id = res.data.data.create_id;
+            if (create_id == user_id) {
+              let data = that.data.match_file;
+              let id = that.data.id;
+              let arr = data.filter((i, index) => index != e.detail.index)
+              wx.request({
+                url: `${app.globalData.publicUrl}/courtAdmin/api/schedule/${id}`, //接口地址
+                method: 'post',
+                data: { match_file: arr },
+                success(res) {
+                  if (res.data.errcode == 0) {
+                    wx.showToast({
+                      title: '删除成功',
+                      duration: 2000,
+                      icon: 'success',
+                    })
+                    that.setData({ match_file: arr })
+                  } else {
+                    wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+                  }
+                }
+              })
+            } else {
+              return wx.showToast({
+                title: '不可删除',
+                duration: 2000,
+                icon: 'error',
+              })
+            }
+          } else {
+            wx.showToast({
+              title: res.data.errmsg,
+              icon: 'none',
+              duration: 2000
+            })
+          }
         }
+      })
+    } else if (that.data.type == '2') {
+      let userid = that.data.userdata.id
+      let red_members = that.data.info.red_members;
+      let blue_members = that.data.info.blue_members;
+      var item = red_members.find(item => item.id == userid)
+      var items = blue_members.find(item => item.id == userid)
+      if (item || items) {
+        let data = that.data.match_file;
+        let id = that.data.id;
+        let arr = data.filter((i, index) => index != e.detail.index)
+        wx.request({
+          url: `${app.globalData.publicUrl}/courtAdmin/api/schedule/${id}`, //接口地址
+          method: 'post',
+          data: { match_file: arr },
+          success(res) {
+            if (res.data.errcode == 0) {
+              wx.showToast({
+                title: '删除成功',
+                duration: 2000,
+                icon: 'success',
+              })
+              that.setData({ match_file: arr })
+            } else {
+              wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+            }
+          }
+        })
+      } else {
+        return wx.showToast({
+          title: '不可删除',
+          duration: 2000,
+          icon: 'error',
+        })
       }
-    })
+    }
   },
   // 提交登录
   formSubmit: function (e) {
     const that = this;
     let id = that.data.id;
     const params = e.detail.value;
-    params.match_file = that.data.fileList;
+    params.match_file = that.data.match_file;
     if (!this.WxValidate.checkForm(params)) {
       const error = this.WxValidate.errorList[0];
       wx.showToast({ title: `${error.msg}`, icon: 'error', duration: 2000 })
@@ -137,28 +279,21 @@ Page({
     this.watchLogin();
   },
   // 监听用户是否登录
-  watchLogin: function () {
+  watchLogin: async function () {
     const that = this;
     let id = that.data.id;
     wx.getStorage({
       key: 'token',
-      success: res => {
-        wx.request({
-          url: `${app.globalData.publicUrl}/courtAdmin/api/schedule/${id}`, //接口地址
-          method: 'get',
-          data: {},
-          success(res) {
-            let fileList = res.data.data.match_file;
-            let match_time = res.data.data.match_time;
-            let time = match_time.substring(5, 17)
-            console.log(res.data.data);
-            that.setData({
-              schedulelist: res.data.data,
-              fileList: fileList,
-              time: time,
-            })
-          }
-        })
+      success: async res => {
+        that.setData({ type: res.data.type, userdata: res.data })
+        const arr = await app.$get(`/courtAdmin/api/schedule/${id}`);
+        if (arr.errcode === 0) {
+          that.setData({
+            info: arr.data,
+            team_id: arr.data.blue_id
+          })
+          that.setData({ match_file: arr.data.match_file })
+        }
       },
       fail: res => {
         return wx.redirectTo({ url: '/pages/login/index', })

pages/match/detail.wxml

@@ -1,83 +1,64 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back">
   <view slot="info" class="main" style="height:{{infoHeight}}px;">
-    <view class="ones">
-      <view class="one">
-        <view class="one_1">
-          <view class="one_1_img">
-            <image class="one_logo1" src="{{schedulelist.blue_logo[0].url}}"></image>
-          </view>
-          <view class="one_1_text textOver">{{schedulelist.blue_name}}</view>
+    <view class="one">
+      <view class="one_1">
+        <view class="one_1_1">
+          <image src="{{info.blue_logo[0].url}}"></image>
+          <view class="textOver">{{info.blue_name}}</view>
         </view>
-        <view class="one_2">
-          <view class="one_2_1">
-            <text class="time">{{time}}</text>
-          </view>
-          <view class="one_2_2">
-            <text class="text1">{{schedulelist.blue_branch||0}}</text>
-            <text class="text2">:</text>
-            <text class="text3">{{schedulelist.red_branch||0}}</text>
-          </view>
-          <view class="one_2_2">
-            <text class="text">{{schedulelist.status=='0'?'待开始':schedulelist.status=='1'?'开始':'结束'}}</text>
+        <view class="one_1_1 one_1_2">
+          <view class="time">{{info.match_time}}</view>
+          <view class="branch">
+            <text>{{info.blue_branch||0}}</text>
+            <text>:</text>
+            <text>{{info.red_branch||0}}</text>
           </view>
+          <view class="status">{{item.status=='0'?'未开始':item.status=='1'?'进行中':'已结束'}}</view>
         </view>
-        <view class="one_3">
-          <view class="one_3_img">
-            <image class="one_logo2" src="{{schedulelist.red_logo[0].url}}"></image>
-          </view>
-          <view class="one_3_text textOver">{{schedulelist.red_name}}</view>
+        <view class="one_1_1">
+          <image src="{{info.red_logo[0].url}}"></image>
+          <view class="textOver">{{info.red_name}}</view>
         </view>
-        <view class="one_4">{{schedulelist.match_name}}</view>
       </view>
+      <view class="one_2">{{info.match_name}}</view>
     </view>
     <view class="two">
-      <view class="two1"><text class="twos">参赛阵容</text></view>
-      <view class="tworight">
-        <view class="two-1">
-          <image class="imgs" src="{{schedulelist.blue_logo[0].url}}"></image>
-          <text class="thrs textOver">{{schedulelist.blue_name}}</text>
-        </view>
-        <view class="two-2" wx:key="item" wx:for="{{schedulelist.blue_members}}">
-          <view class="two2">
-            <view class="two-left">
+      <view class="two_1">参赛阵容</view>
+      <view class="two_2">
+        <view class="two_2_1">
+          <view class="two_2_1_logo">
+            <image src="{{info.blue_logo[0].url}}"></image>
+            <view class="bname">{{info.blue_name}}</view>
+          </view>
+          <view class="two_2_1_members">
+            <view class="list" wx:for="{{info.blue_members}}" wx:key="item">
               <image class="img" src="{{item.icon[0].url}}"></image>
+              <view class="nickname">{{item.nickname}}</view>
             </view>
-            <view class="two-right"><text class="name textOver">{{item.nickname}}</text> </view>
           </view>
         </view>
-      </view>
-    </view>
-    <view class="thr">
-      <view class="thrright">
-        <view class="thrleft">
-          <view class="two-9">
-            <image class="imgss" src="{{schedulelist.red_logo[0].url}}"></image>
+        <view class="two_2_1 two_2_2">
+          <view class="two_2_1_logo">
+            <image src="{{info.red_logo[0].url}}"></image>
+            <view class="bname">{{info.red_name}}</view>
           </view>
-          <text class="thrss textOver">{{schedulelist.red_name}}</text>
-        </view>
-        <view class="thr-1" wx:key="item" wx:for="{{schedulelist.red_members}}">
-          <view class="thr1">
-            <view class="thr-left">
+          <view class="two_2_1_members">
+            <view class="list" wx:for="{{info.red_members}}" wx:key="item">
               <image class="img" src="{{item.icon[0].url}}"></image>
+              <view class="nickname">{{item.nickname}}</view>
             </view>
-            <view class="thr-right"><text class="names textOver">{{item.nickname}}</text> </view>
           </view>
         </view>
       </view>
-
     </view>
-    <view class="four">
-      <view class="four1">
-        <text class="fours">现场照片</text>
-      </view>
-    </view>
-    <view class="upload">
-      <view class="upload_1">
-        <upload list="{{fileList}}" count="{{4}}" bind:imgUpload="imgUpload" bind:imgDel="imgDel"></upload>
+    <view class="thr">
+      <view class="thr_1">现场图片</view>
+      <view class="thr_2">
+        <upload list="{{match_file}}" count="{{4}}" previewSize="{{170}}" bind:imgUpload="imgUpload" bind:imgDel="imgDel"></upload>
       </view>
     </view>
-    <view class="five">
-      <button class="button" bindtap="clickme">上传比分</button>
+    <view class="four" wx:if="{{type=='1'}}">
+      <button size="mini" bindtap="clickme">上传比分</button>
     </view>
     <view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
     <view class="modal" wx:if="{{showModal}}">
@@ -91,19 +72,24 @@
         <view class="modal_main">
           <view class="modal_l">
             <view class="modal_l1">
-              <image class="two_logo1" src="{{schedulelist.blue_logo[0].url}}"></image>
-              <view>{{schedulelist.blue_name}}</view>
+              <image class="two_logo1" src="{{info.blue_logo[0].url}}"></image>
+              <view>{{info.blue_name}}</view>
             </view>
             <view class="modal_l2">
-              <image class="two_logo1" src="{{schedulelist.red_logo[0].url}}"></image>
-              <view>{{schedulelist.red_name}}</view>
+              <image class="two_logo1" src="{{info.red_logo[0].url}}"></image>
+              <view>{{info.red_name}}</view>
             </view>
           </view>
           <view class="modal_r">
             <view class="modal_r1">
               <input class="input" name="blue_branch" type="number" value="{{form.blue_branch}}" placeholder="" />
-              <text class="modal_text">比分</text>
+              <text class="modal_text">积分</text>
+              <input class="input" name="blue_integral" type="number" value="{{form.blue_integral}}" placeholder="" />
+            </view>
+            <view class="modal_r2">
               <input class="input" name="red_branch" type="number" value="{{form.red_branch}}" placeholder="" />
+              <text class="modal_text">积分</text>
+              <input class="input" name="red_integral" type="number" value="{{form.red_integral}}" placeholder="" />
             </view>
           </view>
           <view class="modal_btn">

pages/match/detail.wxss

@@ -2,338 +2,198 @@
   position: relative;
   width: 100%;
 }
-.ones{
-  float: left;
-  width: 100%;
-}
-
-.two {
-  background-color: #ffffff;
-  padding-top: 15px;
-  margin-bottom: 1%;
-}
 
-.two1 {
-  width: 95%;
-  margin-left: 4%;
-  font-size: 15px;
-  font-weight: 550;
-}
-
-.tworight {
-  width: 95%;
+.main .one {
   float: left;
-  padding: 2%;
-  background-color: #ffffff;
-  margin-bottom: 0.5%;
-}
-
-.two-left {
-  width: 90%;
-  height: 50.64px;
-  background-color: #eeeeee;
-  border-radius: 25.32px;
-}
-
-.imgs {
-  margin-left: 14%;
-  border-radius: 48.78px;
-  width: 50%;
-  height: 48.78px;
-}
-
-.van-uploader__preview-image {
-  width: 162px !important;
-  height: 80px !important;
-}
-
-.van-uploader__upload {
-  width: 162px !important;
-  height: 80px !important;
-}
-
-.imgss {
-  margin-left: 20%;
-  border-radius: 48.71px;
-  width: 58%;
-  height: 48.71px;
-}
-
-.img {
   width: 100%;
-  height: 50.64px;
+  background-color: #fff;
+  margin: 0 0 10px 0;
 }
 
-.thrs {
+.main .one .one_1 {
   float: left;
   width: 100%;
-  font-size: 14px;
 }
 
-.two-1 {
-  padding-top: 7px;
-  padding-left: 5px;
+.main .one .one_1 .one_1_1 {
   float: left;
-  width: 26%;
-  background-color: #ffffff;
+  width: 30%;
+  text-align: center;
 }
 
-.two2 {
-  background-color: #ffffff;
+.main .one .one_1 .one_1_2 {
+  width: 40%;
 }
 
-.two-2 {
-  padding-top: 7px;
-  padding-left: 5px;
+.main .one .one_1 .one_1_2 .time {
   float: left;
-  width: 16%;
-  height: 75px;
-  background-color: #ffffff;
-  /* border: 1px solid red; */
-}
-
-.name {
-  font-size: 13px;
-  color: #727272;
-}
-
-.thr-left {
-  width: 90%;
-  height: 50.64px;
-  background-color: #eeeeee;
-  border-radius: 25.32px;
-}
-
-.img {
   width: 100%;
-  height: 50.64px;
-}
-
-.thr {
-  background-color: #ffffff;
-}
-
-.thrright {
-  background-color: #ffffff;
-  margin-bottom: 2%;
+  font-size: 14px;
+  text-align: center;
+  margin: 0 0 8px 0;
 }
 
-.thr-1 {
-  padding-top: 10px;
-  padding-left: 14px;
+.main .one .one_1 .one_1_2 .branch {
   float: left;
-  width: 15%;
-  background-color: #ffffff;
-  padding-bottom: 5px;
+  width: 100%;
+  text-align: center;
+  margin: 0 0 8px 0;
 }
 
-.thr1 {
-  background-color: #ffffff;
+.main .one .one_1 .one_1_2 .branch text {
+  font-size: 25px;
+  padding: 0 5px;
 }
 
-.thr-2 {
-  padding-top: 10px;
-  padding-left: 8px;
-  float: left;
-  width: 18%;
-  height: 75px;
-  background-color: #ffffff;
-  /* border: 1px solid red; */
+.main .one .one_1 .one_1_2 .branch text:nth-child(1) {
+  color: #0000ff;
+  font-weight: bold;
+  background-color: #f1f1f1;
 }
 
-.thr2 {
-  float: left;
-  width: 50px;
-  height: 50px;
-  border: 2px solid #dddcdc;
+.main .one .one_1 .one_1_2 .branch text:nth-child(3) {
+  color: #ff0000;
+  font-weight: bold;
+  background-color: #f1f1f1;
 }
 
-.names {
-  font-size: 13px;
-  color: #727272;
+.main .one .one_1 .one_1_1 image {
+  width: 60px;
+  height: 60px;
+  overflow: hidden;
+  border-radius: 90px;
 }
 
-.thrss {
+.main .one .one_1 .one_1_1 view {
   font-size: 14px;
-  font-weight: 500;
-}
-
-.thrleft {
-  float: left;
-  padding-top: 10px;
-  padding-left: 10px;
-  padding-right: 2px;
-  background-color: #ffffff;
-  margin-bottom: 2%;
-}
-
-.one {
-  background-color: #ffffff;
-  margin-bottom: 4%;
-  padding: 10px 0;
-  float: left;
-  width: 100%;
-}
 
-.back {
-  width: 40rpx;
-  height: 40rpx;
-  left: 15px;
-  width: 40rpx;
-  height: 40rpx;
 }
 
-.five {
+.main .one .one_2 {
   float: left;
   width: 100%;
-  font-weight: 550;
-  font-size: 15px;
-  padding-top: 20%;
-  padding-bottom: 10%;
-  background-color: #ffffff;
-}
-
-.button {
-  margin-top: 5px !important;
-  width: 300px !important;
-  height: 35px;
-  background-color: rgb(247, 89, 16);
-  background-image: linear-gradient(to right, rgb(245, 122, 65), rgb(247, 89, 41));
-  border-radius: 30px;
-  color: #ffffff;
-  font-size: 13px;
+  text-align: center;
+  color: #666;
+  padding: 10px 0;
 }
 
-.upload {
+.main .two {
   float: left;
-  width: 100%;
-  background-color: #ffffff;
-}
-
-.upload .upload_1 {
-  margin-left: 3%;
+  width: 95%;
+  background-color: #fff;
+  margin: 0 0 10px 0;
+  padding: 10px;
 }
 
-
-.two {
+.main .two .two_1 {
   float: left;
   width: 100%;
+  font-size: 16px;
+  font-weight: bold;
+  margin: 0 0 8px 0;
 }
 
-.thr {
+.main .two .two_2 {
   float: left;
   width: 100%;
 }
 
-.four1 {
-  margin-left: 3%;
-  font-size: 15px;
-  font-weight: 550;
-}
-
-.four {
-  margin-top: 2%;
+.main .two .two_2 .two_2_1 {
   float: left;
   width: 100%;
-  padding-top: 3%;
-  padding-bottom: 3%;
-  background-color: white;
+  padding: 0 0 8px 0;
+  margin: 0 0 8px 0;
+  border-bottom: 1px solid #ccc;
 }
 
-.one_1 {
-  width: 35%;
+.main .two .two_2 .two_2_1 .two_2_1_logo {
   float: left;
-
+  width: 18%;
+  text-align: center;
+  margin: 0 10px 0 0;
 }
 
-.one_1_text {
-  margin-left: 20%;
-  font-size: 14px;
+.main .two .two_2 .two_2_1 .two_2_1_logo image {
+  width: 50px;
+  height: 50px;
+  border-radius: 90px;
 }
 
-.one_3_text {
-  text-align: left;
-  padding-left: 9%;
-  font-size: 14px;
+.main .two .two_2 .two_2_1 .two_2_1_logo .bname {
+  font-size: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 2;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
 }
 
-.one_2 {
-  width: 30%;
+.main .two .two_2 .two_2_1 .two_2_1_members {
   float: left;
+  width: 70%;
 }
 
-.one_2_1 {
+.main .two .two_2 .two_2_1 .two_2_1_members .list {
+  float: left;
+  width: 25%;
   text-align: center;
-  margin-bottom: 5px;
 }
 
-.one_2_2 {
-  margin-top: 8%;
-  text-align: center;
+.main .two .two_2 .two_2_1 .two_2_1_members .list image {
+  width: 40px;
+  height: 40px;
+  border-radius: 90px;
 }
 
-.text1 {
-  background-color: rgb(240, 240, 240);
-  text-align: center;
-  color: #00427b;
-  font-size: 30px;
-  font-weight: bold;
-  text-decoration: line-through;
-  text-decoration-color: #fff;
+.main .two .two_2 .two_2_1 .two_2_1_members .list .nickname {
+  font-size: 12px;
 }
 
-.text2 {
-  font-size: 25px;
-  font-weight: bold;
-  margin: 0 5px;
+.main .two .two_2 .two_2_2 {
+  float: left;
+  width: 100%;
+  padding: 0 0 8px 0;
+  border-bottom: none;
 }
 
-.text {
-  font-size: 15px;
-  text-align: center;
+.main .thr {
+  float: left;
+  width: 95%;
+  padding: 10px;
+  background-color: #fff;
+  margin: 0 0 10px 0;
 }
 
-.text3 {
-  background-color: rgb(240, 240, 240);
-  text-align: center;
-  color: #e70000;
-  font-size: 30px;
+.main .thr .thr_1 {
+  float: left;
+  width: 100%;
+  font-size: 16px;
   font-weight: bold;
-  text-decoration: line-through;
-  text-decoration-color: #fff;
-}
-
-.one_3 {
-  width: 31%;
-  float: right;
+  margin: 0 0 8px 0;
 }
 
-.one_4 {
-  margin-top: 4%;
+.main .thr .thr_2 {
   float: left;
   width: 100%;
-  font-size: 14px;
-  color: #999;
-  text-align: center;
-}
-
-.one_logo1 {
-  margin-left: 22%;
-  width: 80px;
-  height: 80px;
-  border-radius: 40px;
 }
-
-.one_3_img {
-  padding: 0 10px;
+.main .four {
+  float: left;
+  width: 95%;
+  background-color: #fff;
+  padding: 10px;
+  text-align: center;
 }
 
-.one_logo2 {
-  border-radius: 40px;
-  width: 80px;
-  height: 80px;
+.main .four button {
+  width: 50%;
+  padding: 5px 0;
+  background-color: rgb(247, 89, 16);
+  background-image: linear-gradient(to right, rgb(245, 122, 65), rgb(247, 89, 41));
+  border-radius: 30px;
+  color: #ffffff;
+  font-size: 13px;
 }
-
 .mask {
   width: 100%;
   height: 100%;
@@ -393,7 +253,6 @@
 }
 
 .modal_r {
-  margin-top: 15%;
   width: 60%;
   float: left;
 }
@@ -429,14 +288,22 @@
   text-align: center;
   border-bottom: 1px solid rgb(228, 228, 228);
 }
-
+.button {
+  width: 300px !important;
+  background-color: #ff7815;
+  border-radius: 30px;
+  color: #ffffff;
+  text-align: center;
+}
 .two_logo1 {
   margin-left: 15%;
+  align-items: center;
   width: 50px;
   height: 45px;
 }
 
 .two_logo2 {
+  margin-left: 15%;
   align-items: center;
   width: 45px;
   height: 45px;

pages/score/index.js

@@ -2,70 +2,33 @@
 import WxValidate from '../../utils/wxValidate'
 const app = getApp()
 Page({
+
   /**
    * 页面的初始数据
    */
   data: {
-    showModal: false,
+    frameStyle: { useTop: true, name: '比赛信息', leftArrow: true, useBar: false },
     // 主体高度
     infoHeight: '',
-    frameStyle: { useTop: true, name: '比赛信息', leftArrow: true, useBar: false },
-    list: [{
-      logo1: '/image/logo1.png',
-      logo2: '/image/logo2.png',
-      time: '1-15 15:00',
-      ranks1: '哈拉海队幼儿园组',
-      score1: '2',
-      score2: '1',
-      ranks2: '马尼拉老年组',
-      state: '未开始',
-      match: '第二届老年组小区板王比赛'
-    }],
-    list1: [{ team: '哈拉海队', logo1: '/image/logo1.png', },],
-    lists1: [
-      { id: '1', text: '小孩1', tou: '/image/tou.png' },
-      { id: '1', text: '小孩2', tou: '/image/tou.png' },
-      { id: '1', text: '小孩3', tou: '/image/tou.png' },
-      { id: '1', text: '小孩4', tou: '/image/tou.png' },
-      { id: '1', text: '小孩5', tou: '/image/tou.png' },
-    ],
-    list2: [{ team: '马尼拉队', logo2: '/image/logo2.png', },],
-    lists2: [
-      { id: '1', text: '老头1', tou: '/image/tou.png' },
-      { id: '1', text: '老头2', tou: '/image/tou.png' },
-      { id: '1', text: '老头3', tou: '/image/tou.png' },
-      { id: '1', text: '老头4', tou: '/image/tou.png' },
-      { id: '1', text: '老头5', tou: '/image/tou.png' },
-      { id: '1', text: '老头6', tou: '/image/tou.png' },
-      { id: '1', text: '老头7', tou: '/image/tou.png' },
-      { id: '1', text: '老头8', tou: '/image/tou.png' },
-      { id: '1', text: '老头9', tou: '/image/tou.png' },
-      { id: '1', text: '老头10', tou: '/image/tou.png' },
-    ],
-    form: {
-      logo1: '/image/logo1.png',
-      team1: '哈拉海队',
-      num1: '0',
-      num2: '',
-      logo2: '/image/logo2.png',
-      team2: '马尼拉队',
-      num3: '0',
-      num4: '',
-    }
+    // 数据id
+    id: '',
+    //详情数据
+    info: {},
+    // 现场图片
+    match_file: [],
+    showModal: false,
+    //修改比分
+    form: [],
   },
-  //提交
-  formSubmit: function (e) {
-    this.setData({
-      showModal: false
-    }),
-      wx.showToast({
-        title: '保存成功',
-        icon: 'success',
-        duration: 2000
-      })
+  //验证是否输入
+  initValidate() {
+    const rules = { blue_branch: { required: true }, red_branch: { required: true, },blue_integral: { required: true }, red_integral: { required: true, } }
+    // 验证字段的提示信息，若不传则调用默认的信息
+    const messages = { blue_branch: { required: '请输入蓝方比分', }, red_branch: { required: '请输入红方比分', },blue_integral: { required: '请输入蓝方积分', }, red_integral: { required: '请输入红方积分', } };
+    this.WxValidate = new WxValidate(rules, messages)
   },
   back: function () {
-    wx.navigateBack({ url: '/pages/me/index' })
+    wx.navigateBack({ url: '/pages/home/index' })
   },
   //显示对话框
   clickme: function () {
@@ -73,32 +36,132 @@ Page({
       showModal: true
     })
   },
-  preventTouchMove: function () {
-  },
   //关闭弹窗
   go: function () {
     this.setData({
       showModal: false
     })
   },
+  //上传图片
+  imgUpload: function (e) {
+    const that = this;
+    let data = that.data.match_file;
+    let id = that.data.id;
+    data.push(e.detail)
+    wx.request({
+      url: `${app.globalData.publicUrl}/courtAdmin/api/schedule/${id}`, //接口地址
+      method: 'post',
+      data: { match_file: data },
+      success(res) {
+        if (res.data.errcode == 0) {
+          wx.showToast({
+            title: '添加成功',
+            duration: 2000,
+            icon: 'success',
+          })
+          that.setData({ match_file: data })
+        } else {
+          wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+        }
+      }
+    })
+  },
+  //删除图片
+  imgDel: function (e) {
+    const that = this;
+    let data = that.data.match_file;
+    let id = that.data.id;
+    let arr = data.filter((i, index) => index != e.detail.index)
+    wx.request({
+      url: `${app.globalData.publicUrl}/courtAdmin/api/schedule/${id}`, //接口地址
+      method: 'post',
+      data: { match_file: arr },
+      success(res) {
+        if (res.data.errcode == 0) {
+          wx.showToast({
+            title: '删除成功',
+            duration: 2000,
+            icon: 'success',
+          })
+          that.setData({ match_file: arr })
+        } else {
+          wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+        }
+      }
+    })
+  },
+  // 提交登录
+  formSubmit: function (e) {
+    const that = this;
+    let id = that.data.id;
+    const params = e.detail.value;
+    params.match_file = that.data.match_file;
+    if (!this.WxValidate.checkForm(params)) {
+      const error = this.WxValidate.errorList[0];
+      wx.showToast({ title: `${error.msg}`, icon: 'error', duration: 2000 })
+      return false
+    } else {
+      wx.request({
+        url: `${app.globalData.publicUrl}/courtAdmin/api/schedule/${id}`, //接口地址
+        method: 'post',
+        data: params,
+        success(res) {
+          if (res.data.errcode == 0) {
+            wx.showToast({
+              title: '保存成功',
+              duration: 2000,
+              icon: 'success',
+              success: (res) => { that.back() }
+            })
+          } else {
+            wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+          }
+        }
+      })
+    }
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    const that = this;
+    that.setData({ id: options.id })
+    //验证规则函数
+    this.initValidate();
     // 计算高度
-    this.searchHeight()
-  },
- // 计算高度
- 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 })
-},
+    this.searchHeight();
+    // 监听用户是否登录
+    this.watchLogin();
+  },
+  // 监听用户是否登录
+  watchLogin: async function () {
+    const that = this;
+    let id = that.data.id;
+    wx.getStorage({
+      key: 'token',
+      success: async res => {
+        const arr = await app.$get(`/courtAdmin/api/schedule/${id}`);
+        if (arr.errcode === 0) {
+          that.setData({ info: arr.data })
+          that.setData({ match_file: arr.data.match_file })
+        }
+      },
+      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 })
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成

pages/score/index.json

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

pages/score/index.wxml

@@ -1,97 +1,102 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back">
-    <view slot="info" class="main" style="height:{{infoHeight}}px;">
-        <view class="one" wx:key="item" wx:for="{{list}}">
-            <view class="one_1">
-                <view class="one_1_img">
-                    <image class="one_logo1" src="{{item.logo1}}"></image>
-                </view>
-                <view class="one_1_text">{{item.ranks1}}</view>
-            </view>
-            <view class="one_2">
-                <view class="one_2_1">
-                    <text class="time">{{item.time}}</text>
-                </view>
-                <view class="one_2_2">
-                    <text class="text1">{{item.score1}}</text>
-                    <text class="text2">:</text>
-                    <text class="text3">{{item.score2}}</text>
-                </view>
-                <view class="one_2_2">
-                    <text class="text">{{item.state}}</text>
-                </view>
-            </view>
-            <view class="one_3">
-                <view class="one_3_img">
-                    <image class="one_logo2" src="{{item.logo2}}"></image>
-                </view>
-                <view class="one_3_text">{{item.ranks2}}</view>
-            </view>
-            <view class="one_4">{{item.match}}</view>
+  <view slot="info" class="main" style="height:{{infoHeight}}px;">
+    <view class="one">
+      <view class="one_1">
+        <view class="one_1_1">
+          <image src="{{info.blue_logo[0].url}}"></image>
+          <view class="textOver">{{info.blue_name}}</view>
+        </view>
+        <view class="one_1_1 one_1_2">
+          <view class="time">{{info.match_time}}</view>
+          <view class="branch">
+            <text>{{info.blue_branch||0}}</text>
+            <text>:</text>
+            <text>{{info.red_branch||0}}</text>
+          </view>
+          <view class="status">{{item.status=='0'?'未开始':item.status=='1'?'进行中':'已结束'}}</view>
         </view>
-        <view class="two" style="height:{{infoHeight-250}}px;">
-            <view class="two_title">参赛阵容</view>
-            <view class="two_1" wx:key="item" wx:for="{{list1}}">
-                <view class="two_1_1">
-                    <image class="two_logo1" src=" {{item.logo1}}"></image>
-                    <text class="two_1_text">{{item.team}}</text>
-                </view>
-                <view class="two_1_2" wx:key="item" wx:for="{{lists1}}">
-                    <image class="two_logo2" src="{{item.tou}}"></image>
-                    <text class="two_1_text">{{item.text}}</text>
-                </view>
+        <view class="one_1_1">
+          <image src="{{info.red_logo[0].url}}"></image>
+          <view class="textOver">{{info.red_name}}</view>
+        </view>
+      </view>
+      <view class="one_2">{{info.match_name}}</view>
+    </view>
+    <view class="two">
+      <view class="two_1">参赛阵容</view>
+      <view class="two_2">
+        <view class="two_2_1">
+          <view class="two_2_1_logo">
+            <image src="{{info.blue_logo[0].url}}"></image>
+            <view class="bname">{{info.blue_name}}</view>
+          </view>
+          <view class="two_2_1_members">
+            <view class="list" wx:for="{{info.blue_members}}" wx:key="item">
+              <image class="img" src="{{item.icon[0].url}}"></image>
+              <view class="nickname">{{item.nickname}}</view>
             </view>
-            <view class="two_2">
-                <view class="two_2_1" wx:key="item" wx:for="{{list2}}">
-                    <image class="two_logo1" src="{{item.logo2}}"></image>
-                    <text class="two_2_text">{{item.team}}</text>
-                </view>
-                <view class="two_2_2" wx:key="item" wx:for="{{lists2}}">
-                    <image class="two_logo2" src="{{item.tou}}"></image>
-                    <text class="two_2_text">{{item.text}}</text>
-                </view>
+          </view>
+        </view>
+        <view class="two_2_1 two_2_2">
+          <view class="two_2_1_logo">
+            <image src="{{info.red_logo[0].url}}"></image>
+            <view class="bname">{{info.red_name}}</view>
+          </view>
+          <view class="two_2_1_members">
+            <view class="list" wx:for="{{info.red_members}}" wx:key="item">
+              <image class="img" src="{{item.icon[0].url}}"></image>
+              <view class="nickname">{{item.nickname}}</view>
             </view>
+          </view>
         </view>
-        <view class="btn" bindtap="clickme">
-            <button class="button">上传比分</button>
+      </view>
+    </view>
+    <view class="thr">
+      <view class="thr_1">现场图片</view>
+      <view class="thr_2">
+        <upload list="{{match_file}}" count="{{4}}" previewSize="{{170}}" bind:imgUpload="imgUpload" bind:imgDel="imgDel"></upload>
+      </view>
+    </view>
+    <view class="four">
+      <button size="mini" bindtap="clickme">上传比分</button>
+    </view>
+    <view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
+    <view class="modal" wx:if="{{showModal}}">
+      <view class="title">
+        <view class="modal_title">上传比分</view>
+        <view class="go" bindtap="go">
+          <image class="cuo" src="/image/cuo.png"></image>
         </view>
-        <view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
-        <view class="modal" wx:if="{{showModal}}">
-            <view class="title">
-                <view class="modal_title">上传比分</view>
-                <view class="go" bindtap="go">
-                    <image class="cuo" src="/image/cuo.png"></image>
-                </view>
+      </view>
+      <form catchsubmit="formSubmit" catchreset="formReset">
+        <view class="modal_main">
+          <view class="modal_l">
+            <view class="modal_l1">
+              <image class="two_logo1" src="{{info.blue_logo[0].url}}"></image>
+              <view>{{info.blue_name}}</view>
+            </view>
+            <view class="modal_l2">
+              <image class="two_logo1" src="{{info.red_logo[0].url}}"></image>
+              <view>{{info.red_name}}</view>
+            </view>
+          </view>
+          <view class="modal_r">
+            <view class="modal_r1">
+              <input class="input" name="blue_branch" type="number" value="{{form.blue_branch}}" placeholder="" />
+              <text class="modal_text">积分</text>
+              <input class="input" name="blue_integral" type="number" value="{{form.blue_integral}}" placeholder="" />
+            </view>
+            <view class="modal_r2">
+              <input class="input" name="red_branch" type="number" value="{{form.red_branch}}" placeholder="" />
+              <text class="modal_text">积分</text>
+              <input class="input" name="red_integral" type="number" value="{{form.red_integral}}" placeholder="" />
             </view>
-
-            <form catchsubmit="formSubmit" catchreset="formReset">
-                <view class="modal_main">
-                    <view class="modal_l">
-                        <view class="modal_l1">
-                            <image class="two_logo1" src="{{form.logo1}}"></image>
-                            <view>{{form.team1}}</view>
-                        </view>
-                        <view class="modal_l2">
-                            <image class="two_logo1" src="{{form.logo2}}"></image>
-                            <view>{{form.team2}}</view>
-                        </view>
-                    </view>
-                    <view class="modal_r">
-                        <view class="modal_r1">
-                            <input class="input" name="num1" type="number" value="{{form.num1}}" placeholder="" />
-                            <text class="modal_text">积分</text>
-                            <input class="input" name="num2" type="number" value="{{form.num2}}" placeholder="" />
-                        </view>
-                        <view class="modal_r2">
-                            <input class="input" name="num3" type="number" value="{{form.num3}}" placeholder="" />
-                            <text class="modal_text">积分</text>
-                            <input class="input" name="num4" type="number" value="{{form.num4}}" placeholder="" />
-                        </view>
-                    </view>
-                    <view class="modal_btn">
-                        <button class="button" formType="submit">保存</button>
-                    </view>
-                </view>
-            </form>
+          </view>
+          <view class="modal_btn">
+            <button class="button" formType="submit">保存</button>
+          </view>
         </view>
+      </form>
     </view>
+  </view>
 </mobile-main>

pages/score/index.wxss

@@ -1,199 +1,199 @@
 .main {
   position: relative;
   width: 100%;
-  background-color: #f0f0f0;
 }
 
-.one {
-  position: relative;
-  background-color: #ffffff;
-  height: 140px;
-  margin-bottom: 10px;
-  padding: 10px 20px;
+.main .one {
+  float: left;
+  width: 100%;
+  background-color: #fff;
+  margin: 0 0 10px 0;
 }
 
-.one_1 {
-  position: relative;
-  width: 35%;
+.main .one .one_1 {
   float: left;
+  width: 100%;
 }
 
-.one_1_text {
+.main .one .one_1 .one_1_1 {
+  float: left;
+  width: 30%;
   text-align: center;
-  font-size: 14px;
 }
 
-.one_3_text {
-  text-align: center;
-  font-size: 14px;
+.main .one .one_1 .one_1_2 {
+  width: 40%;
 }
 
-.one_2 {
-  position: relative;
-  width: 30%;
+.main .one .one_1 .one_1_2 .time {
   float: left;
-  height: 102px;
-}
-
-.one_2_1 {
+  width: 100%;
+  font-size: 14px;
   text-align: center;
+  margin: 0 0 8px 0;
 }
 
-.one_2_2 {
+.main .one .one_1 .one_1_2 .branch {
+  float: left;
+  width: 100%;
   text-align: center;
+  margin: 0 0 8px 0;
 }
 
-.text1 {
-  background-color: #999;
-  text-align: center;
-  color: #00427b;
-  font-size: 30px;
-  font-weight: bold;
-  text-decoration: line-through;
-  text-decoration-color: #fff;
+.main .one .one_1 .one_1_2 .branch text {
+  font-size: 25px;
+  padding: 0 5px;
 }
 
-.text2 {
-  font-size: 40px;
+.main .one .one_1 .one_1_2 .branch text:nth-child(1) {
+  color: #0000ff;
   font-weight: bold;
-  margin: 0 5px;
-}
-
-.text {
-  font-size: 15px;
-  position: relative;
-  top: 9px;
-  text-align: center;
+  background-color: #f1f1f1;
 }
 
-.text3 {
-  background-color: #999;
-  text-align: center;
-  color: #e70000;
-  font-size: 30px;
+.main .one .one_1 .one_1_2 .branch text:nth-child(3) {
+  color: #ff0000;
   font-weight: bold;
-  text-decoration: line-through;
-  text-decoration-color: #fff;
+  background-color: #f1f1f1;
 }
 
-.one_3 {
-  position: relative;
-  width: 35%;
-  float: right;
+.main .one .one_1 .one_1_1 image {
+  width: 60px;
+  height: 60px;
+  overflow: hidden;
+  border-radius: 90px;
 }
 
-.one_4 {
-  position: relative;
-  top: 10px;
-  height: 30px;
+.main .one .one_1 .one_1_1 view {
   font-size: 14px;
-  color: #999;
-  text-align: center;
-}
 
-.one_logo1 {
-  width: 90px;
-  height: 80px;
 }
 
-.one_3_img {
-  padding: 0 15px;
-}
-
-.one_logo2 {
-  align-items: center;
-  width: 90px;
-  height: 80px;
+.main .one .one_2 {
+  float: left;
+  width: 100%;
+  text-align: center;
+  color: #666;
+  padding: 10px 0;
 }
 
-.two {
-  position: relative;
-  background-color: #ffffff;
-  /* height: 320px; */
-  /* margin-bottom: 20px; */
-  padding: 10px 0 10px 15px;
+.main .two {
+  float: left;
+  width: 95%;
+  background-color: #fff;
+  margin: 0 0 10px 0;
+  padding: 10px;
 }
 
-.two_title {
-  font-size: 18px;
+.main .two .two_1 {
+  float: left;
+  width: 100%;
+  font-size: 16px;
+  font-weight: bold;
   margin: 0 0 8px 0;
 }
 
-.two_1 {
-  margin: 10px 0 0px 0;
-  height: 70px;
+.main .two .two_2 {
+  float: left;
+  width: 100%;
 }
 
-.two_1_1 {
-  width: 56px;
+.main .two .two_2 .two_2_1 {
   float: left;
-  margin: 0 4px 0 0;
+  width: 100%;
+  padding: 0 0 8px 0;
+  margin: 0 0 8px 0;
+  border-bottom: 1px solid #ccc;
 }
 
-.two_1_2 {
-  text-align: center;
-  width: 47px;
+.main .two .two_2 .two_2_1 .two_2_1_logo {
   float: left;
-  margin: 0 8px 0 0;
+  width: 18%;
+  text-align: center;
+  margin: 0 10px 0 0;
 }
 
-.two_logo1 {
-  align-items: center;
+.main .two .two_2 .two_2_1 .two_2_1_logo image {
   width: 50px;
-  height: 45px;
+  height: 50px;
+  border-radius: 90px;
 }
 
-.two_logo2 {
-  align-items: center;
-  width: 45px;
-  height: 45px;
-  border: solid 1px #999;
+.main .two .two_2 .two_2_1 .two_2_1_logo .bname {
+  font-size: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 2;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
 }
 
-.two_1_text {
-  font-size: 14px;
+.main .two .two_2 .two_2_1 .two_2_1_members {
+  float: left;
+  width: 70%;
 }
 
-.two_2 {
-  margin: 10px 0 0 0;
+.main .two .two_2 .two_2_1 .two_2_1_members .list {
+  float: left;
+  width: 25%;
+  text-align: center;
 }
 
-.two_2n2 {
-  position: relative;
-  top: 10px;
-  left: 60px;
+.main .two .two_2 .two_2_1 .two_2_1_members .list image {
+  width: 40px;
+  height: 40px;
+  border-radius: 90px;
 }
 
-.two_2_1 {
-  width: 56px;
+.main .two .two_2 .two_2_1 .two_2_1_members .list .nickname {
+  font-size: 12px;
+}
+
+.main .two .two_2 .two_2_2 {
   float: left;
-  margin: 0 4px 10px 0;
+  width: 100%;
+  padding: 0 0 8px 0;
+  border-bottom: none;
 }
 
-.two_2_2 {
-  text-align: center;
-  width: 47px;
+.main .thr {
   float: left;
-  margin: 0 8px 0 0;
+  width: 95%;
+  padding: 10px;
+  background-color: #fff;
+  margin: 0 0 10px 0;
 }
 
-.two_2_text {
-  font-size: 14px;
+.main .thr .thr_1 {
+  float: left;
+  width: 100%;
+  font-size: 16px;
+  font-weight: bold;
+  margin: 0 0 8px 0;
 }
 
-.btn {
-  height: 60px;
+.main .thr .thr_2 {
+  float: left;
+  width: 100%;
+}
+.main .four {
+  float: left;
+  width: 95%;
   background-color: #fff;
+  padding: 10px;
+  text-align: center;
 }
 
-.button {
-  width: 300px !important;
-  background-color: #ff7815;
+.main .four button {
+  width: 50%;
+  padding: 5px 0;
+  background-color: rgb(247, 89, 16);
+  background-image: linear-gradient(to right, rgb(245, 122, 65), rgb(247, 89, 41));
   border-radius: 30px;
   color: #ffffff;
-  text-align: center;
+  font-size: 13px;
 }
-
 .mask {
   width: 100%;
   height: 100%;
@@ -288,3 +288,24 @@
   text-align: center;
   border-bottom: 1px solid rgb(228, 228, 228);
 }
+.button {
+  width: 300px !important;
+  background-color: #ff7815;
+  border-radius: 30px;
+  color: #ffffff;
+  text-align: center;
+}
+.two_logo1 {
+  margin-left: 15%;
+  align-items: center;
+  width: 50px;
+  height: 45px;
+}
+
+.two_logo2 {
+  margin-left: 15%;
+  align-items: center;
+  width: 45px;
+  height: 45px;
+  border: solid 1px #999;
+}