8.24 医生端

Pages/yishi/case/index.js

@@ -21,6 +21,22 @@ Page({
   },
   goReport(event){
     const url=event.currentTarget.dataset.url;
+    const randfile = new Date().getTime() + '检测报告';
+  const newPath = `${wx.env.USER_DATA_PATH}/${randfile}`;
+  wx.downloadFile({
+    // 示例 url，并非真实存在
+    url:url,
+    filePath: newPath,
+    success: function (res) {
+      //const filePath = res.tempFilePath
+      wx.openDocument({
+        filePath: newPath,
+        success: function (res) {
+          console.log('打开文档成功')
+        }
+      })
+    }
+  })
   },
   formatImgList(){
     let diagnose_images = this.data.case_detail.diagnose_images?this.data.case_detail.diagnose_images:[];

Pages/yishi/case/index.wxml

@@ -15,13 +15,13 @@
       <view class="hunyin info_item"><text class="info_title">婚姻：</text><text class="info_val">{{case_detail.marital_status==0?'未婚':case_detail.marital_status==1?'已婚':case_detail.marital_status==2?'离异':'未知'}}</text></view>
     </view>
     <view class="disease_box">
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.disease_class_name}}">
         <view class="title">所患疾病：</view>
         <view class="conent">{{case_detail.disease_class_name}}</view>
       </view>
-      <view class="disease_box_item">
+      <view class="disease_box_item"  wx:if="{{case_detail.diagnosis_date}}">
         <view class="title">确诊日期：</view>
-        <view class="conent">{{dateSubstr.substring(case_detail.diagnosis_date,0,10)}}</view>
+        <view class="conent" >{{dateSubstr.substring(case_detail.diagnosis_date,0,10)}}</view>
       </view>
       <!-- <view class="disease_box_item">
         <view class="title">医生诊断：</view>
@@ -38,7 +38,7 @@
       <view class="disease_info" wx:if="{{case_detail.drugs_name != '' && case_detail.drugs_name != null}}">
         详细描述：{{case_detail.drugs_name}}
       </view>
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.disease_desc}}">
         <view class="title">病情描述：</view>
         <view class="conent">{{case_detail.disease_desc}}</view>
       </view>
@@ -52,18 +52,18 @@
         <view class="title">复诊凭证(病例/处方单/检查报告/住院单)：</view>
         <view class="conent" wx:if="{{case_detail.diagnose_images.length == 0}}">无</view>
       </view>
-      <view class="img_box">
+      <view class="img_box" >
         <van-uploader image-fit="aspectFit" file-list="{{ imglist }}" show-upload="{{false}}" deletable="{{false}}" />
       </view>
 
     </view>
   </view>
-  <view class="sugarbox" wx:if="{{case_detail.detection_project}}" bindtap="goReport" data-url="{{case_detail.detection_link}}">
+  <view class="sugarbox" wx:if="{{case_detail.detection_project}}" data-url="{{case_detail.detection_project.detection_link}}" bindtap="goReport">
     <view class="main_title">{{case_detail.detection_project_name}}</view>
-  <view class="data_box sugar">
+  <view class="data_box sugar" >
      <view class="sugar_left">
         <view class="name">糖组检测</view>
-        <view class="date">{{case_detail.detection_time}}</view>
+        <view class="date">{{case_detail.detection_project.detection_time}}</view>
      </view>
      <van-icon name="arrow" />
   </view>

Pages/yishi/case/index.wxss

@@ -34,7 +34,8 @@ page{
   border-radius: 10rpx;
   display: flex;
   flex-wrap: wrap;
-  margin: 20rpx 0;
+  margin: 20rpx 0 0;
+  padding-bottom: 20rpx;
 }
 .info_item{
   text-align: left;
@@ -62,6 +63,12 @@ page{
   margin-bottom: 30rpx;
   display: flex;
 }
+.data_box .disease_box_item:first-child{
+  margin-top: 20rpx;
+}
+.orther .disease_box_item:first-child{
+  margin-top: 0rpx;
+}
 .title{
   font-size: 30rpx;
   color: #333333;

Pages/yishi/linkPage/linkPage.js

@@ -0,0 +1,68 @@
+// pages/linkPage/linkPage.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    url:''
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+     if(options.url){
+       this.setData({
+         url:decodeURIComponent(options.url)
+       });    
+     }
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+   
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  
+})

