zhaoxiaohai 2 years ago
parent
commit
6763787663
4 changed files with 22 additions and 49 deletions
  1. 7 25
      packageA/group/index.js
  2. 3 1
      packageA/group/index.json
  3. 8 16
      packageA/group/index.scss
  4. 4 7
      packageA/group/index.wxml

+ 7 - 25
packageA/group/index.js

@@ -3,9 +3,9 @@ Page({
     data: {
         ownertable: null,
         ownerid: null,
-        active: 0,
         copyTeams: [], //用来本地搜索
         keyword: "", //搜索关键字
+        activeNames: ["1"],
     },
     handelSubmit(userids) {
         const that = this;
@@ -47,22 +47,18 @@ Page({
     },
     onLoad(options) {
         if (options.item) {
-            let item = JSON.parse(options.item);
             this.setData({
-                ...item
+                ...JSON.parse(options.item)
             });
             this.getList()
         }
     },
-    onInput({
-        detail
-    }) {
-        let list = this.data.copyTeams[this.data.active];
-        if (detail.value) list = list.filter(v => v.position.includes(detail.value) || v.name.includes(detail.value));
+    onChange(event) {
         this.setData({
-            [`teams[${this.data.active}].team`]: list
-        })
+            activeNames: event.detail,
+        });
     },
+
     toAdd() {
         wx.navigateTo({
             url: `/packageA/group/select?data=${
@@ -73,21 +69,7 @@ Page({
           }`,
         })
     },
-    /* 取消搜索 */
-    cancelTheSearch() {
-        this.setData({
-            keyword: "",
-            [`teams[${this.data.active}].team`]: this.data.copyTeams[this.data.active]
-        })
-    },
-    /* 切换tabs */
-    onChange({
-        detail
-    }) {
-        this.setData({
-            active: detail.index
-        })
-    },
+
     //获取列表
     getList() {
         _Http.basic({

+ 3 - 1
packageA/group/index.json

@@ -1,6 +1,8 @@
 {
     "usingComponents": {
-        "List": "./modules/list/index"
+        "List": "./modules/list/index",
+        "van-collapse": "@vant/weapp/collapse/index",
+        "van-collapse-item": "@vant/weapp/collapse-item/index"
     },
     "navigationBarTitleText": "团队"
 }

+ 8 - 16
packageA/group/index.scss

@@ -1,10 +1,3 @@
-.tab-active-class {
-    font-size: 28rpx;
-    font-family: PingFang SC-Bold, PingFang SC;
-    font-weight: bold !important;
-    color: #3874F6 !important;
-}
-
 .head {
     display: flex;
     width: 100vw;
@@ -13,23 +6,16 @@
     padding: 0 30rpx;
     box-sizing: border-box;
 
-    .count {
-        flex: 1;
-        font-size: 28rpx;
-        font-family: PingFang SC-Regular, PingFang SC;
-        color: #333333;
-        flex-shrink: 0;
-    }
-
     .search {
         display: flex;
         align-items: center;
-        width: 360rpx;
+        width: 600rpx;
         height: 58rpx;
         background: #FFFFFF;
         border-radius: 29rpx;
         box-sizing: border-box;
         padding: 0 15rpx;
+        border: 1px solid #ddd;
 
         input {
             flex: 1;
@@ -50,4 +36,10 @@
         margin-left: 32rpx;
         color: #666666;
     }
+}
+
+.content-class {
+    width: 100vw !important;
+    box-sizing: border-box !important;
+    padding: 0 !important;
 }

+ 4 - 7
packageA/group/index.wxml

@@ -1,9 +1,6 @@
-<van-tabs active="{{ active }}" tab-active-class='tab-active-class' color='#3874F6' bind:change="onChange">
-    <van-tab wx:for="{{teams}}" title="{{item.teamname+'团队'}}" wx:key="index">
+<van-collapse value="{{ activeNames }}" bind:change="onChange">
+    <van-collapse-item content-class='content-class' title="{{item.teamleader[0].name+'的团队 ('+item.team.length+')'}}" name="1" wx:for="{{teams}}" wx:key="index">
         <view class="head">
-            <view class="count">
-                总计:{{item.team.length}}个
-            </view>
             <view class="search">
                 <van-icon name="search" />
                 <input type="text" placeholder="搜索关键字" bindinput='onInput' value="{{keyword}}" />
@@ -14,5 +11,5 @@
             </navigator>
         </view>
         <List list='{{item.team}}' />
-    </van-tab>
-</van-tabs>
+    </van-collapse-item>
+</van-collapse>