正在显示
24 个修改的文件
包含
60 行增加
和
22 行删除
images/8KB.png
0 → 100644
4.5 KB
images/additional_deduction.jpg
已删除
100644 → 0
8.7 KB
images/additional_deduction.png
0 → 100644
8.4 KB
images/advance_payment.jpg
已删除
100644 → 0
10.5 KB
images/advance_payment.png
0 → 100644
10.1 KB
images/close.png
0 → 100644
432 Bytes
images/final_payment.jpg
已删除
100644 → 0
7.5 KB
images/final_payment.png
0 → 100644
7.0 KB
images/icon_declare.png
已删除
100644 → 0
824 Bytes
images/nodata.png
0 → 100644
33.1 KB
images/tax_person.jpg
已删除
100644 → 0
10.1 KB
images/tax_person.png
0 → 100644
9.5 KB
| ... | ... | @@ -17,7 +17,7 @@ |
| 17 | 17 | </view> |
| 18 | 18 | <view class='float_right' style='flex:1'> |
| 19 | 19 | <text class='text_999_24 '>可扣除金额</text> |
| 20 | - <text class='text_orange_28 ' style='margin-left:20rpx'>¥1000/月</text> | |
| 20 | + <text class='text_orange_28 ' style='margin-left:20rpx'>¥0/月</text> | |
| 21 | 21 | </view> |
| 22 | 22 | </view> |
| 23 | 23 | </view> |
| ... | ... | @@ -28,17 +28,27 @@ |
| 28 | 28 | <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image> |
| 29 | 29 | <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx}}'>查看</text> |
| 30 | 30 | </view> |
| 31 | - <view style='padding:20rpx'> | |
| 31 | + <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '> | |
| 32 | + <view class='float_left' style='flex:1'> | |
| 33 | + <text class='text_999_24 '>扣除方式</text> | |
| 34 | + <text class='text_gray_28' style='margin-left:20rpx'>月度</text> | |
| 35 | + </view> | |
| 36 | + <view class='float_right' style='flex:1'> | |
| 37 | + <text class='text_999_24 '>可扣除金额</text> | |
| 38 | + <text class='text_orange_28 ' style='margin-left:20rpx'>¥0/月</text> | |
| 39 | + </view> | |
| 40 | + </view> | |
| 41 | + <!-- <view style='padding:20rpx'> | |
| 32 | 42 | <view> |
| 33 | 43 | <text style='font-size:28rpx;color:#666'>学历教育</text> |
| 34 | 44 | <view style='width:100%;display:flex;flex-direction:row '> |
| 35 | 45 | <view class='float_left' style='flex:1'> |
| 36 | 46 | <text class='text_999_24 '>扣除方式</text> |
| 37 | - <text class='text_gray_28' style='margin-left:20rpx'>按月</text> | |
| 47 | + <text class='text_gray_28' style='margin-left:20rpx'>月度</text> | |
| 38 | 48 | </view> |
| 39 | 49 | <view class='float_right' style='flex:1'> |
| 40 | 50 | <text class='text_999_24 '>可扣除金额</text> |
| 41 | - <text class='text_orange_28 ' style='margin-left:20rpx'>¥1000/年</text> | |
| 51 | + <text class='text_orange_28 ' style='margin-left:20rpx'>¥0/月</text> | |
| 42 | 52 | </view> |
| 43 | 53 | </view> |
| 44 | 54 | </view> |
| ... | ... | @@ -47,15 +57,15 @@ |
| 47 | 57 | <view style='width:100%;display:flex;flex-direction:row '> |
| 48 | 58 | <view class='float_left' style='flex:1'> |
| 49 | 59 | <text class='text_999_24 '>扣除方式</text> |
| 50 | - <text class='text_gray_28' style='margin-left:20rpx'>按年</text> | |
| 60 | + <text class='text_gray_28' style='margin-left:20rpx'>月度</text> | |
| 51 | 61 | </view> |
| 52 | 62 | <view class='float_right' style='flex:1'> |
| 53 | 63 | <text class='text_999_24 '>可扣除金额</text> |
| 54 | - <text class='text_orange_28 ' style='margin-left:20rpx'>¥3600/年</text> | |
| 64 | + <text class='text_orange_28 ' style='margin-left:20rpx'>¥0/月</text> | |
| 55 | 65 | </view> |
| 56 | 66 | </view> |
| 57 | 67 | </view> |
| 58 | - </view> | |
| 68 | + </view> --> | |
| 59 | 69 | </view> |
| 60 | 70 | <view wx:if="{{item=='medical_fund'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column'> |
| 61 | 71 | <view style='height:40rpx'> |
| ... | ... | @@ -70,7 +80,7 @@ |
| 70 | 80 | </view> |
| 71 | 81 | <view class='float_right' style='flex:1'> |
| 72 | 82 | <text class='text_999_24 '>可扣除金额</text> |
| 73 | - <text class='text_orange_28 ' style='margin-left:20rpx'>¥0/月</text> | |
| 83 | + <text class='text_orange_28 ' style='margin-left:20rpx'>¥0/年</text> | |
| 74 | 84 | </view> |
| 75 | 85 | </view> |
| 76 | 86 | </view> |
| ... | ... | @@ -87,7 +97,7 @@ |
| 87 | 97 | </view> |
| 88 | 98 | <view class='float_right' style='flex:1'> |
| 89 | 99 | <text class='text_999_24 '>可扣除金额</text> |
| 90 | - <text class='text_orange_28 ' style='margin-left:20rpx'>¥24000/月</text> | |
| 100 | + <text class='text_orange_28 ' style='margin-left:20rpx'>¥0/月</text> | |
| 91 | 101 | </view> |
| 92 | 102 | </view> |
| 93 | 103 | </view> |
| ... | ... | @@ -104,7 +114,7 @@ |
| 104 | 114 | </view> |
| 105 | 115 | <view class='float_right' style='flex:1'> |
| 106 | 116 | <text class='text_999_24 '>可扣除金额</text> |
| 107 | - <text class='text_orange_28 ' style='margin-left:20rpx'>¥12000/月</text> | |
| 117 | + <text class='text_orange_28 ' style='margin-left:20rpx'>¥0/月</text> | |
| 108 | 118 | </view> |
| 109 | 119 | </view> |
| 110 | 120 | </view> | ... | ... |
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | <image class='bgimg' src='/images/guide_bg.png'></image> |
| 8 | 8 | |
| 9 | 9 | <view class='card_rectangle_bg_row' style='margin-top:310rpx;padding:30rpx' bindtap='gotaxPerson'> |
| 10 | - <image class="icon_wrap" src="/images/tax_person.jpg"></image> | |
| 10 | + <image class="icon_wrap" src="/images/tax_person.png"></image> | |
| 11 | 11 | <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view> |
| 12 | 12 | <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'> |
| 13 | 13 | <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>自然人信息采集</text> |
| ... | ... | @@ -17,7 +17,7 @@ |
| 17 | 17 | </view> |
| 18 | 18 | |
| 19 | 19 | <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdditionalDiduction'> |
| 20 | - <image class="icon_wrap" src="/images/additional_deduction.jpg"></image> | |
| 20 | + <image class="icon_wrap" src="/images/additional_deduction.png"></image> | |
| 21 | 21 | <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view> |
| 22 | 22 | <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'> |
| 23 | 23 | <text style='font-size: 36rpx;color: #000;font-weight:bold;'>专项附加扣除</text> |
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 | </view> |
| 28 | 28 | |
| 29 | 29 | <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdvancePayment'> |
| 30 | - <image class="icon_wrap" src="/images/advance_payment.jpg"></image> | |
| 30 | + <image class="icon_wrap" src="/images/advance_payment.png"></image> | |
| 31 | 31 | <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view> |
| 32 | 32 | <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'> |
| 33 | 33 | <text style='font-size: 36rpx;color: #000;font-weight:bold;'>预扣预缴</text> |
| ... | ... | @@ -37,7 +37,7 @@ |
| 37 | 37 | </view> |
| 38 | 38 | |
| 39 | 39 | <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goFinalPayment'> |
| 40 | - <image class="icon_wrap" src="/images/final_payment.jpg"></image> | |
| 40 | + <image class="icon_wrap" src="/images/final_payment.png"></image> | |
| 41 | 41 | <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view> |
| 42 | 42 | <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'> |
| 43 | 43 | <text style='font-size: 36rpx;color: #000;font-weight:bold;'>汇算清缴</text> | ... | ... |
| ... | ... | @@ -12,6 +12,7 @@ Page({ |
| 12 | 12 | comlist: [], |
| 13 | 13 | com_id: "", |
| 14 | 14 | choosed_index: 0, |
| 15 | + chat_idx:"Toview"+0, | |
| 15 | 16 | chatlist: [] |
| 16 | 17 | }, |
| 17 | 18 | |
| ... | ... | @@ -99,10 +100,12 @@ Page({ |
| 99 | 100 | that.data.chatlist.push(res.data) |
| 100 | 101 | that.setData({ |
| 101 | 102 | inputValue: "", |
| 103 | + chat_idx: "Toview"+that.data.chatlist.length, | |
| 102 | 104 | chatlist: that.data.chatlist |
| 103 | 105 | }) |
| 104 | 106 | console.log("chatlist", that.data.chatlist) |
| 105 | - that.getChatinfo() | |
| 107 | + // that.getChatinfo() | |
| 108 | + that.bottom() | |
| 106 | 109 | } |
| 107 | 110 | } |
| 108 | 111 | }) |
| ... | ... | @@ -155,8 +158,10 @@ Page({ |
| 155 | 158 | if (res && res.data) { |
| 156 | 159 | console.log("getChatinfo", res) |
| 157 | 160 | that.setData({ |
| 161 | + chat_idx: "Toview"+res.data.items.length, | |
| 158 | 162 | chatlist: res.data.items.reverse() |
| 159 | 163 | }) |
| 164 | + that.bottom() | |
| 160 | 165 | } |
| 161 | 166 | } |
| 162 | 167 | }) |
| ... | ... | @@ -191,6 +196,21 @@ Page({ |
| 191 | 196 | }) |
| 192 | 197 | }, |
| 193 | 198 | |
| 199 | + //聊天消息始终显示最底端 | |
| 200 | + bottom: function () { | |
| 201 | + var query = wx.createSelectorQuery() | |
| 202 | + query.select('#flag').boundingClientRect() | |
| 203 | + query.selectViewport().scrollOffset() | |
| 204 | + query.exec(function (res) { | |
| 205 | + wx.pageScrollTo({ | |
| 206 | + scrollTop: res[0].bottom // #the-id节点的下边界坐标 | |
| 207 | + }) | |
| 208 | + res[1].scrollTop // 显示区域的竖直滚动位置 | |
| 209 | + }) | |
| 210 | + // var d = SmsListView.ActualHeight; | |
| 211 | + // xxx.ScrollToVerticalOffset(d); | |
| 212 | + }, | |
| 213 | + | |
| 194 | 214 | /** |
| 195 | 215 | * Lifecycle function--Called when page hide |
| 196 | 216 | */ | ... | ... |
| 1 | 1 | <!--pages/main/smartchat/chat.wxml--> |
| 2 | 2 | <import src="../../../common/picker_cell" /> |
| 3 | 3 | |
| 4 | -<view > | |
| 5 | - <scroll-view style='background:#fff;margin-bottom:150rpx'> | |
| 4 | +<view> | |
| 5 | + <scroll-view style='background:#fff;margin-bottom:150rpx' scroll-y="true" > | |
| 6 | 6 | <view wx:for="{{chatlist}}" wx:for-item="item" style='display:flex;flex-direction:column'> |
| 7 | 7 | <view style='margin:50rpx 60rpx 0 36rpx;display:flex;flex-direction:row' wx:if="{{item.type=='0'}}"> |
| 8 | 8 | <image style='width:102rpx;height:92rpx' src="/images/icon_robot.png"></image> |
| ... | ... | @@ -20,7 +20,8 @@ |
| 20 | 20 | </view> |
| 21 | 21 | </view> |
| 22 | 22 | </scroll-view> |
| 23 | - <view class='bottom_wrap'> | |
| 23 | + <!-- <view id="flag"></view> --> | |
| 24 | + <view class='bottom_wrap' id='bottom'> | |
| 24 | 25 | <input class='input_wrap' placeholder-class='input_placeholder_wrap' bindinput="bindKeyInput" placeholder='请输入您要咨询的问题' value='{{inputValue}}'></input> |
| 25 | 26 | <view class='btn_send_wrap' bindtap='sendMsg'>发送</view> |
| 26 | 27 | </view> |
| ... | ... | @@ -33,12 +34,12 @@ |
| 33 | 34 | <view class='divide_line_f5f5f5'></view> |
| 34 | 35 | <view style='width:100%;display:flex;flex-direction:column;max-height:688rpx;'> |
| 35 | 36 | <view wx:for="{{comlist}}" wx:for-index="idx" bindtap='bindChange' id="{{idx}}"> |
| 36 | - <view wx:if="{{idx==choosed_index}}" style='padding:30rpx;display:flex;flex-direction:row;' > | |
| 37 | - <view class='text_item_blue float_left' >{{item.name}}</view> | |
| 37 | + <view wx:if="{{idx==choosed_index}}" style='padding:30rpx;display:flex;flex-direction:row;'> | |
| 38 | + <view class='text_item_blue float_left'>{{item.name}}</view> | |
| 38 | 39 | <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image> |
| 39 | 40 | </view> |
| 40 | - <view wx:else style='padding:30rpx ;display:flex;' > | |
| 41 | - <text class='text_item_black float_left' >{{item.name}}</text> | |
| 41 | + <view wx:else style='padding:30rpx ;display:flex;'> | |
| 42 | + <text class='text_item_black float_left'>{{item.name}}</text> | |
| 42 | 43 | </view> |
| 43 | 44 | <view class='divide_line_f5f5f5'></view> |
| 44 | 45 | </view> | ... | ... |
请
注册
或
登录
后发表评论