12.19 bug

Pages/yishi/myaccount/index.wxss

@@ -112,6 +112,7 @@ color: #333333;
 .cashbox{
   margin:20rpx 30rpx 0;
   display: flex;
+  justify-content: space-between;
 }
 .accountNum{
   font-size: 64rpx;
@@ -124,7 +125,7 @@ font-weight: 400;
 color: #999999;
 }
 .today,.finish{
-  flex:1;
+  /* flex:1; */
 }
 .money{
   margin-top: 16rpx;

Pages/yishi/onlinechufang/index.js

@@ -460,7 +460,7 @@ Page({
    let prescription_num=this.data.prescription_num?this.data.prescription_num:5
     if(save_durg_prescription_product_num > prescription_num){
       Dialog.alert({
-        message: '每个药品数量不允许添加超过'+prescription_num+'个',
+        message: '药品数量不允许添加超过'+prescription_num+'个',
       }).then(() => {
         this.setData({
           save_durg_prescription_product_num:''

Pages/yishi/sickform/index.js

@@ -17,9 +17,9 @@ Page({
     obj:{
       height:'身高',
       weight:'体重',
+      marital_status:'婚姻状态',
       nation_id:'民族',
       job_id:'职业',
-      marital_status:'婚姻状态',
       allergy_history:'是否有过敏史？',
       family_history:'是否有家族病史？',
       is_pregnant:'是否处于备孕、妊娠、哺乳期？',
@@ -106,7 +106,7 @@ Page({
       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)) {
+    if (!/^3[5-9](\.\d+)?$|^[4-9][0-9](\.\d+)?$|^1[0-9][0-9](\.\d+)?$|^2[0-4][0-9](\.\d+)?$|250/.test(personInfo.height)) {
       wx.showToast({
         title: `请输入范围内身高！`,
         icon: 'none',
@@ -496,7 +496,8 @@ for (let i = 0; i < list2.length; i++) {
         let data=JSON.parse(options.case_filled_fields);
         let arr1=[];
         let arr2=[];
-      
+        console.log('----------加载');
+        console.log(data);
         this.setData({
           personInfo:data,
           showBtn:false
@@ -560,6 +561,7 @@ for (let i = 0; i < list2.length; i++) {
       }
      if(options.params){
        let data=JSON.parse(options.params);
+      
        let {obj}=this.data;
        let arr1=[];
        let arr2=[];

Pages/yishi/sickform/index.wxss

@@ -36,7 +36,7 @@ page{
  .iptbox{
    display: flex;
    flex:1;
-  
+   margin-top:4rpx;
    justify-content: flex-end;
  }
  .righticon{
@@ -55,13 +55,17 @@ page{
    text-align: right;
    font-size: 28rpx;
  font-weight: 400;
+
  color: #C5C8CB;
  }
  .ipt{
    width:100%;
    text-align: right;
    color: #666666;
+   line-height: 48rpx;
    font-size: 28rpx;
+ 
+   margin-left: 160rpx;
  }
  .basictitle{
    margin-top: 30rpx;
@@ -145,8 +149,14 @@ margin-bottom: 20rpx;
 .van-radio{
   margin-bottom: 10rpx!important;
 }
+.van-radio__icon--disabled{
+  background-color: #fff!important;
+}
 .van-radio__icon--disabled.van-radio__icon--checked{
-  color:#3cc7c0!important;
-  background-color: #fff;
+  color:#fff!important;
+  background-color: #3cc7c0!important;
   border-color:#3cc7c0 ;
+}
+.van-radio__label--disabled{
+  color:#000!important;
 }

Pages/yishi/write_sickform/index.js

@@ -14,11 +14,11 @@ Page({
       title: '问诊表', //导航栏 中间的标题
     },
     obj:{
-      height:'身高',
-      weight:'体重',
+      height:'身高（CM）',
+      weight:'体重（KG）',
+      marital_status:'婚姻状态',
       nation_id:'民族',
       job_id:'职业',
-      marital_status:'婚姻状态',
       allergy_history:'是否有过敏史？',
       family_history:'是否有家族病史？',
       is_pregnant:'是否处于备孕、妊娠、哺乳期？',
@@ -39,6 +39,7 @@ Page({
     this.setData({
       result: event.detail,
     });
+    console.log(event.detail);
   },
 
   toggle(event) {
@@ -74,7 +75,7 @@ Page({
   })
  },
  handleSend(){
-   let {order_inquiry_id,result}=this.data;
+   let {order_inquiry_id,result,obj}=this.data;
      if(result.length==0){
        wx.showToast({
          title: '请至少选择一项',
@@ -82,10 +83,15 @@ Page({
        })
        return false;
      }
-     console.log(this.data.result);
+     let fields=[];
+     for (const key in obj) {
+         if(result.indexOf(key)!=-1){
+           fields.push(key)
+         }
+     }
   api.doctorSendUnfilled({
     order_inquiry_id,
-    fields:this.data.result
+    fields:fields
   }).then(data=>{
     if(data.code==200){
       wx.navigateBack();

Pages/yishi/write_sickform/index.wxss

@@ -16,7 +16,8 @@ page{
 }
 .container{
   width: 100vw;
-  height:100vh;
+
+  height:calc(100vh - 136rpx);
   display:flex;
   flex-direction: column;
 }
@@ -37,14 +38,13 @@ background:#fff;
 }
 .bottom{
   background-color: #FFFFFF;
-  height:300rpx;
+  height:160rpx;
   width:100%;
 }
 .bottom .btn{
-
-  margin:40rpx 30rpx;
-  height: 80rpx;
-  font-size: 30rpx;
+margin:20rpx 30rpx 0rpx;
+height: 80rpx;
+font-size: 30rpx;
 color: #FFFFFF;
 display: flex;
 align-items: center;
@@ -69,4 +69,8 @@ border-radius: 8rpx;
 }
 .van-cell{
   align-items: center;
+}
+.van-cell__title{
+  font-size: 34rpx!important;
+  color:#000;
 }