优化

wangyu
images/additional_deduction.jpg
images/additional_deduction.png
images/advance_payment.jpg
images/advance_payment.png
images/final_payment.jpg
images/final_payment.png
images/tax_person.jpg
images/tax_person.png
pages/main/addtionalreduce/additiondetail/additiondetail.js
pages/main/addtionalreduce/additiondetail/additiondetail.wxml
pages/main/addtionalreduce/godeclare/godeclare.js
pages/main/addtionalreduce/godeclare/godeclare.wxml
pages/main/addtionalreduce/godetail/godetail.wxml
pages/main/addtionalreduce/home.js
pages/main/addtionalreduce/home.wxml
pages/main/addtionalreduce/lookandupdate/lookandupdate.js
pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
pages/main/addtionalreduce/lookandupdate/lookandupdate.wxss
pages/main/guide/guide.js
pages/main/guide/guide.wxml
--- a/images/additional_deduction.jpg 0 → 100644
查看文件 @868fbe4
+++ b/images/additional_deduction.jpg 0 → 100644
查看文件 @868fbe4
--- a/images/additional_deduction.png 已删除 100644 → 0
查看文件 @8b2bd33
+++ b/images/additional_deduction.png 已删除 100644 → 0
查看文件 @8b2bd33
--- a/images/advance_payment.jpg 0 → 100644
查看文件 @868fbe4
+++ b/images/advance_payment.jpg 0 → 100644
查看文件 @868fbe4
--- a/images/advance_payment.png 已删除 100644 → 0
查看文件 @8b2bd33
+++ b/images/advance_payment.png 已删除 100644 → 0
查看文件 @8b2bd33
--- a/images/final_payment.jpg 0 → 100644
查看文件 @868fbe4
+++ b/images/final_payment.jpg 0 → 100644
查看文件 @868fbe4
--- a/images/final_payment.png 已删除 100644 → 0
查看文件 @8b2bd33
+++ b/images/final_payment.png 已删除 100644 → 0
查看文件 @8b2bd33
--- a/images/tax_person.jpg 0 → 100644
查看文件 @868fbe4
+++ b/images/tax_person.jpg 0 → 100644
查看文件 @868fbe4
--- a/images/tax_person.png 已删除 100644 → 0
查看文件 @8b2bd33
+++ b/images/tax_person.png 已删除 100644 → 0
查看文件 @8b2bd33
--- a/pages/main/addtionalreduce/additiondetail/additiondetail.js
查看文件 @868fbe4
+++ b/pages/main/addtionalreduce/additiondetail/additiondetail.js
查看文件 @868fbe4
@@ -5,7 +5,8 @@ Page({
    * Page initial data
    */
   data: {
-
+    cur_status:"",
+    datas:{}
   },
   /**
@@ -15,7 +16,8 @@ Page({
     var that = this
     console.log("options", options);
     this.setData({
-      cur_index: options.index
+      cur_status: options.status,
+      datas: JSON.parse(options.data)
     })
   },
--- a/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @868fbe4
+++ b/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @868fbe4
 <!--pages/main/addtionalreduce/additiondetail/additiondetail.wxml-->
 <scroll-view class='page'>
-<!-- 子女教育 -->
-  <view style='padding:30rpx'>
+  <!-- 子女教育 -->
+  <view style='padding:30rpx' wx:if="{{cur_status=='children_education'}}">
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>子女身份证件类型：</text>
-      <text class='text_right_333'>身份证</text>
+      <text class='text_right_333'>{{datas.children_id_card_type}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>子女身份证件号码：</text>
-      <text class='text_right_333'>92589038539251</text>
+      <text class='text_right_333'>{{datas.children_id_card_no}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>子女姓名</text>
-      <text class='text_right_333'>哈哈</text>
+      <text class='text_right_333'>{{datas.children_name}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>出生日期</text>
-      <text class='text_right_333'>2019-01-01</text>
+      <text class='text_right_333'>{{datas.children_birthday}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
@@ -32,7 +32,7 @@
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>分配比例</text>
-      <text class='text_right_333'>10%</text>
+      <text class='text_right_333'>{{datas.percent}}%</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
@@ -42,7 +42,7 @@
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>子女受教育阶段</text>
-      <text class='text_right_333'>大学</text>
+      <text class='text_right_333'>{{datas.education_period}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
@@ -60,24 +60,24 @@
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除金额</text>
-      <text class='text_right_orange'>￥1200/月</text>
+      <text class='text_right_orange'>￥{{datas.deduction_amount}}/月</text>
     </view>
     <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>配偶姓名</text>
-      <text class='text_right_333'>西施</text>
+      <text class='text_right_333'>{{datas.spouse_name}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>配偶证件类型</text>
-      <text class='text_right_333'>结婚证</text>
+      <text class='text_right_333'>{{datas.spouse_id_card_type}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>配偶身份证件号码</text>
-      <text class='text_right_333'>1101101010110</text>
+      <text class='text_right_333'>{{datas.spouse_id_card_no}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>出生日期</text>
-      <text class='text_right_333'>2000年10月1日</text>
+      <text class='text_right_333'>{{datas.spouse_birthday}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>国籍</text>
@@ -85,9 +85,9 @@
     </view>
   </view>
-<!-- 赡养老人 -->
-<view style='padding:30rpx' hidden='true'>
-<view style='height:90rpx;width:100%'>
+  <!-- 赡养老人 -->
+  <view style='padding:30rpx' wx:if="{{cur_status=='support_duty'}}">
+    <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>赡养类型：</text>
       <text class='text_right_333'>独立赡养</text>
@@ -127,7 +127,7 @@
       <text class='text_left'>分摊比例：</text>
       <text class='text_right_333'>100%</text>
     </view>
-   <view style='height:90rpx;width:100%'>
+    <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除方式</text>
       <text class='text_right_333'>月度扣除</text>
     </view>
@@ -135,11 +135,11 @@
       <text class='text_left'>扣除金额</text>
       <text class='text_right_orange'>￥1200/月</text>
     </view>
-</view>
+  </view>
-<!-- 住房 -->
-  <view style='padding:30rpx' hidden='true'>
-    <view style='height:90rpx;width:100%' >
+  <!-- 住房 -->
+  <view style='padding:30rpx' wx:if="{{cur_status=='house_fund'}}">
+    <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>租赁房屋坐落地址：</text>
       <text class='text_right_333'>北京市 市辖区 朝阳区</text>
--- a/pages/main/addtionalreduce/godeclare/godeclare.js
查看文件 @868fbe4
+++ b/pages/main/addtionalreduce/godeclare/godeclare.js
查看文件 @868fbe4
@@ -10,66 +10,48 @@ Page({
   data: {
     flag_housing01: false,
     flag_housing02: false,
+    legal_entity_id: '',
+    legal_entity: '',
+
     selectIndex: [{
       message: '子女教育',
       disable_change: '',
-      path: '',
-      data: {},
+      status: "children_education",
       sureid: false
     }, {
       message: '继续教育',
       disable_change: '',
-      path: '',
-      data: {},
+        status: "continuing_education",
       sureid: false
     }, {
       message: '赡养老人',
       disable_change: '',
-      path: '',
-      data: {},
+        status: "support_duty",
       sureid: false
     }, {
       message: '大病医疗',
       disable_change: '',
-      path: '',
-      data: {},
+        status: "medical_fund",
       sureid: false
     }, {
       message: '住房',
       sureid: false,
-      path: '',
-      data: {},
       disable_change: '',
+        status: "children_education",
       extra_message: ''
     }, ],
-    // unitData: {
-    //   label: '选择申报单位',
-    //   bindtype: 'unit',
-    //   selected: '北京小爱智能科技',
-    //   values: ["北京小爱智能科技"],
-    //   placeholder: '请选择申报单位',
-    //   onChange: 'onPickerSelect'
-    // },
-
   },
   /**
    * Lifecycle function--Called when page load
    */
   onLoad: function(options) {
-    var that = this
-    // wx.clearStorage()
-    wx.getStorage({
-      key: 'selectitems',
-      success: function(res) {
-        console.log("selectitems", res.data)
-        that.setData({
-          selectIndex: res.data,
-          flag_housing01: res.data[res.data.length - 1].extra_message == '住房贷款利息',
-          flag_housing02: res.data[res.data.length - 1].extra_message == '住房租金'
-        })
-      },
+    console.log("onLoad", options)
+    this.setData({
+      legal_entity_id: options.legal_entity_id,
+      legal_entity: options.legal_entity
     })
+
   },
   /**
@@ -86,15 +68,6 @@ Page({
   },
-  onPickerSelect: function(e) {
-    console.log('picker发送选择改变，携带值为', e)
-    var unit_data = this.data.unitData
-    unit_data.selected = unit_data.values[e.detail.value]
-    this.setData({
-      unitData: unit_data
-    })
-  },
-
   selectRep: function(e) {
     let index = e.currentTarget.dataset.selectindex;
     let selectIndex = this.data.selectIndex; //取到data里的selectIndex 
@@ -147,52 +120,61 @@ Page({
   },
   gocommit: function() {
-    if (!this.data.unitData.selected || !this.data.unitData.selected.length > 0) {
-      wx.showToast({
-        title: '请选择申报单位',
-      })
-      return;
-    }
     var selectjson = this.data.selectIndex
-    var flag_count = 0
+    if (selectjson[selectjson.length - 1].sureid) {
+      if (this.data.flag_housing01 || this.data.flag_housing02) {
+        selectjson[selectjson.length - 1].extra_message = this.data.flag_housing01 ? "住房贷款利息" : "住房租金";
+        selectjson[selectjson.length - 1].status = this.data.flag_housing01 ? "house_fund_loan" : "house_fund_rent";
+        this.setData({
+          selectIndex: selectjson
+        })
+      } else {
+        wx.showToast({
+          title: '请选择住房类型',
+        })
+        return;
+      }
+    }
+    var stuatusarray = new Array();
     for (var i = 0; i < selectjson.length; i++) {
       if (this.data.selectIndex[i].sureid) {
-        selectjson[i].disable_change = true
-        flag_count++
+        stuatusarray.push(this.data.selectIndex[i].status)
       }
     }
     console.log("selectjson01", selectjson)
-    if (flag_count < 1) {
+    if (stuatusarray.length < 1) {
       wx.showToast({
         title: '请选择专项附加扣除',
       })
       return;
-    } else {
-      if (selectjson[selectjson.length - 1].sureid) {
-        if (this.data.flag_housing01 || this.data.flag_housing02) {
-          selectjson[selectjson.length - 1].extra_message = this.data.flag_housing01 ? "住房贷款利息" : "住房租金";
-          this.setData({
-            selectIndex: selectjson
-          })
-        } else {
-          wx.showToast({
-            title: '请选择住房类型',
+    } 
+    this.goDeclare(stuatusarray)
+   
+  },
+
+  goDeclare: function(array) {
+    var that = this;
+    var Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/additional-settings',
+      data: {
+        "legal_entity_id": this.data.legal_entity_id,
+        "legal_entity": this.data.legal_entity,
+        "options": array
+      },
+      method:"POST",
+      header: {
+        'content-type': 'application/json',
+        "Authorization": Authorization
+      },
+      success: function(res) {
+        if (res && res.data) {
+          console.log("res", res)
+          wx.redirectTo({
+            url: '../godetail/godetail'
           })
-          return;
         }
       }
-    }
-    wx.setStorage({
-      key: 'is_declared',
-      data: true,
-    })
-    wx.setStorage({
-      key: 'selectitems',
-      data: this.data.selectIndex,
-    })
-
-    wx.redirectTo({
-      url: '../godetail/godetail'
     })
   },
--- a/pages/main/addtionalreduce/godeclare/godeclare.wxml
查看文件 @868fbe4
+++ b/pages/main/addtionalreduce/godeclare/godeclare.wxml
查看文件 @868fbe4
@@ -3,7 +3,7 @@
 <view class='page'>
   <view>
-    <view class='text_gray_30' style='padding:30rpx'>北京小爱智能科技，请选择在该单位申报的专项附加扣除项</view>
+    <view class='text_gray_30' style='padding:30rpx'>{{legal_entity}}，请选择在该单位申报的专项附加扣除项</view>
     <!-- <view style='padding:0 30rpx'>
       <view class='divide_line_f5f5f5'></view>
       <template is="picker_cell_normal" data="{{...unitData}}" />
--- a/pages/main/addtionalreduce/godetail/godetail.wxml
查看文件 @868fbe4
+++ b/pages/main/addtionalreduce/godetail/godetail.wxml
查看文件 @868fbe4
@@ -8,7 +8,7 @@
   </view>
   <view wx:if="true">
     <view wx:for="{{datas02}}">
-      <view hidden='{{!datas02[index].sureid}}' class='card_rectangle_bg_column' style='padding:30rpx;margin-top:30rpx'>
+      <view hidden='{{false}}' class='card_rectangle_bg_column' style='padding:30rpx;margin-top:30rpx'>
         <text class='text_black_32' wx:if="{{datas02[index].message!='住房'}}">{{datas02[index].message}}</text>
         <text class='text_black_32' wx:if="{{datas02[index].message=='住房'}}">{{datas02[index].extra_message}}</text>
         <view style='margin:20rpx 0'>
--- a/pages/main/addtionalreduce/home.js
查看文件 @868fbe4
+++ b/pages/main/addtionalreduce/home.js
查看文件 @868fbe4
@@ -16,6 +16,21 @@ Page({
       "success": "审核成功",
       "failed": "审核失败"
     },
+    additiontitle: {
+      "children_education": "子女教育",
+      "continuing_education": "继续教育",
+      "support_duty": "赡养老人",
+      "medical_fund": "大病医疗",
+      "house_fund": "住房"
+    },
+    reducetype:{
+      "month":"月度",
+      "year":"年度"
+    },
+    reducetypeunit: {
+      "month": "月",
+      "year": "年"
+    },
     datas02: ["子女教育", "继续教育", "赡养老人", "大病医疗", "住房贷款利息"]
   },
@@ -26,9 +41,11 @@ Page({
     console.log("onLoad");
   },
-  godeclare: function () {
+  godeclare: function (e) {
+    console.log("godeclare", e);
+    var newdata = this.data.additionlist[e.currentTarget.id]
     wx.navigateTo({
-      url: 'godeclare/godeclare',
+      url: 'godeclare/godeclare?legal_entity_id=' + newdata.legal_entity_id + "&legal_entity=" + newdata.legal_entity,
     })
   },
@@ -39,9 +56,12 @@ Page({
   },
   lookandadd: function (e) {
-    console.log("lookandadd", e);
+    var str = e.currentTarget.id.split('-')
+    var data = this.data.additionlist;
+    console.log("lookandadd", str);
+
     wx.navigateTo({
-      url: 'lookandupdate/lookandupdate?index=' + e.currentTarget.id,
+      url: 'lookandupdate/lookandupdate?status=' + data[str[0]].addition_items[str[1]].addition_category + "&legal_entity_id=" + data[str[0]].legal_entity_id,
     })
   },
--- a/pages/main/addtionalreduce/home.wxml
查看文件 @868fbe4
+++ b/pages/main/addtionalreduce/home.wxml
查看文件 @868fbe4
@@ -2,31 +2,61 @@
 <view class='page'>
   <view style='margin-bottom:30rpxbackground:#fff'>
-    <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column'>
+    <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column' wx:for-index="idx01">
       <view style='margin:30rpx 44rpx;float:left;display:flex;flex-direction:column'>
         <text class=' text_333_40  float_left'>{{item.legal_entity}}</text>
-        <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap '>
+        <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}' >
           <text class='text_godeclare_wrap '>立即申报</text>
         </view>
       </view>
       <view wx:if="{{item.addition_items&&item.addition_items.length>0}}">
-        <block wx:for="{{datas02}}" wx:key="">
+        <block wx:for="{{item.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02">
           <view hidden="{{false}}">
             <view class='divide_line' style='margin:0 50rpx'></view>
             <view style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
               <view style='height:40rpx'>
-                <text class='text_333_32 float_left' wx:if="true">住房</text>
+                <text class='text_333_32 float_left'>{{additiontitle[itemData.addition_category]}}</text>
+                <text class='text_333_32 float_left' hidden="{{(itemData.addition_category=='continuing_education'||itemData.addition_category=='house_fund')||itemData.count<2}}">（{{itemData.count}}）</text>
                 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
-                <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{index}}'>查看</text>
+                <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx01}}-{{idx02}}' >查看</text>
               </view>
-              <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
+              <view wx:if="{{itemData.addition_category=='continuing_education'}}" style='padding:20rpx'>
+                <view>
+                  <text style='font-size:28rpx;color:#666'>学历教育</text>
+                  <view style='width:100%;display:flex;flex-direction:row '>
+                    <view class='float_left' style='flex:1'>
+                      <text class='text_999_24 '>扣除方式</text>
+                      <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}</text>
+                    </view>
+                    <view class='float_right' style='flex:1'>
+                      <text class='text_999_24 '>可扣除金额</text>
+                      <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/年</text>
+                    </view>
+                  </view>
+                </view>
+                <view >
+                  <text style='font-size:28rpx;color:#666'>非学历教育</text>
+                  <text style='font-size:28rpx;color:#666' hidden='{{itemData.count<2}}' >（{{itemData.count}}）</text>
+                  <view style='width:100%;display:flex;flex-direction:row '>
+                    <view class='float_left' style='flex:1'>
+                      <text class='text_999_24 '>扣除方式</text>
+                      <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}</text>
+                    </view>
+                    <view class='float_right' style='flex:1'>
+                      <text class='text_999_24 '>可扣除金额</text>
+                      <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/年</text>
+                    </view>
+                  </view>
+                </view>
+              </view>
+              <view wx:else style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
                 <view class='float_left' style='flex:1'>
                   <text class='text_999_24 '>扣除方式</text>
-                  <text class='text_gray_28' style='margin-left:20rpx'>年度</text>
+                  <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}</text>
                 </view>
                 <view class='float_right' style='flex:1'>
                   <text class='text_999_24 '>可扣除金额</text>
-                  <text class='text_orange_28 ' style='margin-left:20rpx'>￥12000/年</text>
+                  <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/{{reducetypeunit[itemData.deduction_type]}}</text>
                 </view>
               </view>
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.js
查看文件 @868fbe4
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.js
查看文件 @868fbe4
@@ -8,35 +8,61 @@ Page({
    * Page initial data
    */
   data: {
-    cur_index: -1,
-    add_text_arr: ["添加子女", "添加继续教育", "添加老人", "添加大病医疗", "添加住房贷款利息"],
+    cur_status: "",
+    legal_entity_id: "",
+    declareStatus: {
+      "to_declare ": "待申报",
+      "declaring": "申报中",
+      "success": "审核成功",
+      "failed": "审核失败"
+    },
+    additiontitle: {
+      "children_education": "子女教育",
+      "continuing_education": "继续教育",
+      "support_duty": "赡养老人",
+      "medical_fund": "大病医疗",
+      "house_fund": "住房"
+    },
     title: '',
     imgpath: '',
     new_data: null,
-    modal_images: ["/images/childedu_declare.png", "/images/continueedu_declare.png", "/images/support_older_declare.png", "/images/health_declare.png", "/images/house_declare.png"],
-    showModal: false,
-    modalData:{
-      // title:"请选择父母或祖父母进行申报",
-      // datas:["哈哈","嘎嘎","哒哒","啦啦"],
-      // canceltext:"添加被赡养人并申报",
-      // confirmtext: "确定为该被赡养人申报",
-
-      // title: "请选择扣除方式",
-      // datas: ["月度", "年度"],
-      // canceltext: "取消",
-      // confirmtext: "确认",
-
-      // title: "请选择本人、配偶或子女进行大病支出申报",
-      // datas: ["周先生", "安女士","小淘气"],
-      // canceltext: "添加家庭成员并申报",
-      // confirmtext: "确定为该选择的人申报",
-
+    modal_images: { "children_education": "/images/childedu_declare.png", "continuing_education": "/images/continueedu_declare.png", "support_duty": "/images/support_older_declare.png", "medical_fund": "/images/health_declare.png", "house_fund":"/images/house_declare.png"},
+    showModal_img: false,
+    showModal_reducetype: false,
+    showModal_addtype: false,
+    url_arr: {
+      "children_education": "persontax/v1/children-educations/",
+      "continuing_education": "persontax/v1/continuing-educations/",
+      "support_duty": "support-duties/",
+      "medical_fund": "persontax/v1/medical_founds/",
+      "house_fund": "persontax/v1/house_founds/"
+    },
+    reducetype: {
+      "month": "月度扣除",
+      "year": "年度扣除"
+    },
+    additionInfo: [],
+    reducetypeData: ["月度", "年度"],
+    modalData: {},
+    children_modalData: {
       title: "请选择子女进行申报",
-      datas: ["熊大", "熊二"],
+      datas: [],
       canceltext: "添加新子女并申报",
       confirmtext: "确定为该子女申报",
     },
-    datas: ["",""]
+    support_older_modalData: {
+      title: "请选择父母或祖父母进行申报",
+      datas: [],
+      canceltext: "添加被赡养人并申报",
+      confirmtext: "确定为该被赡养人申报",
+    },
+    medical_modalData: {
+      title: "请选择本人、配偶或子女进行大病支出申报",
+      datas: [],
+      canceltext: "添加家庭成员并申报",
+      confirmtext: "确定为该选择的人申报",
+    },
+    datas: ["", ""]
   },
   /**
@@ -46,7 +72,11 @@ Page({
     var that = this
     console.log("options", options);
     this.setData({
-      cur_index: options.index
+      cur_status: options.status,
+      legal_entity_id: options.legal_entity_id
+    })
+    wx.setNavigationBarTitle({
+      title: that.data.additiontitle[options.status],
     })
   },
@@ -62,40 +92,77 @@ Page({
    */
   onShow: function() {
     var that = this
-    var index = this.data.cur_index
-    console.log("onShow", index)
+    this.getAdditionInfo()
     this.getTaxList()
   },
-  lookimg: function() { //查看材料
+  getAdditionInfo() {
+    var that = this;
+    var Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + that.data.url_arr[that.data.cur_status] + that.data.legal_entity_id,
+      header: {
+        'content-type': 'application/json',
+        "Authorization": Authorization
+      },
+      success: function(res) {
+        if (res && res.data) {
+          console.log("res", res)
+          that.setData({
+            additionInfo: res.data.items
+          })
+        }
+      }
+    })
+  },
-    if (this.data.imgpath && this.data.imgpath.length > 0) {
-      wx.previewImage({
-        urls: [this.data.imgpath],
-      })
-    } else {
-      wx.showToast({
-        title: '暂无可查看资料',
+  // lookimg: function() { //查看材料
+
+  //   if (this.data.imgpath && this.data.imgpath.length > 0) {
+  //     wx.previewImage({
+  //       urls: [this.data.imgpath],
+  //     })
+  //   } else {
+  //     wx.showToast({
+  //       title: '暂无可查看资料',
+  //     })
+  //   }
+
+  // },
+
+  showdetail: function(e) {
+    console.log("showdetail", e)
+    if (this.data.additionInfo && this.data.additionInfo.length > 0) {
+      wx.navigateTo({
+        url: '../additiondetail/additiondetail?data=' + JSON.stringify(this.data.additionInfo[e.currentTarget.id]) + "&status=" + this.data.cur_status,
       })
     }
-
-  },
-
-  showdetail:function(e){
-    wx.navigateTo({
-      url: '../additiondetail/additiondetail?index=' + this.data.cur_index,
-    })
   },
   goadd: function(e) { //添加
     var that = this
-    if(true){
-
-    }
-    wx.navigateTo({
-      url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title,
-    })
-
+    var modalinfo
+    if (this.data.cur_status == 'continuing_education' || this.data.cur_status == 'house_fund') {
+      wx.navigateTo({
+        url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title,
+      })
+    }else{
+      if (this.data.cur_status == 'children_education') { //modalData
+        modalinfo = this.data.children_modalData
+      } else if (this.data.cur_status == 'support_duty') {
+        modalinfo = this.data.support_older_modalData
+      } else if (this.data.cur_status == 'medical_fund') {
+        modalinfo = this.data.medical_modalData
+      }
+      console.log("modalinfo", modalinfo)
+      if (modalinfo.data.length < 2) {
+        wx.navigateTo({
+          url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title,
+        })
+      } else {
+        this.showAddtionmodal(modalinfo)
+      }
+    } 
   },
   getTaxList: function() {
@@ -120,13 +187,8 @@ Page({
       },
       success: function(res) {
         console.log('succ', res)
-        if (res.statusCode == 200) {
+        if (res.statusCode < 300) {
           that.handleData(res.data);
-        } else {
-          wx.showModal({
-            title: res.data.message,
-            content: '',
-          })
         }
       },
       fail(res) {
@@ -142,32 +204,87 @@ Page({
   },
   handleData: function(data) {
+
     if (data.items && data.items.length > 0) {
-      var taxlist = []
+      var childRelativelist = []
+      var medicalRelativelist = []
+      var olderRelativelist = []
+      var childmodal = this.data.children_modalData
+      var oldermodal = this.data.support_older_modalData
+      var medicalmodal = this.data.medical_modalData
       for (var i = 0; i < data.items.length; i++) {
-        if (data.items[i].family_ties == '子女') {
-          taxlist.push(data.items[i])
+        if (data.items[i].family_ties == '子' || data.items[i].family_ties == '女') {
+          childRelativelist.push(data.items[i].name)
+        } else if (data.items[i].family_ties != '祖父母' && data.items[i].family_ties != '外祖父母') {
+          medicalRelativelist.push(data.items[i].name)
+        } else if (data.items[i].family_ties == '祖父母' || data.items[i].family_ties == '外祖父母') {
+          olderRelativelist.push(data.items[i].name)
         }
       }
+      childmodal.data = childRelativelist
+      oldermodal.data = olderRelativelist
+      medicalmodal.data = medicalRelativelist
+      this.setData({
+        children_modalData: childmodal,
+        support_older_modalData: oldermodal,
+        medical_modalData: medicalmodal
+      })
     }
   },
-  showdeclare: function(e) {
-    console.log("showdeclare", e)
+  showModalImg: function(e) {
+    console.log("showModalImg", e)
+    this.setData({
+      showModal_img: true,
+    })
+  },
+
+  closeModalImg: function(e) {
+    console.log("closeModalImg", e)
+    this.setData({
+      showModal_img: false
+    })
+  },
+
+  // 扣除类型
+  showModalReducetype: function(e) {
+    console.log("reducetype", e)
+    this.setData({
+      showModal_img: false,
+      showModal_reducetype: true,
+      showModal_addtype: false,
+    })
+  },
+
+  showAddtionmodal: function(modalinfo) {
+    this.setData({
+      modalData: modalinfo,
+      showModal_addtype: true,
+    })
+  },
+
+  reduce_modalCancel: function () { //modal取消(扣除类型)
     this.setData({
-      showModal: true
+      showModal_addtype: false
     })
   },
-  closeModal: function(e) {
-    console.log("closeModal", e)
+  reduce_modalConfirm: function () { //modal确认(扣除类型)
     this.setData({
-      showModal: false
+      showModal_addtype: false
     })
   },
-  reducetype:function(){//选择扣除方式
+  modalCancel: function() { //modal取消(添加)
+    this.setData({
+      showModal_addtype: false
+    })
+  },
+  modalConfirm: function () { //modal确认(添加)
+    this.setData({
+      showModal_addtype: false
+    })
   },
   /**
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @868fbe4
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @868fbe4
@@ -18,15 +18,15 @@
     </view>
     <view style='width:100%;height:20rpx;background:#f5f5f5'></view> -->
-    <!-- <view style='padding-left:30rpx;background:#ffffff;padding-top:30rpx' bindtap='showdeclare'>
+    <!-- <view style='padding-left:30rpx;background:#ffffff;padding-top:30rpx' bindtap='showmodal'>
       <image class='icon_declare_wrap' src="/images/icon_declare.png"></image>
       <text style='padding-left:15rpx;' class='text_blue_28'>申报说明</text>
     </view> -->
-    <image class='openmodal_img' src="/images/openmodal_img.png" bindtap='showdeclare'></image>
+    <image class='openmodal_img' src="/images/openmodal_img.png" bindtap='showModalImg'></image>
     <image style='width:55%;height:254rpx;align-self:center;margin-top:160rpx;margin-bottom:320rpx' hidden='true' src='/images/noreduce_img.png'></image>
-    <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'>
+    <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='showModalReducetype' hidden="{{cur_status=='continuing_education'}}">
       <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
       <image class='arrow_img float_right' style='margin-top:28rpx' src="/images/arrow_right.png"></image>
       <text class='text_999_30 float_right' style='line-height:100rpx'>月度</text>
@@ -312,12 +312,12 @@
     <!-- </view> -->
-    <view wx:if="true">
-      <view wx:for="{{datas}}">
+    <view wx:if="{{cur_status=='children_education'}}">
+      <view wx:for="{{additionInfo}}">
         <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
           <view style='height:110rpx'>
-            <text class='text_gray_36 float_left' style='line-height:110rpx'>张飞</text>
-            <view class='declare_style float_right'> 申报中</view>
+            <text class='text_gray_36 float_left' style='line-height:110rpx'>{{C.children_name}}</text>
+            <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
           </view>
           <view style='padding-right: 30rpx'>
             <view class='divide_line_f5f5f5'></view>
@@ -327,24 +327,28 @@
             </view>
             <view style='height:70rpx'>
               <text class='text_999_28 ' style='line-height:70rpx'>分配比例：</text>
-              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text>
             </view>
             <view style='height:70rpx'>
               <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
             </view>
             <view style='height:70rpx'>
               <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
-              <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text>
+              <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}元</text>
             </view>
             <view class='divide_line_f5f5f5'></view>
-            <text class='text_blue_28 float_right' style='line-height:90rpx' bindtap='showdetail'>查看</text>
+            <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
+            <view class='float_right' wx:if="{{item.status=='failed'}}">
+              <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='showdetail'>删除</text>
+              <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>
+            </view>
           </view>
         </view>
       </view>
     </view>
-    <view>
+    <view wx:if="{{cur_status=='continuing_education'}}">
       <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
         <view style='height:110rpx'>
           <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text>
@@ -416,9 +420,13 @@
         </view>
       </view>
+      <view class='float_right' wx:if="{{item.status=='failed'}}">
+              <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='showdetail'>删除</text>
+              <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>
+            </view>
     </view>
-    <view>
+    <view wx:if="{{cur_status=='support_duty'}}">
       <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
         <view style='height:110rpx'>
           <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
@@ -443,13 +451,17 @@
             <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text>
           </view>
           <view class='divide_line_f5f5f5'></view>
-          <text class='text_blue_28 float_right' style='line-height:90rpx' bindtap='showdetail'>查看</text>
+          <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
+          <view class='float_right' wx:if="{{item.status=='failed'}}">
+              <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='showdetail'>删除</text>
+              <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>
+            </view>
         </view>
       </view>
     </view>
-    <view>
+    <view wx:if="{{cur_status=='medical_fund'}}">
       <view class='divide_line_f5f5f5'></view>
       <view style='height:100rpx;margin:0 30rpx' bindtap='reducetype'>
         <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>个人负担总金额</text>
@@ -492,11 +504,15 @@
             <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text>
             <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥2345元</text>
           </view>
+          <view class='float_right' wx:if="{{item.status!='failed'}}">
+              <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='showdetail'>删除</text>
+              <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>
+            </view>
         </view>
       </view>
     </view>
-    <view>
+    <view wx:if="{{cur_status=='house_fund'}}">
       <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
         <view style='height:110rpx'>
           <text class='text_gray_36 float_left' style='line-height:110rpx'>住房</text>
@@ -518,7 +534,11 @@
             <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text>
           </view>
           <view class='divide_line_f5f5f5'></view>
-          <text class='text_blue_28 float_right' style='line-height:90rpx' bindtap='showdetail'>查看</text>
+          <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
+          <view class='float_right' wx:if="{{item.status=='failed'}}">
+              <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='showdetail'>删除</text>
+              <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>
+            </view>
         </view>
       </view>
     </view>
@@ -531,23 +551,26 @@
       </view>
     </view>
-    <view style='margin-left:30rpx'>
+    <view style='margin-left:30rpx' wx:if="{{cur_status=='support_duty'}}">
       <text class='text_999_28'>您还没有添加继续共同赡养人，</text>
       <text class='text_blue_28' bindtap='goadd'>请添加</text>
     </view>
   </view>
 </view>
-<view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view>
-<!-- <view style='top:250rpx;position:absolute;z-index:10;width:100%' hidden="{{!showModal}}">
-  <image class='modal_img' src="{{modal_images[cur_index]}}" bindtap='closeModal'></image>
-  <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModal'>x</text>
-</view> -->
-<view class='modal_lg' style='' hidden="{{!showModal}}">
-  <text class='text_modal_title' >{{modalData.title}}</text>
+<view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}"></view>
+<!-- 申报说明 -->
+<view style='top:250rpx;position:absolute;z-index:10;width:100%' hidden="{{!showModal_img}}">
+  <image class='modal_img' src="{{modal_images[cur_status]}}" bindtap='closeModalImg'></image>
+  <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text>
+</view>
+
+<!-- 扣除类型 -->
+<view class='modal_lg' style='' wx:if="{{showModal_reducetype}}">
+  <text class='text_modal_title'>请选择扣除方式</text>
   <view class='divide_line_f5f5f5'></view>
   <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
-    <block wx:for="{{modalData.datas}}" wx:for-index="idx">
+    <block wx:for="{{reducetypeData}}" wx:for-index="idx">
       <view wx:if="{{idx!=1}}">
         <text class='text_item_black float_left'>{{item}}</text>
       </view>
@@ -559,15 +582,34 @@
     </block>
   </view>
   <view class='divide_line_f5f5f5'></view>
-  <!-- <view style='width:100%;display: flex;'>
-    <text class='text_cancel' bindtap='showdeclare'>{{modalData.canceltext}}</text>
+
+  <view style='width:100%;display: flex;'>
+    <text class='text_cancel' bindtap='reduce_modalCancel'>取消</text>
     <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
-    <text class='text_confirm' bindtap='closeModal'>{{modalData.confirmtext}}</text>
-  </view> -->
+    <text class='text_confirm' bindtap='reduce_modalConfirm'>确认</text>
+  </view>
+</view>
+<!--  添加子女 老人 大病-->
+<view class='modal_lg' style='' wx:if="{{showModal_addtype}}">
+  <text class='text_modal_title'>{{modalData.title}}</text>
+  <view class='divide_line_f5f5f5'></view>
+  <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
+    <block wx:for="{{modalData.data}}" wx:for-index="idx">
+      <view wx:if="{{idx!=1}}">
+        <text class='text_item_black float_left'>{{item}}</text>
+      </view>
+      <view wx:else>
+        <text class='text_item_blue float_left'>{{item}}</text>
+        <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
+      </view>
+      <view class='divide_line_f5f5f5'></view>
+    </block>
+  </view>
+  <view class='divide_line_f5f5f5'></view>
   <view style='width:100%;display: flex;'>
-    <text class='text_cancel01' bindtap='cancelhandle'>{{modalData.canceltext}}</text>
+    <text class='text_cancel01' bindtap='modalCancel'>{{modalData.canceltext}}</text>
     <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
-    <text class='text_confirm01' bindtap='confirmhandle'>{{modalData.confirmtext}}</text>
+    <text class='text_confirm01' bindtap='modalConfirm'>{{modalData.confirmtext}}</text>
   </view>
 </view>
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxss
查看文件 @868fbe4
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxss
查看文件 @868fbe4
@@ -143,6 +143,7 @@
   text-align: center;
   line-height: 45rpx;
   margin: 40rpx 0;
+  padding: 0 20rpx;
 }
 .text_cancel {
--- a/pages/main/guide/guide.js
查看文件 @868fbe4
+++ b/pages/main/guide/guide.js
查看文件 @868fbe4
@@ -60,11 +60,11 @@ Page({
       confirmColor: '#357aeb',
       success(res) {
         if (res.confirm) {
-          if (data.status == '1' && data.id) {
+          if (data.status == '1' && data.id) {//未完善
             wx.navigateTo({
               url: '../taxperson/editinfo/editinfo?id=' + data.id,
             })
-          } else if (data.status == '1') {
+          } else if (data.status == '1') {//未创建
             wx.navigateTo({
               url: '../taxperson/taxperson/addinfo/addinfo',
             })
--- a/pages/main/guide/guide.wxml
查看文件 @868fbe4
+++ b/pages/main/guide/guide.wxml
查看文件 @868fbe4
@@ -7,7 +7,7 @@
       <image class='bgimg' src='/images/guide_bg.png'></image>
       <view class='card_rectangle_bg_row' style='margin-top:280rpx;padding:30rpx' bindtap='gotaxPerson'>
-        <image class="icon_wrap" src="/images/tax_person.png"></image>
+        <image class="icon_wrap" src="/images/tax_person.jpg"></image>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
           <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>自然人信息采集</text>
@@ -17,7 +17,7 @@
       </view>
       <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdditionalDiduction'>
-        <image class="icon_wrap" src="/images/additional_deduction.png"></image>
+        <image class="icon_wrap" src="/images/additional_deduction.jpg"></image>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
           <text style='font-size: 36rpx;color: #000;font-weight:bold;'>专项附加扣除</text>
@@ -27,7 +27,7 @@
       </view>
       <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdvancePayment'>
-        <image class="icon_wrap" src="/images/advance_payment.png"></image>
+        <image class="icon_wrap" src="/images/advance_payment.jpg"></image>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
           <text style='font-size: 36rpx;color: #000;font-weight:bold;'>预扣预缴</text>
@@ -37,7 +37,7 @@
       </view>
       <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goFinalPayment'>
-        <image class="icon_wrap" src="/images/final_payment.png"></image>
+        <image class="icon_wrap" src="/images/final_payment.jpg"></image>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
           <text style='font-size: 36rpx;color: #000;font-weight:bold;'>汇算清缴</text>
--- a/pages/main/guide/guide.wxss
查看文件 @868fbe4
+++ b/pages/main/guide/guide.wxss
查看文件 @868fbe4
@@ -32,8 +32,8 @@
 }
 .icon_wrap{
-  width: 100rpx;
-  height: 100rpx;
+  width: 104rpx;
+  height: 102rpx;
   align-self: center
 }