111

config/baseURL.js

@@ -3,11 +3,11 @@ import website from '@/config/index';
 let baseurl = '';
 if (process.env.NODE_ENV === 'development') {
 	//#ifdef APP-PLUS
-		baseurl = website.testURL;
+		baseurl = website.testApi.api;
 	//#endif
 } else {
 	//#ifdef APP-PLUS
-		baseurl = website.baseURL;
+		baseurl = website.baseApi.api;
 	//#endif
 }
 export default baseurl

config/envApi.js

@@ -0,0 +1,38 @@
+import website from '@/config/index';
+
+//获取请求url
+export const getAppApiUrl = () => {
+    let url = '', {testApi, baseApi} = website;
+    if (process.env.NODE_ENV === 'development') {
+        //#ifdef APP-PLUS
+        url = testApi.api;
+        //#endif
+    } else {
+        //#ifdef APP-PLUS
+        url = baseApi.api;
+        //#endif
+    }
+    return url
+}
+
+//获取表单的url
+export const getFormApiUrl = () => {
+    let url = '', {testApi, baseApi} = website;
+    if (process.env.NODE_ENV === 'development') {
+        url = testApi.form;
+    } else {
+        url = baseApi.form;
+    }
+    return url
+}
+
+//获取长连接的地址
+export const getWssApiUrl = () => {
+    let url = '', {testApi, baseApi} = website;
+    if (process.env.NODE_ENV === 'development') {
+        url = testApi.wss;
+    } else {
+        url = baseApi.wss;
+    }
+    return url
+}

config/index.js

