From 66af30d79e4cd247d400beab38eb139a96ef1c9d Mon Sep 17 00:00:00 2001
From: cuiyouliang <cuiyouliang@lzzg365.com>
Date: Fri, 6 Jun 2025 17:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ums/member/index.vue | 58 +++++++++++++++++++++-------------
 vite.config.ts                 |  4 +--
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue
index 73c1cd4..c873f6d 100644
--- a/src/views/ums/member/index.vue
+++ b/src/views/ums/member/index.vue
@@ -46,7 +46,7 @@
       <el-table v-loading="loading" :data="umsMemberList" border>
         <el-table-column label="昵称" prop="nickname" width="150" />
         <el-table-column label="手机号码" prop="phoneHidden" width="150" />
-        <el-table-column label="佣金" width="120">
+        <!--        <el-table-column label="佣金" width="120">
           <template v-slot="scope">
             <div>0.00</div>
           </template>
@@ -60,7 +60,7 @@
           <template v-slot="scope">
             <div>0.00</div>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column label="注册时间" prop="createTime" width="180">
           <template v-slot="scope">
             <div>{{ parseTime(scope.row.createTime) }}</div>
@@ -85,7 +85,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
     </div>
     <!--    <SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk" />-->
     <!--  统计  -->
@@ -163,8 +163,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        current: 1,
+        size: 10,
         nickname: null,
         phone: null,
         status: undefined,
@@ -244,16 +244,16 @@ export default {
     /** 查询会员信息列表 */
     getList() {
       this.loading = true;
-      const { pageNum, pageSize } = this.queryParams;
+      const { current: pageNum, size: pageSize } = this.queryParams;
       let query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
-      const pageReq = { page: pageNum - 1, size: pageSize };
+      const pageReq = { current: pageNum - 1, size: pageSize };
       if (!this.dateRange || this.dateRange.length > 0) {
         query = { ...this.addDateRange2(query, this.dateRange) };
       }
       listUmsMember(query, pageReq).then((response) => {
-        const { content, totalElements } = response;
-        this.umsMemberList = content;
-        this.total = totalElements;
+        const { records = [], total = 0 } = response.data || {};
+        this.umsMemberList = records;
+        this.total = total;
         this.loading = false;
       });
     },
@@ -384,24 +384,38 @@ export default {
       });
     },
     goOrder(phone) {
-      decryptedPhone(phone).then((res) => {
-        this.$router.push({
-          path: '/order/order',
-          query: {
-            phone: res
-          }
+      if (phone) {
+        decryptedPhone(phone).then((res) => {
+          this.$router.push({
+            path: '/order/list',
+            query: {
+              phone: res
+            }
+          });
         });
-      });
+      } else {
+        this.$router.push({
+          path: '/order/list',
+          query: {}
+        });
+      }
     },
     goCart(phone) {
-      decryptedPhone(phone).then((res) => {
+      if (phone) {
+        decryptedPhone(phone).then((res) => {
+          this.$router.push({
+            path: '/member/shoppingCart',
+            query: {
+              phone: res
+            }
+          });
+        });
+      } else {
         this.$router.push({
           path: '/member/shoppingCart',
-          query: {
-            phone: res
-          }
+          query: {}
         });
-      });
+      }
     },
     showStatistics(memberId) {
       viewStatistics(memberId).then((response) => {
diff --git a/vite.config.ts b/vite.config.ts
index 37bf9d1..7b1b5e6 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -24,8 +24,8 @@ export default defineConfig(({ mode, command }) => {
       open: true,
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          // target: 'http://192.168.224.1:8080',
-          target: 'http://192.168.1.250:8080',
+          target: 'http://192.168.1.13:8080',
+          // target: 'http://192.168.1.250:8080',
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), ''),