From 2affab534c31e5e8787749f6e9ab16c7382d486c Mon Sep 17 00:00:00 2001
From: XiaoMo <xiaomo.drip@gmail.com>
Date: Sun, 14 Dec 2025 11:13:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(voucher):=20=E4=BF=AE=E6=94=B9=E8=B5=A0?=
 =?UTF-8?q?=E9=80=81=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA=E4=B8=BA=E6=B4=97?=
 =?UTF-8?q?=E8=BD=A6=E9=87=91=E9=A2=9D=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E7=A1=AE=E8=AE=A4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在voucher页面中，将赠送金额的显示从"元"改为"洗车金额"以更准确描述赠送内容
在支付流程中添加确认提示框，提醒用户购买后不可退款
---
 pages/voucher/voucher.js            | 77 ++++++++++++++++-------------
 pages/voucher/voucher.wxml          |  2 +-
 template/serviceTel/serviceTel.wxml |  3 +-
 3 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/pages/voucher/voucher.js b/pages/voucher/voucher.js
index fb69916..e8aee6a 100644
--- a/pages/voucher/voucher.js
+++ b/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', {
-            id: i.data.selectItemID
-        }, !0).then(function (t) {
-            if (wx.hideLoading(), i.isSubmit = !1, 200 != t.code) return wx.showModal({
-                title: "提示",
-                content: t.message
-            }), !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) {
+        wx.showModal({
+            title: "提示",
+            content: "购买洗车金额后不可退，请谨慎购买",
+            success: function (res) {
+                if (!res.confirm) return !1;
+                i.isSubmit = !0, wx.showLoading({
+                    title: ""
+                });
+                e.request('/miniprogram/recharge/create', {
+                    id: i.data.selectItemID
+                }, !0).then(function (t) {
+                    if (wx.hideLoading(), i.isSubmit = !1, 200 != t.code) return wx.showModal({
+                        title: "提示",
+                        content: t.message
+                    }), !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) {
-                        // 加载回调接口
-                        e.request(t.data.notify_url, {
-                            orderid: t.data.orderid
-                        }, !0).then(function (t) {
-                            console.log('pay_success', t);
-                        }).catch(function (t) {
-                            console.log('pay_success', t);
-                        });
-                    }
+                            if (t.data.notify_url) {
+                                // 加载回调接口
+                                e.request(t.data.notify_url, {
+                                    orderid: t.data.orderid
+                                }, !0).then(function (t) {
+                                    console.log('pay_success', t);
+                                }).catch(function (t) {
+                                    console.log('pay_success', t);
+                                });
+                            }
 
-                    getCurrentPages().length > 1 ? wx.navigateBack({}) : wx.redirectTo({
-                        url: "/pages/index/index"
+                            getCurrentPages().length > 1 ? wx.navigateBack({}) : wx.redirectTo({
+                                url: "/pages/index/index"
+                            });
+                        }
                     });
-                }
-            });
-        }).catch(function (t) {
-            wx.hideLoading(), i.isSubmit = !1;
+                }).catch(function (t) {
+                    wx.hideLoading(), i.isSubmit = !1;
+                });
+            }
         });
     },
     showprovision: function () {
@@ -172,4 +179,4 @@ Page({
             approve: 1 == e
         });
     }
-});
\ No newline at end of file
+});
diff --git a/pages/voucher/voucher.wxml b/pages/voucher/voucher.wxml
index bbd5468..e781146 100644
--- a/pages/voucher/voucher.wxml
+++ b/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>
diff --git a/template/serviceTel/serviceTel.wxml b/template/serviceTel/serviceTel.wxml
index 1f5406d..9d8e70e 100644
--- a/template/serviceTel/serviceTel.wxml
+++ b/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>
\ No newline at end of file