修改

@@ -50,7 +50,7 @@ App({
         console.log("getTokenByCode", res.data)
         var user = res.data.user;
         var tenant = res.data.tenant;
-        if (tenant && tenant.length > 0) {
+        if (tenant) {
           that.globalData.tenant_id = tenant.id;
         }
         that.globalData.userInfo = res.data.user;

@@ -32,7 +32,7 @@ Page({
     if (this.data.buttonDisable) return;
     var that = this;
     var mobile = this.data.mobile;
-    var regMobile = /^1[3|4|5|7|8][0-9]{9}$/;
+    var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$/;
     console.log("mobile---", mobile);
     if (!regMobile.test(mobile)) {
       wx.showToast({

@@ -124,7 +124,9 @@ Page({
   },
 
   gosave:function(){
-    
+    wx.navigateBack({
+      delta: 1
+    })
   },
 
   onPickerSelect: function (e) {

@@ -17,7 +17,7 @@
       <view class='divide_line_f5f5f5'></view>
       <view style='height:90rpx'>
         <text class='text_black_30 float_left'>子女身份证号</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女身份证号'></input>
+        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女身份证号'type='idcard'></input>
       </view>
       <view class='divide_line_f5f5f5'></view>
       <view style='height:90rpx'>
@@ -38,7 +38,7 @@
       <view class='divide_line_f5f5f5'></view>
       <view style='height:90rpx'>
         <text class='text_black_30 float_left'>扣除金额</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;;text-align: right' placeholder='请输入扣除金额'></input>
+        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;;text-align: right' placeholder='请输入扣除金额' type='digit'></input>
       </view>
       <view class='divide_line_f5f5f5'></view>
       <view style='height:90rpx;'>
@@ -88,7 +88,7 @@
       <view class='divide_line_f5f5f5'></view>
       <view style='height:90rpx'>
         <text class='text_black_30 float_left'>老人身份证号</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入老人身份证号'></input>
+        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入老人身份证号'type='idcard'></input>
       </view>
       <view class='divide_line_f5f5f5'></view>
       <!-- <view style='height:90rpx'>
@@ -115,7 +115,7 @@
     <view wx:if="{{cur_index==3}}">
       <view style='height:90rpx'>
         <text class='text_black_30 float_left'>扣除金额</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入扣除金额'></input>
+        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入扣除金额'type='digit'></input>
       </view>
     </view>
 
@@ -128,7 +128,7 @@
       <view class='divide_line_f5f5f5'></view>
       <view style='height:90rpx'>
         <text class='text_black_30 float_left'>配偶身份证号</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶身份证号'></input>
+        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶身份证号'type='idcard'></input>
       </view>
     </view>
     <view class='divide_line_f5f5f5'></view>

@@ -7,33 +7,29 @@ Page({
   data: {
     flag_housing01: false,
     flag_housing02: false,
-    repContent: [{
-      message: '子女教育'
-    }, {
-      message: '继续教育'
-    }, {
-      message: '赡养老人'
-    }, {
-      message: '大病医疗'
-    }, {
-      message: '住房'
-    }],
     selectIndex: [{
+      message: '子女教育',
       sureid: false
     }, {
+        message: '继续教育',
       sureid: false
     }, {
+      message: '赡养老人',
       sureid: false
     }, {
+        message: '大病医疗',
       sureid: false
     }, {
-      sureid: false
+      message: '住房',
+      sureid: false,
+      housing01:false,
+      extra_message :''
     }, ],
     unitData: {
       label: '选择申报单位',
       bindtype: 'unit',
-      selected: '',
-      values: ["北京小爱智能科技有限公司", "杭州蜗壳爱有限公司"],
+      selected: '北京小爱智能科技',
+      values: ["北京小爱智能科技"],
       placeholder: '请选择申报单位',
       onChange: 'onPickerSelect'
     },
@@ -44,7 +40,19 @@ Page({
    * 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].housing01,
+          flag_housing02: !res.data[res.data.length - 1].housing01
+        })
+      },
+    })
   },
 
   /**
@@ -101,6 +109,55 @@ Page({
     }
   },
 
+  gocommit: function() {
+    if (!this.data.unitData.selected || !this.data.unitData.selected.length>0){
+      wx.showToast({
+        title: '请选择申报单位',
+      })
+      return;
+    }
+    var selectjson = new Array();
+    for (var i = 0; i < this.data.selectIndex.length; i++) {
+      if (this.data.selectIndex[i].sureid) {
+        selectjson.push(this.data.selectIndex[i]);
+      }
+    }
+    console.log("selectjson01",selectjson)
+    if (selectjson.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].housing01 = true;
+          selectjson[selectjson.length - 1].extra_message = this.data.flag_housing01 ? "住房贷款利息" :"住房租金" ;
+          this.setData({
+            selectIndex: selectjson 
+          })
+        }
+      } else {
+        wx.showToast({
+          title: '请选择住房类型',
+        })
+        return;
+      }
+    }
+    wx.setStorage({
+      key: 'is_declared',
+      data: true,
+    })
+    wx.setStorage({
+      key: 'selectitems',
+      data: this.data.selectIndex,
+    })
+
+    wx.redirectTo({
+      url: '../godetail/godetail'
+    })
+  },
+
   /**
    * Lifecycle function--Called when page hide
    */

@@ -16,13 +16,13 @@
     </view>
     <text class='text_black_30' style='padding-left:30rpx'>选择专项附加扣除项</text>
 
-    <view wx:for="{{repContent}}" class="multi-selection" style='padding:0 30rpx'>
+    <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}}" bindtap="selectRep" 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>
-    <view wx:if='{{selectIndex[4].sureid}}' style='background: #F1FAFD;height:62rpx;position: relative;display: flex;justify-content:center'>
+    <view wx:if="{{selectIndex[4].sureid}}" style='background: #F1FAFD;height:62rpx;position: relative;display: flex;justify-content:center'>
       <view bindtap='housing01'>
         <view class='float_left'>
           <image class='single-img' src="{{flag_housing01? '/images/selected02.png' : '/images/unselected02.png'}}" style='margin-top:16rpx'></image>
@@ -39,7 +39,7 @@
     </view>
   </view>
 
-  <view>
-    <button class="btn_bottom"> 提交</button>
+  <view class="btn_bottom" bindtap='gocommit'>
+    <button class="btn_bottom" > 提交</button>
   </view>
 </view>
\ No newline at end of file

@@ -5,14 +5,23 @@ Page({
    * Page initial data
    */
   data: {
-    datas: ["子女教育", "继续教育", "赡养老人", "大病医疗"]
+    datas02: ["子女教育", "继续教育", "赡养老人", "大病医疗"]
   },
 
   /**
    * Lifecycle function--Called when page load
    */
   onLoad: function (options) {
-
+    var that = this
+    wx.getStorage({
+      key: 'selectitems',
+      success: function (res) {
+        console.log("selectitems", res.data)
+        that.setData({
+          datas02: res.data
+        })
+      },
+    })
   },
 
   /**
@@ -32,7 +41,7 @@ Page({
   lookandadd:function(e){
     console.log("e", e);
     wx.navigateTo({
-      url: '../addextrainfo/addextrainfo?index=' + e.currentTarget.id,
+      url: '../lookandupdate/lookandupdate?index=' + e.currentTarget.id,
     })
   },
 

@@ -7,9 +7,9 @@
     <view class='divide_line_f5f5f5' style='margin-top:30rpx' ></view>
   </view>
   <view wx:if="true">
-    <view wx:for="{{datas}}">
+    <view wx:for="{{datas02}}">
       <view class='card_rectangle_bg_column' style='padding:30rpx;margin-top:30rpx'>
-        <text class='text_black_32'>{{datas[index]}}</text>
+        <text class='text_black_32'>{{datas02[index].message}}</text>
         <view style='margin:20rpx 0'>
                 <text class='text_gray_22 float_left'>已抵扣额度：4890.00</text>
                 <text class='text_gray_22 float_right'>剩余可抵扣额度：12810.00</text>

@@ -5,30 +5,32 @@ Page({
    * Page initial data
    */
   data: {
-      datas:["子女教育","继续教育","赡养老人","大病医疗","住房贷款利息"]
+    datas: [""],
+    is_declared: false,
+    datas02: ["子女教育", "继续教育", "赡养老人", "大病医疗", "住房贷款利息"]
   },
 
   /**
    * Lifecycle function--Called when page load
    */
-  onLoad: function (options) {
-
+  onLoad: function(options) {
+    console.log("onLoad");
   },
 
-  godeclare:function(){
+  godeclare: function() {
     wx.navigateTo({
       url: 'godeclare/godeclare',
     })
   },
 
-  godetail: function () {
-      wx.navigateTo({
-        url: 'godetail/godetail',
-      })
+  godetail: function() {
+    wx.navigateTo({
+      url: 'godetail/godetail',
+    })
   },
 
-  lookandadd: function (e) {
-    console.log("lookandadd",e);
+  lookandadd: function(e) {
+    console.log("lookandadd", e);
     wx.navigateTo({
       url: 'lookandupdate/lookandupdate?index=' + e.currentTarget.id,
     })
@@ -37,49 +39,70 @@ Page({
   /**
    * Lifecycle function--Called when page is initially rendered
    */
-  onReady: function () {
-
+  onReady: function() {
+    console.log("onReady");
   },
 
   /**
    * Lifecycle function--Called when page show
    */
-  onShow: function () {
+  onShow: function() {
+    console.log("onShow");
+    var that = this
+    // wx.clearStorage()
+    wx.getStorage({
+      key: 'is_declared', 
+      success: function (res) {
+        console.log("is_declared", res.data)
+        that.setData({
+          is_declared: res.data
+        })
+      },
+    })
 
+    wx.getStorage({
+      key: 'selectitems',
+      success: function (res) {
+        console.log("selectitems", res.data)
+        that.setData({
+          datas02: res.data
+        })
+      },
+    })
   },
 
   /**
    * Lifecycle function--Called when page hide
    */
-  onHide: function () {
+  onHide: function() {
 
   },
 
   /**
    * Lifecycle function--Called when page unload
    */
-  onUnload: function () {
+  onUnload: function() {
 
   },
 
   /**
    * Page event handler function--Called when user drop down
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
 
   },
 
   /**
    * Called when page reach bottom
    */
-  onReachBottom: function () {
+  onReachBottom: function() {
 
   },
 
   /**
    * Called when user click on the top right corner to share
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
 
   }
 })
\ No newline at end of file

@@ -5,38 +5,39 @@
     <block wx:for="{{datas}}" wx:key="">
       <view class='card_rectangle_bg_column' style="margin-top:30rpx">
         <view style='position:absolute' style='padding:44rpx 30rpx;'>
-          <view hidden='{{index!=0}}' style='float:left;margin-top:4rpx'>
-            <text class='text_999_32'>北京小爱科技北京小爱科</text>
+          <view hidden='{{is_declared}}' style='float:left;margin-top:4rpx'>
+            <text class='text_999_32'>北京小爱智能科技</text>
           </view>
-          <view hidden='{{index==0}}' style='float:left;margin-top:4rpx'>
-            <text class='text_black_32'>北京小爱科技北京小爱</text>
+          <view hidden='{{!is_declared}}' style='float:left;margin-top:4rpx'>
+            <text class='text_black_32'>北京小爱智能科技</text>
           </view>
 
-          <image hidden='{{index!=0}}' class='declare_image_wrap' style='margin-top:12rpx;' src='/images/already_declare.png'></image>
-
-          <image hidden='{{index==0}}' class='declare_image_wrap' style='margin-top:12rpx;' src='/images/not_declare.png'></image>
-          <view style='float:right' hidden='{{index!=0}}' bindtap='godeclare'>
+          <image hidden='{{is_declared}}' class='declare_image_wrap' style='margin-top:12rpx;' src='/images/not_declare.png'></image>
+          <image hidden='{{!is_declared}}' class='declare_image_wrap' style='margin-top:12rpx;' src='/images/already_declare.png'></image>
+          <view style='float:right' hidden='{{is_declared}}' bindtap='godeclare'>
             <text class='text_blue_28'>去申报</text>
             <image class='arrow_img_wrap' src='/images/arrow_right.png'></image>
           </view>
-          <view style='float:right' hidden='{{index==0}}' bindtap='godetail'>
+          <view style='float:right' hidden='{{!is_declared}}' bindtap='godeclare'>
             <text class='text_blue_28'>调整使用项</text>
             <image class='arrow_img_wrap' src='/images/arrow_right.png'></image>
           </view>
 
         </view>
 
-        <view wx:if="{{index!=0}}" style=''>
-          <block wx:for="{{datas}}" wx:key="">
-            <view class='divide_line'></view>
-            <view style='padding:44rpx 30rpx;display:flex;flex-direction:column'>
-              <view >
-                <text class='text_666_30 float_left'>{{datas[index]}}</text>
-                <text class='text_blue_28 float_right' bindtap='lookandadd' id='{{index}}'>查看并调整</text>
-              </view>
-              <view style='margin-top:20rpx'>
-                <text class='text_gray_22 float_left'>已抵扣额度：4890.00</text>
-                <text class='text_gray_22 float_right'>剩余可抵扣额度：12810.00</text>
+        <view wx:if="{{is_declared}}" style=''>
+          <block wx:for="{{datas02}}" wx:key="">
+            <view hidden="{{!datas02[index].sureid}}">
+              <view class='divide_line'></view>
+              <view style='padding:44rpx 30rpx;display:flex;flex-direction:column'>
+                <view>
+                  <text class='text_666_30 float_left'>{{datas02[index].message}}</text>
+                  <text class='text_blue_28 float_right' bindtap='lookandadd' id='{{index}}'>查看并调整</text>
+                </view>
+                <view style='margin-top:20rpx'>
+                  <text class='text_gray_22 float_left'>已抵扣额度：4890.00</text>
+                  <text class='text_gray_22 float_right'>剩余可抵扣额度：12810.00</text>
+                </view>
               </view>
             </view>
           </block>

@@ -6,21 +6,38 @@ Page({
    */
   data: {
     cur_index:0,
-    add_text_arr: ["添加子女", "添加继续教育", "添加老人", "添加大病医疗", "添加住房贷款利息"],
-    title_arr: ["子女教育", "继续教育","赡养老人","大病医疗","住房贷款利息"]
+    add_text_arr: ["添加子女", "添加继续教育", "添加老人", "添加大病医疗", "添加住房贷款利息"], title:'',
+    datas02: []
   },
 
   /**
    * Lifecycle function--Called when page load
    */
   onLoad: function (options) {
+    var that= this
     console.log("options", options);
     this.setData({
       cur_index: options.index
     })
-    wx.setNavigationBarTitle({
-      title: this.data.title_arr[this.data.cur_index]
+    wx.getStorage({
+      key: 'selectitems',
+      success: function (res) {
+        console.log("selectitems", res.data)
+        wx.setNavigationBarTitle({
+          title: res.data[options.index].message,
+        })
+        that.setData({
+          title: res.data[options.index].message,
+          datas02: res.data
+        }) 
+      },
     })
+    
+    // if (this.data.datas02 && this.data.datas02.length>0){
+    //   for (var i = 0; i < this.data.datas02.length;i++){
+        
+    //   }
+    // }
   },
 
   /**
@@ -34,11 +51,18 @@ Page({
    * Lifecycle function--Called when page show
    */
   onShow: function () {
-
+    // wx.showLoading({
+    //   title: '加载中',
+    // })
+    // setTimeout(function(){
+    //   wx.hideLoading()
+    // },2000)
   },
 
   lookimg:function(){//查看材料
-
+    wx.showToast({
+      title: '查看材料',
+    })
   },
 
   goadd:function(e){//添加

@@ -25,7 +25,7 @@
     <view class='divide_line_f5f5f5'></view>
     <view style='margin:30rpx;' class='card_rectangle_bg_column'>
       <!-- 子女教育 -->
-      <view wx:if="{{cur_index==0}}" style='display:flex;flex-direction:column;padding:30rpx;'>
+      <view wx:if="{{title=='子女教育'}}" style='display:flex;flex-direction:column;padding:30rpx;'>
         <view style='height:40rpx'>
           <text class='text_999_28 float_left'>子女姓名</text>
           <text class='text_333_28 float_right'>纳兰嫣然</text>
@@ -54,14 +54,10 @@
           <text class='text_999_28 float_left'>扣除比例</text>
           <text class='text_333_28 float_right'>40%</text>
         </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>扣除时间</text>
-          <text class='text_333_28 float_right'>2018年10月</text>
-        </view>
       </view>
 
       <!-- 继续教育 -->
-      <view wx:if="{{cur_index==1}}" style='display:flex;flex-direction:column;padding:30rpx;'>
+      <view wx:if="{{title=='继续教育'}}" style='display:flex;flex-direction:column;padding:30rpx;'>
         <view style='height:40rpx'>
           <text class='text_999_28 float_left'>教育类型</text>
           <text class='text_333_28 float_right'>消防工程师</text>
@@ -74,14 +70,10 @@
           <text class='text_999_28 float_left'>职业资格编号</text>
           <text class='text_333_28 float_right'>ed29839284</text>
         </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>扣除时间</text>
-          <text class='text_333_28 float_right'>2018年1月</text>
-        </view>
       </view>
 
       <!-- 赡养老人 -->
-      <view wx:if="{{cur_index==2}}" style='display:flex;flex-direction:column;padding:30rpx;'>
+      <view wx:if="{{title=='赡养老人'}}" style='display:flex;flex-direction:column;padding:30rpx;'>
         <view style='height:40rpx'>
           <text class='text_999_28 float_left'>老人姓名</text>
           <text class='text_333_28 float_right'>任我行</text>
@@ -102,26 +94,18 @@
           <text class='text_999_28 float_left'>分摊比例</text>
           <text class='text_333_28 float_right'>5:5</text>
         </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>扣除时间</text>
-          <text class='text_333_28 float_right'>2019年10月</text>
-        </view>
       </view>
 
       <!-- 大病医疗 -->
-      <view wx:if="{{cur_index==3}}" style='display:flex;flex-direction:column;padding:30rpx;'>
+      <view wx:if="{{title=='大病医疗'}}" style='display:flex;flex-direction:column;padding:30rpx;'>
         <view style='height:40rpx'>
           <text class='text_999_28 float_left'>扣除金额</text>
           <text class='text_333_28 float_right'>42895</text>
         </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>扣除时间</text>
-          <text class='text_333_28 float_right'>2019年10月</text>
-        </view>
       </view>
 
       <!-- 住房 -->
-      <view wx:if="{{cur_index==4}}" style='display:flex;flex-direction:column;padding:30rpx;'>
+      <view wx:if="{{title=='住房贷款利息'||title=='住房租金'}}" style='display:flex;flex-direction:column;padding:30rpx;'>
         <view style='height:40rpx'>
           <text class='text_999_28 float_left'>配偶姓名</text>
           <text class='text_333_28 float_right'>刘顺丰</text>
@@ -130,10 +114,10 @@
           <text class='text_999_28 float_left'>配偶身份证号</text>
           <text class='text_333_28 float_right'>42902384023855252</text>
         </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>扣除时间</text>
-          <text class='text_333_28 float_right'>2019年10月</text>
-        </view>
+      </view>
+      <view style='height:40rpx;padding:0 30rpx;'>
+        <text class='text_999_28 float_left'>扣除时间</text>
+        <text class='text_333_28 float_right'>2019年10月</text>
       </view>
 
       <view class='divide_line_f5f5f5' style='margin-top:20rpx'></view>

@@ -13,7 +13,7 @@
       </picker>
       <view class='divide_line_f5f5f5'></view>
       <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>累计工资税收</text>
+        <text class='text_666_30 float_left'>累计工资收入</text>
         <text class='text_333_30_bold float_right'>400000.00</text>
       </view>
       <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
@@ -53,7 +53,7 @@
         <view class='view_bg_wrap' style='margin-top: 44rpx;'>
           <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
             <text class='text_num_wrap'>3838.9</text>
-            <text class='text_text_wrap'>本期应预扣预缴税额</text>
+            <text class='text_text_wrap'>累计应预扣预缴税额</text>
           </view>
           <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
           <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>

@@ -18,7 +18,7 @@
   <view class='divide_line_f5f5f5'></view>
 
   <view class="container_wrap">
-    <canvas canvas-id="pieCanvas" class="canvas" style="height:560rpx" bindtouchstart="touchHandler"></canvas>
+    <canvas canvas-id="pieCanvas" class="canvas" style="height:560rpx" bindtouchstart=""></canvas>
   </view>
 
   <view class='divide_line_f5f5f5'></view>

@@ -17,7 +17,7 @@ Page({
   onLoad: function(options) {
     var mydate = new Date();
     this.setData({
-      choosed_date: mydate.getFullYear() + "年" + (mydate.getMonth() + 1) + "月",
+      choosed_date: mydate.getFullYear() + "年" ,
       long_date: mydate.getTime() / 1000
     })
   },
@@ -42,7 +42,7 @@ Page({
     console.log('datelong', datelong)
     this.setData({
       long_date: datelong,
-      choosed_date: format.yearFormString(datelong) + "年" + format.monthFormString(datelong) + "月"
+      choosed_date: format.yearFormString(datelong) + "年" 
     })
   },
 

 {
-  "navigationBarTitleText": "历史缴纳明细"
+  "navigationBarTitleText": "历史信息"
 }
\ No newline at end of file

 <!--pages/main/finalpayment/historylist/historylist.wxml-->
 <view class='page'>
-  <picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange" style='background:#fff'>
+  <picker mode="date" fields="year" start="1970" end="2100" bindchange="datePickerChange" style='background:#fff'>
     <view style='padding:30rpx;'>
-      <text class='text_gray_32'>当前选择月份</text>
+      <text class='text_gray_32'>本人年度累计缴税情况</text>
       <view class='float_right'>
         <text class='text_gray_32'>{{choosed_date}}</text>
         <image class='arrow_wrap' src='/images/arrow_right.png'></image>

@@ -19,7 +19,7 @@ Page({
   onLoad: function(options) {
     var mydate = new Date();
     this.setData({
-      choosed_date: mydate.getFullYear() + "年" + (mydate.getMonth() + 1) + "月",
+      choosed_date: mydate.getFullYear() + "年" ,
       long_date: mydate.getTime() / 1000
     })
 
@@ -108,7 +108,7 @@ Page({
     console.log('datelong', datelong)
     this.setData({
       long_date: datelong,
-      choosed_date: format.yearFormString(datelong) + "年" + format.monthFormString(datelong) + "月"
+      choosed_date: format.yearFormString(datelong) + "年" 
     })
     },
 

 <!--pages/main/finalpayment/home.wxml-->
 <view class='page'>
-  <scroll-view style='padding-bottom:200rpx'>
-    <view style='background:#ffffff'>
-    <picker  mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
-      <view style='padding:30rpx;'>
-        <text class='text_gray_32'>当前选择月份</text>
-        <view class='float_right'>
-          <text class='text_gray_32'>{{choosed_date}}</text>
-          <image class='arrow_wrap' src='/images/arrow_right.png'></image>
+  <scroll-view style=''>
+    <view style='background:#fff'>
+      <picker mode="date" fields="year" start="1970" end="2100" bindchange="datePickerChange">
+        <view style='padding:30rpx;'>
+          <text class='text_gray_32'>本人年度累计缴税情况</text>
+          <view class='float_right'>
+            <text class='text_gray_32'>{{choosed_date}}</text>
+            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
+          </view>
         </view>
-      </view>
       </picker>
       <view class='divide_line_f5f5f5'></view>
       <view style='margin: 30rpx;positive:relative;width:92%;height:454rpx'>
@@ -48,17 +48,34 @@
         </view>
       </view>
       <view class='divide_line_f5f5f5'></view>
-      <view style='padding-left:30rpx;background:#ffffff;height:100rpx;'>
+      <view style='padding-left:30rpx;background-color:#fff;height:100rpx;'>
         <image class='icon_wrap' src="/images/rectangle_icon.png"></image>
         <text style='padding-left:20rpx;line-height:100rpx' class='text_gray_32'>专项附加扣除概览</text>
       </view>
     </view>
-    <view class="container_wrap">
-      <canvas canvas-id="pieCanvas" class="canvas" style="height:330px" ></canvas>
+    <view class="container_wrap" style='background:#fff'>
+      <canvas canvas-id="pieCanvas" class="canvas" style="height:330px"></canvas>
+    </view>
+    <view class='divide_line' style='margin-top:50rpx'></view>
+    <view style='height:180rpx;display: flex;flex-direction: row;align-items:center;background-color:#fff'>
+      <view style='flex: 1;text-align:center;display: flex;flex-direction: column;'>
+        <text class='text_333_bold_36'>3838.9</text>
+        <text class='text_333_22'>年度可扣除额度</text>
+      </view>
+      <view style='width:2rpx;height:84rpx;background:#E5E5E5;'></view>
+      <view style='flex: 1;text-align:center;display: flex;flex-direction: column;'>
+        <text class='text_333_bold_36'>10398.01</text>
+        <text class='text_333_22'>年度已扣除额度</text>
+      </view>
+      <view style='width:2rpx;height:84rpx;background:#E5E5E5;'></view>
+      <view style='flex: 1;text-align:center;display: flex;flex-direction: column;'>
+        <text class='text_333_bold_36'>133.09</text>
+        <text class='text_333_22'>剩余已抵扣额度</text>
+      </view>
     </view>
-  </scroll-view>
 
-  <view>
-    <button class="btn_bottom" bindtap='addinfo'>录入信息</button>
-  </view>
+    <view style='margin-top:50rpx;background:#357aeb' bindtap='addinfo'>
+      <button class="btn_bottom" >录入信息</button>
+    </view>
+  </scroll-view>
 </view>
\ No newline at end of file

 /* pages/main/finalpayment/home.wxss */
+
+.page{
+   background-color: #fcfcfc
+}
+
 .arrow_wrap {
   position: relative;
   width: 40rpx;
@@ -46,6 +51,20 @@ color: #357AEB;
 letter-spacing: 0;
 }
 
+.text_333_bold_36{
+font-size: 36rpx;
+font-family: PingFangSC-Semibold;
+color: #333333;
+text-align: center;
+}
+
+.text_333_22{
+font-size: 22rpx;
+font-family: PingFangSC-Regular;
+color: #333333;
+text-align: center;
+}
+
 .icon_wrap {
   width: 8rpx;
   height: 28rpx;
@@ -64,4 +83,15 @@ letter-spacing: 0;
 .canvas {
     width: 100%;
     height: 200px;
-}
\ No newline at end of file
+}
+
+.btn_bottom {
+  width: 100%;
+  height: 84rpx;
+  background: #357aeb;
+  text-align: center;
+  position: relative;
+  color: #fff;
+  bottom: 0;
+  line-height: 84rpx;
+}

@@ -5,14 +5,20 @@ Page({
    * Page initial data
    */
   data: {
-
+    datas: [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
+    choosed_date: '',
+    long_date: 0
   },
 
   /**
    * Lifecycle function--Called when page load
    */
   onLoad: function (options) {
-
+    var mydate = new Date();
+    this.setData({
+      choosed_date: mydate.getFullYear() + "年" + (mydate.getMonth() + 1) + "月",
+      long_date: mydate.getTime() / 1000
+    })
   },
 
   /**
@@ -29,6 +35,16 @@ Page({
 
   },
 
+  datePickerChange: function (e) {
+    console.log("e", e)
+    var datelong = Date.parse(new Date(e.detail.value)) / 1000
+    console.log('datelong', datelong)
+    this.setData({
+      long_date: datelong,
+      choosed_date: format.yearFormString(datelong) + "年" + format.monthFormString(datelong) + "月"
+    })
+  },
+
   /**
    * Lifecycle function--Called when page hide
    */

 <!--pages/main/finalpayment/inputinfo/inputinfo.wxml-->
 <view class='page'>
-  <view style='padding:30rpx;'>
-    <text class='text_gray_32'>当前选择月份</text>
-    <view class='float_right'>
-      <text class='text_gray_32'>2018年</text>
-      <image class='arrow_wrap' style='margin-top: 8rpx'src='/images/arrow_right.png'></image>
-    </view>
-  </view>
+<picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange" style='background:#fff'>
+    <view style='padding:30rpx;'>
+      <text class='text_gray_32'>记账月</text>
+      <view class='float_right'>
+        <text class='text_gray_32'>{{choosed_date}}</text>
+        <image class='arrow_wrap' style='margin-top:10rpx' src='/images/arrow_right.png'></image>
+      </view>
+    </view>
+  </picker>
   <view style='height:20rpx;width:100%;background:#f5f5f5'></view>
   <view style='padding:0 30rpx;height:100rpx'>
     <text class='text_333_28_bold ' style='line-height:100rpx'>专项扣除</text>
@@ -17,22 +19,27 @@
     <view style='height:2rpx;width:94%;background:#f5f5f5;align-self:center'></view>
     <view style='padding:0 30rpx;height:80rpx'>
       <text class='text_333_28 float_left'>基本养老保险</text>
-      <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'> </input>
+      <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'type='digit'> </input>
     </view>
     <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
     <view style='padding:0 30rpx;height:80rpx'>
       <text class='text_333_28 float_left'>基本失业保险</text>
-      <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'> </input>
+      <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'type='digit'> </input>
     </view>
     <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
     <view style='padding:0 30rpx;height:80rpx'>
       <text class='text_333_28 float_left'>基本医疗保险</text>
-      <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'> </input>
+      <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00' type='digit'> </input>
     </view>
     <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
     <view style='padding:0 30rpx;height:80rpx'>
       <text class='text_333_28 float_left'>住房公积金</text>
-      <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'> </input>
+      <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00' type='digit'> </input>
+    </view>
+    <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
+    <view style='padding:0 30rpx;height:80rpx'>
+      <text class='text_333_28 float_left'>总额</text>
+      <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00' type='digit'> </input>
     </view>
   </view>
 
@@ -50,12 +57,12 @@
     <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
     <view style='padding:0 30rpx;height:80rpx'>
       <text class='text_333_28 float_left'>总额</text>
-      <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'> </input>
+      <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00' type='digit'> </input>
     </view>
   </view>
 
 
-  <view style='height:20rpx;width:100%;background:#f5f5f5'></view>
+  <!-- <view style='height:20rpx;width:100%;background:#f5f5f5'></view>
   <view style='padding:0 30rpx;height:100rpx'>
     <text class='text_333_28_bold ' style='line-height:100rpx'>专项附加扣除</text>
     <text class='text_blue_28 float_right' style='line-height:100rpx'>编辑</text>
@@ -86,7 +93,7 @@
       <text class='text_333_28 float_left'>赡养老人</text>
       <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'> </input>
     </view>
-  </view>
+  </view> -->
 
   <view style='height:20rpx;width:100%;background:#f5f5f5'></view>
   <view style='padding:0 30rpx;height:100rpx'>
@@ -97,13 +104,13 @@
     <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
     <view style='padding:0 30rpx;height:80rpx'>
       <text class='text_333_28 float_left'>收入类型</text>
-      <image class='arrow_wrap' src='/images/arrow_right.png'></image>
+      <image class='arrow_wrap' style='margin-top:20rpx'src='/images/arrow_right.png'></image>
       <text class='text_333_28 float_right'>工作</text>
     </view>
     <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
     <view style='padding:0 30rpx;height:80rpx'>
       <text class='text_333_28 float_left'>收入金额(含免税部分)</text>
-      <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'> </input>
+      <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00' type='digit'> </input>
     </view>
     <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
     <view style='padding:0 30rpx;height:80rpx'>
@@ -122,7 +129,7 @@
     </view>
     <view style='height:2rpx;width:94%;background:#f5f5f5'></view>
     <view style='padding:0 30rpx;height:80rpx'>
-      <text class='text_333_28 float_left'>总额</text>
+      <text class='text_333_28 float_left'>含税收入总额</text>
       <input class='text_999_28 float_right' style='margin-top:12rpx' value='500.00'> </input>
     </view>
   </view>

@@ -7,14 +7,23 @@
 
 .text_333_28_bold {
   font-family: PingFangSC-Semibold;
-  font-size: 28rpx;
+  font-size: 30rpx;
   color: #333;
   text-align: left;
 }
 
-.arrow_wrap {
+.arrow_wrap01 {
   position: relative;
   width: 40rpx;
   height: 40rpx;
   align-self: center;
+  margin-top: 8rpx
+}
+
+.arrow_wrap02 {
+  position: relative;
+  width: 40rpx;
+  height: 40rpx;
+  align-self: center;
+  margin-top: 16rpx
 }
\ No newline at end of file

@@ -627,7 +627,7 @@ Page({
   formSubmit: function(e) {
     console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
     var regMoney = /^[0-9]*(\.[0,10]{1,2})?$/;
-    var regMobile = /^1[3|4|5|7|8][0-9]{9}$/;
+    var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$/;
     var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,}$/;
     var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,20}[a-z0-9]+$");
     var formdata = e.detail.value;

@@ -63,6 +63,8 @@
           <image class='arrow_wrap' src='/images/arrow_right.png'></image>
           <text class='text_333_28 float_right'>在职</text>
         </view> -->
+
+        <!-- 注释2018/11/26 -->
         <template is="picker_cell_normal" data="{{...personstatusData}}" />
         <view class="divide_line"></view>
 

@@ -829,7 +829,7 @@ Page({
   formSubmit: function(e) {
     console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
     var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,20}[a-z0-9]+$");
-    var regMobile = /^1[3|4|5|7|8][0-9]{9}$/;
+    var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$/;
     var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
     // var regMoney = /^[0-9]*(\.[0,9]{1,2})?$/;
     var regMoney = /^([1-9][\d]{0,10}|0)(\.[\d]{1,2})?$/

@@ -727,7 +727,7 @@ function drawPieText(series, opts, config, context, radius, center) {
   var seriesConvert = series.map(function(item) {
     var arc = 2 * Math.PI - (item._start_ + 2 * Math.PI * item._proportion_ / 2);
     // var text = item.format ? item.format(+item._proportion_.toFixed(2)) : util.toFixed(item._proportion_ * 100) + '%';
-    var text = item.data.toFixed(2);
+    var text = item.data.toFixed(2)+'元';
     var color = item.color;
     return {
       arc: arc,
@@ -1150,6 +1150,8 @@ function drawLegend(series, opts, config, context) {
       // context.setFillStyle(opts.extra.legendTextColor || '#333333');
       context.setFillStyle( '#6C7596');
       context.fillText(item.name, startX, startY + 9);
+      // context.setTextAlign("left");
+      // context.setTextBaseline("middle");
       context.closePath();
       context.stroke();
       startX += measureText(item.name) + 2 * padding;

@@ -727,7 +727,7 @@ function drawPieText(series, opts, config, context, radius, center) {
   var seriesConvert = series.map(function(item) {
     var arc = 2 * Math.PI - (item._start_ + 2 * Math.PI * item._proportion_ / 2);
     // var text = item.format ? item.format(+item._proportion_.toFixed(2)) : util.toFixed(item._proportion_ * 100) + '%';
-    var text = item.data.toFixed(2);
+    var text = item.data.toFixed(2) + '元';
     var color = item.color;
     return {
       arc: arc,