From 67f046c281aaf0128ef0a8bea8e01965deae5680 Mon Sep 17 00:00:00 2001
From: panqihua <panqihua@melt.icu>
Date: Sat, 14 Jan 2023 15:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E8=AF=A6=E6=83=85=E5=92=8C=E8=B4=AD=E4=B9=B0?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/platform/buyDetail.vue           |  7 +++--
 src/views/platform/cart.vue                | 10 +++----
 src/views/platform/discount.vue            |  8 +++--
 src/views/platform/walletDetail.vue        | 17 ++++++-----
 src/views/system/user/index.vue            | 34 +++++++++++++++++-----
 src/views/system/user/profile/baseForm.vue |  2 ++
 6 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/src/views/platform/buyDetail.vue b/src/views/platform/buyDetail.vue
index ed0ed85..cb13990 100644
--- a/src/views/platform/buyDetail.vue
+++ b/src/views/platform/buyDetail.vue
@@ -10,8 +10,9 @@
             </el-form-item>
 
             <el-form-item label="创建时间">
-                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-                    range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                <el-date-picker v-model="queryParams.dateRange" style="width: 240px" value-format="yyyy-MM-dd"
+                    type="daterange" range-separator="-" start-placeholder="开始日期"
+                    end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
 
             <el-form-item>
@@ -21,7 +22,7 @@
         </el-form>
 
 
-        <el-table v-loading="loading" :data="followers">
+        <el-table v-loading="loading" :data="buyDetailList">
             <el-table-column label="新创建时间" align="center">
             </el-table-column>
             <el-table-column label="订单号" align="center">
diff --git a/src/views/platform/cart.vue b/src/views/platform/cart.vue
index 3ca83c8..ada0aaa 100644
--- a/src/views/platform/cart.vue
+++ b/src/views/platform/cart.vue
@@ -46,11 +46,11 @@ export default {
         getList() {
             // this.loading = true;
 
-            listCart(this.userId).then(response => {
-                this.cartList = response.rows;
-                this.total = response.total;
-                this.loading = false;
-            });
+            // listCart(this.userId).then(response => {
+            //     this.cartList = response.rows;
+            //     this.total = response.total;
+            //     this.loading = false;
+            // });
         }
     },
     watch: {
diff --git a/src/views/platform/discount.vue b/src/views/platform/discount.vue
index 1879151..269d56c 100644
--- a/src/views/platform/discount.vue
+++ b/src/views/platform/discount.vue
@@ -2,8 +2,9 @@
     <div class="app-container">
         <el-form class="query-form" :inline="true">
             <el-form-item label="领取时间">
-                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-                    range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                <el-date-picker v-model="queryParams.dateRange" style="width: 240px" value-format="yyyy-MM-dd"
+                    type="daterange" range-separator="-" start-placeholder="开始日期"
+                    end-placeholder="结束日期"></el-date-picker>
 
             </el-form-item>
 
@@ -29,7 +30,7 @@
             </el-row>
         </div>
 
-        <el-table v-loading="loading" :data="followers">
+        <el-table v-loading="loading" :data="discountList">
             <el-table-column label="领取时间" align="center">
             </el-table-column>
             <el-table-column label="名称" align="center">
@@ -62,6 +63,7 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                dateRange: undefined
             },
         }
     },
diff --git a/src/views/platform/walletDetail.vue b/src/views/platform/walletDetail.vue
index 2500049..64aba3f 100644
--- a/src/views/platform/walletDetail.vue
+++ b/src/views/platform/walletDetail.vue
@@ -1,23 +1,23 @@
 <template>
     <div class="app-container">
         <el-row class="balance">
-            <el-col span="4">
+            <el-col :span="4">
                 <div>￥123.00</div>
                 <div>钱包余额</div>
             </el-col>
-            <el-col span="4">
+            <el-col :span="4">
                 <div>￥123.00</div>
                 <div>提现总金额</div>
             </el-col>
-            <el-col span="4">
+            <el-col :span="4">
                 <div>￥123.00</div>
                 <div>充值金额</div>
             </el-col>
-            <el-col span="4">
+            <el-col :span="4">
                 <div>￥123.00</div>
                 <div>邀请金额</div>
             </el-col>
-            <el-col span="4">
+            <el-col :span="4">
                 <div>￥123.00</div>
                 <div>支出金额</div>
             </el-col>
