调整登录逻辑

pages/member/components/memberManage/index.js

@@ -38,9 +38,9 @@ Component({
       })
     },
     async setAdmin(e) {
-      const { user } = e.currentTarget.dataset;
+      const { user, tenement } = e.currentTarget.dataset;
       await wxModal({ content: `你的管理员身份将转交给${user.nickName}` })
-      const { code, message } = await approveUser({ userId: user.id, type: 2 })
+      const { code, message } = await approveUser({ userId: user.id, type: 2, tenement })
       if (code !== OK) {
         alertInfo(message)
         return;
@@ -54,9 +54,9 @@ Component({
       })
     },
     async remove(e) {
-      const { user } = e.currentTarget.dataset;
-      await wxModal({ content: `将移除${user.nickName}？` })
-      const { code, message } = await removeUser(user.id)
+      const { user, tenement } = e.currentTarget.dataset;
+      await wxModal({ content: `将移除${user.name}？` })
+      const { code, message } = await removeUser(user.id, tenement)
       if (code !== OK) {
         alertInfo(message)
         return;

pages/member/components/memberManage/index.json

@@ -1,4 +1,7 @@
 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index"
+  }
 }

pages/member/components/memberManage/index.wxml

@@ -1,8 +1,20 @@
 <!--pages/member/components/memberManage/index.wxml-->
-<view wx:for="{{list}}" wx:key="index" wx:for-item="item" class="item">
+<!-- <view wx:for="{{list}}" wx:key="index" wx:for-item="item" class="item">
   <view class="nickName"> {{ item.nickName }} </view>
   <view class="operate">
     <view class="primaryTextBtn" data-user="{{item}}" bind:tap="setAdmin"> 设为管理员 </view>
     <view class="disAgree dangerTextBtn" data-user="{{item}}" bind:tap="remove"> 移除 </view>
   </view>
-</view>
+</view> -->
+
+<van-tabs active="{{ active }}" bind:change="onChange">
+  <van-tab wx:for="{{list}}" wx:key="index" title="{{item.name}}">
+    <view wx:for="{{item.users}}" wx:key="index" wx:for-item="ele"  class="item">
+      <view class="nickName"> {{ ele.name }} </view>
+      <view class="operate">
+        <view class="primaryTextBtn" data-user="{{ele}}" bind:tap="setAdmin" data-tenement="{{item.id}}"> 设为管理员 </view>
+        <view class="disAgree dangerTextBtn" data-user="{{ele}}" bind:tap="remove" data-tenement="{{item.id}}"> 移除 </view>
+      </view>
+    </view>
+  </van-tab>
+</van-tabs>

pages/member/components/memberManage/index.wxss

@@ -1,3 +1,4 @@
+@import "/app.wxss";
 
 .item {
   display: flex;