Merge branch 'dev_wy' into dev2.0

wangyu
images/8KB.png
images/additional_deduction.jpg
images/additional_deduction.png
images/advance_payment.jpg
images/advance_payment.png
images/childedu_declare.png
images/close.png
images/continueedu_declare.png
images/final_payment.jpg
images/final_payment.png
images/guide_bg.png
images/health_declare.png
images/house_declare.png
images/icon_declare.png
images/nodata.png
images/openmodal_img.png
images/support_older_declare.png
images/tax_person.jpg
images/tax_person.png
pages/main/addtionalreduce/godetail/godetail.wxml
--- a/images/8KB.png 0 → 100644
查看文件 @ffcb395
+++ b/images/8KB.png 0 → 100644
查看文件 @ffcb395
--- a/images/additional_deduction.jpg 已删除 100644 → 0
查看文件 @6a48893
+++ b/images/additional_deduction.jpg 已删除 100644 → 0
查看文件 @6a48893
--- a/images/additional_deduction.png 0 → 100644
查看文件 @ffcb395
+++ b/images/additional_deduction.png 0 → 100644
查看文件 @ffcb395
--- a/images/advance_payment.jpg 已删除 100644 → 0
查看文件 @6a48893
+++ b/images/advance_payment.jpg 已删除 100644 → 0
查看文件 @6a48893
--- a/images/advance_payment.png 0 → 100644
查看文件 @ffcb395
+++ b/images/advance_payment.png 0 → 100644
查看文件 @ffcb395
--- a/images/childedu_declare.png
查看文件 @ffcb395
+++ b/images/childedu_declare.png
查看文件 @ffcb395
--- a/images/close.png 0 → 100644
查看文件 @ffcb395
+++ b/images/close.png 0 → 100644
查看文件 @ffcb395
--- a/images/continueedu_declare.png
查看文件 @ffcb395
+++ b/images/continueedu_declare.png
查看文件 @ffcb395
--- a/images/final_payment.jpg 已删除 100644 → 0
查看文件 @6a48893
+++ b/images/final_payment.jpg 已删除 100644 → 0
查看文件 @6a48893
--- a/images/final_payment.png 0 → 100644
查看文件 @ffcb395
+++ b/images/final_payment.png 0 → 100644
查看文件 @ffcb395
--- a/images/guide_bg.png
查看文件 @ffcb395
+++ b/images/guide_bg.png
查看文件 @ffcb395
--- a/images/health_declare.png
查看文件 @ffcb395
+++ b/images/health_declare.png
查看文件 @ffcb395
--- a/images/house_declare.png
查看文件 @ffcb395
+++ b/images/house_declare.png
查看文件 @ffcb395
--- a/images/icon_declare.png 已删除 100644 → 0
查看文件 @6a48893
+++ b/images/icon_declare.png 已删除 100644 → 0
查看文件 @6a48893
--- a/images/nodata.png 0 → 100644
查看文件 @ffcb395
+++ b/images/nodata.png 0 → 100644
查看文件 @ffcb395
--- a/images/openmodal_img.png
查看文件 @ffcb395
+++ b/images/openmodal_img.png
查看文件 @ffcb395
--- a/images/support_older_declare.png
查看文件 @ffcb395
+++ b/images/support_older_declare.png
查看文件 @ffcb395
--- a/images/tax_person.jpg 已删除 100644 → 0
查看文件 @6a48893
+++ b/images/tax_person.jpg 已删除 100644 → 0
查看文件 @6a48893
--- a/images/tax_person.png 0 → 100644
查看文件 @ffcb395
+++ b/images/tax_person.png 0 → 100644
查看文件 @ffcb395
--- a/pages/main/addtionalreduce/godetail/godetail.wxml
查看文件 @ffcb395
+++ b/pages/main/addtionalreduce/godetail/godetail.wxml
查看文件 @ffcb395
@@ -17,7 +17,7 @@
           </view>
           <view class='float_right' style='flex:1'>
             <text class='text_999_24 '>可扣除金额</text>
