Merge branch 'feature/card' into 'release'

Feature/card

See merge request !300

src/views/IM/diagnosis-admin/diagnosis-im.vue

@@ -117,6 +117,29 @@
                     >
                     <span>该消息类型PC端暂不支持</span>
                   </div>
+                  <!-- 安排接诊医生 -->
+                  <div
+                    v-if="item.showType === 13"
+                    class="time-box"
+                  >
+                    <div class="physician-left">
+                      {{ item.title }}
+                    </div>
+                    <div class="physician">
+                      <div class="physician-right">
+                        <div class="physician-right__top">
+                          <span>{{ item.text.doctorName }}</span>
+                          <span>{{ item.text.title }} {{ item.text.department }}</span>
+                        </div>
+                        <div class="physician-right__center">
+                          {{ item.text.hospital }}
+                        </div>
+                        <div class="physician-right__center">
+                          擅长：{{ item.text.goodAt }}
+                        </div>
+                      </div>
+                    </div>
+                  </div>
                   <!-- 语音消息 -->
                   <div
                     v-if="item.showType == 6"
@@ -133,9 +156,10 @@
                       :src="item.url"
                     />
                   </div>
-                  <!-- 问诊开始与病例模块 -->
+                  <!-- 问诊开始与病例模块 showType == 7-->
+                  <!-- 患者病情 showType == 12-->
                   <div
-                    v-if="item.showType == 7"
+                    v-if="item.showType == 7 || item.showType == 12"
                     class="diagnosis-box"
                   >
                     <div class="title">
@@ -645,7 +669,15 @@
               showType = 11;
               title = content.title;
               text = content.content;
-            }else {
+            } else if(content.bizType === 29) { // 患者病情
+              showType = 12;
+              title = content.title;
+              text = JSON.parse(content.content);
+            } else if(content.bizType === 30) { // 接诊医生
+              showType = 13;
+              title = content.title;
+              text = JSON.parse(content.content);
+            } else {
               showType = 5;
             }
           } else if( msg.type.toLowerCase() == 'image' || msg.type.toLowerCase() == 'picture') { // 图片

src/views/IM/diagnosis-admin/im.scss

@@ -184,9 +184,9 @@
                   border-radius: 8px;
                   min-height: 80px;
                   .title {
-                      padding-bottom: 10px; 
-                      font-size: 14px;
-                      font-weight: 700;
+                    padding-bottom: 10px;
+                    font-size: 14px;
+                    font-weight: 700;
                   }
                   .dia-text {
                     font-size: 12px;
@@ -204,7 +204,7 @@
                   border-radius: 8px;
                   min-height: 80px;
                   .title {
-                    padding-bottom: 10px; 
+                    padding-bottom: 10px;
                     font-size: 14px;
                     font-weight: 700;
                   }
@@ -226,7 +226,7 @@
                   border-radius: 8px;
                   min-height: 80px;
                   .title {
-                      padding-bottom: 10px; 
+                      padding-bottom: 10px;
                       font-size: 14px;
                       font-weight: 700;
                   }
@@ -237,7 +237,7 @@
                         color: #B4B4B4;
                     }
                   }
-                  
+
                 }
                 & > .audio-box audio {
                   width: 242px;
@@ -342,11 +342,10 @@
             }
           }
         }
-        .msg-content::-webkit-scrollbar  
-        {  
-            width: 0px;  
-            height: 0px;  
-            background-color: #fff;  
+        .msg-content::-webkit-scrollbar {
+            width: 0px;
+            height: 0px;
+            background-color: #fff;
         }
         .c-bottom {
           position: relative;
@@ -423,6 +422,37 @@
         -o-animation: rotate 3s linear infinite;
         animation: rotate 3s linear infinite;
       }
+
+      .physician {
+        display: flex;
+        flex-direction: row;
+        align-items: flex-start;
+        justify-content: flex-start;
+
+        &-left {
+          font-size: 14px;
+          font-weight: 600;
+          padding-bottom: 10px;
+        }
+
+        &-right {
+          &__top {
+            span {
+              &:nth-child(1) {
+                font-size: 14px;
+              }
+
+              &:nth-child(2) {
+                font-size: 12px;
+              }
+            }
+          }
+
+          &__center {
+            color: #999999;
+          }
+        }
+      }
       @-webkit-keyframes rotate{from{-webkit-transform: rotate(0deg)}
           to{-webkit-transform: rotate(360deg)}
       }
@@ -434,6 +464,6 @@
       }
       @keyframes rotate{from{transform: rotate(0deg)}
           to{transform: rotate(359deg)}
-      }    
+      }
     }
-  }
+  }
\ No newline at end of file