修改

pagesMy/match/index.wxml

@@ -24,13 +24,13 @@
                     </view>
                 </view>
                 <view class="button">
-                    <button wx:if="{{item.status=='1'}}" class="btn" type="primary" size="mini" data-item="{{item}}" bindtap="toCourse">
+                    <button wx:if="{{item.status=='1'}}" class="color btn" type="primary" size="mini" data-item="{{item}}" bindtap="toCourse">
                         赛程安排
                     </button>
-                    <button class="btn" type="primary" size="mini" data-item="{{item}}" bindtap="toRank">
+                    <button class="color btn" type="primary" size="mini" data-item="{{item}}" bindtap="toRank">
                         排名
                     </button>
-                    <button wx:if="{{user.type=='1'&&item.status=='0'}}" class="btn" type="primary" size="mini" data-item="{{item}}" bindtap="toEdit">
+                    <button wx:if="{{user.type=='1'&&item.status=='0'}}" class="color btn" type="primary" size="mini" data-item="{{item}}" bindtap="toEdit">
                         修改
                     </button>
                 </view>

pagesMy/match/index.wxss

@@ -61,14 +61,25 @@
     text-align: center;
 }
 
-.main .two .list .button .btn {
+.main .two .list .button .color{
     margin: 0 2vw;
-    background-color: var(--rgb40E);
-    background-image: linear-gradient(to right, var(--rgb3AB), var(--rgb40E));
     border-radius: 30rpx;
     font-size: 15px;
 }
 
+.main .two .list .button .btn_1 {
+    background-color: var(--rgb40E);
+    background-image: linear-gradient(to right, var(--rgb3AB), var(--rgb40E));
+}
+.main .two .list .button .btn_2 {
+    background-color: var(--rgbff0);
+    background-image: linear-gradient(to right, var(--rgb3AB), var(--rgbff0));
+}
+.main .two .list .button .btn_3 {
+    background-color: var(--rgb46a);
+    background-image: linear-gradient(to right, var(--rgb3AB), var(--rgb46a));
+}
+
 .type {
     width: 100% !important;
 }

pagesMy/team/index.wxml

@@ -29,13 +29,13 @@
                     </view>
                 </view>
                 <view class="button">
-                    <button class="btn" type="primary" size="mini" data-item="{{item}}" bindtap="toView">
+                    <button class="color btn_1" type="primary" size="mini" data-item="{{item}}" bindtap="toView">
                         查看详情
                     </button>
-                    <button wx:if="{{user.type=='1'&&item.status=='1'}}" class="btn" type="primary" size="mini" data-item="{{item}}" bindtap="toExam">
+                    <button wx:if="{{user.type=='1'&&item.status=='1'}}" class="color btn_2" type="primary" size="mini" data-item="{{item}}" bindtap="toExam">
                         审核成员
                     </button>
-                    <button wx:if="{{user.type=='1'&&item.status=='0'}}" class="btn" type="primary" size="mini" data-item="{{item}}" bindtap="toEdit">
+                    <button wx:if="{{user.type=='1'&&item.status=='0'}}" class="color btn_3" type="primary" size="mini" data-item="{{item}}" bindtap="toEdit">
                         修改
                     </button>
                 </view>

pagesMy/team/index.wxss

@@ -70,15 +70,25 @@
     padding: 1vw 0;
     text-align: center;
 }
