Merge remote-tracking branch 'origin/dev-20210702' into dev-20210702

src/App.vue

@@ -57,7 +57,7 @@ export default {
     getToken() {
       let href = window.location.href;
       let offset = href.indexOf("?");
-      // localStorage.setItem('storageToken','475DB3D057AD489D81FE4E4DAB747B08')
+      // localStorage.setItem('token','475DB3D057AD489D81FE4E4DAB747B08')
       if (offset !== -1) {
         let paramStr = href.substring(offset + 1, href.length);
         let pars = base64decode(paramStr);
@@ -67,17 +67,17 @@ export default {
           isNotEmptyUtils(paramMap["ssoOrigin"])
         ) {
           vm.token = paramMap["token"];
-          localStorage.setItem("storageToken", vm.token);
+          localStorage.setItem("token", vm.token);
           ssoLogin(href, paramMap);
           //vm.$router.push({ path: 'home' })
         } else {
-          if (!localStorage.getItem("storageToken")) {
+          if (!localStorage.getItem("token")) {
             window.location.href = getInnerLoginUrl(); // 没有token返回登录页面
             return;
           }
         }
       } else {
-        if (!localStorage.getItem("storageToken")) {
+        if (!localStorage.getItem("token")) {
           window.location.href = getInnerLoginUrl(); // 没有token返回登录页面
           return;
         }

src/components/common/match.vue

@@ -171,7 +171,7 @@ export default {
     getAdminList(){
       let url = `/diagnose/admin/diagnose/operator/query`
       let params = {
-        "token":localStorage.getItem("storageToken")
+        "token":localStorage.getItem("token")
       };
       this.loading = true;
       this.GET(url, null).then(res => {

src/components/editor/upload-img.vue

@@ -42,7 +42,7 @@ export default {
       imgArr: [
       ],
       headers: {
-        token: localStorage.getItem("storageToken"),
+        token: localStorage.getItem("token"),
       },
       actionurl: "#",
       accept: '.png,.jpeg'

src/components/editor/upload-music.vue

@@ -50,7 +50,7 @@ export default {
       musicArr: [],
       actionUrl: '',
       headers: {
-        token: localStorage.getItem("storageToken"),
+        token: localStorage.getItem("token"),
       },
       loading: false,
       accept: '.mp3,.mpeg'

src/components/list/table-c.vue

@@ -46,13 +46,13 @@
       >
         <template slot-scope="scope">
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,25)" @click="witeDiagnose(scope.row)">设为待问诊</el-button>
-          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21,22,23,24,25,26,3,2) && menuType !==2" @click="changeRun(scope.row)">更换运营</el-button>
+          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21,22,23,24,25,26,3,2) && menuType ==1 " @click="changeRun(scope.row)">更换运营</el-button>
           <el-button type="primary" size="small" class="btn"  @click="goDetail(scope.row,false)">查看详情</el-button>
-          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2,21,22,23,24,25,26,3) && menuType !==2" @click="cancelRefund(scope.row)">取消/退款</el-button>
+          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2,21,22,23,24,25,26,3) && menuType ==1 " @click="cancelRefund(scope.row)">取消/退款</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21)" @click="witeGo(scope.row)">设为稍后跟进</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,22)" @click="waitMatchDot(scope.row)">设为待匹配医生</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,4,5,6,21,22,23,24,25,26)" @click="sendMessage(scope.row)">发送消息</el-button>
-          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,4)" @click="joinDiagnose(scope.row)">加入问诊</el-button>
+          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,26)" @click="joinDiagnose(scope.row)">加入问诊</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2)" @click="matchRun(scope.row)">匹配运营</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2,3,4,6,21,22,23,24,25,26,5,6)" @click="goDetail(scope.row,true)" >编辑</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21)" @click="waitDiagnose(scope.row)">设为待分诊</el-button>

src/utils/diagnosis/index.js

@@ -2,7 +2,7 @@ import fetch from '../fetch';
 import { getBaseUrl } from '@/utils/index'
 let headers = {
   'Content-Type': 'application/json;charset=UTF-8',
-  token:  localStorage.getItem('storageToken'),
+  token:  localStorage.getItem('token'),
 };
 
 /*保存问诊相关信息*/

src/utils/fetch.js

@@ -13,7 +13,7 @@ const service = axios.create({
 // request拦截器
 service.interceptors.request.use(config => {
   config.headers['sysCode'] = 26
-  config.headers['token'] = localStorage.getItem('storageToken')
+  config.headers['token'] = localStorage.getItem('token')
   config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
   Object.assign(config.headers, config.changeHeader)
   if (config.fileHeader) {

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -174,7 +174,7 @@
         </el-row>
         <el-row :gutter="5" type="flex" justify="center" align="center">
           <el-col :span="24" class="btn-wrap">
-            <el-button type="success" class="submit-btn big-btn" @click="batchSetOperator" v-if="searchParam.menuType !== 2"
+            <el-button type="success" class="submit-btn big-btn" @click="batchSetOperator" v-if="searchParam.menuType == 1"
               >批量设置运营</el-button>
             <el-button type="info" class="submit-btn" @click="download"
               >全部导出</el-button

src/views/layout/header.vue

@@ -68,11 +68,11 @@ export default {
       if (command === "logout") {
         window.location.href = getInnerLoginUrl()
         // let req = {
-        //   token: localStorage.getItem("storageToken")
+        //   token: localStorage.getItem("token")
         // };
         // vm.POST("/contents/login/log_out", req).then(res => {
         //   sessionStorage.removeItem("ADMIN_IM_CENTER_NAVS");
-        //   localStorage.removeItem("storageToken");
+        //   localStorage.removeItem("token");
         //   window.location.href = getInnerLoginUrl();
         //   //logout()
         // });
@@ -104,7 +104,7 @@ export default {
             }
             let param =
               "token=" +
-              localStorage.getItem("storageToken") +
+              localStorage.getItem("token") +
               "&ssoOrigin=" +
               localStorage.getItem("ssoOrigin") +
               "&system_type=" +