wangyu / naturalPersonTax · 提交

提交 ac47f09b7511a05642606ad42a992e39e37fd3b3

作者 wangyu
1 个父辈 8318ab0e
构建： 未知

优化

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