Pages/yishi/linkPage/linkPage.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

Pages/yishi/linkPage/linkPage.wxml

@@ -0,0 +1,2 @@
+<!--pages/linkPage/linkPage.wxml-->
+<web-view src="{{url}}" ></web-view>

Pages/yishi/linkPage/linkPage.wxss

@@ -0,0 +1 @@
+/* pages/linkPage/linkPage.wxss */

Pages/yishi/my/index.js

@@ -3,7 +3,7 @@ let api = new API()
 const app = getApp();
 Page({
   data: {
-    title: "个人中心",
+    title: "我的",
     navHeight: 0,
     stateHeight: 0,
     user_name: "医师姓名",

Pages/yishi/my/index.wxml

@@ -1,58 +1,64 @@
 <view class="container">
   <view class="top"></view>
   <view class="title" style="top: {{stateHeight}}px;height: {{navHeight}}px;line-height: {{navHeight}}px;">{{ title }}</view>
-  <view class="info_box" >
+  <view class="info_box">
     <!-- 跳转我的信息 -->
     <view class="photo" bindtap="go" data-url="/Pages/yishi/myinfo/index">
       <t-avatar class="avatar" size="large" image="{{avatar}}" />
     </view>
     <view class="info">
-      <view class="name" bindtap="go" data-url="/Pages/yishi/myinfo/index">{{user_name}}</view>
+      <view class="namebox">
+       
+        <view class="name" bindtap="go" data-url="/Pages/yishi/myinfo/index">{{user_name}}</view>
+        <view class="iconbox"  bindtap="go" data-url="/Pages/yishi/myinfo/index">
+          <text>设置</text>
+          <van-icon name="arrow" class="arrow"/>
+        </view>
+      </view>
+      
       <view class="renzheng">
         <view class="yishi" bindtap="go" data-url="/Pages/yishi/identity/index">{{iden_auth_status==1?'已医师认证':'未医师认证'}}></view>
         <view class="zhiye" bindtap="go" data-url="/Pages/yishi/zhiye_identity/index">{{multi_point_status==1?'已多点执业认证':'未多点执业认证'}}></view>
       </view>
     </view>
-    <view class="icon" bindtap="go" data-url="/Pages/yishi/myinfo/index">
+
-      <van-icon name="arrow" />
-    </view>
   </view>
 
-  <view class="account" >
+  <view class="account">
     <view class="account_top">
       <view class="account_top_left">
         <view class="account_title">
-        <view>
+          <view>
-        账户余额（元）
+            账户余额（元）
-        </view>
+          </view>
         </view>
         <view class="account_num">
           <view>
-          <text style="font-size: 42rpx;">￥</text>
+            <text style="font-size: 42rpx;">￥</text>
-          <text style="font-size: 64rpx;">{{balance_account}}</text>
+            <text style="font-size: 64rpx;">{{balance_account}}</text>
           </view>
         </view>
       </view>
       <view class="account_top_right">
         <navigator url="/Pages/yishi/cash/index" open-type="navigate" hover-class="other-navigator-hover">
-          <van-button custom-style="text-indent: 20rpx;letter-spacing: 20rpx;text-align: center;border-radius: 10rpx;padding: 20rpx 50rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);font-size: 32rpx;">
+          <van-button custom-style="text-indent: 20rpx;letter-spacing: 20rpx;text-align: center;height:70rpx;border-radius: 40rpx;padding: 0rpx 44rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);font-size: 32rpx;">
             提现
           </van-button>
         </navigator>
       </view>
     </view>
     <view class="account_bottom">
-      <view style="font-size: 30rpx;color: #666666;">当日预计收益金额：</view>
+      <view style="font-size: 28rpx;color: #666666;">当日预计收益金额：</view>
-      <view style="font-size: 42rpx;color: #333333;">￥{{estimate_income}}</view>
+      <view style="font-size: 28rpx;color: rgba(0,0,0,0.85);">￥{{estimate_income}}</view>
     </view>
   </view>
 
   <view class="content">
-    <van-cell size="large" url="/Pages/yishi/medince_list/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="药品清单" is-link />
+    <van-cell size="large" url="/Pages/yishi/medince_list/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="药品清单" is-link />
-    <van-cell size="large" url="/Pages/yishi/myaccount/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="我的账户" is-link />
+    <van-cell size="large" url="/Pages/yishi/myaccount/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="我的账户" is-link />
-    <van-cell size="large" url="/Pages/yishi/bankcard/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="我的银行卡" is-link />
+    <van-cell size="large" url="/Pages/yishi/bankcard/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="我的银行卡" is-link />
-    <van-cell size="large" url="/Pages/yishi/mycard/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="我的名片" is-link  />
+    <van-cell size="large" url="/Pages/yishi/mycard/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="我的名片" is-link />
-    <van-cell size="large" url="/Pages/yishi/appraise/index?doctor_id={{doctor_id}}" link-type="navigateTo" title-style="font-size: 34rpx;" title="患者评价" is-link />
+    <van-cell size="large" url="/Pages/yishi/appraise/index?doctor_id={{doctor_id}}" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="患者评价" is-link />
-    <van-cell size="large" url="/Pages/yishi/quickreply/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="常用语" is-link border="{{ false }}"/>
+    <van-cell size="large" url="/Pages/yishi/quickreply/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="常用语" is-link border="{{ false }}" />
   </view>
 </view>

Pages/yishi/my/index.wxss

@@ -4,7 +4,7 @@ page{
 .container{
   background: linear-gradient(180deg, #3CC7C0 0%, rgba(60,199,192,0) 50%);
 
-  padding-bottom: 100rpx;
+  padding-bottom: 70rpx;
   min-height:100vh;
   width: 100vw;
   color: #fff;
@@ -17,6 +17,7 @@ page{
   position: absolute;
 }
 .title{
+  color: #000000;
   position:relative;
   text-align: center;
 }
@@ -34,7 +35,8 @@ page{
 }
 .name{
   height: 50rpx;
-  font-size: 36rpx;
+  font-size: 34rpx;
+  color: rgba(0,0,0,0.85);
   line-height: 50rpx;
 }
 .renzheng{
@@ -50,6 +52,12 @@ page{
   padding: 0 20rpx;
   margin-right: 20rpx;
 }
+.zhiye{
+  background: #999999;
+}
+.yishi{
+  background: #FAAD14;
+}
 .photo{
   flex: 3;
   text-align: center;
@@ -62,11 +70,26 @@ page{
   text-align: right;
   padding-right: 20rpx;
 }
+.namebox{
+  justify-content: space-between;
+  display: flex;
+}
+.iconbox{
+  align-items: center;
+  font-size: 30rpx;
+  color: rgba(0,0,0,0.65);
+  margin-right: 24rpx;
+  display: flex;
+}
+.iconbox .arrow{
+  margin-top: 4rpx;
+  margin-left: 4px;
+}
 .account{
   background-color: rgb(255, 255, 255);
   width: 92vw;
   margin: 0 auto;
-  height: 272rpx;
+  height: 280rpx;
   margin-top: 24rpx;
   position: relative;
   border-radius: 20rpx;
@@ -85,12 +108,16 @@ page{
   margin-left: 20rpx;
 }
 .account_title{
-  flex: 9;
+ margin-top: 32rpx;
   display: flex;
+  font-size: 30rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.65);
   align-items: center;
 }
 .account_num{
-  flex: 10;
+ margin-top: 10rpx;
+  font-weight: bold;
   display: flex;
   align-items: center;
 }
@@ -98,7 +125,8 @@ page{
   flex: 2;
   display: flex;
   justify-content: center;
-  align-items: center;
+  align-items:flex-end;
+  margin-bottom: 20rpx;
 }
 .account_bottom{
   flex: 1;
@@ -112,14 +140,15 @@ page{
   background-color: #fff;
   margin: 24rpx auto 0;
   position: static;
+  overflow: hidden;
   border-radius: 20rpx;
-  padding: 20rpx 0;
+  padding: 0rpx 0 20rpx;
 }
 .t-badge__content-text {
   line-height: 70rpx !important;
 }
 .van-cell {
-  padding: 32rpx !important;
+  padding: 30rpx !important;
 }
 
 

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

@@ -198,7 +198,9 @@ Component({
           let data = customMessage.data;
           const renderDom = [{
             type: 'patient_info',
-            path:data.message_path
+            disease_desc:data.disease_desc,
+            path:data.message_path,
+            detection_link:data.detection_link
           }];
           return renderDom;
         }
@@ -251,12 +253,31 @@ Component({
       } catch (error) {
       }
     },
-    
+    goReport(event){
+      const url=event.currentTarget.dataset.url;
+      const randfile = new Date().getTime() + '检测报告';
+    const newPath = `${wx.env.USER_DATA_PATH}/${randfile}`;
+    wx.downloadFile({
+      // 示例 url，并非真实存在
+      url:url,
+      filePath: newPath,
+      success: function (res) {
+        //const filePath = res.tempFilePath
+        wx.openDocument({
+          filePath: newPath,
+          success: function (res) {
+            console.log('打开文档成功')
+          }
+        })
+      }
+    })
+    },
    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.wxml

@@ -96,7 +96,7 @@
         <view class="sick"> 所患疾病：{{renderDom[0].disease_class_names}}</view>
       </view>
     </view>
-    <view class="detail">
+    <view class="detail" data-url="{{renderDom[0].detection_link}}" bindtap="goReport">
        <view class="left">查看报告</view>
        <image src="../../../../../static/images/back.png" class="back" mode="widthFix"/>
     </view>
@@ -105,13 +105,25 @@
     <image src="../../../../../static/images/patient_bg.png" 
     class="bg" mode=""/>
     <view class="title">患者信息</view>
-    <view class="patient_info">
+    <view class="sickinfo" wx:if="{{renderDom[0].disease_desc}}">
-        <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="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_desc">
+          <text class="sickname">病情描述：</text>{{renderDom[0].disease_desc}}
+        </view>
+        <view class="look sicklook" 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 class="patient_info" wx:else>
+        <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>

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

@@ -333,4 +333,33 @@ justify-content:space-between;
   display: flex;
   color:rgba(0,0,0,0.45);
   align-items: center;
+}
+.sick_desc{
+  font-size: 28rpx;
+  margin:20rpx 32rpx 0;
+  text-align: left;
+  
+  border-bottom: 1rpx solid rgba(0,0,0,0.12);
+  padding-bottom: 30rpx;
+
+}
+.sickname{
+  font-size: 28rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.45);
+}
+.sicklook{
+  justify-content: space-between;
+  margin:0 32rpx;
+  align-items: center;
+  height: 100rpx;
+}
+.sickinfo .name{
+  margin: 20rpx 32rpx 0;
+  
+  text-align: left;
+}
+.sicklook .see{
+ 
+  font-size: 32rpx;
 }

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

@@ -362,7 +362,6 @@ Component({
           const title = customMessage.title
           if(title.indexOf("问诊已结束") > -1){
             setTimeout(() => {
-              console.log('aaaaaaaaaaaaaaaaaaaaaa')
               //收到横条消息去触发父组件getbase方法,演示1秒
               this.triggerEvent('getInquiryMessageBasic');
             }, 1000);

TUIKit/components/TUIChat/index.js

@@ -188,7 +188,6 @@ Component({
       
     },
     onChangeTime(e) {
-      console.log(e.detail)
       this.setData({
         'timeData': e.detail,
       });

TUIKit/components/TUIChat/index.wxss

@@ -154,14 +154,20 @@
 .time_desc{
  color:#E34D59;
  display: flex;
+ align-items: center;
 }
 
 .time_desc .item{
   color:#E34D59;
+ 
+  display: flex;
+  align-items: center;
   font-size: 32rpx;
 }
 .count_time{
   display: flex;
+  height:100rpx;
+  align-items: center;
 }
 .circle_top{
   width: 10rpx;

app.json

@@ -58,7 +58,8 @@
     "Pages/yishi/wenzhenorderV2/index",
     "Pages/yishi/wenzhen_v3/wenzhen",
     "Pages/agreement_page/index",
-    "Pages/yishi/medince_list/index"
+    "Pages/yishi/medince_list/index",
+    "Pages/yishi/linkPage/linkPage"
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",