部分新页面添加

@@ -2,10 +2,18 @@
   "pages": [
     "pages/main/guide/guide",
     "pages/getPhone/getPhone",
-    "pages/main/home/home",
-    "pages/main/editinfo/editinfo",
-    "pages/main/addinfo/addinfo",
-    "pages/main/idinfo/idinfo",
+    "pages/main/taxperson/home",
+    "pages/main/taxperson/editinfo/editinfo",
+    "pages/main/taxperson/addinfo/addinfo",
+    "pages/main/taxperson/idinfo/idinfo",
+
+    "pages/main/addtionalreduce/home",
+    "pages/main/addtionalreduce/godeclare/godeclare",
+    "pages/main/addtionalreduce/godetail/godetail",
+
+    "pages/main/advancepayment/home",
+
+    "pages/main/finalpayment/home",
     "pages/login/login"
   ],
   "window": {

@@ -19,6 +19,12 @@
   height: 2rpx;
 }
 
+.divide_line_f5f5f5{
+  background: #f5f5f5;
+  width: 100%;
+  height: 2rpx;
+}
+
 .item_body {
   width: 100%;
   height: 80rpx;
@@ -47,6 +53,18 @@
   line-height: 80rpx;
 }
 
+.text_666_30 {
+  font-family: PingFangSC-Regular;
+  font-size: 30rpx;
+  color: #666;
+}
+
+.text_333_30_bold {
+  font-family: PingFangSC-Semibold;
+  font-size: 30rpx;
+  color: #333;
+}
+
 .text_999_28 {
   font-family: PingFangSC-Regular;
   font-size: 26rpx;
@@ -55,6 +73,12 @@
   line-height: 80rpx;
 }
 
+.text_black_32 {
+  font-size: 32rpx;
+  color: #000;
+  line-height: 40rpx;
+}
+
 .arrow_wrap {
   width: 40rpx;
   height: 40rpx;
@@ -82,3 +106,27 @@
   bottom: 0;
   line-height: 84rpx;
 }
+
+.card_rectangle_bg_row {
+  position: relative;
+  margin: 0 auto;
+  display: flex;
+  flex-direction: row;
+  margin-left: 30rpx;
+  margin-right: 30rpx;
+  background: #fff;
+  box-shadow: 0 4px 14px 0 rgba(208, 208, 208, 0.50);
+  border-radius: 8px;
+}
+
+.card_rectangle_bg_column {
+  position: relative;
+  margin: 0 auto;
+  display: flex;
+  flex-direction: column;
+  margin-left: 30rpx;
+  margin-right: 30rpx;
+  background: #fff;
+  box-shadow: 0 4px 14px 0 rgba(208, 208, 208, 0.50);
+  border-radius: 8px;
+}

