8.10提交代码 糖组检测

TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js

@@ -17,6 +17,15 @@ Component({
         });
       },
     },
+    patient_family_data:{
+      type: Object,
+      value: {},
+      observer(newVal) {
+        this.setData({
+          patient_family_data: newVal,
+        });
+      }
+    },
     isMine: {
       type: Boolean,
       value: true,
@@ -174,6 +183,25 @@ Component({
           }];
           return renderDom;
         }
+         // 10:糖组检测
+         if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.SUGAR_CHECK) {
+          let data = customMessage.data;
+          const renderDom = [{
+            type: 'sugar_check',
+            title:customMessage.title,
+            disease_class_names:data.disease_class_names
+          }];
+          return renderDom;
+        }
+        // 11:患者信息
+        if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.PATIENT_INFO) {
+          let data = customMessage.data;
+          const renderDom = [{
+            type: 'patient_info',
+            path:data.message_path
+          }];
+          return renderDom;
+        }
       } catch (error) {
       }
       // 客服咨询
@@ -223,6 +251,12 @@ Component({
       } catch (error) {
       }
     },
+    
+   goSick(event){
+    const url=event.currentTarget.dataset.url;
+    console.log(url);
+    app.go(url);
+   },
     openLink(e) {
       if (e.currentTarget.dataset.value.key === '立即前往') {
         wx.navigateTo({

TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.json

@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "van-rate": "@vant/weapp/rate/index"
+    "van-rate": "@vant/weapp/rate/index",
+    "van-icon": "@vant/weapp/icon/index"
   }
 }

TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml

@@ -1,4 +1,4 @@
-<view>
+<view class="custom_wrap">
   <view wx:if="{{renderDom[0].type ==='order'}}"  class="custom-message {{isMine?'my-custom':''}}">
     <image class="custom-image" src="{{renderDom[0].imageUrl}}" />
     <view class="custom-content">
@@ -86,5 +86,34 @@
       </view>
     </view>
   </view>
+  <view wx:if="{{renderDom[0].type==='sugar_check'}}" class="sugarbox">
+    <view class="sugarcon">
+      <view class="title">
+        {{renderDom[0].title}}报告
+      </view>
+      <view class="patient_info">
+        <view class="name">就诊人：{{patient_family_data.patient_name}}（<text wx:if="{{patient_family_data.patient_sex==1}}">男</text><text wx:elif="{{patient_family_data.patient_sex==2}}">女</text><text wx:else>未知</text>｜{{patient_family_data.patient_age}}岁）</view>
+        <view class="sick"> 所患疾病：{{renderDom[0].disease_class_names}}</view>
+      </view>
+    </view>
+    <view class="detail">
+       <view class="left">查看报告</view>
+       <image src="../../../../../static/images/back.png" class="back" mode="widthFix"/>
+    </view>
+  </view>
+  <view wx:if="{{renderDom[0].type==='patient_info'}}" class="patientbox" >
+    <image src="../../../../../static/images/patient_bg.png" 
+    class="bg" mode=""/>
+    <view class="title">患者信息</view>
+    <view class="patient_info">
+        <view class="name">就诊人：{{patient_family_data.patient_name}}（<text wx:if="{{patient_family_data.patient_sex==1}}">男</text><text wx:elif="{{patient_family_data.patient_sex==2}}">女</text><text wx:else>未知</text>｜{{patient_family_data.patient_age}}岁）</view>
+        <view class="look" bindtap="goSick" data-url="{{renderDom[0].path}}">
+           <view class="see">查看详情</view>
+           <van-icon name="arrow" color="rgba(0,0,0,0.45)" style="margin-top:4rpx;margin-left:8rpx;"/>
+        </view>
+      </view>
+  
+     
+  </view>
 </view>
 

TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss

@@ -233,4 +233,104 @@ line-height: 42rpx;
   padding: 15rpx 30rpx;
   border-radius: 40rpx;
   font-size: 30rpx;
+}
+/* 糖组检测 */
+
+.back{
+  width:24rpx;
+  height:48rpx;
+  transform: rotate(180deg);
+}
+.sugarbox{
+  position: relative;
+  width: 420rpx;
+  background: rgb(255, 255, 255);
+  border: 1rpx solid #D8D8D8;
+  border-radius: 12rpx;
+}
+.sugarbox::after{
+  content:'';
+  position: absolute;
+  top: 35rpx;
+  left: 0;
+  transform: translate(-50%,-50%) rotate(45deg);
+  width: 16rpx;
+  height: 16rpx;
+  background: rgb(255, 255, 255);
+  border: 1rpx solid #D8D8D8;
+  border-style: none none solid solid;
+}
+.sugarcon{
+  margin:0rpx 24rpx 0;
+
+}
+.patient_info{
+  font-size: 28rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.65);
+line-height: 40rpx;
+}
+.sugarcon{
+  border-bottom: 1rpx solid rgba(0,0,0,0.12);
+  padding-bottom: 24rpx;
+}
+.sugarcon .title{
+  margin:24rpx 0 20rpx;
+  font-size: 32rpx;
+ font-weight: 500;
+color: #3CC7C0;
+}
+.sugarbox .detail{
+  display: flex;
+  margin:0 24rpx;
+  height:88rpx;
+  font-size: 32rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.85);
+  justify-content: space-between;
+  align-items: center;
+}
+/* 患者信息 */
+.patientbox{
+  display: flex;
+    flex-direction: column;
+    width: calc(100vw - 40rpx);
+    text-align: center;
+   background-color: #fff;
+   border-radius: 12rpx;
+   overflow: hidden;
+  position: relative;
+  box-shadow: 0 0 6rpx 0 #ccc;
+}
+.patientbox .title{
+  position: relative;
+  text-align: left;
+  padding:0 24rpx;
+  height: 90rpx;
+font-size: 32rpx;
+border-bottom: 1rpx solid rgba(0,0,0,0.12);
+font-weight: 550;
+color: rgba(0,0,0,0.85);
+line-height: 90rpx;
+}
+.patientbox .name{
+  color: rgba(0,0,0,0.85);
+  font-size: 32rpx;
+}
+.bg{
+  position: absolute;
+  z-index:0;
+  width:100%;
+  height:90rpx;
+}
+.patientbox .patient_info{
+  padding:40rpx 0;
+  margin:0 24rpx;
+display: flex;
+justify-content:space-between;
+}
+.look{
+  display: flex;
+  color:rgba(0,0,0,0.45);
+  align-items: center;
 }

