提交 77df475f6a330b3de10eb68d6d741b3ac9cd6f68

作者 wangyu
1 个父辈 ca3b1d43

优化

... ... @@ -144,8 +144,8 @@ App({
144 144 // baseUrl: "http://192.144.144.220:20000/",
145 145 // baseUrl: "http://154.8.229.55:20000/",
146 146 // baseUrl: "http://47.110.250.177:20000/",
147   - baseUrl: "http://47.110.158.110:20000/",
148   - // baseUrl: "https://api.workai.com.cn/",
  147 + // baseUrl: "http://47.110.158.110:20000/",
  148 + baseUrl: "https://api.workai.com.cn/",
149 149 OSSUrl: "", //"https://oss.workai.com.cn/",
150 150 userInfo: null,
151 151 hostInfo: null,
... ...
... ... @@ -24,6 +24,7 @@ Page({
24 24 h5_url: this.updateUrl(this.data.url02)
25 25 })
26 26 }
  27 + console.log("url",this.data.h5_url)
27 28 wx.setNavigationBarTitle({
28 29 title: options.type==1?"《公告》":"《公告》解读"
29 30 })
... ... @@ -31,7 +32,10 @@ Page({
31 32
32 33 updateUrl(s){
33 34 if (baseUrl.indexOf("https")>-1 || baseUrl.indexOf("com")>-1){//正式环境
34   - return s.replace("dev","emp")
  35 + // return "https://emp.workai.com.cn//html/financialFinalSettlement_01.html"
  36 + return s.replace("dev", "emp").replace("http","https")
  37 + }else{
  38 + return s
35 39 }
36 40 },
37 41
... ...
... ... @@ -321,7 +321,7 @@ Page({
321 321
322 322 refundDetail:function(){//退税详情
323 323 wx.navigateTo({
324   - url: 'refundDetail/refundDetail',
  324 + url: 'refundDetail/refundDetail?status=' + this.data.refund_status,
325 325 })
326 326 },
327 327
... ...
... ... @@ -9,6 +9,7 @@ Page({
9 9 data: {
10 10 year: "2019",
11 11 refund_status: "", //退税状态 "0" 无需退税; "1" 待退税;"2" 退税中"3" 退税成功;"4"退税失败;"5"放弃退税;
  12 + status_arr: ["", "", "退税中", "退税成功", "退税失败","放弃退税"],
12 13 refundInfo: {},
13 14 refund_tax: 0
14 15 },
... ... @@ -17,7 +18,11 @@ Page({
17 18 * Lifecycle function--Called when page load
18 19 */
19 20 onLoad: function(options) {
  21 + console.log(options)
20 22 this.getRefundDetail()
  23 + this.setData({
  24 + refund_status: options.status,
  25 + })
21 26 },
22 27
23 28 /**
... ...
1 1 <view>
2 2
3 3 <view style="background:#fff;padding:30rpx;margin-top:20rpx">
4   - <view wx:if="{{refund_status=='4'}}" style="margin-bottom:20rpx">
  4 + <view wx:if="{{refund_status=='3'}}" style="margin-bottom:20rpx">
5 5 <text class="text_black3_34">退税详情</text>
6 6 <view class="light_blue_bg" style="display:flex">
7 7 <text style="font-size:14px;color:#54B4F5;margin: 0 auto">退款成功</text>
8 8 </view>
9 9 </view>
10   - <view wx:else style="margin-bottom:20rpx">
  10 + <view wx:elif="{{refund_status!=0&&refund_status!=1}}" style="margin-bottom:20rpx">
11 11 <text class="text_black3_34">退税详情</text>
12 12 <view class="light_yellow_bg" style="display:flex">
13   - <text style="font-size:14px;color:#FF8F1F;margin: 0 auto">{{refund_status=='2'?'申请中':'退税失败'}}</text>
  13 + <text style="font-size:14px;color:#FF8F1F;margin: 0 auto">{{status_arr[refund_status]}}</text>
14 14 </view>
15 15 </view>
16 16 <view class="divide_line" style="margin-bottom:20rpx"></view>
... ...
注册登录 后发表评论