+// pages/main/addtionalreduce/godeclare/godeclare.js
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    flag_housing01: false,
+    flag_housing02: false,
+    repContent: [{
+      message: '子女教育'
+    }, {
+      message: '继续教育'
+    }, {
+      message: '赡养老人'
+    }, {
+      message: '大病医疗'
+    }, {
+      message: '住房'
+    }],
+    selectIndex: [{
+      sureid: false
+    }, {
+      sureid: false
+    }, {
+      sureid: false
+    }, {
+      sureid: false
+    }, {
+      sureid: false
+    }, ],
+
+  },
+
+  /**
+   * 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() {
+
+  },
+
+  selectRep: function(e) {
+    let index = e.currentTarget.dataset.selectindex; //当前点击元素的自定义数据，这个很关键 
+    let selectIndex = this.data.selectIndex; //取到data里的selectIndex 
+    selectIndex[index].sureid = !selectIndex[index].sureid; //点击就赋相反的值 
+    this.setData({
+      selectIndex: selectIndex //将已改变属性的json数组更新 
+    })
+  },
+
+  housing01: function(e) {
+    this.setData ({
+      flag_housing01:!this.data.flag_housing01
+    })
+    if (this.data.flag_housing02) {
+      this.setData({
+        flag_housing02: !this.data.flag_housing02
+      })
+    }
+  },
+
+  housing02: function(e) {
+    this.setData({
+      flag_housing02:!this.data.flag_housing02
+    })
+    if (this.data.flag_housing01) {
+      this.setData({
+        flag_housing01: !this.data.flag_housing01
+      })
+    }
+  },
+
+  /**
+   * 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() {
+
+  }
+})
\ No newline at end of file

+{
+  "navigationBarTitleText": "立即申报"
+}
\ No newline at end of file

+<!--pages/main/addtionalreduce/godeclare/godeclare.wxml-->
+<view class='page'>
+  <view>
+    <view class='text_gray_30' style='padding:30rpx'>您新加入了一家单位，请选择在该单位申报的专项附加扣除项</view>
+    <view style='padding:0 30rpx'>
+      <view class='divide_line_f5f5f5'></view>
+      <text class='text_black_30'>选择申报单位</text>
+      <view class='float_right'>
+        <text class='text_black_30'>请选择申报单位</text>
+        <image class='arrow_img_wrap' src='/images/arrow_right.png'></image>
+      </view>
+      <view class='divide_line_f5f5f5'></view>
+    </view>
+    <text class='text_black_30' style='padding-left:30rpx'>选择专项附加扣除项</text>
+
+    <view wx:for="{{repContent}}" 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 bindtap='housing01'>
+        <view class='float_left'>
+          <image class='single-img' src="{{flag_housing01? '/images/selected02.png' : '/images/unselected02.png'}}" style='margin-top:16rpx'></image>
+        </view>
+        <text class="{{flag_housing01?'select_blue_28':'select_666_28'}}" style='line-height:62rpx;margin-left: 26rpx;'>住房贷款利息</text>
+      </view>
+      <text style='margin:0rpx 20rpx;color:#999;font-size: 28rpx;line-height:62rpx'>/</text>
+      <view bindtap='housing02'>
+        <view class='float_left'>
+          <image class='single-img' src="{{flag_housing02? '/images/selected02.png' : '/images/unselected02.png'}}" style='margin-top:16rpx'></image>
+        </view>
+        <text class="{{flag_housing02?'select_blue_28':'select_666_28'}}" style='line-height:62rpx;margin-left: 26rpx;'>住房租金</text>
+      </view>
+    </view>
+  </view>
+
+  <view>
+    <button class="btn_bottom"> 提交</button>
+  </view>
+</view>
\ No newline at end of file

+.text_gray_30 {
+  font-size: 30rpx;
+  color: #6C7596 ;
+  font-weight: bold;
+}
+
+.text_black_30 {
+  font-size: 30rpx;
+  color: #000;
+  line-height: 90rpx;
+}
+
+.arrow_img_wrap {
+  width: 40rpx;
+  height: 40rpx;
+  align-items: center;
+  float: right;
+  margin-top:24rpx;
+}
+
+.multi-selection{
+  position: relative;
+  height: 80rpx;
+  align-items: center
+}
+
+.multi-img{
+  width: 40rpx;
+  height: 40rpx;
+}
+
+.single-img{
+  width: 30rpx;
+  height: 30rpx;
+}
+
+.select_blue_28{
+  font-size: 28rpx;
+color: #1890FF;
+}
+
+.select_666_28{
+  font-size: 28rpx;
+color: #666666;
+}
\ No newline at end of file

+// pages/main/addtionalreduce/godetail/godetail.js
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    datas: ["子女教育", "继续教育", "赡养老人", "大病医疗"]
+  },
+
+  /**
+   * 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 () {
+
+  }
+})
\ No newline at end of file

+{}
\ No newline at end of file

+<!--pages/main/addtionalreduce/godetail/godetail.wxml-->
+<view class='page' style='margin-bottom:30rpx'>
+  <view class='text_gray_30' style='padding:30rpx'>您在“北京小爱科技”申报的专项附加扣除项已添加完成，请完善各项的具体申报内容。</view>
+  <view style='padding-left:30rpx;padding-right:30rpx'>
+    <image class='icon_wrap' src="/images/rectangle_icon.png"></image>
+    <text style='padding-left:20rpx' class='text_gray_32'>北京小爱科技公司</text>
+    <view class='divide_line_f5f5f5' style='margin-top:30rpx' ></view>
+  </view>
+  <view wx:if="true">
+    <view wx:for="{{datas}}">
+      <view class='card_rectangle_bg_column' style='padding:30rpx;margin-top:30rpx'>
+        <text class='text_black_32'>{{datas[index]}}</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>
+              </view>
+              <view class='divide_line_f5f5f5'></view>
+              <view style='padding:20rpx 0'>
+                <text class='text_blue_28'>查看并调整</text>
+                <image class='arrow_img_wrap' src='/images/arrow_right.png'></image>
+              </view>
+      </view>
+    </view>
+  </view>
+</view>

+/* pages/main/addtionalreduce/godetail/godetail.wxss */
+.text_gray_30 {
+  font-size: 30rpx;
+  color: #6C7596 ;
+  font-weight: bold;
+}
+
+.text_gray_32 {
+  font-size: 32rpx;
+  color: #6C7596 ;
+  font-family: PingFangSC-Semibold;
+}
+
+.text_gray_22 {
+  font-size: 22rpx;
+  color: #9DA7B3;
+}
+
+.icon_wrap{
+  width: 8rpx;
+  height: 28rpx;
+}
+
+.text_blue_28 {
+  font-family: PingFangSC-Regular;
+  font-size: 28rpx;
+  color: #357aeb;
+}
+
+.arrow_img_wrap {
+  width: 40rpx;
+  height: 40rpx;
+  align-items: center;
+  float: right;
+  margin-top:10rpx;
+
+}
\ No newline at end of file

