ymy пре 1 година
родитељ
комит
6dd6600eaa

+ 3 - 0
.env.development

@@ -7,6 +7,9 @@ ENV = 'development'
 # SaaS协同平台/开发环境
 VUE_APP_BASE_API = '/prod-api'
 
+# 用户 "应用中心" 地址
+VUE_APP_CENTERURL = https://user.lzlxylsf.com/app
+
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

+ 3 - 0
.env.production

@@ -7,6 +7,9 @@ ENV = 'production'
 # SaaS协同平台/生产环境
 VUE_APP_BASE_API = '/prod-api'
 
+# 用户 "应用中心" 地址
+VUE_APP_CENTERURL = https://user.lzlxylsf.com/app
+
 # 登录地址 正式
 VUE_APP_LOGIN_URL = 'https://sso.lzlxylsf.com/#/'
 # 开发

+ 2 - 0
.env.test

@@ -6,6 +6,8 @@ NODE_ENV = test
 # 生产环境配置
 ENV = 'test'
 
+# 用户 "应用中心" 地址
+VUE_APP_CENTERURL = https://user.lzlxylsf.com/app
 
 # SaaS协同平台/生产环境
 VUE_APP_BASE_API = '/prod-api'

+ 1 - 1
src/benyun/utils/auth.ts

@@ -6,7 +6,7 @@ const ExpiresInKey = 'AdminOMS-Expires-In'
 
 export function getToken() {
   if(process.env.NODE_ENV === 'development'){
-    return 'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6ImM5NjA2ZWE0LTNjMzYtNDhiMi1iNjA0LTZlMDkxMTExNjE3MSIsInVzZXJuYW1lIjoiYWRtaW4ifQ.EzQDbeUA_E1UQBAxqH4AnAmK2cDxsksphOZgF7tV86ziaNa-mrhzl4uNihBEs4_l_QZnH3te3vjZfETo-1dgtQ'
+    return 'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxNzUsInVzZXJfa2V5IjoiYjU1NjczMmUtNDE0Zi00ODM3LWFhMTAtYjI3NDQ3MWQ2YjdiIiwidXNlcm5hbWUiOiIxNTY2NjY2NjY2NiJ9.ExD31Uuvo7TUTxI8FAF8k4yQ-667k6gy3qx0XRm27kVM3yZhBniuKNm0wNpK5fBs_2f_0U5XNf_GlBDC2-wV2A'
   }else{
     return Cookies.get(TokenKey)
   }

+ 11 - 1
src/layout/components/Navbar.vue

@@ -24,6 +24,11 @@
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item>
+            <a :href="`${userAppCenterUrl}?ssoToken=${ssoToken}`">
+              <span>工作台</span>
+            </a>
+          </el-dropdown-item>
           <!-- <router-link to="/user/profile"> -->
             <el-dropdown-item @click.native="jumpUser">个人中心</el-dropdown-item>
           <!-- </router-link> -->
@@ -60,6 +65,7 @@ export default {
   },
   data() {
     return{
+      userAppCenterUrl: process.env.VUE_APP_CENTERURL,
       userImg:userPic
     }
   },
@@ -67,7 +73,8 @@ export default {
     ...mapGetters([
       'sidebar',
       'avatar',
-      'device'
+      'device',
+      'ssoToken'
     ]),
     setting: {
       get() {
@@ -85,6 +92,9 @@ export default {
         return this.$store.state.settings.topNav
       }
     }
+  },
+  mounted() {
+
   },
   methods: {
     toggleSideBar() {

+ 1 - 0
src/main.ts

@@ -141,6 +141,7 @@ function omsLogin() {
       url,data
     }).then(() => {
       unitVue()
+      
     }).catch((err:any) => {
       let msg = '未知错误,请联系管理员!'
       if(err && err.msg) {

+ 1 - 0
src/store/getters.ts

@@ -15,5 +15,6 @@ const getters = {
   topbarRouters:(state:any) => state.permission.topbarRouters,
   defaultRoutes:(state:any) => state.permission.defaultRoutes,
   sidebarRouters:(state:any) => state.permission.sidebarRouters,
+  ssoToken: (state:any) => state.user.ssoToken
 }
 export default getters

+ 5 - 0
src/store/modules/user.ts

@@ -5,6 +5,7 @@ import { getToken, removeToken, setExpiresIn, setToken } from '@/benyun/utils/au
 const user = {
 	state: {
 		token: getToken(),
+		ssoToken: '',
 		name: '',
 		userInfo: {},
 		avatar: '',
@@ -13,6 +14,9 @@ const user = {
 	},
 
 	mutations: {
+		SET_SSOTOKEN: (state : any, ssoToken : string) => {
+			state.ssoToken = ssoToken
+		},
 		SET_TOKEN: (state : any, token : string) => {
 			state.token = token
 		},
@@ -69,6 +73,7 @@ const user = {
 					let data = res.data
 					setToken(data.token)
 					commit('SET_TOKEN', data.token)
+					commit('SET_SSOTOKEN', data.ssoToken)
 					setExpiresIn(720)
 					commit('SET_EXPIRES_IN', 720)
 					resolve()

+ 1 - 1
src/views/oms/B2BOrder/components/addOrder.vue

@@ -2,7 +2,7 @@
   <vxe-modal v-model="value" id="addOrder" @show="show" width="70%" height="80%" min-width="460" min-height="320"
     show-zoom resize transfer show-footer @hide="hide" v-loading="load">
     <template #title>
-      <span>创建新订单</span>
+      <span>{{orderValue.id?'订单详情':'创建新订单'}}</span>
     </template>
     <template #default>
       <div class="order-step" v-if="orderValue.id">

+ 1 - 1
src/views/oms/B2COrder/components/addOrder.vue

@@ -2,7 +2,7 @@
   <vxe-modal v-model="value" id="addOrder" @show="show" width="70%" height="80%" min-width="460" min-height="320" 
     show-zoom resize transfer show-footer @hide="hide" v-loading="load">
     <template #title>
-      <span>创建新订单</span>
+      <span>{{orderValue.id?'订单详情':'创建新订单'}}</span>
     </template>
     <template #default>
       <div class="order-step" v-if="orderValue.id">

+ 2 - 2
vue.config.js

@@ -38,8 +38,8 @@ module.exports = defineConfig({
       [process.env.VUE_APP_BASE_API]: {
       // '/':{
         ws:false,
-        target: `http://192.168.2.32`,
-        // target: `http://192.168.2.202`,
+        // target: `http://192.168.2.32`,
+        target: `https://oms.lzlxylsf.com`,
         // target:`https://omstest.benyuntech.com`,
         // target: `http://47.107.53.207:9023`,
         changeOrigin: true,