-            <text class='text_orange_28 ' style='margin-left:20rpx'>￥1000/月</text>
+            <text class='text_orange_28 ' style='margin-left:20rpx'>￥0/月</text>
           </view>
         </view>
       </view>
@@ -28,17 +28,27 @@
           <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='{{idx}}'>查看</text>
         </view>
-        <view style='padding:20rpx'>
+        <view 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>
+          </view>
+          <view class='float_right' style='flex:1'>
+            <text class='text_999_24 '>可扣除金额</text>
+            <text class='text_orange_28 ' style='margin-left:20rpx'>￥0/月</text>
+          </view>
+        </view>
+        <!-- <view 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'>按月</text>
+                <text class='text_gray_28' style='margin-left:20rpx'>月度</text>
               </view>
               <view class='float_right' style='flex:1'>
                 <text class='text_999_24 '>可扣除金额</text>
-                <text class='text_orange_28 ' style='margin-left:20rpx'>￥1000/年</text>
+                <text class='text_orange_28 ' style='margin-left:20rpx'>￥0/月</text>
               </view>
             </view>
           </view>
@@ -47,15 +57,15 @@
             <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'>按年</text>
+                <text class='text_gray_28' style='margin-left:20rpx'>月度</text>
               </view>
               <view class='float_right' style='flex:1'>
                 <text class='text_999_24 '>可扣除金额</text>
-                <text class='text_orange_28 ' style='margin-left:20rpx'>￥3600/年</text>
+                <text class='text_orange_28 ' style='margin-left:20rpx'>￥0/月</text>
               </view>
             </view>
           </view>
-        </view>
+        </view> -->
       </view>
       <view wx:if="{{item=='medical_fund'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column'>
         <view style='height:40rpx'>
@@ -70,7 +80,7 @@
           </view>
           <view class='float_right' style='flex:1'>
             <text class='text_999_24 '>可扣除金额</text>
-            <text class='text_orange_28 ' style='margin-left:20rpx'>￥0/月</text>
+            <text class='text_orange_28 ' style='margin-left:20rpx'>￥0/年</text>
           </view>
         </view>
       </view>
@@ -87,7 +97,7 @@
           </view>
           <view class='float_right' style='flex:1'>
             <text class='text_999_24 '>可扣除金额</text>
-            <text class='text_orange_28 ' style='margin-left:20rpx'>￥24000/月</text>
+            <text class='text_orange_28 ' style='margin-left:20rpx'>￥0/月</text>
           </view>
         </view>
       </view>
@@ -104,7 +114,7 @@
           </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'>￥0/月</text>
           </view>
         </view>
       </view>
--- a/pages/main/guide/guide.wxml
查看文件 @ffcb395
+++ b/pages/main/guide/guide.wxml
查看文件 @ffcb395
@@ -7,7 +7,7 @@
       <image class='bgimg' src='/images/guide_bg.png'></image>
       <view class='card_rectangle_bg_row' style='margin-top:310rpx;padding:30rpx' bindtap='gotaxPerson'>
-        <image class="icon_wrap" src="/images/tax_person.jpg"></image>
+        <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: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.jpg"></image>
+        <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: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.jpg"></image>
+        <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: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.jpg"></image>
+        <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:440rpx;margin-left:30rpx;align-self:center;'>
           <text style='font-size: 36rpx;color: #000;font-weight:bold;'>汇算清缴</text>
--- a/pages/main/smartchat/chat.js
查看文件 @ffcb395
+++ b/pages/main/smartchat/chat.js
查看文件 @ffcb395
@@ -12,6 +12,7 @@ Page({
     comlist: [],
     com_id: "",
     choosed_index: 0,
+    chat_idx:"Toview"+0,
     chatlist: []
   },
@@ -99,10 +100,12 @@ Page({
           that.data.chatlist.push(res.data)
           that.setData({
             inputValue: "",
+            chat_idx: "Toview"+that.data.chatlist.length,
             chatlist: that.data.chatlist
           })
           console.log("chatlist", that.data.chatlist)
-          that.getChatinfo()
+          // that.getChatinfo()
+          that.bottom()
         }
       }
     })
