优化

wangyu
pages/common/webview.js
pages/main/finalpay/addUnitInfo/addUnitInfo.js
pages/main/finalpay/home.wxml
pages/main/finalpay/home.wxss
pages/main/finalpay/incomeDetail/incomeDetail.wxml
pages/main/finalpay/refundDetail/refundDetail.js
pages/main/finalpay/refundDetail/refundDetail.wxss
pages/main/finalpay/refundInfo/refundInfo.js
--- a/pages/common/webview.js
查看文件 @ac47f09
+++ b/pages/common/webview.js
查看文件 @ac47f09
@@ -6,7 +6,7 @@ Page({
    */
   data: {
     h5_url:"",
-    url01: "http://emp.workai.com.cn//html/financialFinalSettlement_01.html",
+    url01: "http://dev.workai.com.cn//html/financialFinalSettlement_01.html",
     url02: "http://dev.workai.com.cn//html/financialFinalSettlement_02.html",
   },
--- a/pages/main/finalpay/addUnitInfo/addUnitInfo.js
查看文件 @ac47f09
+++ b/pages/main/finalpay/addUnitInfo/addUnitInfo.js
查看文件 @ac47f09
@@ -86,6 +86,8 @@ Page({
             wx.navigateBack({
               delta:1
             })
+        }else{
+          that.showToast(result.data.message)
         }
       },
     })
--- a/pages/main/finalpay/home.wxml
查看文件 @ac47f09
+++ b/pages/main/finalpay/home.wxml
查看文件 @ac47f09
@@ -18,7 +18,7 @@
       <view style="background:#fff9f0;padding:24rpx;display: flex;">
         <view style="margin-right:12rpx">
-          <image style="width:28rpx;height:28rpx;" src="/images/warn_yellow.png"></image>
+          <image style="width:28rpx;height:28rpx;margin-top:6rpx" src="/images/warn_yellow.png"></image>
         </view>
         <view wx:if="{{declaring_unit_status=='4'}}">
           <text class="text_gray6_28">请于 </text>
@@ -35,8 +35,8 @@
       <view wx:if="{{declaring_unit_status!='4'&&declaring_unit_status!='5'&&!show_other_unit_view}}" style="background:#fff;padding:30rpx 30rpx 50rpx 30rpx;">
         <text class="text_black_bold">{{declare_status=='1'?'汇算清缴申报中…':'汇算清缴申报完成!'}}</text>
-        <view hidden="{{declare_text_extra.length<1}}" style="display: flex;margin:20rpx 0">
-          <image style="width:28rpx;height:28rpx;margin-right:12rpx;margin-top:4rpx" src="/images/warn_yellow.png"></image>
+        <view wx:if="{{declare_text_extra.length>0&&refund_status!='0'}}" style="display: flex;margin:20rpx 0">
+          <image style="width:28rpx;height:28rpx;margin-right:12rpx;margin-top:6rpx" src="/images/warn_yellow.png"></image>
           <text class="text_gray6_28">{{declare_text_extra}} </text>
         </view>
         <view class="divide_line_f5f5f5"></view>
@@ -99,7 +99,7 @@
       </view>
     </view>
-    <view wx:if="{{declaring_unit_status=='4'&&show_other_unit_view}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;background-color:#fff">
+    <view wx:elif="{{declaring_unit_status=='4'&&show_other_unit_view}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;background-color:#fff">
       <view style="display: flex;justify-content: center;margin-top:20rpx">
         <text class="text_gray6_28">距离确认填报其他单位个税申报明细时间还有  </text>
         <text class="text_yellow_28"> {{declare_end_days}} </text>
@@ -113,7 +113,7 @@
       </view>
     </view>
-    <view wx:if="{{refund_status=='1'&&false}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;background-color:#fff">
+    <view wx:elif="{{refund_status=='1'}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;background-color:#fff">
       <view style="display: flex;justify-content: center;margin-top:20rpx">
         <text class="text_gray6_28">距离确认是否申请退税时间还有  </text>
         <text class="text_yellow_28"> {{declare_end_days}} </text>
@@ -127,7 +127,7 @@
       </view>
     </view>
