Merge branch 'develop' into test

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2022-09-21 14:40:58
+ * @LastEditTime: 2023-01-05 14:53:45
  * @FilePath: \TelpoUserManageAdmin\README.md
  * @description:
 -->
@@ -121,4 +121,11 @@ feat
 - 添加群发
   - 增加 动态创建消息模板
 - 群发列表
-  - 修复 分页异常的问题
+  - 修复 分页异常的问题
+
+## v1.0.8
+`2023.1.5`
+feat
+- 添加群发
+  - 取消 模板列表为空时显示默认模板id
+  - 增加 正式环境的接口地址配置

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';

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

src/views/message-manage/main/add-mass/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-08 10:09:47
  * @LastEditors: JinxChen
- * @LastEditTime: 2022-09-21 14:43:45
+ * @LastEditTime: 2023-01-05 14:49:38
  * @FilePath: \TelpoUserManageAdmin\src\views\message-manage\main\add-mass\index.vue
  * @description: 添加群发
 -->
@@ -72,10 +72,8 @@
 </template>
 
 <script>
-//import TopMenu from "@/components/TopMenu/index";
 import { initTime } from '@/utils/index.js';
 import { APIWechatFans } from '@/api/wechat-fans.js';
-/* import './index.scss' */
 export default {
   name: 'add-mass',
   components: {  },
@@ -108,7 +106,7 @@ export default {
        keyword2: '' /* || '财商36问' */, //更新内容
        keyword3: '',
        remark: '' /* || '请点击内容查看详情' */, //内容详情
-       tempId: '' || '-kOhlwJPhO7v3WW3rAdmNs76lR7ZpQEJtbVSY8Y35Eg', //模板id
+       tempId: '' /* || '-kOhlwJPhO7v3WW3rAdmNs76lR7ZpQEJtbVSY8Y35Eg' */, //模板id
      },
      article: '', //选择文章
     //  文章列表
@@ -309,15 +307,15 @@ export default {
     },
     // 保存
     onSave() {
-      // 拼接所需字段
+      // 定义接口所需字段
       let reqBody = {
         send_now: false, //true 是立即发送， false是保存
-        subject: this.form.subject,
-        template_id: this.form.tempId,
-        self_group_id: this.form.selfGroupId,
-        article_id: this.form.articleId || 0,
-        mptemplate_content: JSON.stringify(this.templateInput),
-        url: this.form.articleContent
+        subject: this.form.subject, //消息主题
+        template_id: this.form.tempId, // 模板id
+        self_group_id: this.form.selfGroupId, //发送分组id
+        article_id: this.form.articleId || 0, //文章id
+        mptemplate_content: JSON.stringify(this.templateInput), //模板消息内容
+        url: this.form.articleContent, //文章链接
       };
       this.$refs['form'].validate((valid) => {
         if(valid) {