@@ -155,8 +158,10 @@ Page({
         if (res && res.data) {
           console.log("getChatinfo", res)
           that.setData({
+            chat_idx: "Toview"+res.data.items.length,
             chatlist: res.data.items.reverse()
           })
+          that.bottom()
         }
       }
     })
@@ -191,6 +196,21 @@ Page({
     })
   },
+  //聊天消息始终显示最底端
+  bottom: function () {
+    var query = wx.createSelectorQuery()
+    query.select('#flag').boundingClientRect()
+    query.selectViewport().scrollOffset()
+    query.exec(function (res) {
+      wx.pageScrollTo({
+        scrollTop: res[0].bottom // #the-id节点的下边界坐标
+      })
+      res[1].scrollTop // 显示区域的竖直滚动位置
+    })
+    // var d = SmsListView.ActualHeight;
+    // xxx.ScrollToVerticalOffset(d); 
+  },
+
   /**
    * Lifecycle function--Called when page hide
    */
--- a/pages/main/smartchat/chat.wxml
查看文件 @ffcb395
+++ b/pages/main/smartchat/chat.wxml
查看文件 @ffcb395
 <!--pages/main/smartchat/chat.wxml-->
 <import src="../../../common/picker_cell" />
-<view >
-  <scroll-view style='background:#fff;margin-bottom:150rpx'>
+<view>
+  <scroll-view style='background:#fff;margin-bottom:150rpx' scroll-y="true" >
     <view wx:for="{{chatlist}}" wx:for-item="item" style='display:flex;flex-direction:column'>
       <view style='margin:50rpx 60rpx 0 36rpx;display:flex;flex-direction:row' wx:if="{{item.type=='0'}}">
         <image style='width:102rpx;height:92rpx' src="/images/icon_robot.png"></image>
@@ -20,7 +20,8 @@
       </view>
     </view>
   </scroll-view>
-  <view class='bottom_wrap'>
+  <!-- <view id="flag"></view> -->
+  <view class='bottom_wrap' id='bottom'>
     <input class='input_wrap' placeholder-class='input_placeholder_wrap' bindinput="bindKeyInput" placeholder='请输入您要咨询的问题' value='{{inputValue}}'></input>
     <view class='btn_send_wrap' bindtap='sendMsg'>发送</view>
   </view>
@@ -33,12 +34,12 @@
   <view class='divide_line_f5f5f5'></view>
   <view style='width:100%;display:flex;flex-direction:column;max-height:688rpx;'>
     <view wx:for="{{comlist}}" wx:for-index="idx" bindtap='bindChange' id="{{idx}}">
-      <view wx:if="{{idx==choosed_index}}" style='padding:30rpx;display:flex;flex-direction:row;' >
-        <view class='text_item_blue float_left' >{{item.name}}</view>
+      <view wx:if="{{idx==choosed_index}}" style='padding:30rpx;display:flex;flex-direction:row;'>
+        <view class='text_item_blue float_left'>{{item.name}}</view>
         <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
       </view>
-      <view wx:else style='padding:30rpx ;display:flex;' >
-        <text class='text_item_black float_left' >{{item.name}}</text>
+      <view wx:else style='padding:30rpx ;display:flex;'>
+        <text class='text_item_black float_left'>{{item.name}}</text>
       </view>
       <view class='divide_line_f5f5f5'></view>
     </view>
--- a/pages/main/smartchat/chat.wxss
查看文件 @ffcb395
+++ b/pages/main/smartchat/chat.wxss
查看文件 @ffcb395
@@ -96,6 +96,8 @@
   background: #fff;
 }
+
+
 /* 聊天页面 */
 .bottom_wrap {
@@ -174,3 +176,8 @@
   color: #999;
   letter-spacing: 0;
 }
+
+#flag{
+margin-bottom: 10rpx;
+height: 10rpx;
+}