+// pages/main/addtionalreduce/home.js
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+      datas:["子女教育","继续教育","赡养老人","大病医疗"]
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function (options) {
+
+  },
+
+  godeclare:function(){
+    wx.navigateTo({
+      url: 'godeclare/godeclare',
+    })
+  },
+
+  godetail: function () {
+      wx.navigateTo({
+        url: 'godetail/godetail',
+      })
+  },
+
+  /**
+   * 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 () {
+
+  }
+})
\ No newline at end of file

+{
+  "navigationBarTitleText": "专项附加扣除"
+}
\ No newline at end of file

+<!--pages/main/addtionalreduce/home.wxml-->
+<view class='page'>
+
+  <view style='margin-bottom:30rpx'>
+    <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>
+          <view hidden='{{index==0}}' 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'>
+            <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'>
+            <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'>查看并调整</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>
+          </block>
+        </view>
+      </view>
+    </block>
+  </view>
+
+
+</view>
\ No newline at end of file

+/* pages/main/addtionalreduce/home.wxss */
+
+.page{
+  background-color: #fcfcfc;
+}
+
+.text_black_32 {
+  font-size: 32rpx;
+  color: #000;
+  line-height: 40rpx;
+  font-weight: bold;
+}
+
+.text_999_32 {
+  font-size: 32rpx;
+  color: #999;
+  line-height: 40rpx;
+}
+
+.text_666_30 {
+  font-size: 30rpx;
+  color: #999;
+  line-height: 40rpx;
+}
+
+.text_blue_28 {
+  font-family: PingFangSC-Regular;
+  font-size: 28rpx;
+  color: #357aeb;
+  text-align: right;
+}
+
+.text_gray_22 {
+  font-size: 22rpx;
+  color: #9DA7B3;
+}
+
+.rectangle_lightorange_bg {
+  margin: 10rpx 0rpx;
+  height: 40rpx;
+  background-color: #fff5dc;
+  border-radius: 0 0 4px 4px;
+  border: 1px solid ;
+}
+
+.declare_image_wrap{
+  width: 90rpx;
+  height: 40rpx;
+  margin-left: 10rpx;
+}
+
+.arrow_img_wrap {
+  width: 40rpx;
+  height: 40rpx;
+  align-items: center;
+  float: right;
+  margin-top:10rpx;
+
+}

