Merge branch 'develop' into feat/yf

src/components/IM/diagnosis-live.vue

@@ -24,7 +24,7 @@
       >
         <div class="text">
           <div class="text-left">
-            <img :src="doctorImg" alt />
+            <img :src="item.avatarImageUrl" alt />
           </div>
           <div class="text-right">
             <p>
@@ -159,8 +159,7 @@ export default {
       }
       // 获取视频参数
       this.getViedoParams();
-
-     const info =  this.getInfo();
+      this.getInfo();  // 获取用户信息列表
     },
     toggleVol () {
       if(this.isMuted){
@@ -173,14 +172,12 @@ export default {
     },
     // 主动呼叫
     drivingCall(data) {
-      // /team/call/direct/{imAccId}呼叫
       let url = `/im/team/call/direct/`;
       let params = {
         imAccId: data.accId,
         imTeamId: this.currentChat.tid,
         liveRoomId: this.roomId
       };
-
       this.POST(url, params).then((res) => {
         if (res.code === "000000") {
           this.getInfo(data);
@@ -206,13 +203,18 @@ export default {
               this.roomId = Number(liveInfo.roomId);
               this.type = liveInfo.liveType;
             }
-            console.log('--memberList', memberList);
             if (memberList && memberList.length) {
               memberList.forEach((item) => {
-                //在当前群组中的角色 1: 问诊医生 2: 接诊医生 3: 居民 4: 其他
                 if (item.role == 4) {
                   this.userId = item.liveUserId;
                 }
+                //在当前群组中的角色 1: 问诊医生 2: 接诊医生 3: 居民 4: 其他
+                if(item.role == 1){
+                  this.memberList[0] = item;
+                }
+                if(item.role == 2){
+                  this.memberList[1] = item;
+                }
               });
             }
             this.getAppId();
@@ -257,6 +259,7 @@ export default {
               this.leave();
             }
             this.getErr();
+            return  false;
           }
         })
         .catch((err) => {
@@ -273,6 +276,7 @@ export default {
         userSig: this.userSig,
         vueInstance: this,
       };
+      console.log('---obj', obj);
       this.rtc = new RtcClient(obj);
       window.rtc = this.rtc;
       this.$nextTick(() => {
@@ -329,21 +333,20 @@ export default {
       this.rtc.unmuteLocalAudio();
     },
     // 显示文案
-    showText(status, role, item) {
-      // 1 呼叫中 2 接入 3离线
-      if (item.status == 2) {
-        item.timeleft = 0;
-      }
+    showText(status, role) {
       let text = "";
       switch (status) {
         case 1:
+          text = "已接入";
+          break;
+        case 2:
           text = "呼叫医生";
           break;
         case 3:
-          text = "已离线";
+          text = "呼叫中";
           break;
         default:
-          text = `已接入`;
+          text = `呼叫医生`;
           break;
       }
       return text;

src/components/common/inquirylist.vue

@@ -37,8 +37,8 @@
             <span class="info-phone">
               {{item.doctorMobile}}
             </span>
-             <span class="info-call-time" v-if="item.doctorCallTime">
-               {{item.doctorCallTime}}小时前呼叫
+             <span class="info-call-time" v-if="item.doctorCallKfStatus == 1">
+               {{doctorCallTime}}小时前呼叫
              </span>
           </div>
         </div>
@@ -58,8 +58,8 @@
             <span class="info-phone">
               {{item.userMobile}}
             </span>
-            <span class="info-call-time" v-if="item.userCallKfStatus">
-               {{item.userCallKfStatus}}小时前呼叫
+            <span class="info-call-time" v-if="item.userCallKfStatus == 1">
+               {{userCallTime}}小时前呼叫
              </span>
           </div>
         </div>
@@ -138,6 +138,12 @@ export default {
     },
     appointEndTime () {
       return new Date(this.item.appointEndTime).format("hh:mm");
+    },
+    userCallTime() {
+      return new Date(this.item.userCallTime).format("hh:mm");
+    },
+    doctorCallTime () {
+      return new Date(this.item.doctorCallTime).format("hh:mm");
     }
   },
   methods: {