1

commpents/datetime-picker/index.wxml

@@ -1,5 +1,5 @@
 <view class="main">
-    <picker mode="multiSelector" value="{{datetime}}" bindchange="change" bindcolumnchange="columnChange" range="{{dateTimeArray}}">
+    <picker mode="multiSelector" name="{{datetime}}" value="{{datetime}}" bindchange="change" bindcolumnchange="columnChange" range="{{dateTimeArray}}">
         <view class="text">{{datetime||'选择日期时间'}}</view>
     </picker>
 </view>

pagesMatch/matchAdmin/group/add.js

@@ -8,9 +8,9 @@ Page({
         matchList: []
     },
     initValidate() {
-        const rules = { name: { required: true }, age: { required: false }, explain: { required: false }, match_name: { required: true } }
+        const rules = { name: { required: true }, age: { required: false }, explain: { required: false }, match_id: { required: false } }
         // 验证字段的提示信息，若不传则调用默认的信息
-        const messages = { name: { required: '未输入名称' }, age: { required: '未输入年龄限制' }, explain: { required: '未输入说明' }, match_name: { required: '未选择比赛名称' } };
+        const messages = { name: { required: '组别名称' }, age: { required: '年龄限制' }, explain: { required: '说明' }, match_id: { required: '比赛名称' } };
         this.WxValidate = new WxValidate(rules, messages)
     },
     // 返回
@@ -36,10 +36,11 @@ Page({
             return false
         } else {
             let arr;
-            if (params._id) { arr = await app.$post(`/matchGroup/${params._id}`, params, 'race') }
-            else { arr = await app.$post(`/matchGroup`, params, 'race') }
-            if (arr.errcode == '0') { wx.showToast({ title: `维护信息完成`, icon: 'success', duration: 2000 }); that.back(); }
-            else wx.showToast({ title: `${arr.errmsg}`, icon: 'error', duration: 2000 })
+            console.log(params);
+            // if (params._id) { arr = await app.$post(`/matchGroup/${params._id}`, params, 'race') }
+            // else { arr = await app.$post(`/matchGroup`, params, 'race') }
+            // if (arr.errcode == '0') { wx.showToast({ title: `维护信息完成`, icon: 'success', duration: 2000 }); that.back(); }
+            // else wx.showToast({ title: `${arr.errmsg}`, icon: 'error', duration: 2000 })
         }
     },
     /**

pagesMatch/matchAdmin/group/add.wxml

@@ -8,16 +8,10 @@
                         <input type="text" name="_id" value="{{form._id}}" placeholder="请输入数据id" />
                     </view>
                 </view>
-                <view class="content" style="display: none;">
-                    <view class="label">赛事id：</view>
-                    <view class="value">
-                        <input type="text" name="match_id" value="{{form.match_id}}" placeholder="请输入赛事id" />
-                    </view>
-                </view>
                 <view class="content">
                     <view class="label">比赛名称：</view>
                     <view class="value">
-                        <picker mode="selector" bindchange="matchChange" name="match_name" value="{{form.match_name}}" range="{{matchList}}" range-key="name">
+                        <picker mode="selector" bindchange="matchChange" name="match_id" value="{{form.match_id}}" range="{{matchList}}" range-key="name">
                             <view class="picker">{{form.match_name||'请选择比赛名称'}}</view>
                         </picker>
                     </view>

pagesMatch/matchAdmin/project/add.js

@@ -14,9 +14,9 @@ Page({
         groupList: []
     },
     initValidate() {
-        const rules = { name: { required: true }, type: { required: true }, match_name: { required: true }, group_name: { required: true }, age: { required: false }, gender: { required: false }, num: { required: false }, explain: { required: false } }
+        const rules = { name: { required: true }, type: { required: true }, match_id: { required: true }, group_id: { required: true }, age: { required: false }, gender: { required: false }, num: { required: false }, explain: { required: false } }
         // 验证字段的提示信息，若不传则调用默认的信息
-        const messages = { name: { required: '未输入名称' }, match_name: { required: '未选择比赛赛事' }, group_name: { required: '未选择赛事分组' }, type: { required: '未选择项目类别' }, age: { required: '未输入人数限制' }, gender: { required: '未选择性别限制' }, num: { required: '未输入人数限制' }, explain: { required: '未输入说明' } };
+        const messages = { name: { required: '项目名称' }, match_id: { required: '比赛赛事' }, group_id: { required: '赛事分组' }, type: { required: '项目类别' }, age: { required: '人数限制' }, gender: { required: '性别限制' }, num: { required: '人数限制' }, explain: { required: '说明' } };
         this.WxValidate = new WxValidate(rules, messages)
     },
     // 返回
@@ -121,7 +121,7 @@ Page({
         const that = this;
         let arr;
         // 性别
-        arr = await app.$get(`/dict`, { code: 'gender' });
+        arr = await app.$get(`/dict`, { code: 'match_project_gender' });
         if (arr.errcode == '0' && arr.total > 0) that.setData({ genderList: arr.data[0].list });
         // 项目类别
         arr = await app.$get(`/dict`, { code: 'match_project_type' });

pagesMatch/matchAdmin/project/add.wxml

@@ -8,22 +8,10 @@
                         <input type="text" name="_id" value="{{form._id}}" placeholder="请输入数据id" />
                     </view>
                 </view>
-                <view class="content" style="display: none;">
-                    <view class="label">赛事id：</view>
-                    <view class="value">
-                        <input type="text" name="match_id" value="{{form.match_id}}" placeholder="请输入赛事id" />
-                    </view>
-                </view>
-                <view class="content" style="display: none;">
-                    <view class="label">赛事分组id：</view>
-                    <view class="value">
-                        <input type="text" name="group_id" value="{{form.group_id}}" placeholder="请输入赛事分组id" />
-                    </view>
-                </view>
                 <view class="content">
                     <view class="label">比赛名称：</view>
                     <view class="value">
-                        <picker mode="selector" bindchange="matchChange" name="match_name" value="{{form.match_name}}" range="{{matchList}}" range-key="name">
+                        <picker mode="selector" bindchange="matchChange" name="match_id" value="{{form.match_id}}" range="{{matchList}}" range-key="name">
                             <view class="picker">{{form.match_name||'请选择比赛名称'}}</view>
                         </picker>
                     </view>
@@ -31,7 +19,7 @@
                 <view class="content">
                     <view class="label">赛事分组：</view>
                     <view class="value">
-                        <picker mode="selector" bindchange="groupChange" name="group_name" value="{{form.group_name}}" range="{{groupList}}" range-key="name">
+                        <picker mode="selector" bindchange="groupChange" name="group_id" value="{{form.group_id}}" range="{{groupList}}" range-key="name">
                             <view class="picker">{{form.group_name||'请选择赛事分组'}}</view>
                         </picker>
                     </view>
@@ -57,10 +45,10 @@
                     </view>
                 </view>
                 <view class="content">
-                    <view class="label">性别：</view>
+                    <view class="label">性别限制：</view>
                     <view class="value">
                         <picker mode="selector" bindchange="genderChange" name="gender" value="{{form.gender}}" range="{{genderList}}" range-key="label">
-                            <view class="picker">{{form.zhGender||'请选择性别'}}</view>
+                            <view class="picker">{{form.zhGender||'请选择性别限制'}}</view>
                         </picker>
                     </view>
                 </view>

pagesMatch/matchAdmin/project/list.js

@@ -78,7 +78,7 @@ Page({
         const that = this;
         let arr;
         // 性别
-        arr = await app.$get(`/dict`, { code: 'gender' });
+        arr = await app.$get(`/dict`, { code: 'match_project_gender' });
         if (arr.errcode == '0' && arr.total > 0) that.setData({ genderList: arr.data[0].list });
         // 项目类别
         arr = await app.$get(`/dict`, { code: 'match_project_type' });