From 9071a9b337de6642ccdabaebb400f3acc770edf5 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Wed, 10 Dec 2025 18:14:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                   |  5 ++++-
 src/api/product/product.js    |  2 +-
 src/background.js             |  2 +-
 src/page/lock/index.vue       |  3 ++-
 src/page/login/userlogin.vue  |  6 ++++--
 src/router/axios.js           |  7 ++++++-
 src/store/modules/user.js     |  4 +++-
 src/util/auth.js              |  8 +++++++-
 src/views/customer/add.vue    |  2 +-
 src/views/customer/index.vue  |  2 +-
 src/views/product/add/add.vue | 30 +++++++++++++++++++++---------
 src/views/wel/index.vue       | 30 +++++++++++++++++++++++-------
 12 files changed, 74 insertions(+), 27 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index cd92ca3..4f46065 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,9 +19,9 @@
 </template>
 
 <script>
-import {getProduct} from '@/api/product/product'
 // const { remote } = window.require('electron');
 // const win = remote.getCurrentWindow();
+import {getToken, removeToken, removeRefreshToken} from '@/util/auth';
 export default {
   name: "app",
   data() {
@@ -35,6 +35,9 @@ export default {
 
   },
   mounted(){
+    console.log('1111111111111111111111',getToken())
+    removeToken()
+    window.sessionStorage.removeItem('token');
   },
   methods: {
   },
diff --git a/src/api/product/product.js b/src/api/product/product.js
index 7a937d4..c7b98ab 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -100,7 +100,7 @@ export const getCustomer = (params) =>{
 export const changeUser = (data) =>{
     return request({
         // url:'/api/jinchao/bizPrice/save',
-        url:'/jinchao/bizPrice/submit',
+        url:'/api/jinchao/bizPrice/submit',
         method:'post',
         data
     })
diff --git a/src/background.js b/src/background.js
index 7830a93..b305a53 100644
--- a/src/background.js
+++ b/src/background.js
@@ -48,7 +48,7 @@ async function createWindow() {
   })
 
   // 移除菜单栏（关键代码）
-  Menu.setApplicationMenu(null)
+  Menu.setApplicationMenu(null) 
 
   // if (process.env.WEBPACK_DEV_SERVER_URL) {
   //   // Load the url of the dev server if in development mode
diff --git a/src/page/lock/index.vue b/src/page/lock/index.vue
index aebdf7f..192ab38 100644
--- a/src/page/lock/index.vue
+++ b/src/page/lock/index.vue
@@ -23,7 +23,7 @@
 </template>
 <script>
 import { mapGetters, mapState } from "vuex";
-import { removeRefreshToken, removeToken } from '@/util/auth';
+import { removeRefreshToken, removeToken,removeToken1 } from '@/util/auth';
 export default {
   name: "lock",
   data() {
@@ -52,6 +52,7 @@ export default {
         this.$store.dispatch("LogOut").then(() => {
           // 清除token信息
           removeToken();
+          removeToken1()
           removeRefreshToken();
           this.$router.push({ path: "/login" });
         });
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index ab9c626..54236fa 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -99,9 +99,11 @@
           //角色ID
           roleId: "",
           //用户名
-          username: "admin",
+          // username: "admin",
+          username:'jinchao',
           //密码
-          password: "admin",
+          password: "123456",
+          // password: "admin",
           //账号类型
           type: "account",
           //验证码的值
diff --git a/src/router/axios.js b/src/router/axios.js
index 689abc7..eb482c2 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -9,7 +9,7 @@ import axios from 'axios';
 import store from '@/store/';
 import router from '@/router/router';
 import {serialize} from '@/util/util';
-import {getToken, removeToken, removeRefreshToken} from '@/util/auth';
+import {getToken, removeToken,removeToken1, removeRefreshToken} from '@/util/auth';
 import {Message} from 'element-ui';
 import {isURL, validatenull} from "@/util/validate";
 import website from '@/config/website';
@@ -52,6 +52,9 @@ axios.interceptors.request.use(config => {
   if(config.url.indexOf('/api') != -1){
     config.url = config.url.replace('/api','http://192.168.0.220:8090')
   }
+  // else{
+  //   config.url = "http://192.168.0.220:8090" + config.url
+  // }
   //安全请求header
   config.headers['Blade-Requested-With'] = 'BladeHttpRequest';
   //设置语言请求头
@@ -167,6 +170,7 @@ axios.interceptors.response.use(res => {
         }
         // 清除token信息
         removeToken();
+        removeToken1()
         removeRefreshToken();
         // 重定向到登录页
         store.dispatch('FedLogOut').then(() => router.push({ path: '/login' }));
@@ -188,6 +192,7 @@ axios.interceptors.response.use(res => {
     }
     // 清除token信息
     removeToken();
+    removeToken1()
     removeRefreshToken();
     // 重定向到登录页
     store.dispatch('FedLogOut').then(() => router.push({ path: '/login' }));
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 7121612..f04b1b1 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,4 @@
-import {setToken, setRefreshToken, getRefreshToken, removeToken, removeRefreshToken} from '@/util/auth'
+import {setToken, setRefreshToken, getRefreshToken, removeToken, removeRefreshToken,removeToken1} from '@/util/auth'
 import {Message} from 'element-ui'
 import {setStore, getStore} from '@/util/store'
 import {isURL, validatenull} from '@/util/validate'
@@ -221,6 +221,7 @@ const user = {
           commit('DEL_ALL_TAG');
           commit('CLEAR_LOCK');
           removeToken();
+          removeToken1();
           removeRefreshToken();
           resolve();
         }).catch(error => {
@@ -239,6 +240,7 @@ const user = {
         commit('DEL_ALL_TAG');
         commit('CLEAR_LOCK');
         removeToken();
+        removeToken1()
         removeRefreshToken();
         resolve();
       })
diff --git a/src/util/auth.js b/src/util/auth.js
index 51c69e5..8ab862c 100644
--- a/src/util/auth.js
+++ b/src/util/auth.js
@@ -6,7 +6,6 @@ const UserId = 'b-user-id';
 import {setStore, getStore,removeStore} from '@/util/store'
 export function getToken() {
     // return Cootkies.get(TokenKey)
-    console.log('getStore(TokenKey)=============',getStore(TokenKey))
     return getStore({name:TokenKey})
 }
 
@@ -40,6 +39,13 @@ export function removeToken() {
   return removeStore({name:TokenKey})
 }
 
+export function removeToken1() {
+  // Cookies.remove(SessionId);
+  // Cookies.remove(UserId);
+  // return Cookies.remove(TokenKey)
+  return removeStore({name:'token'})
+}
+
 export function removeRefreshToken() {
   // return Cookies.remove(RefreshTokenKey)
   return removeStore({name:RefreshTokenKey})
diff --git a/src/views/customer/add.vue b/src/views/customer/add.vue
index a5f9160..73c306b 100644
--- a/src/views/customer/add.vue
+++ b/src/views/customer/add.vue
@@ -63,7 +63,7 @@
                 <div class="top_left">联系人信息</div>
             </div>
             <div>
-                <el-table :data="tableData" height="120">
+                <el-table :data="tableData" height="220">
                     <el-table-column width="50" align="center">
                         <template slot="header" slot-scope="scope">
                             <div @click="addColumn()"
diff --git a/src/views/customer/index.vue b/src/views/customer/index.vue
index c995717..b3e2e32 100644
--- a/src/views/customer/index.vue
+++ b/src/views/customer/index.vue
@@ -49,7 +49,7 @@
         <el-button type="danger" @click="handleDelete">批量删除</el-button>
     </div>
     <div class="table_box">
-        <el-table :data="tableData" border height="24vw"  @selection-change="selectionChange">
+        <el-table :data="tableData" border height="425"  @selection-change="selectionChange">
             <el-table-column type="selection" fixed="left"></el-table-column>
             <el-table-column label="编号" prop="code" width="200"></el-table-column>
             <el-table-column label="客户公司名称" prop="companyName" width="200"></el-table-column>
diff --git a/src/views/product/add/add.vue b/src/views/product/add/add.vue
index cef7563..8b64cd2 100644
--- a/src/views/product/add/add.vue
+++ b/src/views/product/add/add.vue
@@ -15,7 +15,7 @@
             </div>
         </div>
          
-        <el-table :data="tableData" ref="multipleTable" style="width: 100%;" height="41vw" @row-click="rowClick"   border @selection-change="selectionChangeProject" @select="selectChange">
+        <el-table :data="tableData" ref="multipleTable" style="width: 100%;" height="570" @row-click="rowClick"   border @selection-change="selectionChangeProject" @select="selectChange">
             <!-- type="selection" -->
             <el-table-column align="center"  width="55px" >
                 <template slot-scope="scope">
@@ -218,6 +218,10 @@ export default {
             this.$refs.multipleTable.toggleRowSelection(row);
         },
         changeSale(val){
+            this.addForm = {
+                ...this.addForm,
+                customerId:''
+            }
             getCustomer({createUserId:val}).then(res =>{
                 this.customerData = res.data.data
             })
@@ -290,7 +294,7 @@ export default {
                     let noIdArr = arr.filter(item => !item.id)
                     let idArr = arr.filter(item => item.id && item.id != '')
                     if(idArr.length != 0){
-                        deleteProduct({ids:idArr.map(item => item.id).join(',')}).then(res =>{
+                        deleteProduct({ids:idArr.map(item => item.id).join(','),catalogId:this.subcategoryId}).then(res =>{
                             if(res.data.code == 200){
                                 this.$message.success('删除成功')
                                 getProduct({current:1,size:9999,catalogId:this.subcategoryId}).then(result =>{
@@ -325,7 +329,7 @@ export default {
                             }
                         })
                     }else{
-                        deleteProduct({ids:row.id}).then(res =>{
+                        deleteProduct({ids:row.id,catalogId:this.subcategoryId}).then(res =>{
                             if(res.data.code == 200){
                                 this.$message.success('删除成功')
                                 getProduct({current:1,size:9999,catalogId:this.subcategoryId}).then(result =>{
@@ -500,18 +504,21 @@ export default {
                                 saleUserId:this.saleData.length != 0 ? this.saleData[0].id : '',
                                 customerId:this.customerData != 0 ? this.customerData[0].id : ''
                             }
-                            this.addDialog = true
+                            getCustomer({createUserId:this.addForm.saleUserId}).then(res =>{
+                                this.customerData = res.data.data
+                                this.addDialog = true
+                            })
                         })
                     }
                 })
             }else{
-                this.addForm.productId = row.id
-                this.addForm.bizPrice = row.standardPrice && row.standardPrice != 0 ? row.standardPrice.replace(/,/g, '') : row.standardPrice
+                this.addForm.bizPrice = row.standardPrice && row.standardPrice != 0  ? (row.standardPrice + '').replace(/,/g, '') : row.standardPrice
                 if(row.bizType == 2){
                     this.addForm = {
                         ...this.addForm,
                         saleUserId:row.saleUserId,
                         customerId:row.customerId,
+                        productId:row.id,
                         id:row.bizPriceId,
                         bizPrice:row.bizPrice && row.bizPrice != 0 ? row.bizPrice.replace(/,/g, '') : row.bizPrice
                     }
@@ -519,10 +526,15 @@ export default {
                     this.addForm = {
                         ...this.addForm,
                         saleUserId:this.saleData.length != 0 ? this.saleData[0].id : '',
-                        customerId:this.customerData != 0 ? this.customerData[0].id : ''
+                        customerId:this.customerData != 0 ? this.customerData[0].id : '',
+                        productId:row.id,
                     }
                 }
-                this.addDialog = true
+                getCustomer({createUserId:this.addForm.saleUserId}).then(res =>{
+                    this.customerData = res.data.data
+                    this.addDialog = true
+                })
+                
             }
         },
         submit(){
@@ -643,7 +655,7 @@ export default {
 <style scoped lang="scss">
 .container {
     width: 99%;
-    height: 99%;
+    // height: 99%;
     background: rgb(255, 255, 255);
     margin: 0 auto;
     margin-top: 8px;
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 28fb39f..f97db13 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -29,7 +29,7 @@
 
 <script>
   import {mapGetters} from "vuex";
-  import {getLazyList} from "@/api/system/menu";
+  import {getLazyList,getRoutes} from "@/api/system/menu";
   import {dateFormat} from "@/util/date";
   import {resetRouter} from '@/router/router'
 
@@ -128,13 +128,29 @@
         this.chineseWeekday = weekdays[today.getDay()];
       },
       getRouter(){
-        getLazyList('',{isJinChao:1}).then(res =>{
-          console.log('res------------',res.data.data)
-          let tmp = res.data.data.filter(item => item.isJinChao == 1)
-          console.log('tmp==============',tmp)
-          if(tmp){
-            this.routerArr = tmp
+        // '',{isJinChao:1}
+        getRoutes().then(res =>{
+          console.log('res------------',res)
+          if(res.data.msg == '暂无承载数据'){
+            console.log('111111111111')
+           this.$store.dispatch("LogOut").then(() => {
+            resetRouter();
+            if (this.website.oauth2.ssoMode) {
+              window.location.href =
+                this.website.oauth2.ssoBaseUrl +
+                this.website.oauth2.ssoLogoutUrl +
+                this.website.oauth2.redirectUri;
+            } else {
+              this.$router.push({path: "/login"});
+            }
+           })
+          }else{
+            let tmp = res.data.data.filter(item => item.isJinChao == 1)
+            if(tmp){
+              this.routerArr = tmp
+            }
           }
+            
           console.log('this.ro=============',this.routerArr)
         })
       },