Merge branch 'dev_wy' into dev2.0

wangyu
app.js
pages/main/guide/guide.wxml
--- a/app.js
查看文件 @0d82f4c
+++ b/app.js
查看文件 @0d82f4c
@@ -149,8 +149,8 @@ App({
     // baseUrl: "http://192.144.144.220:20000/",
     // baseUrl: "http://154.8.229.55:20000/",
     // baseUrl: "http://47.110.250.177:20000/",
-    baseUrl: "http://47.110.158.110:20000/",
-    // baseUrl: "https://api.workai.com.cn/",
+    // baseUrl: "http://47.110.158.110:20000/",
+    baseUrl: "https://api.workai.com.cn/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
     userInfo: null,
     hostInfo:null,
--- a/pages/main/guide/guide.wxml
查看文件 @0d82f4c
+++ b/pages/main/guide/guide.wxml
查看文件 @0d82f4c
@@ -36,7 +36,7 @@
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
       </view>
-      <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goFinalPayment'>
+      <!-- <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goFinalPayment'>
         <image class="icon_wrap" src="/images/final_payment.png"></image>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
@@ -44,7 +44,7 @@
           <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看个人年度税收信息，年度汇算清缴</text>
         </view>
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
-      </view>
+      </view> -->
       <!-- <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='gotaxCalculate'>
         <image class="icon_wrap" src="/images/tax_calculate.png"></image>