diff --git a/README.md b/README.md index b25c4a0..8d2409e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ @@ -121,4 +121,11 @@ feat - 添加群发 - 增加 动态创建消息模板 - 群发列表 - - 修复 分页异常的问题 \ No newline at end of file + - 修复 分页异常的问题 + +## v1.0.8 +`2023.1.5` +feat +- 添加群发 + - 取消 模板列表为空时显示默认模板id + - 增加 正式环境的接口地址配置 \ No newline at end of file diff --git a/src/utils/model.js b/src/utils/model.js index eb1b14a..72a2d9d 100644 --- a/src/utils/model.js +++ b/src/utils/model.js @@ -1,8 +1,8 @@ /* * @Date: 2021-11-30 15:09:25 * @LastEditors: JinxChen - * @LastEditTime: 2022-09-21 14:18:59 + * @LastEditTime: 2022-12-12 11:35:33 * @FilePath: \TelpoUserManageAdmin\src\utils\model.js * @description: 版本号 */ -export const VersionModel = '1.0.7'; +export const VersionModel = '1.0.8'; diff --git a/src/utils/request-wx-fans.js b/src/utils/request-wx-fans.js index 034e603..8c6b982 100644 --- a/src/utils/request-wx-fans.js +++ b/src/utils/request-wx-fans.js @@ -1,7 +1,7 @@ /* * @Date: 2021-12-08 15:59:46 * @LastEditors: JinxChen - * @LastEditTime: 2022-09-15 17:30:14 + * @LastEditTime: 2023-01-05 14:53:02 * @FilePath: \TelpoUserManageAdmin\src\utils\request-wx-fans.js * @description: */ @@ -13,11 +13,17 @@ import store from '@/store' /* import { getToken } from '@/utils/auth' */ // create an axios instance +// 区分正式和测试环境,注意 :http://localhost:9528/ 是你本地项目的启动地址 +const currentUrl = window.location.href.split('#'); // 当前url,因项目部署方式不同,用当前url区分正式环境和测试环境 +const testUrlList = [ + 'http://ping.ssjlai.com', + 'http://localhost:9528' +]; +const proUrl = 'http://47.116.67.214:8766/api'; //正式环境接口地址 +const isTest = testUrlList.some(item => { return currentUrl[0].indexOf(item) > -1; }); const service = axios.create({ - baseURL: /* process.env.VUE_APP_BASE_API */'http://ping.ssjlai.com:8008/api/', // url = base url + request url - // withCredentials: true, // send cookies when cross-domain requests - /* timeout: 5000 */ // request timeout -}) + baseURL: process.env === 'test' || process.env === 'development' ? 'http://ping.ssjlai.com:8008/api/' : isTest ? 'http://ping.ssjlai.com:8008/api/': proUrl, +}); // request interceptor service.interceptors.request.use( @@ -27,7 +33,7 @@ service.interceptors.request.use( /* if (store.getters.token) { config.headers['AuthToken'] = store.getters.token; } */ - return config + return config; }, error => { // do something with request error diff --git a/src/views/message-manage/main/add-mass/index.vue b/src/views/message-manage/main/add-mass/index.vue index 271dd16..f8c7d54 100644 --- a/src/views/message-manage/main/add-mass/index.vue +++ b/src/views/message-manage/main/add-mass/index.vue @@ -1,7 +1,7 @@ @@ -72,10 +72,8 @@