@@ -32,8 +32,9 @@
             </el-form-item>
 
             <el-form-item label="创建时间">
-                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-                    range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                <el-date-picker v-model="queryParams.dateRange" style="width: 240px" value-format="yyyy-MM-dd"
+                    type="daterange" range-separator="-" start-placeholder="开始日期"
+                    end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
 
             <el-form-item>
@@ -43,7 +44,7 @@
         </el-form>
 
 
-        <el-table v-loading="loading" :data="followers">
+        <el-table v-loading="loading" :data="walletDetailList">
             <el-table-column label="新创建时间" align="center">
             </el-table-column>
             <el-table-column label="订单号" align="center">
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0025d42..fdd9e6d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -99,12 +99,12 @@
 
           <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
-              <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+              <el-button size="mini" type="text" @click="showDetail(scope.row.userId)"
                 v-hasPermi="['system:user:edit']">详情</el-button>
               <el-button size="mini" type="text"
                 @click="updateStatusByUserId(scope.row.status === '0' ? '1' : '0', scope.row.userId)"
                 v-hasPermi="['system:user:edit']">{{ scope.row.status === '0' ? '禁用' : '开启' }}</el-button>
-              <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+              <el-button size="mini" type="text" @click="showBuyDetail(scope.row.userId)"
                 v-hasPermi="['system:user:edit']">购买明细</el-button>
 
             </template>
@@ -123,7 +123,8 @@
     </el-dialog>
 
     <!-- 用户详情对话框 -->
-    <el-dialog :title="title" :visible.sync="detail.open" width="1200px" append-to-body @close="getList">
+    <el-dialog :title="title" :visible.sync="detail.open" width="1200px" append-to-body
+      @close="getList(); detail.activeName = null">
       <el-tabs v-model="detail.activeName" type="card">
         <el-tab-pane label="基本信息" name="base">
           <base-form :reset="reset" :form="form" show-detail />
@@ -131,7 +132,7 @@
         <el-tab-pane label="钱包明细" name="balance">
           <platform-wallet-detail :user-id="form.userId" />
         </el-tab-pane>
-        <el-tab-pane label="购买明细" name="pay_detail">
+        <el-tab-pane label="购买明细" name="buy_detail">
           <platform-buy-detail :user-id="form.userId" />
         </el-tab-pane>
         <el-tab-pane v-hasPermi="['platform:address:list']" label="收货地址" name="address">
@@ -235,7 +236,7 @@ export default {
         // 是否显示弹出层
         open: false,
         //激活标签页
-        activeName: "base"
+        activeName: null
       },
       // 用户导入参数
       upload: {
@@ -282,6 +283,15 @@ export default {
     });
   },
   methods: {
+    showBuyDetail(userId) {
+      this.detail.activeName = 'buy_detail'
+      this.clickUserId = userId
+      this.detail.open = true
+    },
+    showDetail(userId) {
+      this.detail.activeName = 'base'
+      this.clickUserId = userId
+    },
     //批量更新用户状态
     updateStatusByUserId(status, userId) {
       updateStatus({
@@ -391,18 +401,19 @@ export default {
       });
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate() {
       this.reset();
-      const userId = row.userId || this.ids;
+      const userId = this.clickUserId
       getUser(userId).then(response => {
         this.form = response.data;
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
         this.$set(this.form, "postIds", response.postIds);
         this.$set(this.form, "roleIds", response.roleIds);
-        this.detail.open = true;
         this.title = "用户详情";
         this.form.password = "";
+        this.detail.open = true
+        this.form.referrerPhone = this.form.referrerSysUser.phonenumber
       });
     },
     /** 重置密码按钮操作 */
@@ -466,6 +477,13 @@ export default {
     submitFileForm() {
       this.$refs.upload.submit();
     }
+  },
+  watch: {
+    'detail.activeName': function (value) {
+      if (value === 'base' && !this.detail.open) {
+        this.handleUpdate()
+      }
+    }
   }
 };
 </script>
diff --git a/src/views/system/user/profile/baseForm.vue b/src/views/system/user/profile/baseForm.vue
index 7b9a053..b885394 100644
--- a/src/views/system/user/profile/baseForm.vue
+++ b/src/views/system/user/profile/baseForm.vue
@@ -152,8 +152,10 @@ export default {
                     }
                 ]
             }
+
         }
     },
+
     methods: {
         // 模糊查询手机号
         queryByPhone(queryString, cb) {