优化

 // pages/common/webview.js
 // pages/common/webview.js
+var baseUrl = getApp().globalData.baseUrl;
 Page({
 Page({
 
 
   /**
   /**
@@ -16,11 +17,11 @@ Page({
   onLoad: function (options) {
   onLoad: function (options) {
       if(options.type == 1){
       if(options.type == 1){
           this.setData({
           this.setData({
-            h5_url:this.data.url01
+            h5_url: this.updateUrl(this.data.url01)
           })
           })
       }else{
       }else{
         this.setData({
         this.setData({
-          h5_url: this.data.url02
+          h5_url: this.updateUrl(this.data.url02)
         })
         })
       }
       }
     wx.setNavigationBarTitle({
     wx.setNavigationBarTitle({
@@ -28,6 +29,12 @@ Page({
     })
     })
   },
   },
 
 
+  updateUrl(s){
+    if (baseUrl.indexOf("https")>-1 || baseUrl.indexOf("com")>-1){//正式环境
+     return s.replace("dev","emp")
+    }
+  },
+
   /**
   /**
    * Lifecycle function--Called when page is initially rendered
    * Lifecycle function--Called when page is initially rendered
    */
    */

@@ -69,6 +69,7 @@ Page({
             declare_status: result.data.declare_status,
             declare_status: result.data.declare_status,
             refund_status: result.data.refund_status,
             refund_status: result.data.refund_status,
             pay_status: result.data.pay_status,
             pay_status: result.data.pay_status,
+            declaring_unit: result.data.declaring_unit,
             declaring_unit_status: result.data.declaring_unit_status,
             declaring_unit_status: result.data.declaring_unit_status,
             new_refund_tax: Math.abs(result.data.refund_tax),
             new_refund_tax: Math.abs(result.data.refund_tax),
             declare_end_date: format.getDateString(result.data.declare_end_time) ,
             declare_end_date: format.getDateString(result.data.declare_end_time) ,
@@ -328,36 +329,42 @@ Page({
     var text = ""
     var text = ""
     var text_status = ""
     var text_status = ""
     var text_title = "应补退税额"
     var text_title = "应补退税额"
-    if (data.declare_status=='1'){//申报中
+    if (data.declare_status=='2'){//申报中
       text = "请等候申报结果"
       text = "请等候申报结果"
     } else {//申报成功
     } else {//申报成功
-      if (data.refund_tax > 0 || data.refund_tax == 0) {
-        text_title = "应补税额"
-      } else {
+      if (data.declare_result=='0') {//申报结果0:退税,1:补税,2:无需补退税
         text_title = "应退税额"
         text_title = "应退税额"
+        if (data.refund_status == "1") {
+          text = "请确认是否申请退款？"
+        } else if (data.refund_status == '2') {
+          text = "申请退税中"
+          text_status = "退税中"
+        } else if (data.refund_status == '4') {
+          text = "退税失败，请确认您的银行卡信息是否正确？"
+          text_status = "退税失败"
+        } else if (data.refund_status == '5') {
+          text = "您已放弃退税"
+          text_status = "已放弃"
+        }
+      } else if (data.declare_result == '1'){//补税
+        text_title = "应补税额"
+        if (data.exempt == 'yes') {
+          text = "您已享受豁免"
+          text_status = "豁免"
+        } else if (data.pay_status == '1') {
+          text = "请等待企业为您代缴税款"
+          text_status = "待缴款"
+        } else if (data.pay_status == '2') {
+          text = "单位已为您代缴税款"
+          text_status = "已缴款"
+        }
       }
       }
 
 
-      if (data.refund_status == "1") {
-        text = "请确认是否申请退款？"
-      } else if (data.refund_status == '2') {
-        text = "申请退税中"
-        text_status = "退税中"
-      } else if (data.refund_status == '4') {
-        text = "退税失败，请确认您的银行卡信息是否正确？"
-        text_status = "退税失败"
-      } else if (data.refund_status == '5') {
-        text = "您已放弃退税"
-        text_status = "已放弃"
-      } else if (data.exempt == 'yes') {
-        text = "您已享受豁免"
-        text_status = "豁免"
-      } else if (data.pay_status == '1') {
-        text = "请等待企业为您代缴税款"
-        text_status = "待缴款"
-      } else if (data.pay_status == '2') {
-        text = "单位已为您代缴税款"
-        text_status = "已缴款"
-      }
+      // if (data.refund_tax > 0 || data.refund_tax == 0) {
+      //   text_title = "应补税额"
+      // } else {
+      //   text_title = "应退税额"
+      // }
     } 
     } 
     this.setData({
     this.setData({
       declare_text_extra:text,
       declare_text_extra:text,

@@ -39,8 +39,8 @@
           <image style="width:28rpx;height:28rpx;margin-right:12rpx;margin-top:6rpx" src="/images/warn_yellow.png"></image>
           <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>
           <text class="text_gray6_28">{{declare_text_extra}} </text>
         </view>
         </view>
-        <view class="divide_line_f5f5f5"></view>
-        <view style="margin-top:20rpx">
+        <view class="divide_line_f5f5f5" style="margin:20rpx 0"></view>
+        <view >
           <text class="text_gray6_28">收入总额：</text>
           <text class="text_gray6_28">收入总额：</text>
           <text class="text_gray3_28 float_right" style="line-height:50rpx">￥{{payinfo.total_salary}}</text>
           <text class="text_gray3_28 float_right" style="line-height:50rpx">￥{{payinfo.total_salary}}</text>
         </view>
         </view>