-    <view wx:if="{{refund_status=='2'||refund_status=='3'||refund_status=='4'}}" style="width:100%;height:144rpx;position: fixed;bottom: 0;background-color:#fff">
+    <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">
       <view bindtap="refundDetail" class="btn_white_radius" style="margin:30rpx ">
         <view class="text_blue_34">查看退税详情</view>
       </view>
@@ -152,7 +152,7 @@
   <view wx:if="{{showUnit&&unitInfo.length>0}}" style="background-color:#fff">
     <view class="text_gray3_34" style="padding:30rpx">选择申报单位</view>
     <view class="divide_line"></view>
-    <view wx:for="{{unitInfo}}" style="height:104rpx;margin-left:50rpx;margin-right:30rpx" bindtap="unitPick" id="{{item.declaring_unit}}~{{item.declaring_unit_id}}"  >
+    <view wx:for="{{unitInfo}}" style="height:104rpx;margin-left:50rpx;margin-right:30rpx" bindtap="unitPick" id="{{item.declaring_unit}}~{{item.declaring_unit_id}}">
       <text class="text_gray3_32" style="line-height:104rpx">{{item.declaring_unit}}</text>
       <image class="icon_choosed" hidden="true" src="/images/icon_chat_choosed.png"></image>
       <view class="divide_line"></view>
--- a/pages/main/finalpay/home.wxss
查看文件 @ac47f09
+++ b/pages/main/finalpay/home.wxss
查看文件 @ac47f09
@@ -10,8 +10,8 @@
   font-size: 36rpx;
   color: #000;
   font-family: PingFangSC-Medium, PingFang SC;
-  font-weight: 500;
   line-height: 50rpx;
+   font-weight:bold;
 }
 .arrow_wrap {
@@ -123,7 +123,7 @@
 .text_gray9_26 {
   font-size: 26rpx;
-  color: #999;
+  color:rgba(153,153,153,1);
   font-family: PingFangSC-Regular, PingFang SC;
   line-height: 40rpx;
 }
--- a/pages/main/finalpay/incomeDetail/incomeDetail.wxml
查看文件 @ac47f09
+++ b/pages/main/finalpay/incomeDetail/incomeDetail.wxml
查看文件 @ac47f09
@@ -11,7 +11,7 @@
   <!-- 境内收入 -->
     <view style="background:#fff;padding:30rpx;margin-top:20rpx">
       <view style="margin-bottom:20rpx">
-        <text class="text_black3_34">境内收入</text>
+        <text class="text_black3_34;">境内收入</text>
       </view>
       <view>
         <text class="text_black6_32">工资薪金收入</text>
--- a/pages/main/finalpay/refundDetail/refundDetail.js
查看文件 @ac47f09
+++ b/pages/main/finalpay/refundDetail/refundDetail.js
查看文件 @ac47f09
-// pages/main/finalpay/refundDetail/refundDetail.js
+;// pages/main/finalpay/refundDetail/refundDetail.js
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 Page({
@@ -48,7 +48,7 @@ Page({
         console.log("declareinfo", result)
         if (result.statusCode == 200) {
           that.setData({
-              refundInfo:result.data
+              refundInfo:result.data.item
           })
         }
       },
--- a/pages/main/finalpay/refundDetail/refundDetail.wxss
查看文件 @ac47f09
+++ b/pages/main/finalpay/refundDetail/refundDetail.wxss
查看文件 @ac47f09
@@ -32,7 +32,7 @@
 .light_yellow_bg {
   float: right;
-  width: 50px;
+  width: 64px;
   height: 20px;
   background:rgba(255,233,211,1);
   border-radius: 2px;
--- a/pages/main/finalpay/refundInfo/refundInfo.js
查看文件 @ac47f09
+++ b/pages/main/finalpay/refundInfo/refundInfo.js
查看文件 @ac47f09
@@ -206,7 +206,10 @@ Page({
         'name': that.data.name,
         "bank": that.data.bank,
         "bank_card_no": that.data.bank_card_no,
-        "bank_card_province": that.data.bank_card_province
+        "bank_card_province": that.data.bank_card_province,
+        "refund_status":"",
+        "years": "2019",
+
       },
       success: function(result) {
         console.log("submit", result)