修改

pagesMatch/enroll/index.js

@@ -58,26 +58,8 @@ Page({
     // 选择成员
     userChange(e) {
         const that = this;
-        const memberList = that.data.memberList
-        const index = e.detail.value;
-        let data = that.data.userList[index];
-        if (data) {
-            const res = memberList.find(i => i._id == data._id)
-            if (!res) {
-                memberList.push(data)
-                that.setData({ memberList, 'form.num': memberList.length.toString() })
-                that.setData({ member: data.name })
-            }
-        }
-    },
-    // 删除成员
-    async toDel(e) {
-        const that = this;
-        let res = e.currentTarget.dataset.item
-        if (res) {
-            let memberList = that.data.memberList.filter(i => i._id != res._id);
-            that.setData({ memberList, 'form.num': memberList.length.toString() })
-        }
+        const member = e.detail.value
+        that.setData({ memberList: member })
     },
     // 提交保存
     async toSave(e) {
@@ -164,7 +146,12 @@ Page({
                             })
                         }
                     }
-                    userList = userList.filter(i => i.name)
+                    for (const val of arr.data.user_id) {
+                        for (const as of userList) {
+                            if (!as.name) as.name = '暂无';
+                            if (as._id == val) as.checked = true
+                        }
+                    }
                     that.setData({ userList })
                 }
                 that.setData({ form: arr.data, memberList: arr.data.user_id })

pagesMatch/enroll/index.wxml

@@ -43,24 +43,13 @@
                         团队成员选择：
                     </view>
                     <view class="value">
-                        <picker bindchange="userChange" value="{{member}}" range="{{userList}}" range-key='name'>
-                            <view class="picker">
-                                {{member||''}}
-                            </view>
-                        </picker>
-                    </view>
-                </view>
-                <view class="info_1">
-                    <view class="label">
-                        团队成员：
-                    </view>
-                    <view class="value">
-                        <view class="list">
-                            <view wx:for="{{memberList}}" wx:key="index" wx:for-item="item" class="name">
-                                <view>{{item.name}}</view>
-                                <icon class="icon-small icon" type="cancel" size="18" data-item="{{item}}" bindtap="toDel"></icon>
-                            </view>
-                        </view>
+                        <checkbox-group class="list" bindchange="userChange">
+                            <label class="label" wx:for="{{userList}}" wx:key="index" wx:for-item="item">
+                                <view class="list_1">
+                                    <checkbox value="{{item._id}}" checked="{{item.checked}}">{{item.name}}</checkbox>
+                                </view>
+                            </label>
+                        </checkbox-group>
                     </view>
                 </view>
                 <view class="info_1" wx:if="{{id}}">
@@ -87,7 +76,7 @@
                         <input disabled value="{{form.score}}" name="score" type="text" placeholder="" />
                     </view>
                 </view>
-                <view class="btn">
+                <view class="btn" wx:if="{{!id||form.status=='-1'}}">
                     <button type="primary" formType="submit">申请报名</button>
                 </view>
             </view>

pagesMy/match/index.wxml

@@ -30,8 +30,8 @@
                     <button wx:if="{{item.status=='1'}}" class="color btn_2" type="primary" size="mini" data-item="{{item}}" bindtap="toRank">
                         排名
                     </button>
-                    <button wx:if="{{user.type=='1'&&item.status=='0'}}" class="color btn_3" type="primary" size="mini" data-item="{{item}}" bindtap="toEdit">
-                        修改
+                    <button wx:if="{{user.type=='1'}}" class="color btn_3" type="primary" size="mini" data-item="{{item}}" bindtap="toEdit">
+                        {{item.status === '-1' ? '修改' : '查看'}}
                     </button>
                 </view>
             </view>

pagesMy/match/index.wxss

@@ -50,6 +50,10 @@
     color: var(--rgbff0)
 }
 
+.main .two .list .list_1 .color-1 {
+    color: var(--rgb8b8)
+}
+
 .main .two .list .other .other_1 {
     margin: 0 0 1vw 0;
     font-size: 14px;