vue2-client 1.8.26 → 1.8.28

package/src/pages/system/ticket/submitTicketSuccess.vue

@@ -57,6 +57,10 @@
         <a-col :span="3"><span class="title">附件</span></a-col>
         <a-col :span="21"><file-item :files="details.files" :downloadable="false" @preview="handleFilePreview" /></a-col>
       </a-row>
+      <a-row v-if="details.resultrecord" class="item">
+        <a-col :span="3"><span class="title">处理结果</span></a-col>
+        <a-col :span="17"><span>{{ details.resultrecord }}</span></a-col>
+      </a-row>
     </div>
     <a-modal v-model="filePreviewVisible" :footer="null" :dialog-style="{ top: '30px' }" width="80%" :z-index="1001">
       <file-preview :path="filePath" />
@@ -90,7 +94,7 @@ export default {
     return {
       title: '提交成功',
       description: '您创建的工单已成功提交，请保持电话畅通，我们的工作人员将尽快与您取得联系。', // +
-        // '如果需要加急，请在倒计时结束后点击加急按钮，加急后我们将优先处理您的工单',
+      // '如果需要加急，请在倒计时结束后点击加急按钮，加急后我们将优先处理您的工单',
       // 工单详情
       details: {
         uploader: '',
@@ -101,6 +105,7 @@ export default {
         confirmTime: '',
         finishedTime: '',
         description: '',
+        resultrecord: '',
         files: [],
         images: []
       },
@@ -203,6 +208,7 @@ export default {
           this.details.description = res.description
           this.details.files = res.files
           this.details.images = res.images
+          this.details.resultrecord = res.resultrecord
         }, err => {
           console.log(err)
         })

package/src/router/guards.js

@@ -8,6 +8,8 @@ import {
   checkSingleAuthorization,
 } from '@vue2-client/utils/login'
 import AES from '@vue2-client/utils/EncryptUtil'
+import Vue from 'vue'
+import { funcToRouter, loadRoutes } from '@vue2-client/utils/routerUtil'
 
 NProgress.configure({ showSpinner: false })
 
@@ -33,8 +35,11 @@ const progressStart = (to, from, next) => {
  * @param options
  */
 const loginGuard = (to, from, next, options) => {
+  console.log('loginGuard', to, from, next, options)
+
   const urlParams = new URLSearchParams(window.location.search)
   const token = urlParams.get('token')
+  const V4_LOGIN_DATA_KEY = localStorage.getItem('v4LoginData')
   if (token) {
     const { AESDecrypt } = AES
     const info = AESDecrypt(token, '3KMKqvgwR8ULbR8Z')
@@ -63,6 +68,29 @@ const loginGuard = (to, from, next, options) => {
         next()
       }
     }
+  } else if (V4_LOGIN_DATA_KEY) {
+    const v4LoginData = JSON.parse(localStorage.getItem('userInfo'))
+    const curUser = {
+      name: v4LoginData.name,
+      username: v4LoginData.name,
+      orgid: v4LoginData.name,
+      avatar: '',
+      ename: v4LoginData.ename,
+      id: v4LoginData.id,
+      orgName: v4LoginData.orgs,
+      contact: '',
+      phone: '',
+      orgs: v4LoginData.orgs
+    }
+    Vue.$store.commit('account/setUser', Object.assign(curUser, v4LoginData))
+    const login = {
+      f: v4LoginData,
+      jwt: v4LoginData.id,
+      r: v4LoginData.r
+    }
+    Vue.$store.commit('account/setLogin', login)
+    // loadRoutes(funcToRouter(v4LoginData.functions))
+    next()
   } else {
     const { store, message } = options
     if (

package/src/services/api/restTools.js

@@ -1,24 +1,24 @@
-import { METHOD, request } from '@vue2-client/utils/request'
-
-/**
- * GET请求
- * @param url 请求地址
- * @param parameter 路径参数
- * @returns {Promise<AxiosResponse<T>>}
- */
-function get (url, parameter) {
-  return request(url, METHOD.GET, parameter)
-}
-
-/**
- * POST请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function post (url, parameter, config = {}) {
-  return request(url, METHOD.POST, parameter, config)
-}
-
-export { get, post }
+import { METHOD, request } from '@vue2-client/utils/request'
+
+/**
+ * GET请求
+ * @param url 请求地址
+ * @param parameter 路径参数
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function get (url, parameter) {
+  return request(url, METHOD.GET, parameter)
+}
+
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function post (url, parameter, config = {}) {
+  return request(url, METHOD.POST, parameter, config)
+}
+
+export { get, post }

package/src/utils/request.js

@@ -12,7 +12,14 @@ let isReloginShow
 
 axios.defaults.timeout = 20000
 axios.defaults.withCredentials = true
-
+// 如果是microapp
+if (window.__MICRO_APP_ENVIRONMENT__) {
+  const data = window.microApp.getData() // 获取主应用下发的data数据
+  // 修改baseurl为主应用地址
+  if (data.origin) {
+    axios.defaults.baseURL = data.origin
+  }
+}
 // 认证类型
 const AUTH_TYPE = {
   BEARER: 'Bearer',