Merge branch 'dev_wy' into dev2.0

@@ -98,7 +98,7 @@
   <view style='padding:30rpx' wx:if="{{cur_status=='support_duty'}}">
   <view style='padding:30rpx' wx:if="{{cur_status=='support_duty'}}">
     <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'>{{singlechildtype[datas.support_type]}}</text>
+      <text class='text_right_333'>{{datas.is_single=='y'?"是":"否"}}</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>
@@ -162,12 +162,12 @@
         <text class='text_right_333'>{{datas.owner_credit_no}}</text>
         <text class='text_right_333'>{{datas.owner_credit_no}}</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_right_333'>{{datas.certification_type}}</text>
+        <text class='text_left'>证书类型</text>
+        <text class='text_right_333'>{{datas.owner_id_cartd_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_right_333'>{{datas.certification_no}}</text>
+        <text class='text_left'>证书号码</text>
+        <text class='text_right_333'>{{datas.owner_id_cartd_no}}</text>
       </view>
       </view>
       <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
       <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
       <view style='height:90rpx;width:100%;clear:both;'>
       <view style='height:90rpx;width:100%;clear:both;'>

@@ -9,6 +9,7 @@ Page({
   data: {
   data: {
     datas: ["", ""],
     datas: ["", ""],
     is_declared: false,
     is_declared: false,
+    hascompleted:false,
     additionlist: [],
     additionlist: [],
     declareStatus: {
     declareStatus: {
       "to_declare ": "待申报",
       "to_declare ": "待申报",
@@ -77,6 +78,9 @@ Page({
   onShow: function () {
   onShow: function () {
     console.log("onShow");
     console.log("onShow");
     var that = this
     var that = this
+    wx.showLoading({
+      title: '',
+    })
     this.getAdditionList()
     this.getAdditionList()
   },
   },
 
 
@@ -100,6 +104,13 @@ Page({
             additionlist: res.data.items
             additionlist: res.data.items
           })
           })
         }
         }
+        wx.hideLoading()
+      },
+      complete(res) {
+        that.setData({
+          hascompleted: true
+        })
+        console.log(res.data)
       }
       }
     })
     })
   },
   },

@@ -74,7 +74,7 @@
     </view> -->
     </view> -->
    
    
   </view>
   </view>
-   <view wx:else style='background:#fff;'>
+   <view wx:if="{{hascompleted&&additionlist.length<1}}" style='background:#fff;'>
     <image style='width:55%;height:254rpx;margin:400rpx 166rpx 0 166rpx;' src='/images/noreduce_img.png'></image>
     <image style='width:55%;height:254rpx;margin:400rpx 166rpx 0 166rpx;' src='/images/noreduce_img.png'></image>
     </view>
     </view>
 </view>
 </view>

@@ -276,7 +276,7 @@ Page({
           return
           return
         }
         }
         if (this.data.reduce_amount < 1 || this.data.reduce_amount > 1000) {
         if (this.data.reduce_amount < 1 || this.data.reduce_amount > 1000) {
-          this.showToast("请输入合理金额")
+          this.showToast("本年度月扣除金额不得大于1000")
           return
           return
         }
         }
       } else {
       } else {

@@ -21,9 +21,9 @@
         <template is="picker_cell_normal" data="{{...shareMethodData}}" />
         <template is="picker_cell_normal" data="{{...shareMethodData}}" />
         <view class='divide_line_f5f5f5'></view>
         <view class='divide_line_f5f5f5'></view>
          <view style='height:90rpx'>
          <view style='height:90rpx'>
-          <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #666;'>本年度月扣除金额</text>
-          <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #999;' 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'></input>
+          <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #666'>本年度月扣除金额</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'></input>
         </view>
         </view>
       </view>
       </view>
       <view wx:elif="{{issinglechildData.selected=='是'}}">
       <view wx:elif="{{issinglechildData.selected=='是'}}">

@@ -126,7 +126,7 @@
 }
 }
 
 
 .input_wrap {
 .input_wrap {
-  width: 380rpx;
+  width: 360rpx;
   height: 90rpx;
   height: 90rpx;
   font-size: 30rpx;
   font-size: 30rpx;
   color: #333;
   color: #333;