Merge branch 'dev' of https://gitlab.33.cn/CassiniatSaturn/fns_backend into dev

package.json

@@ -4,7 +4,8 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build --report"
+    "build": "vue-cli-service build --report",
+    "bd": "npm run build & bash deploy.sh"
   },
   "dependencies": {
     "@tiptap/extension-image": "^2.0.0-beta.15",

src/router/index.ts

@@ -64,37 +64,43 @@ const router = new VueRouter({
 })
 
 router.beforeEach((to, from, next) => {
-  // console.log({ from, to })
+  console.log({ from, to })
 
   const usermsg = getUserMsg()
   if (usermsg === undefined) {
     /* 没有登录 */
     if (to.name == 'adminLogin' || to.name == 'login') {
+      console.log(1)
+
       next()
     } else {
+      console.log(2)
       next({
         name: 'login',
       })
     }
   } else {
+    console.log(3)
     /* 有登录 */
     const roles = (to.meta as { roles?: eRole[] }).roles
     const oldRole = getOldRoleFromUserMsg(usermsg)
     // console.log(oldRole, roles, oldRole && roles && roles.includes(oldRole))
-    const userHasRoleInCurPage = oldRole !== undefined && roles !== undefined && roles.includes(oldRole)
+    const userHasRoleInCurPage =
+      oldRole !== undefined && roles !== undefined && roles.includes(oldRole)
     if (userHasRoleInCurPage) {
-      // console.log(1)
+      console.log(4)
       next()
     } else {
       if (oldRole == eRole.platform_management) {
-        // console.log(2)
-        if(getUserMsg()?.phone){
+        if (getUserMsg()?.phone) {
+          console.log(5)
           next({ name: 'platformUserManagement' })
-        }else{
-          next({name:'changePhone'})
+        } else {
+          console.log(6)
+          next({ name: 'changePhone' })
         }
       } else {
-        // console.log(3)
+        console.log(7)
         next({ name: 'home' })
       }
     }

src/service/index.ts

@@ -6,6 +6,7 @@ import axios, {
 } from 'axios'
 import { message, Modal } from 'ant-design-vue'
 import router from '@/router'
+import RouterUtil from '@/utils/router'
 
 const baseAxios = axios.create({
   baseURL: '/proxyApi/api/v1',
@@ -16,8 +17,9 @@ baseAxios.interceptors.response.use(
     const ret = value.data
     if (ret.code !== undefined && ret.code !== 200) {
       if ([504, 503].includes(ret.code)) {
+        const role = getUserMsg()?.newRole
         window.localStorage.clear()
-        router.push('/login')
+        RouterUtil.getInstance().gotoLogin(role)
         // deleteUserMsg();
       }
       message.error(ret.msg)

src/utils/router/index.ts

+import router from '@/router'
+import { eNewRoleRelatedToBackEnd, eRole } from '@/types/role'
+
+export default class RouterUtil {
+  static instance: RouterUtil
+  static getInstance() {
+    if (!RouterUtil.instance) {
+      RouterUtil.instance = new RouterUtil()
+    }
+    return RouterUtil.instance
+  }
+
+  gotoLogin(role: eNewRoleRelatedToBackEnd | undefined) {
+    if (role === eNewRoleRelatedToBackEnd.PlatformAdmin) {
+      router.push({
+        name: 'adminLogin',
+      })
+    } else {
+      router.push({
+        name: 'login',
+      })
+    }
+  }
+}

src/views/Root/Banner/index.vue

@@ -9,7 +9,7 @@
       :startTime="queryParam.startTime"
       :endTime="queryParam.endTime"
     />
-    <a-button type="primary" style="margin-right: 10px;" @click="fetchList">
+    <a-button type="primary" style="margin-right: 10px;" @click="handleClickQuery">
       查询
     </a-button>
     <!-- 新增 -->
@@ -215,6 +215,10 @@ export default Vue.extend({
     }
   },
   methods: {
+    handleClickQuery(){
+      this.queryParam.offset = 0;
+      this.fetchList();
+    },
     handlePaginationChange(current: number) {
       this.queryParam.offset = (current - 1) * this.queryParam.limit
       this.fetchList()

src/views/Root/Security/changePhone.vue

@@ -105,6 +105,7 @@ import { FormModel, Modal } from "ant-design-vue";
 import { phoneValid } from "./const";
 import UserService from "@/service/UserManagementService";
 import { deleteUserMsg, getUserMsg, setUserMsg } from "@/utils/userMsg/userMsg";
+import RouterUtil from "@/utils/router";
 export default Vue.extend({
   components: { CodeInput },
   props: {
@@ -232,7 +233,9 @@ export default Vue.extend({
               title: "手机号修改成功",
               content: "请重新登陆",
               onOk() {
-                that.$router.push({ name: "login" });
+                const role = getUserMsg()?.newRole
+                window.localStorage.clear()
+                RouterUtil.getInstance().gotoLogin(role)
               },
             });
           } else {

src/views/Root/Security/changePwd.vue

@@ -61,6 +61,7 @@ import codeInput from "@/components/CodeInput/index.vue";
 import UserService from "@/service/UserManagementService";
 import { deleteUserMsg, getUserMsg } from "@/utils/userMsg/userMsg";
 import { Modal } from "ant-design-vue"
+import RouterUtil from "@/utils/router";
 
 export default Vue.extend({
   components: { codeInput },
@@ -148,7 +149,9 @@ export default Vue.extend({
             title: "密码修改成功",
             content: "请重新登陆",
             onOk() {
-              that.$router.push({ name: "login" });
+              const role = getUserMsg()?.newRole
+              window.localStorage.clear()
+              RouterUtil.getInstance().gotoLogin(role)
             },
           });
         } else {

src/views/Root/index.vue

@@ -81,6 +81,7 @@ import { Fragment } from "vue-fragment";
 import { getUserMsg } from "@/utils/userMsg/userMsg";
 import { getOldRoleFromUserMsg } from "@/utils/user";
 import UserService from '@/service/UserManagementService'
+import RouterUtil from "@/utils/router";
 
 Vue.use(Menu);
 Vue.use(Icon);
@@ -151,8 +152,9 @@ export default Vue.extend({
     logout() {
       userService.logout().then(res => {
         if (res.code === 200) {
+          const role = getUserMsg()?.newRole
           window.localStorage.clear()
-          this.$router.push('/login')
+          RouterUtil.getInstance().gotoLogin(role)
         }
       })
     }