From 978a5c4e706fa4da6cc67aeaca8d2e2004c510dc Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 12 Jul 2024 11:52:17 +0800
Subject: [PATCH] =?UTF-8?q?update=20getMerchantListByAuth=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/api/member/info.js                 | 4 ++--
 jsowell-ui/src/views/member/info/index.vue        | 4 ++--
 jsowell-ui/src/views/member/memberGroup/index.vue | 6 +++---
 jsowell-ui/src/views/member/merchantVIP/index.vue | 6 +++---
 jsowell-ui/src/views/pile/card/index.vue          | 9 +++++----
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/jsowell-ui/src/api/member/info.js b/jsowell-ui/src/api/member/info.js
index b5bf3f115..e92553b77 100644
--- a/jsowell-ui/src/api/member/info.js
+++ b/jsowell-ui/src/api/member/info.js
@@ -133,7 +133,7 @@ export function updatePlatformTester(data) {
 }
 
 // 获取运营商列表
-export function getMerchantList() {
+export function getMerchantListByAuth() {
     return request({
         url: '/member/info/getMerchantListByAuth',
         method: 'get'
@@ -147,4 +147,4 @@ export function getMemberBalanceChangesV2(data) {
         method: 'post',
         data: data
     });
-}
\ No newline at end of file
+}
diff --git a/jsowell-ui/src/views/member/info/index.vue b/jsowell-ui/src/views/member/info/index.vue
index 891cdcc29..0e465c19e 100644
--- a/jsowell-ui/src/views/member/info/index.vue
+++ b/jsowell-ui/src/views/member/info/index.vue
@@ -246,7 +246,7 @@ import {
     addInfo,
     updateInfo,
     updateMemberBalance,
-    getMerchantList,
+    getMerchantListByAuth,
 } from "@/api/member/info";
 
 export default {
@@ -334,7 +334,7 @@ export default {
         },
         // 获取运营商列表
         getMerchantList() {
-            getMerchantList().then((response) =>{
+            getMerchantListByAuth().then((response) =>{
               console.log("response", response)
               this.merchantList = response.obj;
             })
diff --git a/jsowell-ui/src/views/member/memberGroup/index.vue b/jsowell-ui/src/views/member/memberGroup/index.vue
index 5a342cf39..156c45864 100644
--- a/jsowell-ui/src/views/member/memberGroup/index.vue
+++ b/jsowell-ui/src/views/member/memberGroup/index.vue
@@ -60,7 +60,7 @@
 
 <script>
 import { listMemberGroup, getMemberGroup, delMemberGroup, addMemberGroup, updateMemberGroup } from "@/api/member/memberGroup";
-import { getMerchantList } from "@/api/member/info";
+import { getMerchantListByAuth } from "@/api/member/info";
 import { getStationListByMerchantId } from "@/api/pile/station";
 
 export default {
@@ -133,9 +133,9 @@ export default {
     methods: {
         // 获取运营商列表
         getMerchantList() {
-            getMerchantList().then((response) => {
+            getMerchantListByAuth().then((response) => {
                 console.log("response", response)
-                this.merchantList = response.data;
+                this.merchantList = response.obj;
                 this.createMerchantVip.targetMerchantId = this.merchantList[0].merchantId
             })
         },
diff --git a/jsowell-ui/src/views/member/merchantVIP/index.vue b/jsowell-ui/src/views/member/merchantVIP/index.vue
index 1ac3e4098..80f95feee 100644
--- a/jsowell-ui/src/views/member/merchantVIP/index.vue
+++ b/jsowell-ui/src/views/member/merchantVIP/index.vue
@@ -214,7 +214,7 @@ import {
     addInfo,
     updateInfo,
     updateMemberBalance,
-    getMerchantList, queryMerchantVipList, createMerchantVip, getMemberBalanceChangesV2
+    getMerchantListByAuth, queryMerchantVipList, createMerchantVip, getMemberBalanceChangesV2
 } from "@/api/member/info";
 import { parseTime } from "@/utils/common";
 export default {
@@ -321,9 +321,9 @@ export default {
         },
         // 获取运营商列表
         getMerchantList() {
-            getMerchantList().then((response) => {
+            getMerchantListByAuth().then((response) => {
                 console.log("response", response)
-                this.merchantList = response.data;
+                this.merchantList = response.obj;
                 this.createMerchantVip.targetMerchantId = this.merchantList[0].merchantId
             })
         },
diff --git a/jsowell-ui/src/views/pile/card/index.vue b/jsowell-ui/src/views/pile/card/index.vue
index f022ea86b..3876628e8 100644
--- a/jsowell-ui/src/views/pile/card/index.vue
+++ b/jsowell-ui/src/views/pile/card/index.vue
@@ -171,7 +171,7 @@
 <script>
 import {listCard, getCard, delCard, addCard, updateCard, deactivateCard} from "@/api/pile/card";
 import {queryFirstLevelMerchant} from "@/api/pile/merchant";
-import {getMerchantList} from "@/api/member/info";
+import {getMerchantListByAuth} from "@/api/member/info";
 
 export default {
     name: "card",
@@ -264,9 +264,9 @@ export default {
         },
         // 获取运营商列表
         getMerchantList() {
-            getMerchantList().then((response) => {
-                // console.log("getMerchantList response", response);
-                this.merchantList = response.data;
+            getMerchantListByAuth().then((response) => {
+                console.log("getMerchantList response", response);
+                this.merchantList = response.obj;
                 this.form.merchantId = this.merchantList[0].merchantId
             })
         },
@@ -306,6 +306,7 @@ export default {
         },
         /** 新增按钮操作 */
         handleAdd() {
+            console.log("新增按钮操作");
             this.reset();
             this.open = true;
             this.title = "添加充电站鉴权卡";