Merge branch 'dev_wy' into dev2.0

@@ -12,9 +12,9 @@ Page({
     legal_entity_id: "",
     legal_entity: "",
     house_type: "",
-    person_total_amount:0,
+    person_total_amount: 0,
     remaining_amount: 0,
-    input_disable:false,
+    input_disable: false,
     declareStatus: {
       "to_declare": "待申报",
       "declaring": "申报中",
@@ -166,20 +166,20 @@ Page({
   handleAddition: function(data) {
     var that = this
     var newdata = data.items
-    if (newdata && newdata.length>0){
+    if (newdata && newdata.length > 0) {
       var issinglechild_Data = this.data.issinglechildData;
       issinglechild_Data.disabled = true;
-      issinglechild_Data.selected = data.is_single=='y'?"是":"否";
+      issinglechild_Data.selected = data.is_single == 'y' ? "是" : "否";
 
       var shareMethod_Data = this.data.shareMethodData;
       shareMethod_Data.disabled = true;
-      shareMethod_Data.selected = data.share_method ? data.share_method:"";
+      shareMethod_Data.selected = data.share_method ? data.share_method : "";
 
       this.setData({
         issinglechildData: issinglechild_Data,
         shareMethodData: shareMethod_Data,
         reduce_amount: data.month_deduction_amount ? data.month_deduction_amount : that.data.reduce_amount,
-        input_disable:true
+        input_disable: true
       })
     }
     for (var i = 0; i < newdata.length; i++) {
@@ -210,18 +210,18 @@ Page({
       }
       if (newdata[i].rent_end) {
         newdata[i].rent_end = this.formatDate(newdata[i].rent_end)
-      } 
-      if (newdata[i].loan_start) {//公积金
+      }
+      if (newdata[i].loan_start) { //公积金
         newdata[i].loan_start = this.formatDate(newdata[i].loan_start)
-      } 
-      if (newdata[i].sec_loan_start) {//商业
+      }
+      if (newdata[i].sec_loan_start) { //商业
         newdata[i].sec_loan_start = this.formatDate(newdata[i].sec_loan_start)
-      } 
+      }
 
       newdata[i].children_id_card_no = this.formatIdNum(newdata[i].children_id_card_no)
       newdata[i].spouse_id_card_no = this.formatIdNum(newdata[i].spouse_id_card_no)
       newdata[i].id_card_no = this.formatIdNum(newdata[i].id_card_no)
-      
+
       if (newdata[i].house_address) {
         if (newdata[i].house_address.province == newdata[i].house_address.city) {
           newdata[i].house_address_new = newdata[i].house_address.city + newdata[i].house_address.district
@@ -251,7 +251,7 @@ Page({
     console.log("housetype_new", housetype_new)
     this.setData({
       house_type: housetype_new,
-      person_total_amount: data.person_total_amount ? data.person_total_amount:0,
+      person_total_amount: data.person_total_amount ? data.person_total_amount : 0,
       remaining_amount: data.remaining_amount ? data.remaining_amount : 0,
       additionInfo: newdata
     })
@@ -332,10 +332,15 @@ Page({
           this.showToast("请选择分摊方式")
           return
         }
-        if (this.data.reduce_amount == -1){
+        if (this.data.reduce_amount == -1) {
           this.showToast("请输入扣除金额")
           return
-        }else if (this.data.reduce_amount < 0 || this.data.reduce_amount > 1000) {
+        }
+        if (format.checkNumber(this.data.reduce_amount)){
+          this.showToast("请输入正确格式")
+          return
+        }
+        if (this.data.reduce_amount < 0 || this.data.reduce_amount > 1000) {
           this.showToast("本年度月扣除金额不得大于1000")
           return
         }
@@ -344,6 +349,7 @@ Page({
           reduce_amount: 2000
         })
       }
+      console.log("reduce_amount", this.data.reduce_amount)
     }
     var modalinfo, senddata
     if (this.data.cur_status == 'continuing_education' || this.data.cur_status == 'house_fund') {
@@ -543,7 +549,7 @@ Page({
   formatDate(date) {
     if (date == 0 || date == -62135596800) {
       date = ""
-    }else{
+    } else {
       date = format.formatTime_date(date)
     }
     console.log("formatDate", date)
@@ -564,16 +570,20 @@ Page({
 
   bindinput: function(e) {
     console.log("bindinput", e)
-    var inputamount 
-    if (e.detail.value && e.detail.value.replace(/\s|\xA0/g, "").length>0){
-      inputamount = parseFloat(e.detail.value)+0
-    }else{
-      inputamount = -1
+    var inputamount
+    if (!e.detail.value || e.detail.value.length < 1 || parseFloat(e.detail.value).toString() == "NaN") {
+      this.showToast("请输入正确格式");
+      return;
     }
+
+    if (e.detail.value.length < 1 || !format.checkNumber(e.detail.value)) {
+      this.showToast("请输入正确格式");
+      return;
+    }
+
     this.setData({
       reduce_amount: inputamount
     })
-    console.log("reduce_amount", inputamount)
   },
 
   showToast: function(data) {

@@ -33,14 +33,14 @@
           </view>
           <view wx:else style='height:90rpx'>
             <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:26rpx'>本年度月扣除金额</text>
-            <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #ff9f00;' name='country'>{{reduce_amount}}/月</text>
+            <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #ff9f00;' name='country'>¥{{reduce_amount}}/月</text>
           </view>
         </view>
         <view wx:elif="{{issinglechildData.selected=='是'}}">
           <view class='divide_line_f5f5f5'></view>
           <view style='height:90rpx'>
             <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:26rpx'>本年度月扣除金额</text>
-            <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #ff9f00;' name='country'>2000/月</text>
+            <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #ff9f00;' name='country'>¥2000/月</text>
           </view>
         </view>
       </view>

@@ -140,6 +140,15 @@ function isMobile(mobile) {
   return regMobile.test(mobile)
 }
 
+//验证字符串是否是数字
+function checkNumber(theObj) {
+  var reg = /^[0-9]+.?[0-9]*$/;
+  if (reg.test(theObj)) {
+    return true;
+  }
+  return false;
+}
+
 module.exports = {
   formatTime: formatTime,
   formatTime_date: formatTime_date,  
@@ -151,5 +160,6 @@ module.exports = {
   isIDCardNum: isIDCardNum,
   curDateTime: curDateTime,
   analyzeIDCard: analyzeIDCard,
+  checkNumber: checkNumber,
   isMobile: isMobile
 }