From f0869c3ba8f3c9256d001fe585dfd895df633d74 Mon Sep 17 00:00:00 2001
From: qijq <624811160@qq.com>
Date: Sat, 10 May 2025 06:04:40 +0800
Subject: [PATCH] update

---
 java-mall-app-shop-admin/api/audit.js         |  2 -
 .../pages/audit/checkAudit.vue                | 12 ++++--
 .../pages/audit/shop1.vue                     |  7 ++--
 .../pages/audit/shop2.vue                     |  7 ++--
 .../pages/audit/shop3.vue                     |  8 ++--
 .../pages/index/index.vue                     |  2 +-
 .../pages/login/login.vue                     |  2 +-
 java-mall-app-shop-admin/pages/my/setting.vue | 37 +------------------
 .../store/modules/user.js                     | 13 ++++---
 9 files changed, 31 insertions(+), 59 deletions(-)

diff --git a/java-mall-app-shop-admin/api/audit.js b/java-mall-app-shop-admin/api/audit.js
index 61e6b14..8a8204b 100644
--- a/java-mall-app-shop-admin/api/audit.js
+++ b/java-mall-app-shop-admin/api/audit.js
@@ -97,7 +97,6 @@ export function GetAuditStatus(params = {}) {
       .then((res) => {
         if (res && res.status == 200) {
           uni.setStorageSync('approvalStatus', res.data.approval_status);
-          uni.setStorageSync('approvalStatusInfo', res.data);
         }
         resolve(res);
       })
@@ -124,7 +123,6 @@ export function GetAuditInfo(params) {
       .then((res) => {
         if (res && res.status == 200) {
           uni.setStorageSync('approvalStatus', res.data.approval_status);
-          uni.setStorageSync('approvalStatusInfo', res.data);
         }
         resolve(res);
       })
diff --git a/java-mall-app-shop-admin/pages/audit/checkAudit.vue b/java-mall-app-shop-admin/pages/audit/checkAudit.vue
index bd0f9c7..cf5c6e7 100644
--- a/java-mall-app-shop-admin/pages/audit/checkAudit.vue
+++ b/java-mall-app-shop-admin/pages/audit/checkAudit.vue
@@ -2,7 +2,7 @@
   <view class="checkAudit-container">
     <u-navbar :autoBack="true" :safeAreaInsetTop="true" title="商户入驻申请">
       <template slot="right">
-        <view class="btn-login-out" @click="LoginOut">退出登录</view>
+        <view class="btn-login-out" @click="loginOut">退出登录</view>
       </template>
     </u-navbar>
     <favorite-loading
@@ -113,7 +113,7 @@ import {
 } from "../../api/audit";
 import { GetAccountDashboard } from "../../api/user";
 import { UploadFilePromise } from "../../api/upload";
-import { mapState, mapActions } from "vuex";
+import { mapState } from "vuex";
 import favoriteLoading from "@/components/favorite-loading/favorite-loading.vue";
 export default {
   name: "checkAudit",
@@ -161,7 +161,6 @@ export default {
     ...mapState("user", ["userInfo"]),
   },
   methods: {
-    ...mapActions("user", ["LoginOut"]),
     async getAuditInfo() {
       var params = {};
 
@@ -200,10 +199,12 @@ export default {
 
         if (
           this.auditInfo.approval_status == 1 &&
-          this.auditInfo.signed_status == 2
+          this.auditInfo.signed_status == 2 &&
+          this.auditInfo.store_status == 1
         ) {
           let result = await GetAccountDashboard();
           if (result && result.status == 200) {
+            debugger;
             uni.setStorageSync("accountDashboard", result.data);
             uni.setStorageSync("auditInfo", res.data);
             uni.switchTab({
@@ -363,6 +364,9 @@ export default {
       this.form.bank_name = e.value[0].bank_name;
       this.showActionSheet = false;
     },
+    loginOut() {
+      this.$store.dispatch("user/LoginOut");
+    },
   },
 };
 </script>
diff --git a/java-mall-app-shop-admin/pages/audit/shop1.vue b/java-mall-app-shop-admin/pages/audit/shop1.vue
index 5b6b0be..1f11325 100644
--- a/java-mall-app-shop-admin/pages/audit/shop1.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop1.vue
@@ -12,7 +12,7 @@
       title="填写店铺信息第1步 / 共3步"
     >
       <template slot="right">
-        <view class="btn-login-out" @click="LoginOut">退出登录</view>
+        <view class="btn-login-out" @click="loginOut">退出登录</view>
       </template>
     </u-navbar>
     <u-form :model="form" class="form" ref="uForm" label-width="70">
@@ -114,7 +114,6 @@
   </view>
 </template>
 <script>
-import { mapActions } from "vuex";
 import { UploadFilePromise } from "../../api/upload";
 export default {
   data() {
@@ -194,7 +193,6 @@ export default {
     this.$refs["uForm"].setRules(this.rules);
   },
   methods: {
-    ...mapActions("user", ["LoginOut"]),
     async afterRead1(e) {
       const item = e.file;
       const imgUrl = item.url;
@@ -314,6 +312,9 @@ export default {
         }
       });
     },
+    loginOut() {
+      this.$store.dispatch("user/LoginOut");
+    },
   },
 };
 </script>
diff --git a/java-mall-app-shop-admin/pages/audit/shop2.vue b/java-mall-app-shop-admin/pages/audit/shop2.vue
index 332ce4c..149e2f7 100644
--- a/java-mall-app-shop-admin/pages/audit/shop2.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop2.vue
@@ -6,7 +6,7 @@
       title="填写店铺信息第2步 / 共3步"
     >
       <template slot="right">
-        <view class="btn-login-out" @click="LoginOut">退出登录</view>
+        <view class="btn-login-out" @click="loginOut">退出登录</view>
       </template>
     </u-navbar>
     <view class="shop-2-content">
@@ -270,7 +270,6 @@
 </template>
 
 <script>
-import { mapActions } from "vuex";
 import { UploadFilePromise } from "../../api/upload";
 export default {
   data() {
@@ -414,7 +413,6 @@ export default {
     this.$refs["uForm2"].setRules(this.rules2);
   },
   methods: {
-    ...mapActions("user", ["LoginOut"]),
     //营业执照
     async afterRead(e, type) {
       const item = e.file;
@@ -617,6 +615,9 @@ export default {
 
       this.showPicker = false;
     },
+    loginOut() {
+      this.$store.dispatch("user/LoginOut");
+    },
   },
 };
 </script>
diff --git a/java-mall-app-shop-admin/pages/audit/shop3.vue b/java-mall-app-shop-admin/pages/audit/shop3.vue
index 7e59d5b..c076adb 100644
--- a/java-mall-app-shop-admin/pages/audit/shop3.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop3.vue
@@ -6,7 +6,7 @@
       title="填写店铺信息第3步 / 共3步"
     >
       <template slot="right">
-        <view class="btn-login-out" @click="LoginOut">退出登录</view>
+        <view class="btn-login-out" @click="loginOut">退出登录</view>
       </template>
     </u-navbar>
     <u-form :model="form" ref="uForm" label-width="90">
@@ -78,7 +78,7 @@
 <script>
 import { GetBankList, GetMerchApply, GetRestartMerchApply } from "@/api/audit";
 import lzcPicker from "@/components/lzc-picker/lzc-picker.vue";
-import { mapState, mapActions } from "vuex";
+import { mapState } from "vuex";
 export default {
   components: {
     lzcPicker,
@@ -139,7 +139,6 @@ export default {
     this.getBankList();
   },
   methods: {
-    ...mapActions("user", ["LoginOut"]),
     async getBankList() {
       let res = await GetBankList();
       if (res && res.status == 200) {
@@ -193,6 +192,9 @@ export default {
     handleCancel(item) {
       this.form.bank_name = item.bank_name;
     },
+    loginOut() {
+      this.$store.dispatch("user/LoginOut");
+    },
   },
 };
 </script>
diff --git a/java-mall-app-shop-admin/pages/index/index.vue b/java-mall-app-shop-admin/pages/index/index.vue
index 125007a..6728a71 100644
--- a/java-mall-app-shop-admin/pages/index/index.vue
+++ b/java-mall-app-shop-admin/pages/index/index.vue
@@ -30,7 +30,7 @@ export default {
     ...mapState("user", ["userInfo"]),
   },
   onShow() {
-    if (this.userInfo) {
+    if (this.userInfo && Object.keys(this.userInfo).length > 0) {
       var _userinfo = JSON.parse(JSON.stringify(this.userInfo));
       var mobile = "";
 
diff --git a/java-mall-app-shop-admin/pages/login/login.vue b/java-mall-app-shop-admin/pages/login/login.vue
index 5c3184c..3c5b0ba 100644
--- a/java-mall-app-shop-admin/pages/login/login.vue
+++ b/java-mall-app-shop-admin/pages/login/login.vue
@@ -176,7 +176,7 @@ export default {
     ...mapState("user", ["userInfo"]),
   },
   onShow() {
-    if (this.userInfo) {
+    if (this.userInfo && Object.keys(this.userInfo).length > 0) {
       var _userinfo = JSON.parse(JSON.stringify(this.userInfo));
       var mobile = "";
 
diff --git a/java-mall-app-shop-admin/pages/my/setting.vue b/java-mall-app-shop-admin/pages/my/setting.vue
index c3ed824..92b12ac 100644
--- a/java-mall-app-shop-admin/pages/my/setting.vue
+++ b/java-mall-app-shop-admin/pages/my/setting.vue
@@ -65,7 +65,6 @@
 
 <script>
 import { mapState } from "vuex";
-import { OutLogin } from "../../api/user";
 export default {
   data() {
     return {};
@@ -100,41 +99,7 @@ export default {
       });
     },
     outLogin() {
-      uni.showModal({
-        title: "退出登录",
-        content: `您是否要退出登录？`,
-        success: async (res) => {
-          if (res.confirm) {
-            let res = await OutLogin();
-            if (res && res.status == 200) {
-              uni.removeStorageSync("ukey");
-              uni.removeStorageSync("uid");
-              uni.removeStorageSync("accountDashboard");
-              uni.removeStorageSync("approvalStatus");
-              uni.removeStorageSync("approvalStatusInfo");
-              uni.removeStorageSync("auditInfo");
-              uni.removeStorageSync("contractDownloadUrl");
-              uni.removeStorageSync("pdfjs.history");
-              uni.removeStorageSync("userInfo");
-
-              this.$store.state.user.ukey = "";
-              this.$store.state.user.uid = "";
-              this.$store.state.user.auditStatusInfo = {
-                approval_invalid_col: [],
-                approval_status: -4,
-                approval_remark: "",
-                id: 0,
-              };
-              setTimeout(() => {
-                uni.redirectTo({
-                  url: "/pages/index/index",
-                });
-              }, 100);
-            }
-          } else if (res.cancel) {
-          }
-        },
-      });
+      this.$store.dispatch("user/LoginOut");
     },
   },
 };
diff --git a/java-mall-app-shop-admin/store/modules/user.js b/java-mall-app-shop-admin/store/modules/user.js
index 748f674..9d7ea34 100644
--- a/java-mall-app-shop-admin/store/modules/user.js
+++ b/java-mall-app-shop-admin/store/modules/user.js
@@ -1,13 +1,11 @@
 import { GetLogin, GetAccountLogin } from '../../api/login';
-import { OutLogin } from '../../api/user';
+import { OutLogin, GetAccountDashboard } from '../../api/user';
 import { GetAuditStatus, GetAuditInfo } from '../../api/audit';
 // import $cookies from '../../utils/vue-cookies'
 
 const defaultState = () => {
   return {
-    userInfo: uni.getStorageSync('userInfo') || {
-      user_mobile: '',
-    },
+    userInfo: uni.getStorageSync('userInfo') || {},
     uid: uni.getStorageSync('uid') || '',
     ukey: uni.getStorageSync('ukey') || '',
     auditStatusInfo: uni.getStorageSync('auditStatusInfo') || {
@@ -30,14 +28,16 @@ const mutations = {
     state.auditStatusInfo = auditStatusInfo;
   },
   LOGIN_OUT(state) {
-    state.ukey = '';
+    state.userInfo = '';
     state.uid = '';
+    state.ukey = '';
     state.auditStatusInfo = {
       approval_invalid_col: [],
       approval_status: -4,
       approval_remark: '',
       id: 0,
     };
+    state.approvalStatus = '';
   },
 };
 
@@ -106,8 +106,8 @@ const actions = {
             uni.removeStorageSync('uid');
             uni.removeStorageSync('accountDashboard');
             uni.removeStorageSync('approvalStatus');
-            uni.removeStorageSync('approvalStatusInfo');
             uni.removeStorageSync('auditInfo');
+            uni.removeStorageSync('auditId');
             uni.removeStorageSync('contractDownloadUrl');
             uni.removeStorageSync('pdfjs.history');
             uni.removeStorageSync('userInfo');
@@ -161,6 +161,7 @@ const actions = {
           result.data.contract_download_url
         );
         uni.setStorageSync('auditId', result.data.id);
+        uni.setStorageSync('auditInfo', result.data);
 
         uni.switchTab({
           url: '/pages/order/order',