Merge branch 'dev2.0' into dev_py

@@ -125,8 +125,8 @@ App({
     // baseUrl: "http://47.96.75.229:20000/",
     // baseUrl: "http://47.96.75.229:20000/",
     // baseUrl: "http://192.144.144.220:20000/",
     // baseUrl: "http://192.144.144.220:20000/",
     // baseUrl: "http://154.8.229.55:20000/",
     // baseUrl: "http://154.8.229.55:20000/",
-    baseUrl: "http://47.110.158.110:20000/",
-    // baseUrl: "https://api.workai.com.cn/",
+    // baseUrl: "http://47.110.158.110:20000/",
+    baseUrl: "https://api.workai.com.cn/",
     OSSUrl: "",//"https://oss.workai.com.cn/",
     OSSUrl: "",//"https://oss.workai.com.cn/",
     userInfo: null,
     userInfo: null,
     hasLogin: false,
     hasLogin: false,

@@ -176,11 +176,11 @@
         <view wx:if="{{datas.owner_type=='个人'}}">
         <view wx:if="{{datas.owner_type=='个人'}}">
           <view style='height:90rpx;width:100%;clear:both;'>
           <view style='height:90rpx;width:100%;clear:both;'>
             <text class='text_left'>证照类型</text>
             <text class='text_left'>证照类型</text>
-            <text class='text_right_333'>{{datas.owner_id_cartd_type=='1'?"居民身份证":datas.owner_id_cartd_type}}</text>
+            <text class='text_right_333'>{{datas.owner_id_card_type=='1'?"居民身份证":datas.owner_id_cartd_type}}</text>
           </view>
           </view>
           <view style='height:90rpx;width:100%;clear:both;'>
           <view style='height:90rpx;width:100%;clear:both;'>
             <text class='text_left'>证照号码</text>
             <text class='text_left'>证照号码</text>
-            <text class='text_right_333'>{{datas.owner_id_cartd_no}}</text>
+            <text class='text_right_333'>{{datas.owner_id_card_no}}</text>
           </view>
           </view>
         </view>
         </view>
         <view wx:if="{{datas.owner_type=='企业'}}">
         <view wx:if="{{datas.owner_type=='企业'}}">

@@ -178,7 +178,7 @@ Page({
       this.setData({
       this.setData({
         issinglechildData: issinglechild_Data,
         issinglechildData: issinglechild_Data,
         shareMethodData: shareMethod_Data,
         shareMethodData: shareMethod_Data,
-        reduce_amount: data.month_deduction_amount ? data.month_deduction_amount : that.data.reduce_amount,
+        reduce_amount: data.month_deduction_amount ? data.month_deduction_amount : 0,
         input_disable: true
         input_disable: true
       })
       })
     }
     }
@@ -328,6 +328,7 @@ Page({
         return
         return
       }
       }
       if (this.data.issinglechildData.selected == "否") {
       if (this.data.issinglechildData.selected == "否") {
+        console.log("reduce_amount", this.data.reduce_amount)
         if (this.data.shareMethodData.selected.length < 1) {
         if (this.data.shareMethodData.selected.length < 1) {
           this.showToast("请选择分摊方式")
           this.showToast("请选择分摊方式")
           return
           return
@@ -336,7 +337,7 @@ Page({
           this.showToast("请输入扣除金额")
           this.showToast("请输入扣除金额")
           return
           return
         }
         }
-        if (format.checkNumber(this.data.reduce_amount)){
+        if (!format.checkNumber(this.data.reduce_amount+"")){
           this.showToast("请输入正确格式")
           this.showToast("请输入正确格式")
           return
           return
         }
         }
@@ -569,20 +570,15 @@ Page({
   },
   },
 
 
   bindinput: function(e) {
   bindinput: function(e) {
-    console.log("bindinput", e)
-    var inputamount
-    if (!e.detail.value || e.detail.value.length < 1 || parseFloat(e.detail.value).toString() == "NaN") {
+   
+    var inputamount = e.detail.value
+    if (inputamount.length < 1 || !format.checkNumber(inputamount)) {
       this.showToast("请输入正确格式");
       this.showToast("请输入正确格式");
       return;
       return;
     }
     }
-
-    if (e.detail.value.length < 1 || !format.checkNumber(e.detail.value)) {
-      this.showToast("请输入正确格式");
-      return;
-    }
-
+    console.log("bindinput", inputamount)
     this.setData({
     this.setData({
-      reduce_amount: inputamount
+      reduce_amount: parseFloat(inputamount)
     })
     })
   },
   },
 
 

@@ -142,8 +142,9 @@ function isMobile(mobile) {
 
 
 //验证字符串是否是数字
 //验证字符串是否是数字
 function checkNumber(theObj) {
 function checkNumber(theObj) {
-  var reg = /^[0-9]+.?[0-9]*$/;
-  if (reg.test(theObj)) {
+  var reg01 = /^[0-9]+.?[0-9]*$/;
+  var reg02 = /^[0-9]+$/;
+  if (reg01.test(theObj) || reg02.test(theObj)) {
     return true;
     return true;
   }
   }
   return false;
   return false;