+// pages/main/advancepayment/home.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 () {
+
+  }
+})
\ No newline at end of file

+{
+  "navigationBarTitleText": "预扣预缴"
+}
\ No newline at end of file

+<!--pages/main/advancepayment/home.wxml-->
+<view class='page'>
+  <scroll-view>
+    <view style='padding:30rpx;background:#ffffff'>
+      <view>
+        <text class='text_gray_32'>当前选择月份</text>
+        <view class='float_right'>
+          <text class='text_gray_32'>2018年11月</text>
+          <image class='arrow_wrap' src='/images/arrow_right.png'></image>
+        </view>
+      </view>
+      <view class='divide_line_f5f5f5'></view>
+      <view style='padding:30rpx 0'>
+        <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>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>累计免税收入</text>
+        <text class='text_333_30_bold float_right'>40.00</text>
+      </view>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>累计基本减除费用</text>
+        <text class='text_333_30_bold float_right'>8000.00</text>
+      </view>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>累计专项扣除额</text>
+        <text class='text_333_30_bold float_right'>84783.00</text>
+      </view>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>累计专项附加扣除额</text>
+        <text class='text_333_30_bold float_right'>32200.00</text>
+      </view>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>累计其他扣除额</text>
+        <text class='text_333_30_bold float_right'>0.00</text>
+      </view>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>累计预缴应纳税所得额</text>
+        <text class='text_333_30_bold float_right'>32983000.00</text>
+      </view>
+    </view>
+    <view style='padding:30rpx;positive:relative;width:92%;height:312rpx'>
+      <image class=' payment_img_bg ' src='/images/payment_bg.png ' style='position:absolute;z-index: 1;'></image>
+      <view>
+        <view style='position:absolute;z-index: 2'>
+          <text >38382738</text>
+        <text >38382739</text>
+        <text >38382730</text>
+        </view>
+        
+      </view>
+    </view>
+  </scroll-view>
+</view>
\ No newline at end of file

+/* pages/main/advancepayment/home.wxss */
+.page{
+  background-color: #fcfcfc;
+}
+
+.text_gray_32 {
+  font-size: 32rpx;
+  color: #6C7596 ;
+  font-family: PingFangSC-Semibold;
+  line-height: 100rpx;
+}
+
+.arrow_wrap {
+  position: relative;
+  width: 40rpx;
+  height: 40rpx;
+  margin-top: 30rpx;
+  align-self: center
+}
+
+.payment_img_bg{
+  width: 92%;
+  height: 312rpx;
+}
\ No newline at end of file

+// pages/main/finalpayment/home.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 () {
+
+  }
+})
\ No newline at end of file

+{
+  "navigationBarTitleText": "汇算清缴"
+}
\ No newline at end of file

+<!--pages/main/finalpayment/home.wxml-->
+<text>pages/main/finalpayment/home.wxml</text>

+/* pages/main/finalpayment/home.wxss */
\ No newline at end of file

