Merge branch 'develop' into test

miniprogram/pages/components/PlatformFeeDialog/PlatformFeeDialog.ts

@@ -33,6 +33,7 @@ Component({
     showDialog: false,
     type: 1, // 1 支付 2 扫码
     isSkip: 0,
+    isOnlyShowPrompt: 0,
     rechargeBalance: 0,
     payTimeLimit: 0,
     billType: '0',
@@ -57,12 +58,18 @@ Component({
         },
       })
         .then(res => {
-          const { isSkip, rechargeBalance, payTimeLimit } = res;
+          const {
+            isSkip,
+            rechargeBalance,
+            payTimeLimit,
+            isOnlyShowPrompt,
+          } = res;
           this.setData({
             isSkip,
             rechargeBalance,
             payTimeLimit,
             showDialog: rechargeBalance > 0 ? true : false,
+            isOnlyShowPrompt,
           });
           fetchedPlatform = true;
         })

miniprogram/pages/components/PlatformFeeDialog/PlatformFeeDialog.wxml

@@ -9,7 +9,10 @@
           您好！您的平台服务费已生成，为不影响设备正常使用，请在{{payTimeLimit}}个工作日内及时缴费,谢谢
         </view>
       </view>
-      <view class="PlatformFeeDialog-priceInfo">
+      <button wx:if="{{isOnlyShowPrompt}}" class="PlatformFeeDialog-btn big" bind:tap="cancelShow">
+        确定
+      </button>
+      <view wx:else class="PlatformFeeDialog-priceInfo">
         <view class="PlatformFeeDialog-priceItem">
           <view class="PlatformFeeDialog-priceItemLabel">服务费</view>
           <view class="PlatformFeeDialog-priceItemPrice">{{rechargeBalance}}元</view>
@@ -32,8 +35,12 @@
           </view>
         </view>
         <view class="PlatformFeeDialog-btnbox">
-          <button class="PlatformFeeDialog-btn cancel" wx:if="{{isSkip}}" bind:tap="cancelShow">取消</button>
-          <button class="PlatformFeeDialog-btn {{isSkip?'':'big'}}" bind:tap="fetchRechargeInfo">确认支付</button>
+          <button class="PlatformFeeDialog-btn cancel" wx:if="{{isSkip}}" bind:tap="cancelShow">
+            取消
+          </button>
+          <button class="PlatformFeeDialog-btn {{isSkip?'':'big'}}" bind:tap="fetchRechargeInfo">
+            确认支付
+          </button>
         </view>
         <view class="PlatformFeeDialog-links">
           <view bind:tap="goRecordsPage">查看服务费明细</view>