Merge branch 'develop' into 'release'

Develop See merge request com.pica.cloud.education.frontend/pica-admin-consultation!121

Merge branch 'develop' into 'release'
Develop See merge request com.pica.cloud.education.frontend/pica-admin-consultation!121
d732d625 · 张磊 · cd17a73f · da3917ca · d732d625 · d732d625
--- a/package-lock.json
+++ b/package-lock.json
@@ -1308,6 +1308,7 @@
      "resolved": "http://192.168.110.93:4873/boom/-/boom-2.10.1.tgz",
      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
      "dev": true,
+      "optional": true,
      "requires": {
        "hoek": "2.x.x"
      }
@@ -2099,6 +2100,11 @@
        }
      }
    },
+    "dayjs": {
+      "version": "1.10.6",
+      "resolved": "http://192.168.110.93:4873/dayjs/-/dayjs-1.10.6.tgz",
+      "integrity": "sha1-KIsqqC8thBimydTfWJjAc3rQKmM="
+    },
    "de-indent": {
      "version": "1.0.2",
      "resolved": "http://192.168.110.93:4873/de-indent/-/de-indent-1.0.2.tgz",
@@ -2831,7 +2837,8 @@
        "ansi-regex": {
          "version": "2.1.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "aproba": {
          "version": "1.2.0",
@@ -2852,12 +2859,14 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@@ -2872,17 +2881,20 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "core-util-is": {
          "version": "1.0.2",
@@ -2999,7 +3011,8 @@
        "inherits": {
          "version": "2.0.4",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "ini": {
          "version": "1.3.5",
@@ -3011,6 +3024,7 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@@ -3025,6 +3039,7 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@@ -3032,12 +3047,14 @@
        "minimist": {
          "version": "1.2.5",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "minipass": {
          "version": "2.9.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.2",
            "yallist": "^3.0.0"
@@ -3056,6 +3073,7 @@
          "version": "0.5.3",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "minimist": "^1.2.5"
          }
@@ -3117,7 +3135,8 @@
        "npm-normalize-package-bin": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "npm-packlist": {
          "version": "1.4.8",
@@ -3145,7 +3164,8 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "object-assign": {
          "version": "4.1.1",
@@ -3157,6 +3177,7 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@@ -3234,7 +3255,8 @@
        "safe-buffer": {
          "version": "5.1.2",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "safer-buffer": {
          "version": "2.1.2",
@@ -3270,6 +3292,7 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@@ -3289,6 +3312,7 @@
          "version": "3.0.1",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "ansi-regex": "^2.0.0"
          }
@@ -3332,12 +3356,14 @@
        "wrappy": {
          "version": "1.0.2",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "yallist": {
          "version": "3.1.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        }
      }
    },
@@ -3718,7 +3744,8 @@
      "version": "2.16.3",
      "resolved": "http://192.168.110.93:4873/hoek/-/hoek-2.16.3.tgz",
      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true
+      "dev": true,
+      "optional": true
    },
    "home-or-tmp": {
      "version": "2.0.0",

--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
    "axios": "0.16.2",
    "better-scroll": "^0.1.15",
    "clipboard": "^2.0.6",
+    "dayjs": "^1.10.6",
    "echarts": "^4.2.0-rc.2",
    "element-ui": "^2.6.1",
    "fastclick": "^1.0.6",

--- a/src/components/IM/chat.vue
+++ b/src/components/IM/chat.vue
@@ -970,7 +970,9 @@ export default {
    },

    closeChat() {
-      window.rtc.leave();
+      if(window.rtc){
+        window.rtc.leave();
+      }
      this.clearSession();
      this.$store.commit("updateShowChat", false);
      this.$store.commit("updateCurrentChat", {});

--- a/src/components/IM/diagnosis-live.vue
+++ b/src/components/IM/diagnosis-live.vue
@@ -8,7 +8,7 @@
            </p>
          <span>{{ diagnoseType }}</span>
          </div>
-        <div class="time-message ml10">
+        <div class="time-message ml10" v-if="currentChat.diagnoseType != 3">
          <p class="msg-img"> <img :src="im_time" alt /></p>
          <p>设定时长: {{ time }}分钟 &nbsp;&nbsp;</p>
          <p v-if="startTime && endTime">总时长: {{ useTime }}&nbsp;&nbsp;</p>
@@ -144,10 +144,8 @@ export default {
          return '语音问诊'
        case 2:
          return '视频问诊'
-          break;
        case 3:
          return '图文问诊'
-          break;
        default:
          return''
      }
@@ -175,7 +173,6 @@ export default {
        this.rtc.muteLocalAudio();
      }
      this.isMuted = !this.isMuted;
-
    },
    // 主动呼叫
    drivingCall(data) {
@@ -295,6 +292,10 @@ export default {
    },
    // 创建trtcClient
    clientLogin() {
+      if(Number(this.currentChat.diagnoseType) === 3){
+        console.log('问诊类型', this.currentChat.diagnoseType);
+        return false;
+      }
      let obj = {
        roomId: this.roomId,
        role: this.roleAnchor,
@@ -303,7 +304,6 @@ export default {
        userSig: this.userSig,
        vueInstance: this,
      };
-      console.log('---obj', obj);
      this.rtc = new RtcClient(obj);
      window.rtc = this.rtc;
      this.$nextTick(() => {
@@ -353,10 +353,12 @@ export default {
    },
    // 关闭mc
    muteLocalAudio() {
+      this.isMuted = true;
      this.rtc.muteLocalAudio();
    },
    // 打开mc
    unmuteLocalAudio() {
+      this.isMuted = false;
      this.rtc.unmuteLocalAudio();
    },
    // 显示文案
@@ -486,6 +488,7 @@ export default {
    },
    // client离开房间
    leave() {
+      this.muteLocalAudio();
      this.rtc.leave();
      this.clearSession();
      window.location.href = "about:blank";
@@ -568,6 +571,7 @@ export default {
      clearInterval(this.answerTimeFn);
      clearInterval(this.useTimeFn);
      clearInterval(this.loseTimeFn);
+      this.isMuted = true;
    },
    // 清除直播时间相关的seession
    clearSession() {
@@ -779,5 +783,4 @@ export default {
    margin: 15px auto 6%;
  }
 }
-
 </style>
--- a/src/components/common/diagnosis-doctor.vue
+++ b/src/components/common/diagnosis-doctor.vue
--- a/src/utils/env-config.js
+++ b/src/utils/env-config.js
@@ -3,11 +3,11 @@
 */
 export const envConfig = {
  development: {
-    baseUrl: 'https://dev-sc.yunqueyi.com',
+    // baseUrl: 'https://dev-sc.yunqueyi.com',
    // // baseUrl: 'http://10.177.15.180:10202/',
    // // baseUrl: 'http://192.168.140.14:10201/',

-    // baseUrl: 'https://test1-sc.yunqueyi.com',
+    baseUrl: 'https://test1-sc.yunqueyi.com',
    // baseUrl:   'https://uat-sc.yunqueyi.com',