-
-.main .two .list .button .btn {
+.main .two .list .button .color{
     margin: 0 2vw;
-    background-color: var(--rgb40E);
-    background-image: linear-gradient(to right, var(--rgb3AB), var(--rgb40E));
     border-radius: 30rpx;
     font-size: 15px;
 }
 
+.main .two .list .button .btn_1 {
+    background-color: var(--rgb40E);
+    background-image: linear-gradient(to right, var(--rgb3AB), var(--rgb40E));
+}
+.main .two .list .button .btn_2 {
+    background-color: var(--rgbff0);
+    background-image: linear-gradient(to right, var(--rgb3AB), var(--rgbff0));
+}
+.main .two .list .button .btn_3 {
+    background-color: var(--rgb46a);
+    background-image: linear-gradient(to right, var(--rgb3AB), var(--rgb46a));
+}
+
 .type {
     width: 100% !important;
 }

pagesMy/teamCreate/index.js

@@ -12,9 +12,6 @@ Page({
         userList: [],
         // 上传图片
         imgList: [],
-        // 成员
-        member: '',
-        memberList: []
     },
     // 上传图片
     imgUpl: function (e) {
@@ -33,26 +30,9 @@ 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 })
-                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 })
-        }
+        const member = e.detail.value
+        that.setData({ "form.member": member })
+        that.setData({ "form.number": member.length.toString() })
     },
     //成立日期选择器
     bindDateChange: function (e) {
@@ -71,9 +51,9 @@ Page({
             // 判断id使用
             let form = that.data.form;
             let res;
-            parmas.member = that.data.memberList
-            parmas.number = that.data.memberList.length.toString()
             parmas.logo = that.data.imgList
+            parmas.member = form.member
+            parmas.number = form.number
             if (form._id) res = await app.$api(`team/${form._id}`, 'POST', parmas);
             else res = await app.$api('team', 'POST', parmas);
             if (res.errcode == '0') {
@@ -115,7 +95,10 @@ Page({
         // 成员
         res = await app.$api('user', 'GET', { status: '1', type: '0' })
         if (res.errcode == '0') {
-            for (const val of res.data) if (!val.name) val.name = '暂无';
+            for (const val of res.data) {
+                val.checked = false
+                if (!val.name) val.name = '暂无';
+            }
             that.setData({ userList: res.data })
         }
     },
@@ -129,7 +112,13 @@ Page({
                     if (res.errcode == '0') {
                         let arr = res.data.create_time.split(/\s+/);
                         if (arr) { res.data.date = arr[0]; res.data.time = arr[1] }
-                        that.setData({ imgList: res.data.logo, memberList: res.data.member, form: res.data })
+                        for (const val of res.data.member) {
+                            for (const as of that.data.userList) {
+                                if (as._id == val) as.checked = true
+                                else as.checked = false
+                            }
+                        }
+                        that.setData({ imgList: res.data.logo, form: res.data })
                     } else {
                         wx.showToast({ title: `${res.errmsg}`, icon: 'none' });
                     }

pagesMy/teamCreate/index.wxml

@@ -30,14 +30,6 @@
                         </picker>
                     </view>
                 </view>
-                <view class="info_1">
-                    <view class="label">
-                        单位地址：
-                    </view>
-                    <view class="value">
-                        <input value="{{form.address}}" name="address" type="text" placeholder="" />
-                    </view>
-                </view>
                 <view class="info_1">
                     <view class="label">
                         手机号：
@@ -48,27 +40,24 @@
                 </view>
                 <view class="info_1">
                     <view class="label">
-                        团队成员选择：
+                        单位地址：
                     </view>
                     <view class="value">
-                        <picker bindchange="userChange" value="{{member}}" range="{{userList}}" range-key='name'>
-                            <view class="picker">
-                                {{member||''}}
-                            </view>
-                        </picker>
+                        <input value="{{form.address}}" name="address" type="text" placeholder="" />
                     </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">

pagesMy/teamCreate/index.wxss

@@ -35,9 +35,14 @@
 
 .main .one .info .info_1 .value .list {
     display: flex;
+    justify-content: center;
     flex-wrap: wrap;
 }
 
+.main .one .info .info_1 .value .list .label {
+    margin: 2px;
+}
+
 .main .one .info .info_1 .value .list .name {
     display: flex;
     align-items: center;

pagesTeam/apply/index.js

@@ -7,6 +7,7 @@ Page({
         info: {},
         user: {},
         adminList: [],
+        memberList: [],
         is_apply: true
     },
     // 申请加入团队
@@ -47,7 +48,7 @@ Page({
     // 退出团队
     async toOut() {
         const that = this;
-        const memberList = that.data.info.member.filter(i => i._id !== that.data.user._id)
+        const memberList = that.data.memberList.filter(i => i._id !== that.data.user._id)
         const number = memberList.length.toString()
         const data = { member: memberList, number: number }
         let res = await app.$api(`team/${that.data.info._id}`, 'POST', data);
@@ -121,8 +122,16 @@ Page({
         const that = this;
         let res = await app.$api(`team/${that.data.id}`, 'GET', {})
         if (res.errcode == '0') {
-            let data = res.data.member.find(i => i._id === that.data.user._id)
+            let memberList = []
+            for (const val of res.data.member) {
+                let arr = await app.$api(`user/${val}`, 'GET', {})
+                if (arr.errcode == '0') {
+                    memberList.push({ _id: val, name: arr.data.name, icon: arr.data.icon })
+                }
+            }
+            let data = memberList.find(i => i._id === that.data.user._id)
             if (data) that.setData({ is_apply: false })
+            that.setData({ memberList })
             res.data.admin_name = that.getDict(res.data.administrator, 'admin')
             that.setData({ info: res.data })
         }

pagesTeam/apply/index.wxml

@@ -13,7 +13,7 @@
     <view class="two">
         <view class="name">团队成员</view>
         <view class="two_1">
-            <view class="list" wx:for="{{info.member}}" wx:key="index" wx:for-item="item">
+            <view class="list" wx:for="{{memberList}}" wx:key="index" wx:for-item="item">
                 <image class="images" src="{{item.icon&&item.icon.length>0?item.icon[0].url:logo}}" mode="" />
                 <view class="title">
                     {{item.name}}