Merge branch 'master' of http://git.cc-lotus.info/ball-court/ball-applet

pages/stuAdmin/coach/list.js

@@ -9,7 +9,7 @@ Page({
         limit: 5,
         // 性别
         genderList: [],
-        //运动等级
+        //教练等级
         levelList: [],
     },
     // 返回
@@ -63,8 +63,8 @@ Page({
         // 性别
         arr = await app.$get(`/dict`, { code: 'gender' });
         if (arr.errcode == '0' && arr.total > 0) that.setData({ genderList: arr.data[0].list });
-        // 运动等级
-        arr = await app.$get(`/dict`, { code: 'student_grade' });
+        // 教练等级
+        arr = await app.$get(`/dict`, { code: 'coach_grade' });
         if (arr.errcode == '0' && arr.total > 0) that.setData({ levelList: arr.data[0].list });
     },
     // 监听用户是否登录

pages/stuAdmin/coach/list.less

@@ -55,22 +55,6 @@
                     .txt text:nth-child(1) {
                         color: #666;
                     }
-
-                    .other {
-                        display: flex;
-                        flex-direction: row;
-                        justify-content: space-between;
-                        font-size: var(--font14Size);
-                        border-bottom: 1px dashed var(--f1Color);
-
-                        .other_1 {
-                            padding: 0 0 1vw 0;
-                        }
-
-                        .other_1 text:nth-child(1) {
-                            color: #666;
-                        }
-                    }
                 }
             }
 

pages/stuAdmin/coach/list.wxml

@@ -12,12 +12,7 @@
                             <view class="content">
                                 <view class="name textOver">{{item.coach_id_name||'暂无'}}</view>
                                 <view class="txt textOver"><text>联系电话：</text><text>{{item.coach_id_phone||'暂无'}}</text></view>
-                                <view class="other textOver">
-                                    <view class="other_1 textOver"><text>性别：</text><text>{{item.zhGender||'暂无'}}</text></view>
-                                    <view class="other_1 textOver"><text>年龄：</text><text>{{item.coach_id_age||'暂无'}}岁</text></view>
-                                </view>
                                 <view class="txt textOver"><text>教练等级：</text><text>{{item.zhLevel||'暂无'}}</text></view>
-                                <view class="txt textOver"><text>所获荣誉：</text><text>{{item.coach_id_honor||'暂无'}}</text></view>
                             </view>
                         </view>
                         <view class="btn">

pages/stuAdmin/coach/list.wxss

@@ -50,19 +50,6 @@
 .main .two .list .list_1 .content .txt text:nth-child(1) {
   color: #666;
 }
-.main .two .list .list_1 .content .other {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  font-size: var(--font14Size);
-  border-bottom: 1px dashed var(--f1Color);
-}
-.main .two .list .list_1 .content .other .other_1 {
-  padding: 0 0 1vw 0;
-}
-.main .two .list .list_1 .content .other .other_1 text:nth-child(1) {
-  color: #666;
-}
 .main .two .list .btn {
   width: 92vw;
   text-align: center;

pages/stuAdmin/money/add.js

@@ -25,7 +25,7 @@ Page({
         const form = that.data.form;
         const params = e.detail.value;
         var money = params.paymoney;
-        if (form.money) money = Number(form.money) + Number(params.paymoney);
+        if (form.money) money = Math.floor((Number(form.money) + Number(params.paymoney)) * 100) / 100;
         if (!this.WxValidate.checkForm(params)) {
             const error = this.WxValidate.errorList[0];
             wx.showToast({ title: `${error.msg}`, icon: 'error', duration: 2000 })

pages/stuAdmin/money/list.less

@@ -30,9 +30,10 @@
             border-radius: 10px;
 
             .name {
-                font-size: var(--font16Szie);
+                font-size: var(--font18Szie);
                 font-weight: bold;
                 margin: 0 0 2vw 0;
+                color: red;
             }
 
             .other {

pages/stuAdmin/money/list.wxml

@@ -7,11 +7,10 @@
             <scroll-view scroll-y="true" class="scroll-view" bindscrolltolower="toPage">
                 <view class="list-scroll-view">
                     <view class="list" wx:for="{{list}}" wx:key="item">
-                        <view class="name">{{item.school_id_name||'暂无'}}</view>
+                        <view class="name">{{item.money||0}}元</view>
                         <view class="other">
-                            <view class="other_1"><text>联系电话：</text><text>{{item.school_id_phone||'暂无'}}</text></view>
-                            <view class="other_1"><text>学校地址：</text><text>{{item.school_id_address||'暂无'}}</text></view>
-                            <view class="other_1"><text>账号余额：</text><text>{{item.money||0}}元</text></view>
+                            <view class="other_1"><text>学校名称：</text><text>{{item.school_id_name||'暂无'}}</text></view>
+                            <view class="other_1"><text>学校联系电话：</text><text>{{item.school_id_phone||'暂无'}}</text></view>
                         </view>
                         <view class="btn">
                             <button size="mini" type="primary" bindtap="toCommon" data-item="{{item}}" data-route="stuAdmin/money/add">充值</button>

pages/stuAdmin/money/list.wxss

@@ -27,9 +27,10 @@
   border-radius: 10px;
 }
 .main .two .list .name {
-  font-size: var(--font16Szie);
+  font-size: var(--font18Szie);
   font-weight: bold;
   margin: 0 0 2vw 0;
+  color: red;
 }
 .main .two .list .other {
   margin: 0 0 2vw 0;