医生提交1212

Pages/index/index.js

@@ -91,6 +91,10 @@ Page({
       complete: () => {}
     })
     this.setData({ loading: false });
+    if(app.globalData.isLogin){
+      let usertype = wx.getStorageSync('usertype');
+      this.guideTo(usertype)
+    }
     // let isEntry=wx.getStorageSync('hasEntry');
     // console.log("onshow:"+isEntry)
     // if(!isEntry){

Pages/yishi/case/index.wxml

@@ -124,13 +124,13 @@
       </view>
       <view class="disease_box_item" >
         <view class="title">药品：</view>
-        <view class="conent" wx:for="case_detail.order_prescription.product" wx:for-item="itemName">
+        <view class="conent" wx:for="{{case_detail.order_prescription.product}}" wx:for-item="itemName">
-        {{itemName}};
+        {{itemName.product_name}};
         </view>
       </view>
       <view class="disease_box_item" >
         <view class="title">用法：</view>
-        <view class="conent">{{case_detail.order_prescription.single_use}}</view>
+        <view class="conent">{{case_detail.order_prescription.doctor_advice}}</view>
       </view>
   </view> 
     </view>

Pages/yishi/case/index.wxss

@@ -42,7 +42,8 @@ page{
 }
 .info_item{
   text-align: left;
-  width: 203rpx; 
+  width: 33.3%; 
+  margin-right: -1rpx;
   /* height: 60rpx; */
   margin-top: 10rpx;
 
@@ -52,7 +53,7 @@ page{
   align-items: flex-start;
 }
 .info_item:nth-child(3n){
-   text-indent: 20rpx;
+  margin-right: 0rpx;
 } 
 .info_title{
   font-size: 28rpx;

Pages/yishi/cash/index.js

@@ -17,6 +17,7 @@ Page({
     bank_name	: "xx银行",
     bank_card_code_mask: "888 xxxx xxxx 888",
     withdrawal_amount: "xxxx",
+    amount_total:'',
     income_tax: "xx",
     contactKeFu: false,
     sub_visible: false,
@@ -91,6 +92,7 @@ Page({
           bank_name	: response.data.bank.bank_name,
           bank_card_code_mask: response.data.bank.bank_card_code_mask,
           withdrawal_amount: response.data.withdrawal_amount,
+          amount_total:response.data.amount_total,
           order_inquiry_ids: response.data.order_inquiry_ids,
           bank_card_name: response.data.bank.bank_card_name_mask,
           income_tax: response.data.income_tax,

Pages/yishi/cash/index.wxml

@@ -21,29 +21,43 @@
   <view class="cash" wx:if="{{!skeleton_loading}}">
     <view class="cash_top">
       <view class="cash_left">
-        <view class="cash_left_title">实际到账（元）</view>
+        <!-- <view class="cash_left_title">实际到账（元）</view> -->
         <view class="cash_num">
           <view>
-            <text style="font-size: 42rpx;">￥</text>{{withdrawal_amount}}
+            <text style="font-size: 34rpx;">账户余额：￥</text>{{amount_total}}
           </view>
         </view>
         <view class="shui">扣除个人所得税： 
           <text style="color: red;">{{income_tax}}元</text>
         </view>
       </view>
-      <view class="cash_right">
+      <!-- <view class="cash_right">
         <navigator url="/Pages/yishi/wenzhenorderV2/index" open-type="navigate" hover-class="other-navigator-hover">
           <van-button custom-style="text-align: center;border-radius: 10rpx;padding: 20rpx 50rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);">
             查看订单
           </van-button>
         </navigator>
-      </view>
+      </view> -->
     </view>
     <view class="cash_bottom">
-      <navigator url="/Pages/yishi/cashrecord/index" open-type="navigate" hover-class="other-navigator-hover">
+        <view class="title">
-      提现记录 >
+          实际到账（元）
+        </view>
+        <view class="moneybox">
+        <view class="money"><text class="mark">￥</text><text class="moneyNum">{{withdrawal_amount}}</text></view>
+        <navigator url="/Pages/yishi/wenzhenorderV2/index" open-type="navigate" hover-class="other-navigator-hover">
+          <van-button custom-style="text-align: center;border-radius: 10rpx;height:70rpx;width:200rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);">
+            查看订单
+          </van-button>
         </navigator>
         </view>
+    
+    </view>
+  </view>
+  <view class="tixian">
+    <navigator url="/Pages/yishi/cashrecord/index" open-type="navigate" hover-class="other-navigator-hover">
+      提现记录 <van-icon name="arrow" />
+      </navigator> 
   </view>
   <view class="cash_loading" wx:if="{{skeleton_loading}}">
     <t-skeleton theme="text" row-col="{{[{width: '30%'},{width: '80%'},{width: '50%'},{width: '30%'}]}}" animation="gradient" loading="{{skeleton_loading}}" />

Pages/yishi/cash/index.wxss

@@ -66,7 +66,7 @@ page{
 }
 .cash{
   width: 92vw;
-  height: 300rpx;
+
   margin: 20rpx auto;
   background-color: #fff;
   border-radius: 20rpx;
@@ -74,20 +74,26 @@ page{
   flex-direction: column;
 }
 .cash_top{
-  margin-top: 20rpx;
+  margin-top:30rpx;
   display: flex;
   flex: 3;
 }
 .cash_bottom{
+  padding:20rpx 20rpx 30rpx;
   border-top: 1px solid #E5E5E5;
-  flex: 1.2;
+ 
-  color: #3CC7C0;
   font-size: 32rpx;
   display: flex;
-  align-items: center;
+
-  justify-content: flex-end;
+  flex-direction: column;
   padding-right: 20rpx;
 }
+.cash_bottom .title{
+  margin-top: 10rpx;
+  font-size: 30rpx;
+ 
+  color: #000000;
+}
 .cash_left{
   flex: 3;
   display: flex;
@@ -104,10 +110,12 @@ page{
   flex: 2;
   display: flex;
   align-items: center;
-  font-size: 64rpx;
+  font-size: 34rpx;
 }
 .shui{
   flex: 1;
+  margin-top: 20rpx;
+  margin-bottom: 30rpx;
   display: flex;
   align-items: center;
   font-size: 28rpx;
@@ -154,3 +162,31 @@ page{
   color: #3CC7C0;
 }
 
+.moneybox{
+  display: flex;
+}
+.moneybox{
+  display: flex;
+  margin-top: 20rpx;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.money .mark{
+  font-size: 42rpx;
+font-weight: 400;
+color: #333333;
+}
+.moneyNum{
+  font-size: 64rpx;
+font-family: ArialMT;
+color: #333333;
+}
+.tixian{
+  display: flex;
+  margin:0 30rpx;
+  color: #3CC7C0;
+  font-size: 32rpx;
+  align-items: center;
+  justify-content: flex-end;
+}

Pages/yishi/cashrecord/index.wxml

@@ -1,5 +1,6 @@
 <!-- 提现记录 -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<wxs src="../../../filters/filter.wxs" module="moduleFilter"></wxs>
 <view class="container">
   <view class="top">
     <view class="top_txt" bindtap="onDatePicker">
@@ -10,19 +11,24 @@
 
     <view class="data_item" wx:for="{{record_list}}">
       <view class="data_item_top">
+      
+        <view class="data_item_top_content">
+         <view class="namebox">
           <view class="data_item_top_icon">
           <van-image custom-style="" src="{{static_host}}/applet/doctor/static/images/yishi/bankcard/js_icon.png" fit="heightFix" height="50rpx" aria-label="role" />
         </view>
-        <view class="data_item_top_content">
           <view class="name">{{item.account_name}}<text style="margin-left:20rpx;font-size: 28rpx;color:#999;">（尾号{{item.bank_card_code_four}}）</text></view>
-          <view class="date">{{item.created_at}}</view>
          </view>
-        <view class="data_item_top_num">
-          <view class="jine">￥{{item.actual_withdrawal_amount}}</view>
          <view class="status_box">
             <!-- 审核状态（1:审核中 2:审核通过 3:审核未通过） -->
-            <view class="status status_ing">{{item.examine_status==1?'审核中':item.examine_status==2?'审核通过':item.examine_status==3?'审核未通过':'未知'}}</view>
+            <view class="status {{item.examine_status==1?'paying':item.examine_status==2?'paysuccess':item.examine_status==3?'payfail':''}}">{{item.examine_status==1?'结算中':item.examine_status==2?'结算成功':item.examine_status==3?'结算失败':'未知'}}</view>
           </view>
+        
+        </view>
+        <view class="data_item_top_num">
+          <view class="date">{{moduleFilter.transforDay(item.created_at,"noyear")}}</view>
+          <view class="jine"><text class="jinename">实际到账金额：</text>￥{{item.actual_withdrawal_amount}}</view>
+          
         </view>
       </view>
       <view class="data_item_bottom">个人所得税：￥{{item.income_tax}}</view>

Pages/yishi/cashrecord/index.wxss

@@ -25,46 +25,57 @@ page{
 .data_item{
   display: flex;
   flex-direction: column;
-  margin-bottom: 50rpx;
+  margin-bottom: 20rpx;
-  height: 200rpx;
   background-color: #ffffff;
   border-radius: 20rpx;
-  padding: 20rpx 0 0 0;
+  padding: 30rpx 0 0 0;
 }
 .data_item_top{
-  flex: 2;
+  margin:0 30rpx;
-  display: flex;
   border-bottom: 1px solid #E7E7E7;
 }
 .data_item_top_icon{
-  flex: 1;
+
   text-align: center;
-  height: 70%;
+
-  align-self: start;
 }
 .data_item_top_content{
-  flex: 3;
+ 
+ justify-content: space-between;
   display: flex;
-  flex-direction: column;
 }
 .name{
+  margin-left: 10rpx;
   font-size: 32rpx;
   color: #333333;
-  flex: 1;
+ 
 }
 .date{
-  flex: 1;
   font-size: 28rpx;
+  display: flex;
+ margin-left: 28rpx;
   color: #999999;
+  white-space: nowrap;
 }
 .data_item_top_num{
-  flex: 2;
-  display: flex;
-  flex-direction: column;
   justify-content: space-between;
+  display: flex;
+  align-items: center;
+  margin:0 30rpx 25rpx;
+
   text-align: center;
 }
+.jinename{
+  font-size: 30rpx;
+  font-weight: 400;
+  color: #666666;
+}
+.namebox{
+  display: flex;
+}
 .jine{
+  display: flex;
+  align-items: center;
   color: #FF0000;
   font-size: 34rpx;
 }
@@ -73,27 +84,38 @@ page{
   justify-content: center;
 }
 .status{
-  border-radius: 10px;
+  width: 125rpx;
-  font-size: 24rpx;
+  height: 50rpx;
-  padding: 10rpx 40rpx;
+  background: #FFF2E8;
+  border-radius: 10rpx;
   margin-bottom: 20rpx;
+  font-size: 24rpx;
+ font-weight: 400;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #FFFFFF;
 }
-.status_ing{
+.status.paying{
-  background-color: #FFF2E8;
+  background: #FFF2E8;
   color: #FA541C;
 }
-.status_end{
+.status.paysuccess{
+  background: #E2FFFE;
+  color: #3CC7C0;
+}
+.status.payfail{
   background-color: #C5C5C5;
   color: #FFFFFF;
 }
 .data_item_bottom{
-  flex: 1;
+  padding:20rpx 30rpx 26rpx;
   display: flex;
   align-items: center;
   justify-content: flex-end;
   margin-right: 20rpx;
   color: #666;
-  font-size: 32rpx;
+  font-size: 28rpx;
 }
 .t-picker__confirm{
   color: #3CC7C0 !important;

Pages/yishi/myaccount/index.js

@@ -12,9 +12,12 @@ Page({
     dateVisible: false,
     dateText: "",
     dateValue: ['2023','3'],
+    dialog_visible:false,
     select_date: "",
     balance_account: "",
     amount_total_month: "",
+    doctor_today_inquiry_total:'',
+    doctor_day_completed_amount_total:'',
     withdrawal_amount_month: "",
     static_host: api.getStaticHost(),
     bill: [],
@@ -54,7 +57,7 @@ Page({
     let mmdateValue = [''+year+'',''+month+''];
     this.setData({
       dateValue: mmdateValue,
-      dateText: month+"月"
+      dateText: year+"年"
     })
 
     let date = this.data.dateValue.join("-");
@@ -63,7 +66,16 @@ Page({
   onColumnChange(e) {
     console.log('picker onColumnChange:', e);
   },
-
+  confirmDialog(){
+    this.setData({
+      dialog_visible:false
+     })
+  },
+  showDialog(){
+   this.setData({
+    dialog_visible:true
+   })
+  },
   onPickerChange(e) {
     const { key } = e.currentTarget.dataset;
     const { value } = e.detail;
@@ -72,7 +84,7 @@ Page({
     this.setData({
       [`${key}Visible`]: false,
       [`${key}Value`]: value,
-      [`${key}Text`]: value[1]+"月",
+      [`${key}Text`]: value[0]+"年",
     });
 
     let date = value.join("-");
@@ -106,11 +118,16 @@ Page({
       this.setData({
         balance_account: response.data.balance_account,
         amount_total_month: response.data.amount_total_month,
+        doctor_today_inquiry_total:response.data.doctor_today_inquiry_total,
+        doctor_day_completed_amount_total:response.data.doctor_today_inquiry_total,
         withdrawal_amount_month: response.data.withdrawal_amount_month,
         bill: response.data.bill,
       })
     }).catch(errors => {console.error(errors);})
   },
+  goTixian(){
+    app.go('/Pages/yishi/cash/index')
+  },
   goDetail(e){
     let url = e.currentTarget.dataset.url;
     let md = e.currentTarget.dataset.md;

Pages/yishi/myaccount/index.json

@@ -6,6 +6,7 @@
     "t-picker": "tdesign-miniprogram/picker/picker",
     "t-picker-item": "tdesign-miniprogram/picker-item/picker-item",
     "van-icon": "@vant/weapp/icon/index",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog",
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-empty": "@vant/weapp/empty/index"

Pages/yishi/myaccount/index.wxml

@@ -1,6 +1,6 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
-  <view class="top">
+  <!-- <view class="top">
     <view class="top_txt">
       <view style="font-size: 30rpx;">
         账户当前余额：
@@ -9,17 +9,38 @@
         ¥ {{balance_account}}
       </view>
     </view>
-  </view>
+  </view> -->
   <view class="monthbox">
-    <view class="month" bindtap="showPop">{{dateText}}<van-icon name="arrow-down" color="#999" size="40rpx" /></view>
+    <view class="titlebox">
+      <view class="name">账户余额（元）</view>
+      <van-icon name="question-o"  class="question" bindtap="showDialog"/>
+    </view>
+    <view class="accoutbox">
+      <view class="accountNum"><text class="mark">￥</text>{{balance_account}}</view>
+      <view class="tixian" bindtap="goTixian">提现</view>
+    </view>
+    <view class="line"></view>
+    <view class="cashbox">
+       <view class="today">
+        <view class="titlename">今日接诊收入</view>
+        <view class="money">¥{{doctor_today_inquiry_total}}</view>
+       </view>
+       <view class="finish">
+        <view class="titlename">已完成待入账</view>
+        <view class="money">¥{{doctor_day_completed_amount_total}}</view>
+       </view>
+    </view>
+    <!-- <view class="month" bindtap="showPop">{{dateText}}<van-icon name="arrow-down" color="#999" size="40rpx" /></view>
     <view class="account">
       <view class="account_left" style="font-size: 30rpx;">当月收益：<text style="font-size: 40rpx;">￥{{amount_total_month}}</text></view>
       <view class="account_right" style="font-size: 30rpx;">当月已提取：<text style="font-size: 40rpx;">￥{{withdrawal_amount_month}}</text></view>
+    </view> -->
   </view>
+  <view class="txt_title" bindtap="showPop">
+    {{dateText}}<van-icon name="arrow-down" color="#333" size="34rpx" />
   </view>
-  <view class="txt_title">账单</view>
   <view class="content">
-    <van-cell size="large" bindtap="goDetail" data-url="/Pages/yishi/orderdetail/index" data-md="{{item.month}}-{{item.day}}" title-style="font-size: 30rpx;" title="{{item.month}}月{{item.day}}日" value="+{{item.total_amount}}元"  is-link wx:for="{{bill}}" />
+    <van-cell size="large" bindtap="goDetail" data-url="/Pages/yishi/orderdetail/index" data-md="{{item.month}}" title-style="font-size: 30rpx;" title="{{item.month}}月" value=""  is-link wx:for="{{bill}}" />
     <van-empty description="暂无账单" wx:if="{{ bill.length == 0 }}" />
   </view>
 
@@ -37,8 +58,21 @@
       bindcancel="onPickerCancel"
     >
       <t-picker-item options="{{years}}"></t-picker-item>
-      <t-picker-item options="{{seasons}}"></t-picker-item>
+      <!-- <t-picker-item options="{{seasons}}"></t-picker-item> -->
     </t-picker>
 
+    <t-dialog
+    visible="{{ dialog_visible }}"
+    title="温馨提示"
 
+  >
+  <view  slot="content" class="slotcontent">
+     <view class="msg">1、账户余额表示未提现的所有已经结束的订单金额总和</view>
+     <view class="msg">2、今日接诊收入表示今日已经接诊的订单金额总和 </view>
+     <view class="msg">3、已完成待入账表示近期已完成未结束的订单金额总和 </view>
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="confirmDialog">
+    确定
+  </view>
+  </t-dialog>
 </view>

Pages/yishi/myaccount/index.wxss

@@ -20,9 +20,9 @@ page{
 }
 .monthbox{
   width: 92vw;
-  margin: -40rpx auto 0 auto;
+  margin: 20rpx auto 0 auto;
   background-color: #ffffff;
-  height: 200rpx;
+  padding:26rpx 0 20rpx;
   border-radius: 20rpx;
   display: flex;
   flex-direction: column;
@@ -53,7 +53,7 @@ page{
   text-align: left;
 }
 .txt_title{
-  font-size: 30rpx;
+  font-size: 34rpx;
   margin: 20rpx 0;
   position: relative;
   left: 4vw;
@@ -64,10 +64,126 @@ page{
   background-color: #fff;
   margin: 0 auto;
   border-radius: 20rpx;
-  padding: 20rpx 0;
+ overflow: hidden;
 }
 .t-picker__confirm{
   color: #3CC7C0 !important;
 }
+.titlebox{
+  margin:0 30rpx;
+  display: flex;
+}
+.titlebox .name{
+  color: #000000;
+}
+.question{
+ color:rgba(0,0,0,0.6);
+}
+.tixian{
+  width: 200rpx;
+height: 70rpx;
+background: linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);
+border-radius: 10rpx;
+font-size: 32rpx;
+display: flex;
+align-items: center;
+justify-content: center;
+font-weight: 400;
+color: #FFFFFF;
+}
+.accoutbox{
+  margin:20rpx 30rpx 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-bottom: 26rpx;
   
-
+}
+.line{
+  width:100%;
+  height:1rpx;
+  background-color:#E5E5E5;
+}
+.mark{
+  font-size: 42rpx;
+font-weight: 400;
+color: #333333;
+}
+.cashbox{
+  margin:20rpx 30rpx 0;
+  display: flex;
+}
+.accountNum{
+  font-size: 64rpx;
+font-family: ArialMT;
+color: #333333;
+}
+.titlename{
+  font-size: 28rpx;
+font-weight: 400;
+color: #999999;
+}
+.today,.finish{
+  flex:1;
+}
+.money{
+  margin-top: 16rpx;
+  font-size: 36rpx;
+font-weight: 400;
+color: #000000;
+}
+.van-cell:after{
+  left:0rpx!important;
+  right:0rpx!important;
+}
+.van-cell{
+  padding:35rpx 16rpx!important;
+}
+.dialog{
+  width: 100%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  position: relative;
+}
+.dialog_cancel_btn::before {
+  content: ' ';
+  position: absolute;
+  box-sizing: border-box;
+  top: 0;
+  left: 0;
+  border-top: 2px solid var(--td-border-color, #e7e7e7);
+  border-right: 2px solid var(--td-border-color, #e7e7e7);
+  transform: scale(0.5);
+  transform-origin: 0 0;
+  width: 200%;
+  height: 200%;
+  border-radius: 0;
+  border-top-left-radius: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
+}
+.t-button__content{
+  color: #3CC7C0 !important;
+}
+.t-dialog__button--text:before {
+  border-top: 2px solid #E9E9E9 !important;
+  border-left: 2px solid var(--td-border-color, #E9E9E9);
+  border-top-color: #E9E9E9 !important;
+}
+.slotcontent{
+  margin-top: 20rpx;
+}
+.slotcontent .msg{
+  font-size: 34rpx;
+font-weight: 400;
+color: #666;
+line-height: 48rpx;
+}

Pages/yishi/onlinechufang/index.js

@@ -60,7 +60,7 @@ Page({
     let order_inquiry_id = options.order_inquiry_id;
     let order_prescription_id	 = options.order_prescription_id	;
     //获取患者问诊病例
-    api.getDoctorInquiryCase({order_inquiry_id: order_inquiry_id}).then(response => {
+    api.getInquiryDetail({order_inquiry_id: order_inquiry_id}).then(response => {
       console.log(response);
       this.setData({
         case_detail: response.data

Pages/yishi/orderdetail/index.wxml

@@ -6,13 +6,14 @@
       <view class="order_item_content">
         <view class="order_item_content_top ">
           {{ item.inquiry_type==1?'专家问诊':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'其他' }}
-        <view class="order_status order_status_cancle">{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'问诊结束':item.inquiry_status==7?'已取消':'其他' }}</view>
+        <!-- <view class="order_status order_status_cancle">{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'问诊结束':item.inquiry_status==7?'已取消':'其他' }}</view> -->
+        <view class="order_status order_status_cancle {{item.entry_status==1?'entrying':item.entry_status==2?'entrysuccess':item.entry_status==3?'entryfail':'' }}">{{ item.entry_status==1?'入账中':item.entry_status==2?'入账成功':item.entry_status==3?'入账失败':'未知' }}</view>
         </view>
         <view class="order_item_content_data">
           <view class="order_id">订单编号：<text style="font-size: 30rpx;color: #666666;">{{item.inquiry_no}}</text></view>
           <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁）</text></view>
           <view class="order_id">接诊时间：<text style="font-size: 30rpx;color: #666666;">{{item.reception_time}}</text></view>
-          <view class="order_id">结束时间：<text style="font-size: 30rpx;color: #666666;">{{item.finish_time}}</text></view>
+          <view class="order_id" wx:if="{{item.finish_time}}">结束时间：<text style="font-size: 30rpx;color: #666666;">{{item.finish_time}}</text></view>
           <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥{{item.amount_total}}</text></view>
           <view class="order_id">预计收入：<text style="font-size: 30rpx;color: #666666;">￥{{item.estimate_income}}</text></view>
         </view>

Pages/yishi/orderdetail/index.wxss

@@ -46,6 +46,18 @@ page{
   background-color: #C5C5C5;
   color: #fff;
 }
+.order_status.entrying{
+  background: #FFF2E8;
+  color: #FA541C;
+}
+.order_status.entrysuccess{
+  background: #E2FFFE;
+  color: #3CC7C0;
+}
+.order_status.entryfail{
+  background-color: #C5C5C5;
+  color: #fff;
+}
 .order_item_content_data{
   flex: 5;
   display: flex;

Pages/yishi/patient_sick/index.js

@@ -26,7 +26,6 @@ Page({
   goDetail:debounce(function(event){
     console.log(event)
     let id=event.currentTarget.dataset.id;
-    console.log(id);
     app.go("/Pages/yishi/case/index?order_inquiry_id="+id);
   }),
   goDetailbefore:debounce(function(event){

Pages/yishi/sickform/index.js

@@ -1,4 +1,9 @@
-// Pages/sickform/index.js
+// pages/inquiryForm/inquiryForm.js
+const app = getApp()
+import { API } from './../../../utils/network/api'
+const api = new API()
+
+
 Page({
 
   /**
@@ -9,23 +14,552 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '问诊表', //导航栏 中间的标题
     },
-    params:null,
+    obj:{
-    basic:[],
+      height:'身高',
-    preson:[]
+      weight:'体重',
-  },
+      nation_id:'民族',
+      job_id:'职业',
+      marital_status:'婚姻状态',
+      allergy_history:'是否有过敏史？',
+      family_history:'是否有家族病史？',
+      is_pregnant:'是否处于备孕、妊娠、哺乳期？',
+      is_operation:'是否做过手术？',
+      drink_wine_status:'是否有饮酒史?',
+      smoke_status:'是否有吸烟史？',
+      chemical_compound_status:'是否有接触过化学物?',
+      diagnosis_hospital:'确诊医院是？',
+      is_take_medicine:'服用药品是？'
 
+    },
+    showNation:false,
+    showJob:false,
+    showMarital:false,
+    nationname:'',
+    order_inquiry_id:'',
+    jobname:'',
+    hideGuomin:false,
+    hideFamilysick:false,
+    hidePregnant:false,
+    hideOperation:false,
+    hideChemical:false,
+    hideHospital:false,
+    hideDrug:false,
+    personInfo:{},
+    showBtn:true,
+    maritalColumn: [{
+      text: '未婚',
+      value: 0
+    }, {
+      text: '已婚 ',
+      value: 1
+    }, {
+      text: '离异 ',
+      value: 2
+    }],
+    nationcolumns:[],
+    jobcolumns:[],
+    list1:[],
+    list2:[],
+    startIndex1:1,
+    showList:[{
+      isHas:false,
+      index:1
+    },{
+      isHas:false,
+      index:2
+    },{
+      isHas:false,
+      index:3  
+    },{
+      isHas:false,
+      index:4
+    },{
+      isHas:false,
+      index:5
+    },{
+      isHas:false,
+      index:6
+    },{
+      isHas:false,
+      index:7
+    },{
+      isHas:false,
+      index:8
+    },{
+      isHas:false,
+      index:9
+    }],
+    static_host: ''
+    
+
+  },
+  handleSendFields(){
+    const {order_inquiry_id,personInfo,list1,list2,marital_name,jobname,nationname}=this.data;
+    console.log(personInfo)
+    const fields=[];
+  for (let i = 0; i <list1.length; i++) {
+   if(list1[i]=='height' && !personInfo.height){
+      wx.showToast({
+        title: '请填写身高',
+        icon:'none'
+      })
+      return false
+   }
+   if (list1[i]=='height' && personInfo.height) {
+    if (!/^3[5-9](\.\d+)?$|^[4-9][0-9](\.\d+)?$|^1[0-9][0-9](\.\d+)?$|^2[1-4][0-9](\.\d+)?$|250/.test(personInfo.height)) {
+      wx.showToast({
+        title: `请输入范围内身高！`,
+        icon: 'none',
+      });
+      return false;
+    }
+  };
+    if(list1[i]=='weight' && !personInfo.weight){
+      wx.showToast({
+        title: '请填写体重',
+        icon:'none'
+      })
+      return false
+  }
+  
+  if (list1[i]=='weight' && personInfo.weight) {
+    if (!/^[2-9](\.\d+)?$|^[1-9][0-9](\.\d+)?$|^1[0-9]{1,2}(\.\d+)?$|200/.test(personInfo.weight)) {
+      wx.showToast({
+        title: `请输入范围内体重！`,
+        icon: 'none',
+      });
+      return false;
+    }
+  }
+  if(list1[i]=='marital_status' && !marital_name){
+    wx.showToast({
+      title: '请选择婚姻状态',
+      icon:'none'
+    })
+    return false
+ }
+ if(list1[i]=='nation_id' && !nationname){
+  wx.showToast({
+    title: '请选择民族',
+    icon:'none'
+  })
+  return false
+}
+if(list1[i]=='job_id' && !jobname){
+  wx.showToast({
+    title: '请选择职业',
+    icon:'none'
+  })
+  return false
+}
+    
+}
+for (let i = 0; i < list2.length; i++) {
+  if( list2[i]=="is_allergy_history"){
+ if(!personInfo.is_allergy_history && personInfo.is_allergy_history!=0){
+    wx.showToast({
+      title: '请选择是否有过敏史',
+      icon:'none'
+    })
+    return false
+  }
+  if(personInfo.is_allergy_history==1 && !personInfo.allergy_history){
+    wx.showToast({
+      title: '请填写过敏源',
+      icon:'none'
+    })
+    return false
+  }
+  
+ 
+  }else if(list2[i]=="is_family_history"){
+    if(!personInfo.is_family_history && personInfo.is_family_history!=0){
+      wx.showToast({
+        title: '请选择是否有家族病史',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.is_family_history==1 && !personInfo.family_history){
+      wx.showToast({
+        title: '请填写家族病史',
+        icon:'none'
+      })
+      return false
+    }
+  
+  }else if(list2[i]=="is_pregnant"){
+    if(!personInfo.is_pregnant && personInfo.is_pregnant!=0){
+      wx.showToast({
+        title: '请选择是否处于备孕、妊娠、哺乳期',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.is_pregnant==1 && !personInfo.is_pregnant){
+      wx.showToast({
+        title: '请填写请描述您目前所处阶段，如备孕中、哺乳期中、妊娠月份',
+        icon:'none'
+      })
+      return false
+    }
+  
+  }else if(list2[i]=="is_operation"){
+    if(!personInfo.is_operation && personInfo.is_operation!=0){
+      wx.showToast({
+        title: '请选择是否做过手术',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.is_operation==1 && !personInfo.operation){
+      wx.showToast({
+        title: '请描述具体手术名称和做手术医院',
+        icon:'none'
+      })
+      return false
+    }
+    
+  }else if(list2[i]=="drink_wine_status"){
+    if(!personInfo.drink_wine_status){
+      wx.showToast({
+        title: '请选择是否有饮酒史',
+        icon:'none'
+      })
+      return false
+    }
+  }else if(list2[i]=="smoke_status"){
+    if(!personInfo.smoke_status){
+      wx.showToast({
+        title: '请选择是否有吸烟史',
+        icon:'none'
+      })
+      return false
+    }
+  }else if(list2[i]=="chemical_compound_status"){
+    if(!personInfo.chemical_compound_status){
+      wx.showToast({
+        title: '是否有接触过化学物',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.chemical_compound_status && personInfo.chemical_compound_status!=1 && !personInfo.chemical_compound_describe){
+      wx.showToast({
+        title: '请详细填写接触过的相关化学物',
+        icon:'none'
+      })
+      return false
+    }
+  }else if(list2[i]=="diagnosis_hospital"){
+    if(!personInfo.diagnosis_hospital){
+      wx.showToast({
+        title: '请填写确诊医院名称',
+        icon:'none'
+      })
+      return false
+    }
+  
+  }else if(list2[i]=="is_take_medicine"){
+    if(!personInfo.is_take_medicine && personInfo.is_take_medicine!=0){
+      wx.showToast({
+        title: '请填写是否正在服药',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.is_take_medicine==1 && !personInfo.drugs_name){
+      wx.showToast({
+        title: '请填服药名称',
+        icon:'none'
+      })
+      return false
+    }
+  }
+  
+}
+    
+    sendFields({
+      order_inquiry_id,
+      fields:personInfo,
+    }).then(data=>{
+      wx.showToast({
+        title: '发送成功',
+        icon:'none'
+      }),
+      wx.navigateBack()
+      
+    })
+  },
+  openMaritalPicker() {
+      this.setData({
+        showMarital: true
+      })
+  },
+  closeMaritalPicker() {
+    this.setData({
+      showMarital: false
+    })
+  },
+  onConfirmMaritalPicker(event) {
+    const {
+      value
+    } = event.detail;
+  
+    this.setData({
+      showMarital: false,
+      marital_name:value.text,
+     'personInfo.marital_status':value.value
+    })
+  },
+  onChangeRadio(event) {
+    let key = event.target.dataset.id;
+    let obj= "personInfo."+key;
+    this.setData({
+       [obj]:Number(event.detail)
+    });
+    if(key=="chemical_compound_status" && event.detail==1){
+      this.setData({
+        "personInfo.chemical_compound_describe":''
+      })
+    }else if(event.detail==0){
+       if(key=="is_allergy_history"){
+         this.setData({
+         "personInfo.allergy_history":'',
+         hideGuomin:false
+         })
+       };
+       if(key=="is_pregnant"){
+        this.setData({
+          "personInfo.pregnant":'',
+           hidePregnant:false
+          })
+       }
+       if(key=="is_family_history"){
+        this.setData({
+          "personInfo.family_history":'',
+           hideFamilysick:false
+          })
+       }
+    }
+  },
+  handelFocus(e) {
+    let key = e.target.dataset.id;
+    let value = e.target.dataset.value;
+    let obj="personInfo."+value;
+    if (!e.detail.value) {
+      this.setData({
+        [key]: false,
+        [obj]: e.detail.value
+      })
+    } else {
+      this.setData({
+        [key]: true,
+        [obj]: e.detail.value
+      })
+    }
+  },
+  onConfirmNation(event) {
+    const {
+      value
+    } = event.detail;
+    this.setData({
+     "nationname": `${value.nation_name}`,
+     "personInfo.nation_id": `${value.nation_id}`,
+     showNation: false
+    })
+  },
+  showNation() {
+   
+      this.setData({
+        showNation: true
+      })
+
+  },
+  onCancelNation() {
+    this.setData({
+      showNation: false
+    })
+  },
+  onConfirmJob(event) {
+    const {
+      value
+    } = event.detail;
+    this.setData({
+     "jobname": `${value.job_name}`,
+     "personInfo.job_id": `${value.job_id}`,
+      showJob: false
+    })
+  },
+  showJob() {
+      this.setData({
+        showJob: true
+      }) 
+  },
+  onCancelJob() {
+    this.setData({
+      showJob: false
+    })
+  },
+  commonMethods(arr1,arr2){
+    this.setData({
+      list1:arr1,
+      list2:arr2
+    });
+    let count=0;
+    arr2.forEach((item)=>{
+       if(item=="allergy_history"){
+         count++;
+        this.setData({
+          'showList[0].isHas':true,
+          'showList[0].index':1
+        })
+       }else if(item=="family_history"){
+         count++;
+        this.setData({
+          'showList[1].isHas':true,
+          'showList[1].index':count
+        })
+       }else if(item=="is_pregnant"){
+        count++;
+        this.setData({
+          'showList[2].isHas':true,
+          'showList[2].index':count
+        })
+       }else if(item=="is_operation"){
+        count++;
+        this.setData({
+          'showList[3].isHas':true,
+          'showList[3].index':count
+        })
+       }else if(item=="drink_wine_status"){
+        count++;
+        this.setData({
+          'showList[4].isHas':true,
+          'showList[4].index':count
+        })
+       }else if(item=="smoke_status"){
+        count++;
+        this.setData({
+          'showList[5].isHas':true,
+          'showList[5].index':count
+        })
+       }else if(item=="chemical_compound_status"){
+        count++;
+        this.setData({
+          'showList[6].isHas':true,
+          'showList[6].index':count
+        })
+       }else if(item=="diagnosis_hospital"){
+        count++;
+        this.setData({
+          'showList[7].isHas':true,
+          'showList[7].index':count
+        })
+       }else if(item=="is_take_medicine"){
+        count++;
+        this.setData({
+          'showList[8].isHas':true,
+          'showList[8].index':count
+        })
+       }
+    })
+
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    if(options.params){
+    this.getNation();
+    this.getJob();
+       if(options.order_inquiry_id){
          this.setData({
-        params:options.params
+          order_inquiry_id:options.order_inquiry_id
+         })
+       }
+      if(options.case_filled_fields){
+        
+        let data=JSON.parse(options.case_filled_fields);
+        let arr1=[];
+        let arr2=[];
+      
+        this.setData({
+          personInfo:data,
+          showBtn:false
         });
+        if(data.is_allergy_history==1){
+          this.setData({
+            hideGuomin:true
+          })
+        }
+        if(data.is_family_history==1){
+          this.setData({
+            hideFamilysick:true
+          })
+        }
+        if(data.is_operation==1){
+          this.setData({
+            hideOperation:true
+          })
+        }
+        if(data.is_pregnant==1){
+          this.setData({
+            hidePregnant:true
+          })
+        }
+        if(data.chemical_compound_status && data.chemical_compound_status!=1){
+          this.setData({
+            hideChemical:true
+          })
+        }
+        if(data.diagnosis_hospital){
+          this.setData({
+            hideHospital:true
+          })
+        }
+        if(data.is_take_medicine==1){
+          this.setData({
+           hideDrug:true
+          })
+        }
+        let {maritalColumn,jobcolumns,nationcolumns}=this.data;
+        if(data.marital_status==0 || data.marital_status){
+          let select=maritalColumn.filter(item=>{return item.value==data.marital_status});
+          this.setData({
+            'marital_name':select[0].text
+          })
+        };
+       
+       
+      
+        Object.keys(data).forEach(function(key){
+          if(key=="weight" || key=="height" || key=="marital_status" || key=="nation_id" || key=="job_id"){
+            arr1.push(key);
+         }else{
+            arr2.push(key);
+         }
+          })
+          this.commonMethods(arr1,arr2);
+         
+
+
+      }
+     if(options.params){
        let data=JSON.parse(options.params);
-      console.log(options.params)
+       let {obj}=this.data;
+       let arr1=[];
+       let arr2=[];
+        data.forEach(item => {
+        if(item=="weight" || item=="height" || item=="marital_status" || item=="nation_id" || item=="job_id"){
+           arr1.push(item);
+        }else{
+           arr2.push(item);
         }
        
+      })
+      this.commonMethods(arr1,arr2);
+     
+     }
   },
 
   /**
@@ -34,12 +568,44 @@ Page({
   onReady() {
 
   },
-
+  getNation(){
+    api.getNation().then(data=>{
+        let result=data.data;
+        this.setData({
+          nationcolumns:result
+        })
+        let {personInfo}=this.data;
+        if(personInfo.nation_id || personInfo.nation_id==0){
+          let select=result.filter(item=>{return item.nation_id==personInfo.nation_id});
+          this.setData({
+            'nationname':select[0].nation_name
+          })
+        }
+    })
+  },
+ getJob(){
+  api.getJob().then(data=>{
+    let result=data.data;
+      this.setData({
+        jobcolumns: result
+      })
+      let {personInfo}=this.data;
+      if(personInfo.job_id || personInfo.job_id==0){
+         let select=result.filter(item=>{return item.job_id==personInfo.job_id});
+        this.setData({
+          'jobname':select[0].job_name
+        })
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    console.log(api.getStaticHost())
+   this.setData({
+     static_host:api.getStaticHost()
+   })
   },
 
   /**

Pages/yishi/sickform/index.wxml

@@ -1,65 +1,63 @@
-<!--Pages/sickform/index.wxml-->
+<wxs src="../../../filters/filter.wxs" module="filter"></wxs>
-<!--Pages/yishi/patient_sick/index.wxml-->
-<!--Pages/yishi/medince_list/index.wxml-->
 <view class="page">
   <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
   <view class="container"> 
     <view class="questionbox">
     <view class="cellbox">
    <view class="basictitle">基本信息</view>
-    <view class="cell" >
+    <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'height').ISHAS}}">
         <view class="cellrow">
           <view class="name">
-           1、身高（CM）
+            {{filter.formatwenzhenList(list1,'height').NUMBER}}、身高（CM）
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请输入身高" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请输入身高" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
 
           </view>
         </view>
       </view>
-      <view class="cell" >
+      <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'weight').ISHAS}}">
         <view class="cellrow">
           <view class="name">
-          2、体重（KG）
+            {{filter.formatwenzhenList(list1,'weight').NUMBER}}、体重（KG）
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请输入体重" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请输入体重" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
 
           </view>
         </view>
       </view>
-      <view class="cell" >
+      <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'marital_status').ISHAS}}" bindtap="openMaritalPicker">
         <view class="cellrow">
           <view class="name">
-           3、婚姻状况
+            {{filter.formatwenzhenList(list1,'marital_status').NUMBER}}、婚姻状况
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择婚姻状况" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+            <input type="text" value="{{marital_name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择婚姻状况" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
-            <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
+            <image src="{{static_host}}/applet/patient/static/righticon.png"  class="righticon"></image>
 
           </view>
         </view>
       </view>
-      <view class="cell" >
+      <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'nation_id').ISHAS}}" bindtap="showNation">
         <view class="cellrow">
           <view class="name">
-           4、民族
+            {{filter.formatwenzhenList(list1,'nation_id').NUMBER}}、民族
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择民族" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+            <input type="text" value="{{nationname}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择民族" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
-            <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
+            <image src="{{static_host}}/applet/patient/static/righticon.png"  class="righticon"></image>
           </view>
         </view>
       </view>
-      <view class="cell" >
+      <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'job_id').ISHAS}}" bindtap="showJob">
         <view class="cellrow">
           <view class="name">
-           5、职业
+            {{filter.formatwenzhenList(list1,'job_id').NUMBER}}、职业
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请选择职业" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+            <input type="text" value="{{jobname}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请选择职业" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
-            <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
+            <image src="{{static_host}}/applet/patient/static/righticon.png"  class="righticon"></image>
           </view>
         </view>
       </view>
@@ -69,85 +67,85 @@
      <view class="basictitle">个人情况</view>
      <view class="sickHis">
         <view class="list">
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[0].isHas}}">
-            <view class="num">1、</view>
+            <view class="num">{{showList[0].index}}、</view>
             <view class="titlebox">
               <view class="title">您是否有过敏史？</view>
               <view class="radio" >
-                <van-radio-group value="{{ filter.numberTOstring(personInfo.is_allergy_history) }}" class="singlegroup" data-id="is_allergy_history" bind:change="onChangeRadio" direction="horizontal">
+                <van-radio-group disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.is_allergy_history) }}" class="singlegroup" data-id="is_allergy_history" bind:change="onChangeRadio" direction="horizontal">
                   <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
                   <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
                 </van-radio-group>
               </view>
               <!-- hidden="{{checkGuomin!=1}}" -->
               <view class="radiotip" hidden="{{personInfo.is_allergy_history!=1}}">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done" bindinput="handelFocus"  value="{{personInfo.allergy_history}}" data-id="hideGuomin" data-value="allergy_history"></textarea>
+                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	disabled="{{!showBtn}}" confirm-type="done" bindinput="handelFocus"  value="{{personInfo.allergy_history}}" data-id="hideGuomin" data-value="allergy_history"></textarea>
                 <view class="textbox" hidden="{{hideGuomin}}">
                   <view class="desc"><text>过敏史：</text>请填写过敏源，如药物，请写出药名；如食物，请写具体如鸡蛋、牛奶等（限制50个字）</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[1].isHas}}">
-            <view class="num">2、</view>
+            <view class="num">{{showList[1].index}}、</view>
             <view class="titlebox">
               <view class="title">您是否有家族病史？</view>
               <view class="radio">
-                <van-radio-group class="singlegroup" value="{{filter.numberTOstring(personInfo.is_family_history)}}"   data-id="is_family_history" bind:change="onChangeRadio" direction="horizontal">
+                <van-radio-group disabled="{{!showBtn}}" class="singlegroup" value="{{filter.numberTOstring(personInfo.is_family_history)}}"   data-id="is_family_history" bind:change="onChangeRadio" direction="horizontal">
                   <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
                   <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
                 </van-radio-group>
               </view>
               <view class="radiotip" hidden="{{personInfo.is_family_history!=1}}">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
+                <textarea placeholder=" " disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
                 <view class="textbox" hidden="{{hideFamilysick}}">
                   <view class="desc"><text>家族病史：</text>请详细填写相关家族病史（限制50个字）</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa" wx:if="{{sex==2}}">
+          <view class="qa" wx:if="{{showList[2].isHas}}">
-            <view class="num">{{startIndex}}、</view>
+            <view class="num">{{showList[2].index}}、</view>
             <view class="titlebox">
               <view class="title">您是否处于备孕、妊娠、哺乳期？</view>
               <view class="radio">
-                <van-radio-group value="{{ filter.numberTOstring(personInfo.is_pregnant) }}"  bind:change="onChangeRadio"   data-id="is_pregnant"  direction="horizontal" class="singlegroup">
+                <van-radio-group disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.is_pregnant) }}"  bind:change="onChangeRadio"   data-id="is_pregnant"  direction="horizontal" class="singlegroup">
                   <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
                   <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
                 </van-radio-group>
               </view>
               <view class="radiotip" hidden="{{personInfo.is_pregnant!=1}}">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.pregnant}}" data-id="hidePregnant" data-value="pregnant"></textarea>
+                <textarea placeholder=" " disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.pregnant}}" data-id="hidePregnant" data-value="pregnant"></textarea>
                 <view class="textbox" hidden="{{hidePregnant}}">
                   <view class="desc">请描述您目前所处阶段，如备孕中、哺乳期中、妊娠月份。（限制50个字）</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[3].isHas}}">
-            <view class="num">{{startIndex+1}}、</view>
+            <view class="num">{{showList[3].index}}、</view>
             <view class="titlebox">
               <view class="title">是否做过手术</view>
               <view class="radio">
-                <van-radio-group  value="{{ filter.numberTOstring(personInfo.is_operation) }}"  data-id="is_operation"  bind:change="onChangeRadio" direction="horizontal" class="singlegroup">
+                <van-radio-group  disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.is_operation) }}"  data-id="is_operation"  bind:change="onChangeRadio" direction="horizontal" class="singlegroup">
                   <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
                   <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
                 </van-radio-group>
               </view>
               <view class="radiotip" hidden="{{personInfo.is_operation !=1}}">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.operation}}" data-id="hideOperation" data-value="operation"></textarea>
+                <textarea placeholder=" " disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.operation}}" data-id="hideOperation" data-value="operation"></textarea>
                 <view class="textbox" hidden="{{hideOperation}}">
                   <view class="desc">请描述具体手术名称和做手术医院</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[4].isHas}}">
-            <view class="num">{{startIndex+2}}、</view>
+            <view class="num">{{showList[4].index}}、</view>
             <view class="titlebox">
               <view class="title">是否有饮酒史</view>
               <view class="radio">
-                <van-radio-group value="{{ filter.numberTOstring(personInfo.drink_wine_status) }}"   data-id="drink_wine_status"  bind:change="onChangeRadio" direction="horizontal" class="group">
+                <van-radio-group disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.drink_wine_status) }}"   data-id="drink_wine_status"  bind:change="onChangeRadio" direction="horizontal" class="group">
                   <van-radio name="1" checked-color="#3cc7c0">从不</van-radio>
                   <van-radio name="2" checked-color="#3cc7c0">偶尔</van-radio>
                   <van-radio name="3" checked-color="#3cc7c0">经常</van-radio>
@@ -157,12 +155,12 @@
               </view>
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[5].isHas}}">
-            <view class="num">{{startIndex+3}}、</view>
+            <view class="num">{{showList[5].index}}、</view>
             <view class="titlebox">
               <view class="title">是否有吸烟史</view>
               <view class="radio">
-                <van-radio-group value="{{ filter.numberTOstring(personInfo.smoke_status) }}"  data-id="smoke_status" bind:change="onChangeRadio" direction="horizontal" class="group">
+                <van-radio-group disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.smoke_status) }}"  data-id="smoke_status" bind:change="onChangeRadio" direction="horizontal" class="group">
                   <van-radio name="1" checked-color="#3cc7c0">从不</van-radio>
                   <van-radio name="2" checked-color="#3cc7c0">偶尔</van-radio>
                   <van-radio name="3" checked-color="#3cc7c0">经常</van-radio>
@@ -172,12 +170,12 @@
               </view>
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[6].isHas}}">
-            <view class="num">{{startIndex+4}}、</view>
+            <view class="num">{{showList[6].index}}、</view>
             <view class="titlebox">
               <view class="title">是否有接触过化学物</view>
               <view class="radio">
-                <van-radio-group value="{{filter.numberTOstring(personInfo.chemical_compound_status)}}"   data-id="chemical_compound_status"    bind:change="onChangeRadio" direction="horizontal" class="group">
+                <van-radio-group disabled="{{!showBtn}}" value="{{filter.numberTOstring(personInfo.chemical_compound_status)}}"   data-id="chemical_compound_status"    bind:change="onChangeRadio" direction="horizontal" class="group">
                   <van-radio name="1" checked-color="#3cc7c0">从不</van-radio>
                   <van-radio name="2" checked-color="#3cc7c0">偶尔</van-radio>
                   <van-radio name="3" checked-color="#3cc7c0">经常</van-radio>
@@ -186,7 +184,7 @@
               </view>
              
               <view class="radiotip" wx:if="{{(personInfo.chemical_compound_status!=1 && personInfo.chemical_compound_status)}}">
-                <textarea placeholder=" "  show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done" value="{{personInfo.chemical_compound_describe}}" bindinput="handelFocus"  data-id="hideChemical" data-value="chemical_compound_describe"></textarea>
+                <textarea placeholder=" "  disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done" value="{{personInfo.chemical_compound_describe}}" bindinput="handelFocus"  data-id="hideChemical" data-value="chemical_compound_describe"></textarea>
                 <view class="textbox" hidden="{{hideChemical}}">
                   <view class="desc"><text>化学物：</text>请详细填写接触过的相关化学物（限制50个字）</view>
                 </view>
@@ -194,27 +192,31 @@
 
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[7].isHas}}">
-            <view class="num">{{startIndex+45}}、</view>
+            <view class="num">{{showList[7].index}}、</view>
             <view class="titlebox">
               <view class="title">确诊医院是？</view>
-             
               <view class="radiotip" >
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
+                <textarea placeholder=" " disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.diagnosis_hospital}}" data-id="hideHospital" data-value="diagnosis_hospital"></textarea>
-                <view class="textbox" hidden="{{hideFamilysick}}">
+                <view class="textbox" hidden="{{hideHospital}}">
                   <view class="desc"><text></text>请填写确诊医院名称</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa">
+          <view class="qa" wx:if="{{showList[8].isHas}}">
-            <view class="num">{{startIndex+6}}、</view>
+            <view class="num">{{showList[8].index}}、</view>
             <view class="titlebox">
-              <view class="title">服用药品是？</view>
+              <view class="title">是否正在服药？</view>
-             
+              <view class="radio">
-              <view class="radiotip" >
+                <van-radio-group  disabled="{{!showBtn}}" value="{{filter.numberTOstring(personInfo.is_take_medicine) }}"  data-id="is_take_medicine"  bind:change="onChangeRadio" direction="horizontal" class="singlegroup">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
+                  <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
-                <view class="textbox" hidden="{{hideFamilysick}}">
+                  <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
+                </van-radio-group>
+              </view>
+              <view class="radiotip" hidden="{{personInfo.is_take_medicine !=1}}">
+                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.drugs_name}}" data-id="hideDrug" data-value="drugs_name"></textarea>
+                <view class="textbox" hidden="{{hideDrug}}">
                   <view class="desc"><text></text>请详细填写所服药物（限制50个字）</view>
                 </view>
               </view>

Pages/yishi/sickform/index.wxss

@@ -1,16 +1,19 @@
 page{
-  overflow: hidden;
+  display: flex;
+  flex-direction: column;
 }
 .container{
- height:100vh;
+
- overflow: scroll;
+ flex:1;
+ overflow-y: scroll;
  background-color: #F6F6F6;
 }
 .cellbox{
   background-color: #fff;
 }
 .questionbox{
-  overflow-y: scroll;
+  
+ 
 }
 .cellbox .cell{
   background-color: #fff;

Pages/yishi/wenzhen_v2/wenzhen.wxml

@@ -199,7 +199,10 @@
               <!-- <van-button bind:click="go" data-url="/Pages/yishi/chat_session/index" plain custom-style="width:200rpx;  border-radius: 10rpx;" color="#3CC7C0">会话列表</van-button> -->
             </view>
           </view>
-          <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</view>
+          <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">
+            <text wx:if="{{item.inquiry_type ==2 || item.inquiry_type ==4}}">不接诊5分钟后自动取消</text>
+            <text wx:elif="{{item.inquiry_type ==3 || item.inquiry_type ==1}}">不接诊524小时后自动取消</text>
+          </view>
         </view>         
          <!-- aa -->
       </van-tab>

Pages/yishi/write_sickform/index.wxss

@@ -66,3 +66,6 @@ border-radius: 8rpx;
   align-items: center;
   flex-direction: column;
 }
+.van-cell{
+  align-items: center;
+}

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

@@ -311,9 +311,8 @@ Component({
     })
     }),
    goSick(event){
-    // const url=event.currentTarget.dataset.url;
+    const url=event.currentTarget.dataset.url;
-    // console.log(url);
+    app.go(url);
-    // app.go(url);
    },
 
     openLink(e) {
@@ -336,7 +335,7 @@ Component({
       const {ismine,params}=event.currentTarget.dataset;
       console.log(params);
       if(!ismine){
-        app.go('/Pages/yishi/sickform/index?params='+params)
+        app.go('/Pages/yishi/sickform/index?case_filled_fields='+params)
       }
      // app.go(url);
     }

TUIKit/components/TUIChat/components/MessageInput/index.wxml

@@ -55,7 +55,7 @@
             <view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">常用语</view>
         </view>
         <view class="TUI-Extension-slot MY-TUI-Extension-slot" bindtap="showWenZhenBiao">
-            <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="{{static_host}}/applet/doctor/static/images/chat/wenzi.png" />
+            <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="../../../../../static/images/yishi/tabbar_icon/wenzhenicon.png" />
             <view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">问诊表</view>
         </view>
         <!-- <view class="TUI-Extension-slot" bindtap="handleSendPicture">

app.js

@@ -122,10 +122,11 @@ App({
             userID: this.globalData.config.userID,
             userSig
         });
-  
+        let THIS=this;
         login_promise.then(function(imResponse) {
           // console.log(imResponse.data); // 登录成功
           callback();
+          THIS.globalData.isLogin=true;
         }).catch(function(imError) {
           console.warn('login error:', imError); // 登录失败的相关信息
           if(type==1 && imError.indexOf("重复登录")!=-1){

commpents/upload-cell/index.wxml

@@ -11,7 +11,7 @@
   </view>
   <view class="upload-cell-input">
     <van-uploader disabled="{{disabled}}" multiple="{{is_multiple}}" preview-full-image="{{true}}" file-list="{{ fileList }}" max-count="{{max_count}}" deletable="{{ deletable }}" bind:after-read="afterRead" bind:delete="delete" >
-      <van-image width="100" height="100" src="{{static_host}}/applet/doctor/static/images/yishi/upload_button.png" />
+      <van-image width="80" height="80" src="{{static_host}}/applet/doctor/static/images/yishi/upload_button.png" />
     </van-uploader>
   </view>
   <view class="error_box" wx:if="{{ has_error_content != '' }}" >

filters/filter.wxs

@@ -0,0 +1,70 @@
+
+function numberTOstring(value){
+   if(value==null) return null;
+   return value.toString();
+};
+function formatwenzhenList(arr,type){
+  var obj=null;
+  for (var i = 0; i < arr.length; ++i) {
+    if(arr[i]==type){
+      return {NUMBER:i+1,ISHAS:true}
+    }
+   };
+   return {ISHAS:false}
+  };
+ function transforDay(time, type) {
+    if (time == null || type == '') {
+      return ''
+    }
+    if (arguments.length === 0) {
+      return null
+    }
+    var  time_cur=0
+    if(typeof time=="string"){
+      var reg = getRegExp("-", "g");
+    var timeS=time.replace(reg, '/');
+      time_cur = getDate(timeS).getTime();
+    }else{
+      time_cur=time*1000
+    }
+    var date = getDate(time_cur);//在wxs中不能使用new Date()来处理日期
+    console.log("date", date);
+    var y = date.getFullYear();
+    var m = addZero(date.getMonth() + 1);
+    var d = addZero(date.getDate());
+    var h =addZero(date.getHours());
+    var i = addZero(date.getMinutes());
+    var s =addZero(date.getSeconds());
+    var a = addZero(date.getDay());
+    var time_str = "";
+    if (type == 'month') {
+      time_str = y + '-' + m;
+    }else if(type=='day'){
+      time_str = m + '-' + d;
+    } else if(type=='HM'){
+      time_str =h + ':' + s;
+    }else if (type == 'date') {
+      time_str = y + '-' + m + '-' + d;
+    }else if(type=='noyear'){
+      time_str =m + '-' + d + ' ' + h + ':' + i 
+    }else if(type == 'dateminute'){
+      time_str = y + '-' + m + '-' + d + ' ' + h + ':' + i 
+    }else if (type == 'datetime') {
+      time_str = y + '-' + m + '-' + d + ' ' + h + ':' + i + ':' + s;
+    } else if (type == 'onlyMonth') {
+      time_str = m;
+    } else if (type == 'onlyYear') {
+      time_str = y;
+    }
+    return time_str
+  };
+  function addZero(n) {
+    n = n.toString()
+    return n[1] ? n : '0' + n
+  };
+
+module.exports = {
+  formatwenzhenList:formatwenzhenList,
+  numberTOstring:numberTOstring,
+  transforDay:transforDay
+};

utils/network/api.js

@@ -898,6 +898,19 @@ doctorSendUnfilled(params) {//医生发送缺少字段至患者
     }
   })
 }
+getNation() {//获取名族
+  return this.request({
+    url: `${this.baseUrl}/basic/nation`,
+    method: 'GET'
+  })
+}
+getJob() {//获取职业
+  return this.request({
+    url: `${this.baseUrl}/basic/job`,
+    method: 'GET'
+  })
+}
+
 
 
 

utils/substr.wxs

@@ -6,6 +6,7 @@ var filters = {//截取字符串返回
         //也可做一些判断 //我不需要所以没做其他处理，直接返回的
         return str.substring(start,end);
     }
+   
 }
 module.exports = {
     substring:filters.substring