Merge branch 'feature/权限管理'

package.json

@@ -16,7 +16,7 @@
     "core-js": "^2.6.5",
     "element-ui": "^2.13.0",
     "js-cookie": "^2.2.0",
-    "vue": "^2.6.11",
+    "vue": "2.6.6",
     "vue-router": "^3.1.5"
   },
   "devDependencies": {
@@ -38,7 +38,7 @@
     "sass-loader": "^7.1.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2",
-    "vue-template-compiler": "^2.6.10"
+    "vue-template-compiler": "2.6.6"
   },
   "husky": {
     "hooks": {

public/index.html

@@ -5,7 +5,6 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon2.ico">
-    <link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/lib/element-ui/2.15.6/index.css" />
     <link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.68.css" />
     <link rel="stylesheet" href="//at.alicdn.com/t/font_2995156_rf810o69kh.css">
     <title>实施运维</title>
@@ -15,12 +14,15 @@
       <strong>We're sorry but damolish doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app"></div>
-    <script src="//web-1251519181.file.myqcloud.com/lib-4.0/vue/2.6.10/vue.min.js"></script>
-    <script src="//web-1251519181.file.myqcloud.com/lib/element-ui/2.15.6/index.js"></script>
-    <script src="//web-1251519181.file.myqcloud.com/components/input.2.0.14.js"></script>
-    <script src="//web-1251519181.file.myqcloud.com/components/transfer.1.0.15.js"></script>
-    <script src="//web-1251519181.file.myqcloud.com/components/steps.1.0.8.js"></script>
-    <script src="//web-1251519181.file.myqcloud.com/components/step.1.0.5.js"></script>
+    <!-- 组件引用cdn -->
+    <script>
+      (function() {
+        var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
+        var host = window.location.host;
+        host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
+        document.write('<script src="//' + host + src + '"><\/script>');
+      })();
+    </script>
     <script src="//web-1251519181.file.myqcloud.com/components/user-info.1.0.3.js"></script>
   </body>
 </html>

src/main.js

@@ -8,11 +8,7 @@ import App from './App.vue';
 import router from './router';
 import { isRequest } from '@/config';
 import filters from '@/filters';
-// import ElementUI from 'element-ui';
-// import 'element-ui/lib/theme-chalk/index.css';
 
-// 请求头这种添加请求标识
-// Vue.use(ElementUI);
 // 复制粘贴
 import VueClipboard from 'vue-clipboard2';
 Vue.use(VueClipboard);

src/views/message/template.vue

@@ -48,13 +48,16 @@ export default {
     };
   },
   created() {
-    this.getTableHeader();
-    this.getChannelList();
+    this.getChannelList().then(this.getTableHeader);
     this.getTableData();
   },
   methods: {
     // table methods
     getTableHeader() {
+      const formatter = row => {
+        const channel = this.channelList.find(el => el.channelId == row.sendSmsType) || {};
+        return channel.channelName || '--';
+      };
       this.tableData.tableHeader = [
         { label: '品牌名称', prop: 'brandName' },
         { label: '公司名称', prop: 'enterpriseName' },
@@ -62,24 +65,7 @@ export default {
         {
           label: '发送通道',
           prop: 'sendSmsType',
-          formatter(row) {
-            let text = '';
-            switch (row.sendSmsType) {
-              case 0:
-                text = '多通道';
-                break;
-              case 1:
-                text = '腾讯云';
-                break;
-              case 3:
-                text = '大汉三通';
-                break;
-              default:
-                text = '--';
-                break;
-            }
-            return text;
-          }
+          formatter
         },
         { label: '短信模板总数', prop: 'maxTemplateCount' },
         { label: '已用短信模板数', prop: 'useTemplateCount' }
@@ -113,9 +99,14 @@ export default {
       this.$router.push(`/messageTemplateDetail?id=${row.enterpriseId}&tabId=${this.$route.query.tabId}`);
     },
     // others
-    async getChannelList() {
-      const { result } = await getAllChannel();
-      this.channelList = result.concat({ channelId: 0, channelName: '多通道' }) || [];
+    getChannelList() {
+      return getAllChannel().then(res => {
+        if (!Array.isArray(res.result)) {
+          res.result = [];
+        }
+        res.result.unshift({ channelId: 0, channelName: '多通道' });
+        this.channelList = res.result;
+      });
     },
     searchTypeChange() {
       this.tableData.currentPage = 1;

vue.config.js

@@ -2,8 +2,9 @@ const path = require("path");
 
 module.exports = {
   productionSourceMap: process.env.NODE_ENV !== 'production',
-  publicPath: process.env.NODE_ENV === 'production' ? '/gic-marketing-operation' : '/',
+  publicPath: '/gic-marketing-operation',
   devServer: {
+    publicPath: '/gic-marketing-operation',
     overlay: {
       warnings: true,
       errors: true
@@ -12,11 +13,10 @@ module.exports = {
   configureWebpack: config => {
     config.externals = {
       vue: 'Vue',
-      // 'vue-router': 'VueRouter',
-      // vuex: 'Vuex',
-      // axios: 'axios',
+      axios: 'axios',
+      vuex: 'Vuex',
+      'vue-router': 'VueRouter',
       'element-ui': 'ELEMENT',
-      // BMap: 'BMap'
     };
     if (process.env.NODE_ENV === 'production') {
       config.optimization.minimizer[0].options.terserOptions.compress.warnings = false;