fix(voucher): 修改赠送金额显示为洗车金额并添加支付确认提示

在voucher页面中，将赠送金额的显示从"元"改为"洗车金额"以更准确描述赠送内容
在支付流程中添加确认提示框，提醒用户购买后不可退款

pages/voucher/voucher.js

@@ -121,44 +121,51 @@ Page({
             title: "请选择购买洗车金额~",
             icon: "none"
         }), !1;
-        this.isSubmit = !0, wx.showLoading({
-            title: ""
-        });
         var i = this;
-        e.request('/miniprogram/recharge/create', {
+        wx.showModal({
-            id: i.data.selectItemID
+            title: "提示",
-        }, !0).then(function (t) {
+            content: "购买洗车金额后不可退，请谨慎购买",
-            if (wx.hideLoading(), i.isSubmit = !1, 200 != t.code) return wx.showModal({
+            success: function (res) {
-                title: "提示",
+                if (!res.confirm) return !1;
-                content: t.message
+                i.isSubmit = !0, wx.showLoading({
-            }), !1;
+                    title: ""
-            var r = t.data.result;
+                });
-            wx.requestPayment({
+                e.request('/miniprogram/recharge/create', {
-                timeStamp: r.timeStamp,
+                    id: i.data.selectItemID
-                nonceStr: r.nonceStr,
+                }, !0).then(function (t) {
-                package: r.package,
+                    if (wx.hideLoading(), i.isSubmit = !1, 200 != t.code) return wx.showModal({
-                signType: r.signType,
+                        title: "提示",
-                paySign: r.paySign,
+                        content: t.message
-                success: function (o) {
+                    }), !1;
+                    var r = t.data.result;
+                    wx.requestPayment({
+                        timeStamp: r.timeStamp,
+                        nonceStr: r.nonceStr,
+                        package: r.package,
+                        signType: r.signType,
+                        paySign: r.paySign,
+                        success: function (o) {
 
-                    if (t.data.notify_url) {
+                            if (t.data.notify_url) {
-                        // 加载回调接口
+                                // 加载回调接口
-                        e.request(t.data.notify_url, {
+                                e.request(t.data.notify_url, {
-                            orderid: t.data.orderid
+                                    orderid: t.data.orderid
-                        }, !0).then(function (t) {
+                                }, !0).then(function (t) {
-                            console.log('pay_success', t);
+                                    console.log('pay_success', t);
-                        }).catch(function (t) {
+                                }).catch(function (t) {
-                            console.log('pay_success', t);
+                                    console.log('pay_success', t);
-                        });
+                                });
-                    }
+                            }
 
-                    getCurrentPages().length > 1 ? wx.navigateBack({}) : wx.redirectTo({
+                            getCurrentPages().length > 1 ? wx.navigateBack({}) : wx.redirectTo({
-                        url: "/pages/index/index"
+                                url: "/pages/index/index"
+                            });
+                        }
                     });
-                }
+                }).catch(function (t) {
-            });
+                    wx.hideLoading(), i.isSubmit = !1;
-        }).catch(function (t) {
+                });
-            wx.hideLoading(), i.isSubmit = !1;
+            }
         });
     },
     showprovision: function () {

pages/voucher/voucher.wxml

@@ -30,7 +30,7 @@
         <view class="edition1-list">
             <view bindtap="selectItem" class="{{selectItemID==item.id?item.special?'edition1-item edition1-select active':'edition1-item active':item.special?'edition1-item edition1-select':'edition1-item'}}" data-id="{{item.id}}" wx:for="{{list}}" wx:key="index">
                 <view class="now">{{item.paymentamount}}元</view>
-                <view class="origin">赠送{{item.bonusamount*1}}元</view>
+                <view class="origin">赠送{{item.bonusamount*1}}洗车金额</view>
             </view>
             <view></view>
             <view></view>

template/serviceTel/serviceTel.wxml

@@ -1,6 +1,5 @@
 <view class="service-tel">
     <!-- <view>=客服电话=</view>
     <view bindtap="callUs">{{tel}}</view> -->
-
+    <!-- <button class="service-tel" open-type="contact" show-message-card="true">联系客服</button> -->
-    <button class="service-tel" open-type="contact" show-message-card="true">联系客服</button>
 </view>