新增api

api/api.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-
+import request1 from '@/utils/request'
 // 获取律师信息
 export function getLawyerInfo(params) {
   return request({
@@ -10,19 +10,19 @@ export function getLawyerInfo(params) {
 }
 
 // 编辑律师用户信息
-export function editLawyerUser(data) {
+export function editLawyerUser(params) {
   return request({
     url: '/lawyer/user/editLawyerUser',
     method: 'post',
-    data: data
+    data: params
   })
 }
 
 // 上传图片
 export function upload(params) {
-  return request({
+  return request1({
     url: '/file/upload',
     method: 'post',
     data: params
   })
-}
+}

utils/request.js

@@ -6,7 +6,7 @@ import { toast, showConfirm, tansParams } from '@/utils/common'
 
 let timeout = 10000
 const baseUrl = config.baseUrl
-
+const baseUrl1 = config.baseUrl1
 const request = config => {
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
@@ -70,4 +70,67 @@ const request = config => {
   })
 }
 
-export default request
+const request1 = config => {
+  // 是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  config.header = config.header || {}
+  if (getToken() && !isToken) {
+    config.header['Authorization'] = 'Bearer ' + getToken()
+  }
+  // get请求映射params参数
+  if (config.params) {
+    let url = config.url + '?' + tansParams(config.params)
+    url = url.slice(0, -1)
+    config.url = url
+  }
+  return new Promise((resolve, reject) => {
+    uni.request({
+        method: config.method || 'get',
+        timeout: config.timeout ||  timeout,
+        url: config.baseUrl1 || baseUrl1 + config.url,
+        data: config.data,
+        header: config.header,
+        dataType: 'json'
+      }).then(response => {
+        let [error, res] = response
+        if (error) {
+          toast('后端接口连接异常')
+          reject('后端接口连接异常')
+          return
+        }
+        const code = res.data.code || 200
+        const msg = errorCode[code] || res.data.msg || errorCode['default']
+        if (code === 401) {
+          showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
+            if (res.confirm) {
+              store.dispatch('LogOut').then(res => {
+                uni.reLaunch({ url: '/pages/login' })
+              })
+            }
+          })
+          reject('无效的会话，或者会话已过期，请重新登录。')
+        } else if (code === 500) {
+          toast(msg)
+          reject('500')
+        } else if (code !== 200) {
+          toast(msg)
+          reject(code)
+        }
+        resolve(res.data)
+      })
+      .catch(error => {
+        let { message } = error
+        if (message === 'Network Error') {
+          message = '后端接口连接异常'
+        } else if (message.includes('timeout')) {
+          message = '系统接口请求超时'
+        } else if (message.includes('Request failed with status code')) {
+          message = '系统接口' + message.substr(message.length - 3) + '异常'
+        }
+        toast(message)
+        reject(error)
+      })
+  })
+}
+
+export default request||request1

utils/upload.js

@@ -6,6 +6,7 @@ import { toast, showConfirm, tansParams } from '@/utils/common'
 
 let timeout = 10000
 const baseUrl = config.baseUrl
+const baseUrl1 = config.baseUrl1
 
 const upload = config => {
   // 是否需要设置 token
@@ -20,10 +21,12 @@ const upload = config => {
     url = url.slice(0, -1)
     config.url = url
   }
+  // 支持自定义 baseUrl，如果没有指定则使用默认的 baseUrl
+  const uploadBaseUrl = config.baseUrl || baseUrl
   return new Promise((resolve, reject) => {
       uni.uploadFile({
         timeout: config.timeout || timeout,
-        url: baseUrl + config.url,
+        url: uploadBaseUrl + config.url,
         filePath: config.filePath,
         name: config.name || 'file',
         header: config.header,