优化

 // pages/main/addtionalreduce/addextrainfo/addextrainfo.js
 var OSSInit;
-var baseUrl = getApp().globalData.baseUrl;
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
 Page({
 
   /**

 // pages/main/addtionalreduce/godeclare/godeclare.js
+
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
 Page({
 
   /**

 // pages/main/addtionalreduce/godetail/godetail.js
+
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
 Page({
 
   /**

 // pages/main/addtionalreduce/home.js
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
 Page({
 
   /**
@@ -51,8 +53,8 @@ Page({
     var that = this
     // wx.clearStorage()
     wx.getStorage({
-      key: 'is_declared', 
-      success: function (res) {
+      key: 'is_declared',
+      success: function(res) {
         console.log("is_declared", res.data)
         that.setData({
           is_declared: res.data
@@ -62,13 +64,33 @@ Page({
 
     wx.getStorage({
       key: 'selectitems',
-      success: function (res) {
+      success: function(res) {
         console.log("selectitems", res.data)
         that.setData({
           datas02: res.data
         })
       },
     })
+    this.getAdditionList()
+  },
+
+  getAdditionList: function() {
+    var that = this;
+    var Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/additional-settings',
+      data: {
+        limit: 10,
+        offset: 0
+      },
+      header: {
+        'content-type': 'application/json',
+        "Authorization": Authorization
+      },
+      success: function(res) {
+
+      }
+    })
   },
 
   /**

 // pages/main/addtionalreduce/childreneducate/childreneducate.js
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
+
 Page({
 
   /**
@@ -10,6 +13,8 @@ Page({
     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,
     datas02: []
   },
 
@@ -77,11 +82,25 @@ Page({
   goadd: function(e) { //添加
     var that = this
     wx.navigateTo({
-      url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index +'&title=' + that.data.title,
+      url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title,
     })
 
   },
 
+  showdeclare: function(e) {
+    console.log("showdeclare", e)
+    this.setData({
+      showModal: true
+    })
+  },
+
+  closeModal: function(e) {
+    console.log("closeModal", e)
+    this.setData({
+      showModal: false
+    })
+  },
+
   /**
    * Lifecycle function--Called when page hide
    */

 <!--pages/main/addtionalreduce/childreneducate/childreneducate.wxml-->
 
 <view class='page'>
-  <view style='display:flex;flex-direction:column'>
+  <view style='display:flex;flex-direction:column' hidden="{{showModal}}">
     <view style='height:180rpx'>
-      <image style='width:100%;height:180rpx;position:absolute;z-index: 1;' src='/images/extra_img_bg.png'></image>
+      <image style='width:100%;height:180rpx;position:absolute;' src='/images/extra_img_bg.png'></image>
       <view class='view_bg_wrap' style='margin-top: 48rpx;'>
         <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
           <text class='text_text_wrap'>累计使用额度</text>
@@ -18,12 +18,10 @@
     </view>
     <view style='width:100%;height:20rpx;background:#f5f5f5'></view>
 
-    <view style='padding-left:30rpx;background:#ffffff;height:100rpx;'>
-      <image class='icon_wrap' src="/images/rectangle_icon.png"></image>
-      <text style='padding-left:20rpx;line-height:100rpx' class='text_gray_32' wx:if="{{cur_index==0}}">子女教育</text>
-      <text style='padding-left:20rpx;line-height:100rpx' class='text_gray_32' wx:if="{{cur_index!=0}}">专项附加扣除概览</text>
+    <view style='padding-left:30rpx;background:#ffffff;padding-top:30rpx' bindtap='showdeclare'>
+      <image class='icon_declare_wrap' src="/images/icon_declare.png"></image>
+      <text style='padding-left:15rpx;' class='text_blue_28'>申报说明</text>
     </view>
-    <view class='divide_line_f5f5f5'></view>
     <view wx:if='{{new_data&&new_data!=null}}' style='margin:30rpx;' class='card_rectangle_bg_column'>
       <!-- 子女教育 -->
       <view wx:if="{{cur_index==0}}" style='display:flex;flex-direction:column;padding: 30rpx 30rpx 0 30rpx;'>
@@ -173,7 +171,7 @@
       </view>
 
       <!-- 大病医疗 -->
-      <view wx:if="{{title=='大病医疗'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
+      <view wx:if="{{cur_index==3}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
         <view style='height:40rpx'>
           <text class='text_999_28 float_left'>姓名</text>
           <text class='text_333_28 float_right'>{{new_data.name}}</text>
@@ -311,9 +309,16 @@
     </view>
 
     <view class='rectangle_dashed_bg' bindtap='goadd'>
-      <view class='text_blue_28' style='line-height:90rpx'>
+      <view class='text_blue_28' style='line-height:90rpx;text-align:center'>
         十 添加{{title}}
       </view>
     </view>
   </view>
-</view>
\ No newline at end of file
+</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]}}" ></image>
+    <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModal'>x</text>
+  </view>
+

