优化

wangyu
pages/main/addtionalreduce/godeclare/godeclare.wxml
pages/main/addtionalreduce/lookandupdate/lookandupdate.js
pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
--- a/pages/main/addtionalreduce/godeclare/godeclare.wxml
查看文件 @c7e1af3
+++ b/pages/main/addtionalreduce/godeclare/godeclare.wxml
查看文件 @c7e1af3
@@ -11,11 +11,14 @@
     </view> -->
     <text class='text_black_30' style='padding-left:30rpx'>选择专项附加扣除项</text>
-    <view wx:for="{{selectIndex}}" class="multi-selection" style='padding:0 30rpx' >
-      <view class='float_left'>
-        <image src="{{selectIndex[index].sureid? '/images/selected.png' : '/images/unselected.png'}}" class="multi-img" data-selectIndex="{{index}}"  style='margin-top:20rpx' bindtap="selectRep"/>
+    <view wx:for="{{selectIndex}}" class="multi-selection" style='padding:0 30rpx'>
+      <view data-selectIndex="{{index}}" bindtap="selectRep">
+        <view class='float_left'>
+          <image src="{{selectIndex[index].sureid? '/images/selected.png' : '/images/unselected.png'}}" class="multi-img" style='margin-top:20rpx' />
+        </view>
+        <text class="{{selectIndex[index].sureid?'select_blue_28':'select_666_28'}}" style='line-height:80rpx;margin-left: 34rpx;'>{{item.message}}</text>
       </view>
-      <text class="{{selectIndex[index].sureid?'select_blue_28':'select_666_28'}}" style='line-height:80rpx;margin-left: 34rpx;'>{{item.message}}</text>
+
     </view>
     <view wx:if="{{selectIndex[4].sureid}}" style='background: #F1FAFD;height:62rpx;position: relative;display: flex;justify-content:center'>
       <view bindtap='housing01'>
@@ -35,6 +38,6 @@
   </view>
   <view class="btn_bottom" bindtap='gocommit'>
-    <button class="btn_bottom" > 提交</button>
+    <button class="btn_bottom"> 提交</button>
   </view>
 </view>
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.js
查看文件 @c7e1af3
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.js
查看文件 @c7e1af3
@@ -164,6 +164,7 @@ Page({
   },
   handleAddition: function(data) {
+    var that = this
     var newdata = data.items
     if (newdata && newdata.length>0){
       var issinglechild_Data = this.data.issinglechildData;
@@ -172,12 +173,12 @@ Page({
       var shareMethod_Data = this.data.shareMethodData;
       shareMethod_Data.disabled = true;
-      shareMethod_Data.selected = 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,
+        reduce_amount: data.month_deduction_amount ? data.month_deduction_amount : that.data.reduce_amount,
         input_disable:true
       })
     }
@@ -315,7 +316,7 @@ Page({
   goadd: function(e) { //添加
     console.log("goadd", e)
     var that = this
-    if (this.data.cur_status == 'support_duty') {
+    if (this.data.cur_status == 'support_duty' && !this.data.issinglechildData.disabled) {
       if (this.data.issinglechildData.selected.length < 1) {
         this.showToast("请选择是否独生子女")
         return
@@ -328,7 +329,7 @@ Page({
         if (this.data.reduce_amount == -1){
           this.showToast("请输入扣除金额")
           return
-        }else if (this.data.reduce_amount < 1 || this.data.reduce_amount > 1000) {
+        }else if (this.data.reduce_amount < 0 || this.data.reduce_amount > 1000) {
           this.showToast("本年度月扣除金额不得大于1000")
           return
         }
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @c7e1af3
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @c7e1af3
@@ -23,7 +23,7 @@
         <view style='height:90rpx'>
           <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #666;margin-left:26rpx'>本年度月扣除金额</text>
           <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:20rpx' name='country'>/月</text>
-          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入(不超过1000)' type='digit' name='reduce_amount' bindinput='bindinput' disabled='{{input_disable}}' value='{{reduce_amount>0?reduce_amount:""}}'></input>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入(不超过1000)' type='digit' name='reduce_amount' bindinput='bindinput' disabled='{{input_disable}}' value='{{reduce_amount>=0?reduce_amount:""}}'></input>
         </view>
       </view>
       <view wx:elif="{{issinglechildData.selected=='是'}}">
@@ -334,14 +334,14 @@
                   <view class='text_999_28 float_left' style='line-height:70rpx;width:248rpx;text-align:left;white-space:nowrap;'>租赁房屋坐落地址：</view>
                   <view style='display:flex;flex-direction:column;max-width:392rpx;'>
                     <text class='text_333_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_address_new}}</text>
-                    <text class='text_999_28 text_singleline' style='line-height:70rpx:text-align:left'>{{item.house_detail_address}}</text>
+                    <text class='text_999_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_detail_address}}</text>
                   </view>
                 </view>
                 <view wx:if="{{house_type!='house_fund_loan'}}">
                   <text class='text_999_28 float_left' style='line-height:70rpx;width:192rpx;text-align:left;white-space:nowrap;'>房屋坐落地址：</text>
                   <view style='display:flex;flex-direction:column;max-width:450rpx;'>
                     <text class='text_333_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_address_new}}</text>
-                    <text class='text_999_28 text_singleline' style='line-height:70rpx:text-align:left'>{{item.house_detail_address}}</text>
+                    <text class='text_999_28 text_singleline' style='line-height:70rpx;text-align:left'>{{item.house_detail_address}}</text>
                   </view>
                 </view>
               </view>