wangyu / naturalPersonTax · 提交

提交 ed2f5b1f0e28806ab2b08caa41ddcbc8b05a93ca

作者 pangy
2 个父辈 bb808d02 21bd5ee0
构建： 未知

Merge branch 'dev2.0' into dev_py

内嵌 并排对比
正在显示 6 个修改的文件 包含 28 行增加 和 35 行删除
@@ -391,7 +391,7 @@ Page({ @@ -391,7 +391,7 @@ Page({
391 if (data.items[i].family_ties == '子' || data.items[i].family_ties == '女') { 391 if (data.items[i].family_ties == '子' || data.items[i].family_ties == '女') {
392 childRelativelist.push(data.items[i]) 392 childRelativelist.push(data.items[i])
393 } 393 }
394 - if (data.items[i].family_ties == '父母' || data.items[i].family_ties == '祖父母' || data.items[i].family_ties == '外祖父母') { 394 + if (data.items[i].family_ties == '父母' || data.items[i].family_ties == '祖父母、外祖父母') {
395 olderRelativelist.push(data.items[i]) 395 olderRelativelist.push(data.items[i])
396 } else { 396 } else {
397 medicalRelativelist.push(data.items[i]) 397 medicalRelativelist.push(data.items[i])
@@ -328,12 +328,12 @@ @@ -328,12 +328,12 @@
328 <view wx:if="{{house_type=='house_fund_rent'}}"> 328 <view wx:if="{{house_type=='house_fund_rent'}}">
329 <text class='text_999_28 ' style='line-height:70rpx'>租赁房屋坐落地址：</text> 329 <text class='text_999_28 ' style='line-height:70rpx'>租赁房屋坐落地址：</text>
330 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address_new}}</text> 330 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address_new}}</text>
331 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text> 331 + <text class='text_999_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
332 </view> 332 </view>
333 <view wx:if="{{house_type=='house_fund_loan'}}"> 333 <view wx:if="{{house_type=='house_fund_loan'}}">
334 <text class='text_999_28 ' style='line-height:70rpx'>房屋坐落地址：</text> 334 <text class='text_999_28 ' style='line-height:70rpx'>房屋坐落地址：</text>
335 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address_new}}</text> 335 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address_new}}</text>
336 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text> 336 + <text class='text_999_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
337 </view> 337 </view>
338 <view style='height:70rpx'> 338 <view style='height:70rpx'>
339 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text> 339 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 } 32 }
33 33
34 .icon_wrap{ 34 .icon_wrap{
35 - width: 104rpx; 35 + width: 112rpx;
36 height: 102rpx; 36 height: 102rpx;
37 align-self: center 37 align-self: center
38 } 38 }
@@ -9,7 +9,7 @@ Page({ @@ -9,7 +9,7 @@ Page({
9 data: { 9 data: {
10 showModal: false, 10 showModal: false,
11 inputValue: "", 11 inputValue: "",
12 - comlist: "", 12 + comlist: ["DDD","SSS","AAA","QQQ","ZZZ"],
13 com_id: "", 13 com_id: "",
14 choosed_index: 0, 14 choosed_index: 0,
15 chatlist: [] 15 chatlist: []
@@ -101,7 +101,7 @@ Page({ @@ -101,7 +101,7 @@ Page({
101 chatlist: that.data.chatlist 101 chatlist: that.data.chatlist
102 }) 102 })
103 console.log("chatlist", that.data.chatlist) 103 console.log("chatlist", that.data.chatlist)
104 - // that.getChatinfo() 104 + that.getChatinfo()
105 } 105 }
106 } 106 }
107 }) 107 })
@@ -182,17 +182,14 @@ Page({ @@ -182,17 +182,14 @@ Page({
182 182
183 bindChange: function(e) { 183 bindChange: function(e) {
184 console.log("goselect", e) 184 console.log("goselect", e)
  185 + var s = e.currentTarget.id
  186 + // var s = e.detail.value
185 this.setData({ 187 this.setData({
186 - com_id: this.data.comlist[e.detail.value].id,  
187 - choosed_index: e.detail.value 188 + com_id: this.data.comlist[s].id,
  189 + choosed_index: s
188 }) 190 })
189 }, 191 },
190 192
191 - bindChange:function(e){  
192 - console.log("bindChange", e.detail.value)  
193 -  
194 - },  
195 -  
196 /** 193 /**
197 * Lifecycle function--Called when page hide 194 * Lifecycle function--Called when page hide
198 */ 195 */
@@ -31,13 +31,13 @@ @@ -31,13 +31,13 @@
31 <view class='modal_lg' hidden="{{!showModal}}"> 31 <view class='modal_lg' hidden="{{!showModal}}">
32 <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位咨询问题。</text> 32 <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位咨询问题。</text>
33 <view class='divide_line_f5f5f5'></view> 33 <view class='divide_line_f5f5f5'></view>
34 - <view style='width:100%;display:flex;flex-direction:column;max-height:486rpx;'> 34 + <view style='width:100%;display:flex;flex-direction:column;max-height:688rpx;'>
35 <view wx:for="{{comlist}}" wx:for-index="idx" bindtap='bindChange' id="{{idx}}"> 35 <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;' > 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 class='text_item_blue float_left' >{{item.name}}</view>
38 <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image> 38 <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
39 </view> 39 </view>
40 - <view wx:else style='padding:30rpx;display:flex;' > 40 + <view wx:else style='padding:30rpx ;display:flex;' >
41 <text class='text_item_black float_left' >{{item.name}}</text> 41 <text class='text_item_black float_left' >{{item.name}}</text>
42 </view> 42 </view>
43 <view class='divide_line_f5f5f5'></view> 43 <view class='divide_line_f5f5f5'></view>
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 .modal_lg { 15 .modal_lg {
16 width: 72%; 16 width: 72%;
17 position: fixed; 17 position: fixed;
18 - top: 120px; 18 + /* top: 120px; */
19 left: 0; 19 left: 0;
20 right: 0; 20 right: 0;
21 margin: 0 auto; 21 margin: 0 auto;
@@ -51,13 +51,10 @@ @@ -51,13 +51,10 @@
51 letter-spacing: 0; 51 letter-spacing: 0;
52 line-height: 18px; 52 line-height: 18px;
53 width: 500rpx; 53 width: 500rpx;
54 -  
55 - text-align:center;  
56 - overflow:hidden;  
57 -text-overflow:ellipsis;  
58 -white-space:nowrap;  
59 -  
60 - 54 + text-align: center;
  55 + overflow: hidden;
  56 + text-overflow: ellipsis;
  57 + white-space: nowrap;
61 } 58 }
62 59
63 .text_item_black { 60 .text_item_black {
@@ -67,11 +64,10 @@ white-space:nowrap; @@ -67,11 +64,10 @@ white-space:nowrap;
67 letter-spacing: 0; 64 letter-spacing: 0;
68 line-height: 18px; 65 line-height: 18px;
69 width: 500rpx; 66 width: 500rpx;
70 -  
71 - text-align:center;  
72 - overflow:hidden;  
73 -text-overflow:ellipsis;  
74 -white-space:nowrap; 67 + text-align: center;
  68 + overflow: hidden;
  69 + text-overflow: ellipsis;
  70 + white-space: nowrap;
75 } 71 }
76 72
77 .text_cancel { 73 .text_cancel {
@@ -94,10 +90,10 @@ white-space:nowrap; @@ -94,10 +90,10 @@ white-space:nowrap;
94 flex: 1; 90 flex: 1;
95 } 91 }
96 92
97 -.picker_wrap{  
98 -position: fixed; 93 +.picker_wrap {
  94 + position: fixed;
99 bottom: 0rpx; 95 bottom: 0rpx;
100 - background:#fff; 96 + background: #fff;
101 } 97 }
102 98
103 /* 聊天页面 */ 99 /* 聊天页面 */
@@ -121,7 +117,7 @@ position: fixed; @@ -121,7 +117,7 @@ position: fixed;
121 margin-top: 20rpx; 117 margin-top: 20rpx;
122 margin-bottom: 20rpx; 118 margin-bottom: 20rpx;
123 margin-right: 30rpx; 119 margin-right: 30rpx;
124 - color: #fff; 120 + color: #fff;
125 font-size: 32rpx; 121 font-size: 32rpx;
126 text-align: center; 122 text-align: center;
127 line-height: 80rpx; 123 line-height: 80rpx;
@@ -152,7 +148,7 @@ position: fixed; @@ -152,7 +148,7 @@ position: fixed;
152 font-size: 14px; 148 font-size: 14px;
153 color: #4a4a4a; 149 color: #4a4a4a;
154 letter-spacing: 0; 150 letter-spacing: 0;
155 - word-break:break-all; 151 + word-break: break-all;
156 } 152 }
157 153
158 .send_bg { 154 .send_bg {
@@ -166,9 +162,9 @@ position: fixed; @@ -166,9 +162,9 @@ position: fixed;
166 .text_send_wrap { 162 .text_send_wrap {
167 font-family: PingFangSC-Regular; 163 font-family: PingFangSC-Regular;
168 font-size: 14px; 164 font-size: 14px;
169 - color: #4a4a4a; 165 + color: #fff;
170 letter-spacing: 0; 166 letter-spacing: 0;
171 - word-break:break-all; 167 + word-break: break-all;
172 } 168 }
173 169
174 .input_placeholder_wrap { 170 .input_placeholder_wrap {
请 注册 或 登录 后发表评论