修改代码冲突

package.json

@@ -28,7 +28,7 @@
     "js-md5": "^0.7.3",
     "jsencrypt": "^3.0.0-rc.1",
     "jspdf": "^1.5.3",
-    "node-sass": "^4.9.2",
+    "node-sass": "^4.14.1",
     "qrcode": "^1.3.3",
     "showdown": "^1.6.4",
     "sortablejs": "^1.10.0-rc3",

src/utils/fetch.js

@@ -52,10 +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'] = 'B6A38C32790E4462BC451C335F65848E';
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/views/yqrange/create-range.vue

@@ -19,6 +19,7 @@
       </el-row>
       <div class="first-step" v-if="active == 0">
         <p class="p-title">基础信息</p>
+
         <base-info :formData="formData" @returnTypeData="returnTypeData">
         </base-info>
       </div>
@@ -53,7 +54,6 @@
           introduce: '',
           contentRole: '',
         }
-
       }
     },
     created() {
@@ -89,7 +89,7 @@
         this.formData[item.name] = item.val
       },
     }
-  }
+}
 </script>
 <style lang="scss">
   .yqrange-index-wrapper {
@@ -231,4 +231,4 @@
     color: #F56C6C;
     margin-right: 4px;
   }
-</style>
+</style>
\ No newline at end of file

src/views/yqrange/yq-range.vue

@@ -148,7 +148,7 @@ export default {
     //成员管理
     roleManage(row) {
       this.$router.push({
-        path: '/role-manage',
+        path: '/role-manage?id=' + row.id,
       })
     },
     //编辑