fix fetch.js conflict

package-lock.json

@@ -2718,10 +2718,6 @@
         "loader-utils": "~0.2.5"
       }
     },
-    "file-saver": {
-      "version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
-      "from": "github:eligrey/FileSaver.js#1.3.8"
-    },
     "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
@@ -4376,6 +4372,10 @@
             "base64-arraybuffer": "^0.1.5"
           }
         },
+        "file-saver": {
+          "version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
+          "from": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e"
+        },
         "html2canvas": {
           "version": "1.0.0-alpha.12",
           "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-alpha.12.tgz",
@@ -9167,9 +9167,39 @@
       "dev": true
     },
     "vue-ueditor-wrap": {
-      "version": "2.4.1",
-      "resolved": "http://192.168.110.93:4873/vue-ueditor-wrap/-/vue-ueditor-wrap-2.4.1.tgz",
-      "integrity": "sha512-UjZz0I5Fy8ADrmvjCqTJm+XJVkf52hi6/yajcTyjqG20DTS2IVByFF26TI69by9PZApwbC+eHkV/lALcvEFgjw=="
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/vue-ueditor-wrap/-/vue-ueditor-wrap-2.4.2.tgz",
+      "integrity": "sha512-bZZdUmhT/n9QPdVwR10b8u2A9+Q2L6vyfr3Nls2EDKI3GmuWQwGqBwcgjBWbaM50twyHjXwAPXiKlUhn3JAFtA=="
+    },
+    "vuedraggable": {
+      "version": "2.23.2",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.23.2.tgz",
+      "integrity": "sha512-PgHCjUpxEAEZJq36ys49HfQmXglattf/7ofOzUrW2/rRdG7tu6fK84ir14t1jYv4kdXewTEa2ieKEAhhEMdwkQ==",
+      "requires": {
+        "sortablejs": "^1.10.1"
+      },
+      "dependencies": {
+        "sortablejs": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+          "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+        }
+      }
+    },
+    "vuedraggable": {
+      "version": "2.23.2",
+      "resolved": "http://192.168.110.93:4873/vuedraggable/-/vuedraggable-2.23.2.tgz",
+      "integrity": "sha512-PgHCjUpxEAEZJq36ys49HfQmXglattf/7ofOzUrW2/rRdG7tu6fK84ir14t1jYv4kdXewTEa2ieKEAhhEMdwkQ==",
+      "requires": {
+        "sortablejs": "^1.10.1"
+      },
+      "dependencies": {
+        "sortablejs": {
+          "version": "1.10.2",
+          "resolved": "http://192.168.110.93:4873/sortablejs/-/sortablejs-1.10.2.tgz",
+          "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+        }
+      }
     },
     "vuedraggable": {
       "version": "2.23.2",

src/router/router.js

@@ -52,6 +52,8 @@ const yqRange = r => require.ensure([], () => r(require('../views/yqrange/yq-ran
 const liveManage = r => require.ensure([], () => r(require('../views/yqrange/live-manage.vue')), 'live-manage')
 const roleManage = r => require.ensure([], () => r(require('../views/yqrange/role-manage.vue')), 'role-manage')
 const createRange = r => require.ensure([], () => r(require('../views/yqrange/create-range.vue')), 'create-range')
+const editRange = r => require.ensure([], () => r(require('../views/yqrange/edit-range.vue')), 'edit-range')
+const createLive = r => require.ensure([], () => r(require('../views/yqrange/create-live.vue')), 'create-live')
 
 export default [{
     path: '/',
@@ -213,6 +215,15 @@ export default [{
             path: '/create-range',
             component: createRange
         },
+        {
+            path: '/create-live',
+            component: createLive
+        },
+        {
+            path:'/edit-range',
+            component: editRange
+
+        },
       // {
       //   path: '/followup',
       //   name: 'followUp',

src/utils/fetch.js

@@ -52,9 +52,11 @@ service.interceptors.request.use(config => {
     if( config.headers['sysCode']==undefined) {
       config.headers['sysCode'] = 12
     }
-    if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
+    if( process.env.BUILD_ENV == "development" ){  // 本地开发环境qgit
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       config.headers['token'] = '1C7A1CC89FD24B8A8EAA0A54A06F7C9A';
+      // config.headers['token'] = '4559D8D1D615430991878A1264830A04';
+      // config.headers['token'] = 'B6A38C32790E4462BC451C335F65848E';
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/views/yqrange/live-manage.vue

@@ -45,9 +45,9 @@
         <el-table-column prop="endTime" label="结束时间" min-width="100" align="center"></el-table-column>
         <el-table-column label="操作" min-width="300" align="center">
           <template slot-scope="scope">
+            <el-button @click="reviewLive(scope.row)" type="text" size="small">设置回放</el-button>
             <el-button @click="liveLink(scope.row)" type="text" size="small">直播链接</el-button>
-            <el-button @click="reviewLive(scope.row)" type="text" size="small">回放</el-button>
-            <el-button @click="shareLive(scope.row)" type="text" size="small">分享直播</el-button>
+            <el-button @click="countLive(scope.row)" type="text" size="small">数据统计</el-button>
             <el-button @click="editLive(scope.row)" type="text" size="small">编辑</el-button>
             <el-button @click="deleteLive(scope.row)" type="text" size="small">删除</el-button>
           </template>
@@ -114,17 +114,49 @@
         console.log('重置')
       },
       //新建直播
-      createLive() {},
+      createLive() {
+        this.$router.push({
+          path: '/create-live',
+        })
+      },
       //直播链接
       liveLink(row) {},
       //回放
       reviewLive(row) {},
-      //分享直播
-      shareLive(row) {},
+      //数据统计
+      countLive(row) {
+        this.$msgbox({
+          title: '直播链接',
+          message: '这是一段内容',
+          showCancelButton: true
+          // confirmButtonText: '确定',
+          // cancelButtonText: '取消'
+        }).then(action => {
+          this.$message({
+            type: 'info',
+            message: 'action: ' + action
+          });
+        })
+      },
       //编辑直播
-      editLive(row) {},
+      editLive(row) {
+        this.$router.push({
+          path: '/create-live',
+        })
+      },
       //删除直播
-      deleteLive(row) {},
+      deleteLive(row) {
+        this.$confirm(`确定删除“${row.liveName}”吗？`, '', {
+          confirmButtonText: '删除',
+          cancelButtonText: '取消',
+          type: 'warning',
+          customClass: 'range-make-box',
+        }).then(() => {
+          //  confirm
+        }).catch(() => {
+          //  cancel
+        });
+      },
       handleSizeChange(val) {
         this.searchForm.pageSize = val;
         this.searchForm.pageNo = 1;

src/views/yqrange/yq-range.vue

@@ -151,7 +151,11 @@ export default {
       })
     },
     //编辑
-    editRange(row) {},
+    editRange(row) {
+      this.$router.push( {
+        path: '/edit-range',
+      })
+    },
     //解散圈子
     deleteRange(row) {
       this.$confirm(`确定解散“${row.name}”吗？`, '', {