Merge branch 'dev_wy' into dev2.0

 {
 {
   "pages": [
   "pages": [
+    "pages/main/addtionalreduce/adddupporters/adddupporters",
     "pages/main/guide/guide",
     "pages/main/guide/guide",
     "pages/getPhone/getPhone",
     "pages/getPhone/getPhone",
     "pages/main/smartchat/chat",
     "pages/main/smartchat/chat",
@@ -12,6 +13,9 @@
     "pages/main/addtionalreduce/godetail/godetail",
     "pages/main/addtionalreduce/godetail/godetail",
     "pages/main/addtionalreduce/lookandupdate/lookandupdate",
     "pages/main/addtionalreduce/lookandupdate/lookandupdate",
     "pages/main/addtionalreduce/addextrainfo/addextrainfo",
     "pages/main/addtionalreduce/addextrainfo/addextrainfo",
+   
+
+
     "pages/main/addtionalreduce/additiondetail/additiondetail",
     "pages/main/addtionalreduce/additiondetail/additiondetail",
     "pages/main/advancepayment/adPayHome",
     "pages/main/advancepayment/adPayHome",
     "pages/main/finalpayment/home",
     "pages/main/finalpayment/home",

+// pages/main/addtionalreduce/adddupporters/adddupporters.js
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+{
+  "navigationBarTitleText": "添加共同赡养人"
+  }

+<!--pages/main/addtionalreduce/adddupporters/adddupporters.wxml-->
+<view class='page'>
+  <form bindsubmit='formSubmit'>
+  <view style='height:90rpx;padding:0 30rpx'>
+      <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
+      <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>证照类型</text>
+      <input class='text_333_30 float_right' placeholder='请输入姓名' name='name' value='{{name}}' placeholder-class='text_999_30'  maxlength='15'></input>
+    </view>
+    <view class="divide_line"></view>
+    <view style='height:90rpx;padding:0 30rpx'>
+      <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
+      <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>证照类型</text>
+      <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>居民身份证</text>
+    </view>
+    <view class="divide_line"></view>
+    <view class="btn_bottom">
+      <button class="btn_bottom" formType="submit"> 保存</button>
+    </view>
+  </form>
+</view>

+/* pages/main/addtionalreduce/adddupporters/adddupporters.wxss */
+.text_999_30{
+  font-family: PingFangSC-Regular;
+font-size: 15px;
+color: #999999;
+text-align: right;
+line-height: 45px;
+}
+
+.text_333_30{
+  font-family: PingFangSC-Regular;
+font-size: 15px;
+color: #333333;
+text-align: right;
+line-height: 45px;
+}

@@ -46,7 +46,7 @@ Page({
   },
   },
 
 
   lookandadd:function(e){
   lookandadd:function(e){
-    console.log("e", e);
+    console.log("lookandadd", e);
     if (this.data.additiondata.options && this.data.additiondata.options.length>0){
     if (this.data.additiondata.options && this.data.additiondata.options.length>0){
       wx.navigateTo({
       wx.navigateTo({
         url: '../lookandupdate/lookandupdate?status=' + this.data.additiondata.options[e.currentTarget.id] + "&legal_entity_id=" + this.data.additiondata.legal_entity_id,
         url: '../lookandupdate/lookandupdate?status=' + this.data.additiondata.options[e.currentTarget.id] + "&legal_entity_id=" + this.data.additiondata.legal_entity_id,

@@ -3,7 +3,7 @@
   <view class='text_gray_30' style='padding:30rpx'>您在“{{additiondata.legal_entity}}”申报的专项附加扣除项已添加完成，请完善各项的具体申报内容。</view>
   <view class='text_gray_30' style='padding:30rpx'>您在“{{additiondata.legal_entity}}”申报的专项附加扣除项已添加完成，请完善各项的具体申报内容。</view>
 
 
   <view wx:if="{{additiondata.options&&additiondata.options.length>0}}">
   <view wx:if="{{additiondata.options&&additiondata.options.length>0}}">
-    <block wx:for="{{additiondata.options}}" wx:key="" wx:for-item="item">
+    <block wx:for="{{additiondata.options}}" wx:key="" wx:for-item="item" wx:for-index="idx" >
       <view wx:if="{{item=='children_education'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
       <view wx:if="{{item=='children_education'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
         <view style='height:40rpx'>
         <view style='height:40rpx'>
           <text class='text_333_32 float_left'>子女教育</text>
           <text class='text_333_32 float_left'>子女教育</text>

@@ -10,7 +10,6 @@ Page({
   data: {
   data: {
     cur_status: "",
     cur_status: "",
     legal_entity_id: "",
     legal_entity_id: "",
-    title:'',
     declareStatus: {
     declareStatus: {
       "to_declare ": "待申报",
       "to_declare ": "待申报",
       "declaring": "申报中",
       "declaring": "申报中",
@@ -84,7 +83,7 @@ Page({
       legal_entity_id: options.legal_entity_id
       legal_entity_id: options.legal_entity_id
     })
     })
     wx.setNavigationBarTitle({
     wx.setNavigationBarTitle({
-      title: that.data.additiontitle[options.status],
+      "title": that.data.additiontitle[options.status],
     })
     })
   },
   },
 
 
@@ -125,6 +124,12 @@ Page({
     })
     })
   },
   },
 
 
+  goaddSupporter:function(){
+    wx.navigateTo({
+      url: '../adddupporters/adddupporters',
+    })
+  },
+
   // lookimg: function() { //查看材料
   // lookimg: function() { //查看材料
 
 
   //   if (this.data.imgpath && this.data.imgpath.length > 0) {
   //   if (this.data.imgpath && this.data.imgpath.length > 0) {

@@ -550,7 +550,7 @@
 
 
     <view style='margin-left:30rpx' wx:if="{{cur_status=='support_duty'}}">
     <view style='margin-left:30rpx' wx:if="{{cur_status=='support_duty'}}">
       <text class='text_999_28'>您还没有添加继续共同赡养人，</text>
       <text class='text_999_28'>您还没有添加继续共同赡养人，</text>
-      <text class='text_blue_28' bindtap='goadd'>请添加</text>
+      <text class='text_blue_28' bindtap='goaddSupporter'>请添加</text>
     </view>
     </view>
   </view>
   </view>
 </view>
 </view>