代码合并

api/file.js

@@ -1,7 +1,4 @@
 import request from '../utils/request'
-import { getToken } from '@/utils/auth'
-import config from '@/config'
-const baseUrl = config.baseUrl
 
 //文件上传
 export function uploadFile(data) {

api/version.js

@@ -0,0 +1,46 @@
+import { toast, showConfirm, tansParams } from '@/utils/common'
+import { RequestConfig, ResponseData } from '@/types/request'
+import errorCode from '@/utils/errorCode'
+import config from '@/config'
+const baseUrl = config.baseUrl
+export function getVersion(version) {
+    return new Promise((resolve, reject) => {
+        uni.request({
+          method: 'GET',
+          timeout: 600000,
+          url: baseUrl + `/system/config/serviceUrl/${version}`,
+          data: {},
+          header: {},
+          dataType: 'json'
+        }).then(response => {
+          const res = response
+          const data = res.data
+          const code = data.code || 200
+          // @ts-ignore
+          const msg = errorCode[code] || data.msg || errorCode['default']
+          if (code === 401) {          
+            reject('500')
+          } else if (code === 500) {
+            toast(msg)
+            reject('500')
+          } else if (code !== 200) {
+            toast(msg)
+            reject(code)
+          }
+          resolve(data)
+        })
+          .catch(error => {
+            let message = error?.message || '未知错误'
+            uni.hideLoading()
+            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)
+          })
+      })
+}

config.js

@@ -1,7 +1,7 @@
 const base_url = {
-  // develop:'http://192.168.100.128:9527',//开发版 
+  develop:'http://192.168.100.122:9527',//开发版 
   // develop: 'http://192.168.100.139:9527', //嵘哥
-  develop: 'https://yongc.top/prod-api',//体验版
+  // develop: 'https://yongc.top/prod-api',//体验版
   // develop: 'https://goldshulin.com/prod-api',//体验版
 
   trial: 'https://yongc.top/prod-api',//体验版
@@ -22,7 +22,7 @@ const config = {
   // 应用信息
   appInfo: {
     // 应用名称
-    name: 'ruoyi-app-vue3',
+    name: '金邻助家',
     // 应用版本
     version: '1.2.0',
     // 应用logo
@@ -41,6 +41,7 @@ const config = {
       },
     ],
   },
+  base_url,
 }
 
 export default config

main.js

@@ -3,7 +3,6 @@ import plugins from './plugins'
 import uviewPlus from 'uview-plus'
 import store from './store/index.ts'
 import shareMixin from '@/utils/shareMixin'
