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

pagesMatch/matchAdmin/project/add.js

@@ -6,7 +6,7 @@ Page({
         form: {},
         // 比赛列表
         matchList: [],
-        // 赛事分组
+        // 赛事组别
         groupList: [],
         //项目类别
         typeList: [],
@@ -39,7 +39,7 @@ Page({
             that.setData({ 'form.type': data.value, 'form.zhType': data.label })
         }
     },
-    // 比赛名称
+    // 赛事名称
     matchChange: function (e) {
         const that = this;
         let data = that.data.matchList[e.detail.value];
@@ -47,7 +47,7 @@ Page({
             that.setData({ 'form.match_id': data._id, 'form.match_name': data.name })
         }
     },
-    // 赛事分组
+    // 赛事组别
     groupChange: function (e) {
         const that = this;
         let data = that.data.groupList[e.detail.value];

pagesMatch/matchAdmin/project/add.wxml

@@ -9,18 +9,18 @@
                     </view>
                 </view>
                 <view class="content">
-                    <view class="label">比赛名称：</view>
+                    <view class="label">赛事名称：</view>
                     <view class="value">
                         <picker mode="selector" bindchange="matchChange" name="match_id" value="{{form.match_id}}" range="{{matchList}}" range-key="name">
-                            <view class="picker">{{form.match_name||'请选择比赛名称'}}</view>
+                            <view class="picker">{{form.match_name||'请选择赛事名称'}}</view>
                         </picker>
                     </view>
                 </view>
                 <view class="content">
-                    <view class="label">赛事分组：</view>
+                    <view class="label">赛事组别：</view>
                     <view class="value">
                         <picker mode="selector" bindchange="groupChange" name="group_id" value="{{form.group_id}}" range="{{groupList}}" range-key="name">
-                            <view class="picker">{{form.group_name||'请选择赛事分组'}}</view>
+                            <view class="picker">{{form.group_name||'请选择赛事组别'}}</view>
                         </picker>
                     </view>
                 </view>

pagesMatch/system/index.js

@@ -49,7 +49,7 @@ Page({
                     const aee = await app.$get(`/user/${arr.data.user_id}`);
                     if (aee.errcode == '0') { arr.data.user_id = aee.data; }
                     that.setData({ user: arr.data })
-                    let btnData = match_menu.find((i) => i.type == '1');
+                    let btnData = match_menu.find((i) => i.type == arr.data.type);
                     that.setData({ list: [...btnData.menu, ...school_sysmenu] })
                 }
                 else { wx.showToast({ title: `${arr.errmsg}`, icon: 'error', duration: 2000 }); }