正在显示
8 个修改的文件
包含
20 行增加
和
15 行删除
... | ... | @@ -6,7 +6,7 @@ Page({ |
6 | 6 | */ |
7 | 7 | data: { |
8 | 8 | h5_url:"", |
9 | - url01: "http://emp.workai.com.cn//html/financialFinalSettlement_01.html", | |
9 | + url01: "http://dev.workai.com.cn//html/financialFinalSettlement_01.html", | |
10 | 10 | url02: "http://dev.workai.com.cn//html/financialFinalSettlement_02.html", |
11 | 11 | }, |
12 | 12 | |
... | ... |
... | ... | @@ -18,7 +18,7 @@ |
18 | 18 | |
19 | 19 | <view style="background:#fff9f0;padding:24rpx;display: flex;"> |
20 | 20 | <view style="margin-right:12rpx"> |
21 | - <image style="width:28rpx;height:28rpx;" src="/images/warn_yellow.png"></image> | |
21 | + <image style="width:28rpx;height:28rpx;margin-top:6rpx" src="/images/warn_yellow.png"></image> | |
22 | 22 | </view> |
23 | 23 | <view wx:if="{{declaring_unit_status=='4'}}"> |
24 | 24 | <text class="text_gray6_28">请于 </text> |
... | ... | @@ -35,8 +35,8 @@ |
35 | 35 | |
36 | 36 | <view wx:if="{{declaring_unit_status!='4'&&declaring_unit_status!='5'&&!show_other_unit_view}}" style="background:#fff;padding:30rpx 30rpx 50rpx 30rpx;"> |
37 | 37 | <text class="text_black_bold">{{declare_status=='1'?'汇算清缴申报中…':'汇算清缴申报完成!'}}</text> |
38 | - <view hidden="{{declare_text_extra.length<1}}" style="display: flex;margin:20rpx 0"> | |
39 | - <image style="width:28rpx;height:28rpx;margin-right:12rpx;margin-top:4rpx" src="/images/warn_yellow.png"></image> | |
38 | + <view wx:if="{{declare_text_extra.length>0&&refund_status!='0'}}" style="display: flex;margin:20rpx 0"> | |
39 | + <image style="width:28rpx;height:28rpx;margin-right:12rpx;margin-top:6rpx" src="/images/warn_yellow.png"></image> | |
40 | 40 | <text class="text_gray6_28">{{declare_text_extra}} </text> |
41 | 41 | </view> |
42 | 42 | <view class="divide_line_f5f5f5"></view> |
... | ... | @@ -99,7 +99,7 @@ |
99 | 99 | </view> |
100 | 100 | </view> |
101 | 101 | |
102 | - <view wx:if="{{declaring_unit_status=='4'&&show_other_unit_view}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;background-color:#fff"> | |
102 | + <view wx:elif="{{declaring_unit_status=='4'&&show_other_unit_view}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;background-color:#fff"> | |
103 | 103 | <view style="display: flex;justify-content: center;margin-top:20rpx"> |
104 | 104 | <text class="text_gray6_28">距离确认填报其他单位个税申报明细时间还有 </text> |
105 | 105 | <text class="text_yellow_28"> {{declare_end_days}} </text> |
... | ... | @@ -113,7 +113,7 @@ |
113 | 113 | </view> |
114 | 114 | </view> |
115 | 115 | |
116 | - <view wx:if="{{refund_status=='1'&&false}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;background-color:#fff"> | |
116 | + <view wx:elif="{{refund_status=='1'}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;background-color:#fff"> | |
117 | 117 | <view style="display: flex;justify-content: center;margin-top:20rpx"> |
118 | 118 | <text class="text_gray6_28">距离确认是否申请退税时间还有 </text> |
119 | 119 | <text class="text_yellow_28"> {{declare_end_days}} </text> |
... | ... | @@ -127,7 +127,7 @@ |
127 | 127 | </view> |
128 | 128 | </view> |
129 | 129 | |
130 | - <view wx:if="{{refund_status=='2'||refund_status=='3'||refund_status=='4'}}" style="width:100%;height:144rpx;position: fixed;bottom: 0;background-color:#fff"> | |
130 | + <view wx:elif="{{declaring_unit_status!='5'&&(refund_status=='2'||refund_status=='3'||refund_status=='4')}}" style="width:100%;height:144rpx;position: fixed;bottom: 0;background-color:#fff"> | |
131 | 131 | <view bindtap="refundDetail" class="btn_white_radius" style="margin:30rpx "> |
132 | 132 | <view class="text_blue_34">查看退税详情</view> |
133 | 133 | </view> |
... | ... | @@ -152,7 +152,7 @@ |
152 | 152 | <view wx:if="{{showUnit&&unitInfo.length>0}}" style="background-color:#fff"> |
153 | 153 | <view class="text_gray3_34" style="padding:30rpx">选择申报单位</view> |
154 | 154 | <view class="divide_line"></view> |
155 | - <view wx:for="{{unitInfo}}" style="height:104rpx;margin-left:50rpx;margin-right:30rpx" bindtap="unitPick" id="{{item.declaring_unit}}~{{item.declaring_unit_id}}" > | |
155 | + <view wx:for="{{unitInfo}}" style="height:104rpx;margin-left:50rpx;margin-right:30rpx" bindtap="unitPick" id="{{item.declaring_unit}}~{{item.declaring_unit_id}}"> | |
156 | 156 | <text class="text_gray3_32" style="line-height:104rpx">{{item.declaring_unit}}</text> |
157 | 157 | <image class="icon_choosed" hidden="true" src="/images/icon_chat_choosed.png"></image> |
158 | 158 | <view class="divide_line"></view> |
... | ... |
... | ... | @@ -10,8 +10,8 @@ |
10 | 10 | font-size: 36rpx; |
11 | 11 | color: #000; |
12 | 12 | font-family: PingFangSC-Medium, PingFang SC; |
13 | - font-weight: 500; | |
14 | 13 | line-height: 50rpx; |
14 | + font-weight:bold; | |
15 | 15 | } |
16 | 16 | |
17 | 17 | .arrow_wrap { |
... | ... | @@ -123,7 +123,7 @@ |
123 | 123 | |
124 | 124 | .text_gray9_26 { |
125 | 125 | font-size: 26rpx; |
126 | - color: #999; | |
126 | + color:rgba(153,153,153,1); | |
127 | 127 | font-family: PingFangSC-Regular, PingFang SC; |
128 | 128 | line-height: 40rpx; |
129 | 129 | } |
... | ... |
... | ... | @@ -11,7 +11,7 @@ |
11 | 11 | <!-- 境内收入 --> |
12 | 12 | <view style="background:#fff;padding:30rpx;margin-top:20rpx"> |
13 | 13 | <view style="margin-bottom:20rpx"> |
14 | - <text class="text_black3_34">境内收入</text> | |
14 | + <text class="text_black3_34;">境内收入</text> | |
15 | 15 | </view> |
16 | 16 | <view> |
17 | 17 | <text class="text_black6_32">工资薪金收入</text> |
... | ... |
1 | -// pages/main/finalpay/refundDetail/refundDetail.js | |
1 | +;// pages/main/finalpay/refundDetail/refundDetail.js | |
2 | 2 | var app = getApp(); |
3 | 3 | var baseUrl = app.globalData.baseUrl; |
4 | 4 | Page({ |
... | ... | @@ -48,7 +48,7 @@ Page({ |
48 | 48 | console.log("declareinfo", result) |
49 | 49 | if (result.statusCode == 200) { |
50 | 50 | that.setData({ |
51 | - refundInfo:result.data | |
51 | + refundInfo:result.data.item | |
52 | 52 | }) |
53 | 53 | } |
54 | 54 | }, |
... | ... |
... | ... | @@ -206,7 +206,10 @@ Page({ |
206 | 206 | 'name': that.data.name, |
207 | 207 | "bank": that.data.bank, |
208 | 208 | "bank_card_no": that.data.bank_card_no, |
209 | - "bank_card_province": that.data.bank_card_province | |
209 | + "bank_card_province": that.data.bank_card_province, | |
210 | + "refund_status":"", | |
211 | + "years": "2019", | |
212 | + | |
210 | 213 | }, |
211 | 214 | success: function(result) { |
212 | 215 | console.log("submit", result) |
... | ... |
请
注册
或
登录
后发表评论