TUIKit/components/TUIChat/components/MessageList/concat.wxs

@@ -7,7 +7,15 @@ var concat = function() {
 var connect = function() {
     return arguments[0] + arguments[1]
 }
+var formateText=function (value){
+  if(!value){
+    return {}
+  }else{
+    return JSON.parse(value)
+  }
+}
 module.exports = {
     concat: concat,
-    connect: connect
+    connect: connect,
+    formateText:formateText
 };

TUIKit/components/TUIChat/components/MessageList/index.js

@@ -355,7 +355,7 @@ Component({
       let show_avatar = true;
       if(type === "TIMCustomElem"){
         const customMessage = JSON.parse(message.payload.data);
-        if(Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE_VERIFY){
+        if(Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE_VERIFY && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.SUGAR_CHECK){
           show_avatar = false;
         }
         if(Number(customMessage.message_type) == GDXZ_CUSTOM_MSEEAGE.TRABECULA && refreshBaseInfo){
@@ -374,6 +374,7 @@ Component({
     },
     // 历史消息渲染
     $handleMessageRender(messageList, currentMessageList) {
+      console.log(messageList);
       // console.log("handleMessageRenderhandleMessageRenderhandleMessageRender");
       // this.showHistoryMessageTime(currentMessageList);
       if (messageList.length > 0) {
@@ -944,6 +945,11 @@ Component({
         });
       }
     },
+    goMedinceList(){
+     wx.navigateTo({
+       url: '/Pages/yishi/medince_list/index',
+     })
+    },
   },
 
 });

TUIKit/components/TUIChat/components/MessageList/index.wxml

@@ -55,7 +55,7 @@
                     <ImageMessage wx:if="{{item.type === 'TIMImageElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}" />
                     <VideoMessage wx:if="{{item.type === 'TIMVideoFileElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                     <AudioMessage wx:if="{{item.type === 'TIMSoundElem'}}"  message="{{item}}" data-index ='{{index}}' messageList="{{messageList}}" isMine="{{item.flow === 'out'}}"/>
-                    <CustomMessage wx:if="{{item.type === 'TIMCustomElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}" bindtap="handleJumpLink" data-value = "{{item}}"/>
+                    <CustomMessage wx:if="{{item.type === 'TIMCustomElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}" bindtap="handleJumpLink" data-value = "{{item}}" patient_family_data="{{concat.formateText(item.cloudCustomData).patient_family_data}}"/>
                     <FaceMessage wx:if="{{item.type === 'TIMFaceElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                     <FileMessage wx:if="{{item.type === 'TIMFileElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                     <MergerMessage wx:if="{{item.type === 'TIMRelayElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
@@ -69,6 +69,7 @@
         <SystemMessage  message="{{item}}" bind:changeSystemMessageList="changeSystemMessageList"></SystemMessage>
     </view>
 </scroll-view>
+  <image src="../../../../../static/images/yishi/tabbar_icon/medinceList.png" class="medList" mode="" bindtap="goMedinceList"/>
 </view>
 <view wx:if="{{showDownJump}}" bindtap="handleJumpNewMessage">
     <view class="new-message-item" > 

TUIKit/components/TUIChat/components/MessageList/index.wxss

@@ -1,6 +1,7 @@
 .container{
   width: 100%;
   height: 100%;
+  position: relative;
   background-color: #F4F4F4;
 }
 .message-list-container {
@@ -267,4 +268,11 @@
 .content_desc{
   font-size: 28rpx;
   color: rgb(146, 144, 144);
+}
+.medList{
+  position: absolute;
+  left:0;
+  bottom:10rpx;
+  width:153rpx;
+  height: 159rpx;
 }

TUIKit/utils/constant.js

@@ -49,6 +49,8 @@ const constant = {
     PRESCRIBE: 6,//6:处方开具成功（医生端）
     PRESCRIBE_VERIFY: 7,//7:处方审核通过（患者端）
     BANNER_MESSAGE: 8,//8 弹框消息
+    SUGAR_CHECK:10,//糖组检测
+    PATIENT_INFO:11,//患者信息
   },
 
   OPERATING_ENVIRONMENT: 'imWxTuikit'