12.19 bug

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;
 }