@@ -2,7 +2,6 @@
 
 .view_bg_wrap {
   position: absolute;
-  z-index: 2;
   display: flex;
   width: 100%;
   flex-wrap: nowrap;
@@ -27,6 +26,11 @@
   height: 28rpx;
 }
 
+.icon_declare_wrap {
+  width: 23rpx;
+  height: 26rpx;
+}
+
 .text_gray_32 {
   font-size: 32rpx;
   color: #6c7596;
@@ -62,3 +66,23 @@
   border: 1px dashed #d7e4fb;
   border-radius: 4px;
 }
+
+/* 遮罩层 */
+.mask {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000;
+  opacity: 0.7;
+  z-index: 10;
+}
+
+.modal_img{
+  width: 325px;
+  height: 390px;
+  margin:0 auto;
+display:block;
+
+}
\ No newline at end of file

 // pages/main/advancepayment/home.js
 var format = require('../../../utils/util.js');
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
+
 Page({
 
   /**
    * Page initial data
    */
   data: {
+    // tab切换  
+    isshow : false,
+    currentTab: 0,
+    datas:["","",""],
     choosed_date: '',
     long_date: 0
   },
@@ -45,6 +52,37 @@ Page({
     })
   },
 
+  /** 
+  * 点击tab切换 
+  */
+  swichNav: function (e) {
+    var that = this;
+
+    if (this.data.currentTab === e.target.dataset.current) {
+      return false;
+    } else {
+      that.setData({
+        currentTab: e.target.dataset.current
+      })
+    }
+  },
+
+   /** 
+   * 滑动切换tab 
+   */
+  bindChange: function (e) {
+
+    var that = this;
+    that.setData({ currentTab: e.detail.current });
+  },
+
+  gospan:function(e){
+    console.log(e)
+    this.setData({
+      isshow: !this.data.isshow
+    })
+  },
+
   /**
    * Lifecycle function--Called when page hide
    */

 <!--pages/main/advancepayment/home.wxml-->
-<view class='page'>
-  <scroll-view style='margin-bottom:40rpx'>
+<view>
+  <!-- <scroll-view style='margin-bottom:40rpx'>
     <view style='padding:30rpx;background:#ffffff'>
       <picker  mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
         <view>
@@ -103,5 +103,62 @@
         <text class='text_wrap_right'>13860.00</text>
       </view>
     </view>
-  </scroll-view>
+  </scroll-view> -->
+
+  <picker mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
+    <view style='padding: 0 30rpx;background:#2F72E0'>
+      <text class='text_white_28'>{{choosed_date}}</text>
+      <view class='float_right'>
+        <image class='arrow_wrap' src='/images/arrow_down.png'></image>
+      </view>
+    </view>
+  </picker>
+  <view class="swiper-tab" style='display:flex'>
+    <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" style="margin:0 90rpx" data-current="0" bindtap="swichNav">预扣预缴</view>
+    <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" style="margin:0 90rpx" data-current="1" bindtap="swichNav">工资明细</view>
+  </view>
+  <view style='height:10rpx;background:#f8f8f8'></view>
+  <view class="swiper-box page" style="height:100%;margin-top:20rpx" bindchange="bindChange">
+    <view wx:if="{{currentTab==0}}">
+      <view wx:for="{{datas}}" style='margin-bottom:20rpx'>
+        <view class='card_rectangle_bg_column' style='padding:30rpx'>
+          <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>所得项目:工资薪金</text>
+          <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
+          <text class='text_666_28'>累计收入额:10800.00</text>
+          <text class='text_666_28'>累计应缴纳所得额:43800.00</text>
+          <text class='text_666_28'>累计应扣缴税额:1860.00</text>
+          <text class='text_666_28'>已预交税额:1130.00</text>
+          <text class='text_666_28'>本期应缴税额:730.00</text>
+        </view>
+      </view>
+    </view>
+    <view wx:else>
+      <view wx:for="{{datas}}" style='margin-bottom:20rpx'>
+        <view class='card_rectangle_bg_column' style='padding:30rpx'>
+          <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>薪酬批次工资:业务部八月工资</text>
+          <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view>
+          <text class='text_666_28'>发薪日:2018、10、31</text>
+          <text class='text_666_28'>计薪时间:2018/10/01-2018/10/31</text>
+          <text class='text_666_28'>应发额度:23460.00</text>
+          <text class='text_666_28'>实发:13980.00</text>
+          <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view>
+          <view wx:if="{{!isshow}}" bindtap='gospan'>
+            <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>展开</text>
+            <image class='head_image_wrap_down' src='/images/arrow_blue_down.png'></image>
+          </view>
+          <view wx:if="{{isshow}}" bindtap='gospan'>
+            <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>收起</text>
+            <image class='head_image_wrap_up' src='/images/arrow_blue_up.png'></image>
+          </view>
+          <view wx:if="{{isshow}}" wx:for="{{datas}}">
+            <view>
+              <text style='font-size:28rpx;color:#999;text-align:left'>中文姓名</text>
+              <text style='font-size:28rpx;color:#999;text-align:right'>嘎嘎</text>
+            </view>
+          </view>
+        </view>
+      </view>
+
+    </view>
+  </view>
 </view>
\ No newline at end of file

 /* pages/main/advancepayment/home.wxss */
-
-.page {
-  background-color: #fcfcfc;
+.text_white_28 {
+  font-size: 28rpx;
+  color: #fff;
+  font-family: PingFangSC-Regular;
+  line-height: 70rpx;
 }
 
-.text_gray_32 {
-  font-size: 32rpx;
-  color: #6c7596;
-  font-family: PingFangSC-Semibold;
-  line-height: 100rpx;
+.text_666_28 {
+  font-size: 28rpx;
+  color: #666;
+  font-family:  PingFangSC-Regular;
 }
 
 .arrow_wrap {
   position: relative;
-  width: 40rpx;
-  height: 40rpx;
-  margin-top: 30rpx;
+  width: 20rpx;
+  height: 14rpx;
+  margin-top: 28rpx;
   align-self: center;
 }
 
-.payment_img_bg {
+.swiper-tab {
+  width: 100%;
+  text-align: center;
+  line-height: 88rpx;
+  background: #fff;
+  box-sizing: border-box;
+}
+
+.swiper-tab-list {
+  font-size: 28rpx;
+  display: inline-block;
+  color: #999;
+  flex: 1
+}
+
+.on {
+  color: #4e8fe7;
+  border-bottom: 6rpx solid #4e8fe7;
+}
+
+.head_image_wrap_down {
+  width: 24rpx;
+  height: 16rpx;
+  margin-top: 24rpx;
+  float:right;
+}
+
+.head_image_wrap_up {
+  width: 26rpx;
+  height: 20rpx;
+  float:right;
+  margin-top:20rpx
+}
+
+/* .payment_img_bg {
   width: 92%;
   height: 312rpx;
 }
 
+.text_gray_32 {
+  font-size: 32rpx;
+  color: #6c7596;
+  font-family: PingFangSC-Semibold;
+  line-height: 100rpx;
+}
+
 .icon_wrap {
   width: 8rpx;
   height: 28rpx;
@@ -64,4 +106,4 @@
   color: #000;
   text-align: right;
   float: right
-}
+} */

@@ -2,6 +2,7 @@
 var format = require('../../../../utils/util.js');
 var wxCharts = require('../../../../utils/wxcharts02.js');
 var app = getApp();
+var baseUrl = app.globalData.baseUrl;
 var pieChart = null;
 Page({
 

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

@@ -2,6 +2,7 @@
 var format = require('../../../utils/util.js');
 var wxCharts = require('../../../utils/wxcharts01.js');
 var app = getApp();
+var baseUrl = app.globalData.baseUrl;
 var pieChart = null;
 Page({
 

 // pages/main/finalpayment/inputinfo/inputinfo.js
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
 Page({
 
   /**

 // pages/main/guide/guide.js
+
 Page({
 
   /**

@@ -4,7 +4,7 @@
   <scroll-view>
     <view class="bg_wrap">
 
-      <image class='bgimg' src='/images/guide_bg.jpg'></image>
+      <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>
@@ -58,6 +58,6 @@
     </view>
   </scroll-view>
   
-  <!-- <image class='chat-img' bindtap='gochat' src='/images/selected02.png'></image> -->
+  <image class='chat-img' bindtap='gochat' src='/images/icon_chat.png'></image>
 
 </view>
\ No newline at end of file

@@ -28,6 +28,7 @@
   display: flex;
   flex-direction: column;
   width: 100%;
+  padding-bottom: 40rpx
 }
 
 .icon_wrap{
@@ -58,9 +59,9 @@ text-align: left;
 }
 
 .chat-img{
-  width: 66rpx;
-  height: 66rpx;
+  width: 96rpx;
+  height: 96rpx;
   position: fixed; 
   right: 40rpx;
-  bottom: 60rpx;
+  bottom: 40rpx;
 }

 // pages/main/smartchat/chat.js
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
 Page({
 
   /**
    * Page initial data
    */
   data: {
-
+    showModal:true,
+    datas: ["", "", "", "", ""]
   },
 
   /**
@@ -29,6 +32,20 @@ Page({
 
   },
 
+  cancelhandle:function(e){
+    console.log("cancelhandle", e)
+      this.setData({
+        showModal: false
+      })
+  },
+
+  confirmhandle: function (e) {
+    console.log("confirmhandle",e)
+    this.setData({
+      showModal: false
+    })
+   },
+
   /**
    * Lifecycle function--Called when page hide
    */

 <!--pages/main/smartchat/chat.wxml-->
-<view>
-  <scroll-view>
+<view hidden='{{showModal}}'>
+  <scroll-view style='background:#fff;margin-bottom:150rpx'>
     <view wx:for="{{datas}}">
-      <view >666</view>
+      <view style='margin:50rpx 60rpx 0 36rpx;display:flex;flex-direction:row'>
+        <image style='width:136rpx;height:92rpx' src="/images/icon_robot.png"></image>
+        <view class='receive_bg'>
+          <text class='text_receive_wrap'>您要计算工资薪金的还是劳务报酬的个您要计算工资薪金的还是劳务报酬的</text>
+        </view>
+
+      </view>
+      <view style='margin:50rpx 36rpx 0 60rpx;display:flex;flex-direction:row'>
+        <view class='send_bg'>
+          <text class='text_send_wrap'>您要计算工资薪金的还是劳务报酬的个您要计算工资薪金的还是劳务报酬的</text>
+        </view>
+        <view style='width:136rpx;height:92rpx'>
+          <open-data type="userAvatarUrl"></open-data>
+        </view>
+      </view>
     </view>
   </scroll-view>
-  <view style='  width: 100%;height: 50rpx;position: fixed; bottom: 0rpx;text-align:center'>
-    <text>发送</text>
+  <view class='bottom_wrap'>
+    <input class='input_wrap'></input>
+    <text class='btn_send_wrap '>发送</text>
+  </view>
+</view>
+
+<!-- 自定义弹窗 -->
+<view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view>
+<view class='modal_lg' hidden="{{!showModal}}">
+  <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位资讯问题。</text>
+  <view class='divide_line_f5f5f5'></view>
+  <view style='width:100%;display:flex;flex-direction:column;align-items:center;max-height:450rpx'>
+    <block wx:for="{{datas}}" wx:for-index="idx">
+      <view wx:if="{{idx!=1}}">
+        <text class='text_item_black float_left'>北京小爱智能科技有限公司</text>
+      </view>
+      <view wx:else>
+        <text class='text_item_blue float_left'>北京小爱智能科技有限公司</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_cancel' bindtap='cancelhandle'>取消</text>
+    <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
+    <text class='text_confirm' bindtap='confirmhandle'>确定</text>
   </view>
 </view>
\ No newline at end of file

-/* pages/main/smartchat/chat.wxss */
\ No newline at end of file
+/* pages/main/smartchat/chat.wxss */
+
+/* 遮罩层 */
+.mask {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000;
+  opacity: 0.7;
+}
+
+.modal_lg {
+  width: 72%;
+  position: fixed;
+  top: 120px;
+  left: 0;
+  right: 0;
+  margin: 0 auto;
+  background-color: #fff;
+  border-radius: 7px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.text_title {
+  font-family: PingFangSC-Regular;
+  font-size: 15px;
+  color: #000;
+  letter-spacing: 0;
+  text-align: center;
+  line-height: 45rpx;
+  margin: 42rpx 42rpx 30rpx 42rpx;
+}
+
+.icon_choosed {
+  width: 24rpx;
+  height: 26rpx;
+  margin-top: 30rpx;
+  margin-right: 20rpx;
+  float: right;
+}
+
+.text_item_blue {
+  font-family: PingFangSC-Regular;
+  font-size: 16px;
+  color: #108ee9;
+  letter-spacing: 0;
+  line-height: 18px;
+  padding: 30rpx;
+}
+
+.text_item_black {
+  font-family: PingFangSC-Regular;
+  font-size: 16px;
+  color: #333;
+  letter-spacing: 0;
+  line-height: 18px;
+  padding: 30rpx;
+}
+
+.text_cancel {
+  font-family: PingFangSC-Regular;
+  font-size: 36rpx;
+  color: #999;
+  letter-spacing: 0;
+  text-align: center;
+  line-height: 100rpx;
+  flex: 1;
+}
+
+.text_confirm {
+  font-family: PingFangSC-Regular;
+  font-size: 36rpx;
+  color: #108ee9;
+  letter-spacing: 0;
+  text-align: center;
+  line-height: 100rpx;
+  flex: 1;
+}
+
+/* 聊天页面 */
+
+.bottom_wrap {
+  width: 100%;
+  height: 120rpx;
+  position: fixed;
+  bottom: 0rpx;
+  background: #fcfcfc;
+}
+
+.btn_send_wrap {
+  background: #6db1ff;
+  border-radius: 4px;
+  height: auto;
+  width: 86px;
+  color: #fff;
+  font-size: 32rpx;
+  float: right;
+  text-align: center;
+  line-height: 80rpx;
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
+  margin-right: 30rpx;
+}
+
+.input_wrap {
+  background: #fff;
+  width: 486rpx;
+  height: 40px;
+  float: left;
+  margin: 24rpx 30rpx;
+  border: 1px solid #e7e7e7;
+  border-radius: 4px;
+}
+
+.receive_bg{
+  border: 1px solid #e7e7e7;
+  border-radius: 8px;
+  padding: 24rpx 28rpx;
+  margin-left: 28rpx;
+}
+
+.text_receive_wrap {
+  font-family: PingFangSC-Regular;
+  font-size: 14px;
+  color: #4a4a4a;
+  letter-spacing: 0;
+}
+
+.send_bg{
+  background: #6DB1FF;
+border-radius: 8px;
+  padding: 24rpx 28rpx;
+  margin-right: 28rpx;
+}
+
+.text_send_wrap {
+  font-family: PingFangSC-Regular;
+  font-size: 14px;
+  color: #4a4a4a;
+  letter-spacing: 0;
+}