@@ -34,7 +34,7 @@ Page({
    */
   gotaxPerson:function(){
       wx.navigateTo({
-        url: '../home/home',
+        url: '../taxperson/home',
       })
   },
 
@@ -43,7 +43,7 @@ Page({
    */
   goAdditionalDiduction: function () {
     wx.navigateTo({
-      url: '../home/home',
+      url: '../addtionalreduce/home',
     })
   },
 
@@ -52,7 +52,7 @@ Page({
    */
   goAdvancePayment: function () {
     wx.navigateTo({
-      url: '../home/home',
+      url: '../advancepayment/home',
     })
   },
 
@@ -61,7 +61,7 @@ Page({
    */
   goFinalPayment: function () {
     wx.navigateTo({
-      url: '../home/home',
+      url: '../finalpayment/home',
     })
   },
 

 <!--pages/main/guide/guide.wxml-->
 
-<view class='page'>
+<scroll-view class='page'>
   <view class="bg_wrap">
     <image class='bgimg' src='/images/guide_bg.jpg'></image>
 
-    <view class='card_rectangle_bg' style='margin-top:280rpx;padding:30rpx' bindtap='gotaxPerson'>
+    <view class='card_rectangle_bg_row' style='margin-top:280rpx;padding:30rpx' bindtap='gotaxPerson'>
       <image class="icon_wrap" src="/images/tax_person.png"></image>
       <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
-      <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
+      <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>
         <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>采集本人和家庭成员的基本信息</text>
       </view>
       <image class='arrow_wrap' src='/images/arrow_right.png'></image>
     </view>
 
-    <view class='card_rectangle_bg' style='margin-top:30rpx;padding:30rpx' bindtap='goAdditionalDiduction'>
+    <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdditionalDiduction'>
       <image class="icon_wrap" src="/images/additional_deduction.png"></image>
       <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
-      <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
+      <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>
         <text style='font-size:28rpx;color: #999;margin-top:6rpx'>上传可抵扣的专项附加扣除费用票据</text>
       </view>
       <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
     </view>
 
-    <view class='card_rectangle_bg' style='margin-top:30rpx;padding:30rpx' bindtap='goAdvancePayment'>
+    <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdvancePayment'>
       <image class="icon_wrap" src="/images/advance_payment.png"></image>
       <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
-      <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
+      <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>
         <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看本人的个税扣缴明细</text>
       </view>
       <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
     </view>
 
-    <view class='card_rectangle_bg' style='margin-top:30rpx;padding:30rpx' bindtap='goFinalPayment'>
+    <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goFinalPayment'>
       <image class="icon_wrap" src="/images/final_payment.png"></image>
       <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
-      <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
+      <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>
         <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看个人年度税收信息，年度汇算清缴</text>
       </view>
       <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
     </view>
 
-    <!-- <view class='card_rectangle_bg' style='margin-top:30rpx;padding:30rpx' bindtap='gotaxCalculate'>
+    <!-- <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='gotaxCalculate'>
       <image class="icon_wrap" src="/images/tax_calculate.png"></image>
       <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
       <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
@@ -55,4 +55,4 @@
     </view> -->
   </view>
 
-</view>
\ No newline at end of file
+</scroll-view>
\ No newline at end of file

@@ -12,7 +12,7 @@
   align-self: center;
 }
 
-.card_rectangle_bg {
+/* .card_rectangle_bg {
   position: relative;
   margin: 0 auto;
   display: flex;
@@ -22,7 +22,7 @@
   background: #fff;
   box-shadow: 0 4px 14px 0 rgba(208, 208, 208, 0.50);
   border-radius: 8px;
-}
+} */
 
 .bg_wrap {
   display: flex;

 // pages/main/addinfo/addinfo.js
 var app = getApp();
-var format = require('../../../utils/util.js');
+var format = require('../../../../utils/util.js');
 var baseUrl = app.globalData.baseUrl;
 Page({
 

 <!--pages/main/addinfo/addinfo.wxml-->
-<import src="../../common/picker_cell" />
+<import src="../../../common/picker_cell" />
 
 <view class='page'>
   <form bindsubmit='formSubmit'>

-// pages/main//editinfo/editinfo.js
-var format = require('../../../utils/util.js');
+var format = require('../../../../utils/util.js');
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 Page({

 <!--pages/main//editinfo/editinfo.wxml-->
-<import src="../../common/picker_cell" />
+<import src="../../../common/picker_cell" />
 
 <view class='page'>
   <form bindsubmit='formSubmit'>

@@ -149,14 +149,14 @@ Page({
   goadd: function(e) {
     console.log(e)
     wx.navigateTo({
-      url: '../addinfo/addinfo',
+      url: 'addinfo/addinfo',
     })
   },
 
   goedit: function(e) {
     console.log(e)
     wx.navigateTo({
-      url: '../editinfo/editinfo?id=' + e.currentTarget.id,
+      url: 'editinfo/editinfo?id=' + e.currentTarget.id,
     })
   },