Merge branch 'fix/fs' into 'develop'

结束会话

See merge request !54

src/components/IM/chat.scss

@@ -36,7 +36,7 @@
           }
           .c-header-edit{
             display: flex;
-            min-width: 111px;
+            min-width: 140px;
             justify-content: space-around;
             .edit-img{
               width: 24px;
@@ -46,6 +46,18 @@
                 height: 100%;
               }
             }
+            .edit-imgclose{
+              width: 70px;
+              height: 24px;
+              background: #FF5E57;
+              border-radius: 12px;
+              font-size: 13px;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #FFFFFF;
+              line-height: 24px;
+              user-select:none;
+            }
           }
         }
         .msg-content {

src/components/IM/chat.vue

@@ -12,8 +12,8 @@
               <span class="dep">&nbsp;{{currentChat.department}}</span>
             </div>
             <div class="c-header-edit">
-            <span class="edit-img" @click="overFn">
-              <img src="../../assets/image/IM/im_close.png" alt />
+            <span class="edit-imgclose" @click="overFn">
+              结束问诊
             </span>
               <span class="edit-img" @click="closeChat">
   <img src="../../assets/image/IM/im_close2.png" alt />

src/components/common/inquirylist.vue

@@ -19,7 +19,9 @@
                 <em class="offline" v-if="item.doctorTrtcEntryStatus==2" ></em>
                 <div class="onedoctor"> <el-avatar src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png"></el-avatar></div>
                 <div class="onedoctorname"> {{item.doctorName}} <span>接诊医生</span>
-                  <div class="onedoctornum">{{item.doctorMobile}} <span v-if="item.doctorCallTime">{{}}小时前呼叫</span> <span v-if="inquiry.answer">未接听</span><i v-else></i></div>
+                  <div class="onedoctornum">{{item.doctorMobile}} <span v-if="item.doctorCallTime">{{}}小时前呼叫</span> <span v-if="inquiry.answer">未接听</span>
+                    <img class="doctorcallImg" :src="doctorIncomingcallImg" v-show="item.doctorCallKfStatus =='0'" alt />
+                  </div>
                 </div>
                 <img
                 @click="calldoc()"
@@ -32,7 +34,9 @@
                 <em v-if="item.userTrtcEntryStatus==2" class="offline"></em>
                 <div class="onedoctor">  <el-avatar src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png"></el-avatar></div>
                 <div class="onedoctorname"> {{item.userName}} <span>助诊医生</span>
-                  <div class="onedoctornum">{{item.userMobile}} <span v-if="item.userCallTime">{{}}小时前呼叫</span> <span v-if="inquiry.answer">未接听</span><i v-else></i></div>
+                  <div class="onedoctornum">{{item.userMobile}} <span v-if="item.userCallTime">{{}}小时前呼叫</span> <span v-if="inquiry.answer">未接听</span>
+                    <img class="doctorcallImg" :src="doctorIncomingcallImg" v-show="item.userCallKfStatus =='0'" alt />
+                  </div>
                 </div>
                 <img
                 v-if="inquiry.imgshowhelp"
@@ -69,7 +73,8 @@ export default {
       timer:null,
       flag:true,
       nomor:true,
-      Adviceslist:{}
+      Adviceslist:{},
+      doctorIncomingcallImg: require('@/assets/image/workbench/doctorCallcustomer.gif')
     };
   },
   props:{
@@ -343,6 +348,10 @@ export default {
         .onedoctornum{
           font-size: 16px;
           margin-top: 2px;
+          .doctorcallImg{
+            width: 14px;
+            height: 14px;
+          }
         }
       }
    }
@@ -508,6 +517,10 @@ export default {
             .onedoctornum{
               font-size: 14px;
               margin-top: 5px;
+              .doctorcallImg{
+                width: 14px;
+                height: 14px;
+              }
             }
           }
           .helpdoctor{
@@ -542,6 +555,10 @@ export default {
             .onedoctornum{
               font-size: 14px;
               margin-top: 5px;
+              .doctorcallImg{
+                width: 14px;
+                height: 14px;
+              }
             }
           }
       }
@@ -703,6 +720,10 @@ export default {
             .onedoctornum{
               font-size: 14px;
               margin-top: 5px;
+              .doctorcallImg{
+                width: 14px;
+                height: 14px;
+              }
             }
           }
           .helpdoctor{
@@ -737,6 +758,10 @@ export default {
             .onedoctornum{
               font-size: 14px;
               margin-top: 5px;
+              .doctorcallImg{
+                width: 14px;
+                height: 14px;
+              }
             }
           }
       }
@@ -899,6 +924,10 @@ export default {
             .onedoctornum{
               font-size: 14px;
               margin-top: 5px;
+              .doctorcallImg{
+                width: 14px;
+                height: 14px;
+              }
             }
           }
           .helpdoctor{
@@ -933,6 +962,10 @@ export default {
             .onedoctornum{
               font-size: 14px;
               margin-top: 5px;
+              .doctorcallImg{
+                width: 14px;
+                height: 14px;
+              }
             }
           }
       }