@@ -9,15 +9,17 @@ export default {
     switchMode: false,  // 是否开启部门切换模式
     lockPage: '/lock',
     tokenTime: 1700,
-    socket: 'wss://business.hcxxy.com/wss/websocket/',
-    //请求地址s
-    baseURL: 'http://47.110.251.215:8090/', // 正式
-    //testURL: 'http://192.168.0.166:8090/',  // 测试
-    testURL: 'http://192.168.0.109:8090/',  // 测试
-    //表单地址
-    formUrl: {
-        base: 'https://user.hcxxy.com/',     // 正式
-        test: 'http://192.168.0.109:5173/' // 测试
+    //测试环境
+    testApi: {
+        api: 'http://192.168.0.109:8090/',  //请求地址
+        form: 'http://192.168.0.109:5173/', //表单地址
+        wss: 'wss://business.hcxxy.com/wss/websocket/', //长连接地址
+    },
+    //正式环境
+    baseApi: {
+        api: 'http://47.110.251.215:8090/', //请求地址
+        form: 'https://user.hcxxy.com/',    //表单地址
+        wss: 'wss://business.hcxxy.com/wss/websocket/', //长连接地址
     },
     //H5测试设置
     vite: {

config/tabbar.js

@@ -1,27 +0,0 @@
-//tabber配置
-export const tabBarList = [
-	{
-		"pagePath": "/pages/index/index",
- 		"text": "应用主页",
- 		"iconPath": "/static/tabbar/home.png",
- 		"selectedIconPath": "/static/tabbar/home_select.png"
-	}, {
-		"pagePath": "/pages/taskInfo/taskInfo",
-		"text": "任务消息",
-		"iconPath": "/static/tabbar/news.png",
-		"selectedIconPath": "/static/tabbar/news_select.png"
-	},{
-		"pagePath": "/pages/my/my",
-		"text": "我的",
-		"iconPath": "/static/tabbar/my.png",
-		"selectedIconPath": "/static/tabbar/my_select.png"
-	}
-]
-
-export const tabbarClick = (index)=>{
-	uni.navigateTo({
-		url: tabBarList[index].pagePath
-	});
-}
-
-export const hoverColor = "#554d84"

httpApi/modules/upload.js

@@ -1,15 +1,22 @@
-import baseURL from '@/config/baseURL'
 import {getTokenHeader} from '../request/header'
 import {getObjValue} from "js-fast-way";
+import {getAppApiUrl} from "@/config/envApi";
+
+export const getUploadApi = () => {
+    let url = '';
+    //#ifdef H5
+        url = '/api/blade-resource/oss/endpoint/upload-file';
+    //#endif
+    //#ifdef APP-PLUS
+        url = getAppApiUrl() + 'blade-resource/oss/endpoint/upload-file'
+    //#endif
+    return url
+}
 
 export const uploadApi = async (file, form= {}) => {
     return new Promise((resolve) => {
-        let url = '/api/blade-resource/oss/endpoint/upload-file';
-        //#ifdef APP-PLUS
-        url = baseURL + 'blade-resource/oss/endpoint/upload-file'
-        //#endif
         uni.uploadFile({
-            url: url,
+            url: getUploadApi(),
             name: 'file',
             formData: form,
             header: getTokenHeader(),

httpApi/request/index.js

@@ -3,11 +3,11 @@ import {getToken} from '../util/auth';
 import website from '@/config/index';
 import {Base64} from 'js-base64';
 import {toSerialize} from "js-fast-way"
-import baseURL from '@/config/baseURL'
+import {getAppApiUrl} from '@/config/envApi';
 
 // 创建请求实例
 const instance = ajax.create({
-    baseURL: baseURL,
+    baseURL: getAppApiUrl(),
     timeout: 1800000,
     validateStatus: function (status) {
         return status >= 200 && status <= 500;

pages/data-fill/editTable.vue

@@ -22,8 +22,8 @@ import {onLoad, onShow, onReady, onUnload} from '@dcloudio/uni-app'
 import {errorToast, successToast, toPdfPreview, querySelect} from "@/utils/tools";
 import {getStorage} from "@/utils/storage";
 import {useAppStore} from "@/store";
-import website from '@/config/index';
 import wbsApi from '~api/data-fill/wbs';
+import {getFormApiUrl} from '@/config/envApi';
 
 const store = useAppStore()
 const instance = getCurrentInstance().proxy
@@ -58,7 +58,7 @@ onShow(() => {
 
 //表格地址
 const webSrc = ref('');
-const envUrl = process.env.NODE_ENV === 'development' ? website.formUrl.test : website.formUrl.base
+const envUrl = getFormApiUrl()
 const htmlsrc = `${envUrl}/#/app/table-form?source=app&type=data-fill`
 
 //渲染完成

pages/ledger/editTable.vue

@@ -53,7 +53,7 @@ import {errorToast, toPdfPreview, querySelect} from "@/utils/tools";
 import {getObjValue, isNullES} from "js-fast-way";
 import {getStorage} from "@/utils/storage";
 import mainApi from '~api/ledger/index';
-import website from '@/config/index';
+import {getFormApiUrl} from '@/config/envApi';
 
 const instance = getCurrentInstance().proxy
 let wv; //计划创建的webview
@@ -84,7 +84,7 @@ onShow(() => {
 
 //表格地址
 const webSrc = ref('');
-const envUrl = process.env.NODE_ENV === 'development' ? website.formUrl.test : website.formUrl.base
+const envUrl = getFormApiUrl()
 const htmlsrc = `${envUrl}/#/app/table-form?source=app&type=log-fill`
 
 //渲染完成

vite.config.js

@@ -22,9 +22,16 @@ export default defineConfig({
             '/api': {
                 ws: true,
                 changeOrigin: true,
-                target: website.testURL,
+                target: getApiUrl(),
                 rewrite: (path) => path.replace(new RegExp('^/api'), '/'),
             }
         }
     },
 })
+
+function getApiUrl() {
+    const {testApi, baseApi} = website
+    const url = process.env.NODE_ENV === 'development' ? testApi.api : baseApi.api
+    console.log('当前请求地址：', url)
+    return url
+}