-import soketMixin from '@/utils/soketMixin'
 
 import { createSSRApp } from 'vue'
 export function createApp() {
@@ -12,7 +11,6 @@ export function createApp() {
   app.use(plugins)
   app.use(store)
   app.mixin(shareMixin)
-  // app.mixin(soketMixin)
 
   return {
     app

pages_mine/pages/income/index.vue

@@ -77,7 +77,6 @@ const {
     jlzj_volunteer_source_type,
     is_pay
 } = useDict('jlzj_money_change_type', 'jlzj_client_source_type','jlzj_volunteer_source_type','is_pay');
-const baseUrl = config.baseUrl
 const userType = uni.getStorageSync('userType') //读取本地存储
 const data = ref({
     totalEarning: 0,

store/modules/user.ts

@@ -1,11 +1,9 @@
-import config from '@/config'
 import storage from '@/utils/storage'
 import constant from '@/utils/constant'
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { UserState, UserForm } from '@/types/store'
 import { Module } from 'vuex'
-const baseUrl = config.baseUrl
 
 const user: Module<UserState, UserState> = {
   state: {

utils/request.ts

@@ -1,14 +1,16 @@
 import store from '@/store'
 import config from '@/config'
-import { getToken,removeToken } from '@/utils/auth'
+import { getToken, removeToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { toast, showConfirm, tansParams } from '@/utils/common'
 import { RequestConfig, ResponseData } from '@/types/request'
-
+import { getVersion } from '@/api/version'
 let timeout = 600000
-const baseUrl = config.baseUrl
+const baseConfig = config
+
 
-const request = <T>(config:RequestConfig):Promise<ResponseData<T>> => {
+let base_url = null;
+const request = <T>(config: RequestConfig): Promise<ResponseData<T>> => {
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   config.header = config.header || {}
@@ -21,11 +23,16 @@ const request = <T>(config:RequestConfig):Promise<ResponseData<T>> => {
     url = url.slice(0, -1)
     config.url = url
   }
-  return new Promise((resolve, reject) => {
+  return new Promise(async (resolve, reject) => {
+    if (!base_url) {
+      const ver_res = await getVersion(baseConfig.appInfo.version)
+      base_url = ver_res.data.serviceUrl;
+      console.log("TCL: ver_res", ver_res)
+    }
     uni.request({
       method: config.method || 'GET',
       timeout: config.timeout || timeout,
-      url: config.baseUrl || baseUrl + config.url,
+      url: config.baseUrl || base_url + config.url,
       data: config.data,
       header: config.header,
       dataType: 'json'
@@ -37,13 +44,13 @@ const request = <T>(config:RequestConfig):Promise<ResponseData<T>> => {
          return
        } */
       const res = response
-      const data:ResponseData<T> = res.data as ResponseData<T>
+      const data: ResponseData<T> = res.data as ResponseData<T>
       const code = data.code || 200
       // @ts-ignore
-      const msg:string = errorCode[code] || data.msg || errorCode['default']
+      const msg: string = errorCode[code] || data.msg || errorCode['default']
       if (code === 401) {
         uni.$u.debounce(startConfirm, 500)
-      
+
         reject('无效的会话，或者会话已过期，请重新登录。')
       } else if (code === 500) {
         toast(msg)
@@ -70,11 +77,9 @@ const request = <T>(config:RequestConfig):Promise<ResponseData<T>> => {
   })
 }
 
-const startConfirm = ()=>{
-  console.log('________________________>>>>');
-  // return
+const startConfirm = () => {
   store.dispatch('ClearUserInfo');
-  showConfirm(getToken()?'您的登陆已过期，请重新登陆!':'您还未登陆系统，是否前往登陆?').then(res => {
+  showConfirm(getToken() ? '您的登陆已过期，请重新登陆!' : '您还未登陆系统，是否前往登陆?').then(res => {
     if (res.confirm) {
       store.dispatch('LogOut').then(res => {
         uni.navigateTo({ url: '/pages/login' })

utils/upload.ts

@@ -4,9 +4,10 @@ import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { toast, showConfirm, tansParams } from '@/utils/common'
 import { ResponseData, RequestUploadConfig } from '@/types/request'
+import { getVersion } from '@/api/version'
+let base_url = null;
 
 let timeout = 10000
-const baseUrl = config.baseUrl
 
 const upload = <T>(config:RequestUploadConfig):Promise<ResponseData<T>> => {
   // 是否需要设置 token
@@ -21,10 +22,15 @@ const upload = <T>(config:RequestUploadConfig):Promise<ResponseData<T>> => {
     url = url.slice(0, -1)
     config.url = url
   }
-  return new Promise((resolve, reject) => {
+  return new Promise(async(resolve, reject) => {
+    if (!base_url) {
+          const ver_res = await getVersion(baseConfig.appInfo.version)
+          base_url = ver_res.data.serviceUrl;
+          console.log("TCL: ver_res", ver_res)
+        }
       uni.uploadFile({
         timeout: config.timeout || timeout,
-        url: baseUrl + config.url,
+        url: base_url + config.url,
         filePath: config.filePath,
         name: config.name || 'file',
         header: config.header,

utils/wxRequest.js

@@ -1,7 +1,6 @@
 import { getToken } from '@/utils/auth'
-import config from '@/config'
-const baseUrl = config.baseUrl
-
+import { getVersion } from '@/api/version'
+let base_url = null;
 //上传文件还是选择相册图片
 const getWxFile = (type,fileNum) => {
     return new Promise((resolve, reject) => {
@@ -47,10 +46,15 @@ const getWxFile = (type,fileNum) => {
     })
 }
 const getUploadPromise = (file) => {
-    return new Promise((resolve, reject) => {
+    return new Promise(async(resolve, reject) => {
         const path = file.path
+         if (!base_url) {
+              const ver_res = await getVersion(baseConfig.appInfo.version)
+              base_url = ver_res.data.serviceUrl;
+              console.log("TCL: ver_res", ver_res)
+            }
         wx.uploadFile({
-            url: baseUrl + '/common/upload',  // 服务器接口地址 
+            url: base_url + '/common/upload',  // 服务器接口地址 
             filePath: path,        // 本地文件路径（通过 wx.chooseImage  获取）
             name: 'file',                      // 文件对应的 key（服务器接收字段名）
             formData: {                        // 额外表单数据