From b078bbf26a1d04811ca546440f52e746402d9601 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Fri, 21 Feb 2025 08:41:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98=E8=B4=A6=E5=8F=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/searchSelect/index.js              |  7 ++-
 .../account/components/editModal/index.js     | 24 +++++++-
 .../account/components/editModal/index.wxml   |  1 +
 pages/workBench/components/account/index.js   | 55 ++++++++++++++++---
 pages/workBench/components/account/index.json |  3 +-
 pages/workBench/components/account/index.wxml | 22 ++++----
 pages/workBench/components/account/index.wxss | 44 +++++++++++++++
 pages/workBench/components/tenement/index.js  | 26 ++++++++-
 .../workBench/components/tenement/index.wxml  | 12 +---
 pages/workBench/index.js                      |  2 +-
 service/user.js                               |  5 ++
 11 files changed, 168 insertions(+), 33 deletions(-)

diff --git a/components/searchSelect/index.js b/components/searchSelect/index.js
index 6efd65e..00301d8 100644
--- a/components/searchSelect/index.js
+++ b/components/searchSelect/index.js
@@ -60,7 +60,12 @@ Component({
     onConfirm(event) {
       const { index } = event.detail;
       const { list = [], type } = this.data;
+      console.log("index", index)
       const item = list[index];
+      if (!item) {
+        alertInfo("请选择一项")
+        return
+      }
       this.setData({
         columns: [],
         list: [],
@@ -134,7 +139,7 @@ Component({
     },
     async onSearchBuilding() {
       const { park } = this.data;
-      const { code, message, data = [] } = await getParkBuildingList(park);
+      const { code, message, buildings: data = [] } = await getParkBuildingList(park);
       if (code !== OK) {
         alertInfo(message)
         return
diff --git a/pages/workBench/components/account/components/editModal/index.js b/pages/workBench/components/account/components/editModal/index.js
index 1eaa7a4..090a41e 100644
--- a/pages/workBench/components/account/components/editModal/index.js
+++ b/pages/workBench/components/account/components/editModal/index.js
@@ -16,12 +16,28 @@ Component({
     park: String,
     tenement: String,
   },
-
+  observers: {
+    "name": function(newValue) {
+      const newData = this.data;
+      newData.name = newValue
+      this.setData({ data: newData })
+    },
+    "id": function(newValue) {
+      const newData = this.data;
+      newData.id = newValue
+      this.setData({ data: newData })
+    },
+    "phone": function(newValue) {
+      const newData = this.data;
+      newData.phone = newValue
+      this.setData({ data: newData })
+    }
+  },
   /**
    * 组件的初始数据
    */
   data: {
-    data: { name: "", phone: "" }
+    data: { name: "", phone: "", id: "" }
   },
 
   /**
@@ -42,6 +58,7 @@ Component({
       const { code, message } = await createTenementWxUser({ ...data, tenement, park })
       if (code !== OK) {
         alertInfo(message)
+        this.triggerEvent("cancel")
         return;
       }
       alertSuccess("操作成功")
@@ -55,6 +72,9 @@ Component({
       this.setData({
         data: newData,
       })
+    },
+    onCancel() {
+      this.triggerEvent("cancel")
     }
   }
 })
\ No newline at end of file
diff --git a/pages/workBench/components/account/components/editModal/index.wxml b/pages/workBench/components/account/components/editModal/index.wxml
index 900e421..cbf0761 100644
--- a/pages/workBench/components/account/components/editModal/index.wxml
+++ b/pages/workBench/components/account/components/editModal/index.wxml
@@ -5,6 +5,7 @@
   show="{{ visible }}"
   show-cancel-button
   bind:confirm="onSubmit"
+  bind:cancel="onCancel"
 >
   <view class="modalContentWrapper">
     <van-field
diff --git a/pages/workBench/components/account/index.js b/pages/workBench/components/account/index.js
index 81299da..470ba4a 100644
--- a/pages/workBench/components/account/index.js
+++ b/pages/workBench/components/account/index.js
@@ -1,7 +1,8 @@
 // pages/workBench/components/account/index.js
 import request from "../../../../utils/request"
-import { getTenementBackInfo, getTenementUsers } from "../../../../service/tenement"
-import { alertInfo } from "../../../../utils/index"
+import { getTenementBackInfo, } from "../../../../service/tenement"
+import { getBackApproveList, removeUser } from "../../../../service/user"
+import { alertInfo, alertSuccess } from "../../../../utils/index"
 const { OK } = request
 
 Component({
@@ -56,6 +57,7 @@ Component({
           })
           break;
         case "tenement":
+          console.log('data', data)
           this.setData({
             tenement: data.id,
             tenementName: data.name,
@@ -73,21 +75,33 @@ Component({
       })
     },
     handleDelete(e) {
-      const {} = e;
+      const { id, name } = e.currentTarget.dataset;
+      const { tenement } = this.data;
+      const that = this;
       wx.showModal({
         title: '提示',
-        content: '确认要移除该用户吗？',
-        complete: (res) => {
+        content: `确认要移除${name}吗？`,
+        complete: async (res) => {
           if (res.cancel) {
             
           }
       
           if (res.confirm) {
-            
+            const { code, message } = await removeUser(id, tenement)
+            if (code !== OK) {
+              alertInfo(message)
+              return;
+            }
+            alertSuccess("删除成功")
+            that.initUserList();
           }
         }
       })
     },
+    onEditConfirm() {
+      this.initUserList()
+      this.handleCancel();
+    },
     async getTenementInfo() {
       const { tenement, park } = this.data;
       const { code, message, tenement: data } = await getTenementBackInfo(park, tenement)
@@ -100,8 +114,8 @@ Component({
       })
     },
     async initUserList() {
-      const { tenementName, park } = this.data;
-      const { code, message, data } = await getTenementUsers({ park, keyword: tenementName });
+      const { tenement } = this.data;
+      const { code, message, data } = await getBackApproveList(tenement, 1);
       if (code !== OK) {
         alertInfo(message)
         return;
@@ -116,6 +130,31 @@ Component({
         type: "add",
         title: "新建子账号"
       })
+    },
+    handleChangeMain() {
+      const { list = [] } = this.data;
+      const main = list?.find(item => item.isAdmin)
+      if (!main) {
+        return
+      }
+      this.setData({
+        visible: true,
+        type: "update",
+        title: "编辑管理员",
+        phone: main.phone,
+        name: main.name,
+        id: main.id,
+      })
+    },
+    handleCancel() {
+      console.log("-------------")
+      this.setData({
+        visible: false,
+        type: "",
+        phone: "",
+        name: "",
+        id: "",
+      })
     }
   }
 })
\ No newline at end of file
diff --git a/pages/workBench/components/account/index.json b/pages/workBench/components/account/index.json
index 57b9106..5f3de68 100644
--- a/pages/workBench/components/account/index.json
+++ b/pages/workBench/components/account/index.json
@@ -11,6 +11,7 @@
     "van-radio": "@vant/weapp/radio/index",
     "van-radio-group": "@vant/weapp/radio-group/index",
     "van-tag": "@vant/weapp/tag/index",
-    "edit-modal": "./components/editModal/index"
+    "edit-modal": "./components/editModal/index",
+    "van-tag": "@vant/weapp/tag/index"
   }
 }
\ No newline at end of file
diff --git a/pages/workBench/components/account/index.wxml b/pages/workBench/components/account/index.wxml
index 115801a..0b6ea3e 100644
--- a/pages/workBench/components/account/index.wxml
+++ b/pages/workBench/components/account/index.wxml
@@ -50,7 +50,7 @@
     />
     <view class="operateBox">
         <van-button type="primary" size="small" style="margin-right: 20rpx;" bind:click="handleAddSon"> 添加子账号 </van-button>
-        <van-button type="primary" size="small" style="margin-right: 20rpx;" > 修改主账号 </van-button>
+        <van-button type="primary" size="small" style="margin-right: 20rpx;" bind:click="handleChangeMain"> 修改主账号 </van-button>
     </view>
     <view wx:if="{{list.length}}">
         <view class="tableWrapper">
@@ -58,20 +58,21 @@
                 <view class="thead">
                     <view class="th" style="width: 70rpx"> 序号 </view>
                     <view class="th" style="width: 200rpx"> 昵称 </view>
-                    <view class="th" style="width: 200rpx"> 手机号 </view>
-                    <view class="th" style="width: 200rpx"> 操作 </view>
+                    <view class="th" style="width: 300rpx"> 手机号 </view>
+                    <view class="th" style="width: 100rpx"> 操作 </view>
                 </view>
                 <view class="tbody">
                     <van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
                         <block wx:for="{{list}}" wx:for-index="itemIndex" wx:key="item">
                             <view class="tr">
-                                <view class="th" style="width: 200rpx"> {{ index }} </view>
-                                <view class="th" style="width: 200rpx"> {{ item.tenement.shortName }} </view>
-                                <view class="th" style="width: 200rpx"> {{ item.money }} </view>
-                                <view class="th" style="width: 200rpx">
-                                    <view class="primaryTextBtn" bind:tap="handleDelete" data-id="{{item.id}}">
+                                <view class="th" style="width: 70rpx"> {{ itemIndex + 1 }} </view>
+                                <view class="th" style="width: 200rpx"> {{ item.name }} </view>
+                                <view class="th" style="width: 300rpx"> {{ item.phone }} </view>
+                                <view class="th" style="width: 100rpx; display: flex;">
+                                    <view class="primaryTextBtn" bind:tap="handleDelete" data-id="{{item.id}}" data-name="{{item.name}}" wx:if="{{!item.isAdmin}}">
                                         移除
                                     </view>
+                                    <van-tag type="primary" wx:else>管理员</van-tag>
                                 </view>
                             </view>
                         </block>
@@ -81,7 +82,7 @@
         </view>
        
     </view>
-    <empty bind:refresh="initUserList" />
+    <empty wx:else bind:refresh="initUserList" />
  
 </view>
 <search-select 
@@ -99,5 +100,6 @@
     title="{{title}}"  
     tenement="{{tenement}}"
     park="{{park}}"  
-    bind:ok="initUserList"
+    bind:ok="onEditConfirm"
+    bind:cancel="handleCancel"
 />
\ No newline at end of file
diff --git a/pages/workBench/components/account/index.wxss b/pages/workBench/components/account/index.wxss
index 8a693b1..e07b279 100644
--- a/pages/workBench/components/account/index.wxss
+++ b/pages/workBench/components/account/index.wxss
@@ -2,4 +2,48 @@
 
 .operateBox {
     margin: 20rpx;
+}
+
+.table {
+    width: 890rpx;
+    
+}
+
+.classWrapper {
+    width: 100vw;
+    overflow-x: auto;
+}
+
+.thead {
+    display: flex;
+    flex-wrap: nowrap;
+    border-bottom: 1rpx solid #EEEEEE;
+}
+
+.thead  .th {
+    padding: 20rpx;
+    white-space: nowrap;
+    text-align: center;
+    box-sizing: border-box;
+
+}
+
+.tbody {
+    width: 890rpx;
+}
+
+.tbody .tr {
+    padding: 20rpx;
+    border-bottom: 1rpx solid #EEEEEE;
+    display: flex;
+    align-items: center;
+    flex-wrap: nowrap;
+}
+
+.tbody .th {
+    word-break: break-all;
+    text-align: center;
+}
+.primaryTextBtn {
+    color: #1989fa;
 }
\ No newline at end of file
diff --git a/pages/workBench/components/tenement/index.js b/pages/workBench/components/tenement/index.js
index 9ed03a7..ec7c5da 100644
--- a/pages/workBench/components/tenement/index.js
+++ b/pages/workBench/components/tenement/index.js
@@ -1,5 +1,7 @@
 import { alertInfo } from "../../../../utils/index";
-
+import { getTenementBackInfo, } from "../../../../service/tenement"
+import request from "../../../../utils/request"
+const { OK } = request
 // pages/workBench/components/tenement/index.js
 Component({
 
@@ -34,6 +36,7 @@ Component({
     },
     onTenementFocus(e) {
       const { park } = this.data;
+      const that = this;
       if (!park) {
         alertInfo("请先选择园区")
         return;
@@ -46,9 +49,21 @@ Component({
     },
     async init() {
 
+    },
+    async getTenementInfo() {
+      const { tenement, park } = this.data;
+      const { code, message, tenement: data } = await getTenementBackInfo(park, tenement)
+      if (code !== OK) {
+        alertInfo(message)
+        return;
+      }
+      this.setData({
+        tenementInfo: data,
+      })
     },
     onConfirm(e) {
       const { type, data } = e.detail;
+      const that = this;
       switch(type) {
         case "park":
           this.setData({
@@ -57,6 +72,15 @@ Component({
             show: false,
           })
           break;
+        case "tenement":
+          this.setData({
+            tenement: data.id,
+            tenementName: data.name,
+            show: false,
+          } , () => {
+            that.getTenementInfo();
+          })
+          break;
       }
     },
     startKh() {
diff --git a/pages/workBench/components/tenement/index.wxml b/pages/workBench/components/tenement/index.wxml
index c356208..2f18178 100644
--- a/pages/workBench/components/tenement/index.wxml
+++ b/pages/workBench/components/tenement/index.wxml
@@ -37,26 +37,20 @@
 <van-empty wx:if="{{!tenement}}" description="选择园区和商户后查看" />
 <view wx:else>
     <van-field
-        value="{{item.tenement.name}}"
+        value="{{tenementInfo.fullName}}"
         label="商户名称"
         readonly
         title-width="140rpx"
     />
     
     <van-field
-        value="{{item.meterNo}}"
+        value="{{tenementInfo.shortName}}"
         label="商户简称"
         readonly
         title-width="140rpx"
     />
     <van-field
-        value="{{item.address}}"
-        label="收费类型"
-        readonly
-        title-width="140rpx"
-    />
-    <van-field
-        value="{{item.address}}"
+        value="{{tenementInfo.phone}}"
         label="预留电话"
         readonly
         title-width="140rpx"
diff --git a/pages/workBench/index.js b/pages/workBench/index.js
index e257546..09ee29b 100644
--- a/pages/workBench/index.js
+++ b/pages/workBench/index.js
@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    active: 3
+    active: 1
   },
 
   /**
diff --git a/service/user.js b/service/user.js
index f0145c5..9f8199e 100644
--- a/service/user.js
+++ b/service/user.js
@@ -68,4 +68,9 @@ export const getPrivaciList = async function() {
 // 获取常见问题
 export const getQuestionList = async function(page) {
   return await GET(`/wx/getQuestions?page=${page}&type=0`);
+}
+
+// 获取扫描二维码的列表
+export const getBackApproveList = async function(tenement, status=0) {
+  return await GET(`/wx/getApproveList?status=${status}&tenement=${tenement}`);
 }
\ No newline at end of file