Merge remote-tracking branch 'origin/master'

.env.production

@@ -2,7 +2,7 @@
 VITE_APP_ENV = 'production'
 
 # URL路径
-VITE_APP_BASE_URL = 'http://test.rhhzkj.com:8080'
+VITE_APP_BASE_URL = 'https://api.rddyz.com'
 
 # 照片url路径
-VITE_APP_IMG_URL = 'http://file.rhhzkj.com:8080'
\ No newline at end of file
+VITE_APP_IMG_URL = 'https://file.rddyz.com'
\ No newline at end of file

src/pages/index/index.vue

@@ -272,7 +272,10 @@ const getCouponMainList = () => {
 const receive = (data) => {
   if (data.couponType === 'mch' && data.numState === 0) {
     receiveCoupon([data.couponYzfId]).then((res) => {
-      // console.log('打印', res);
+      xma.showToast({
+        title: '领取成功！',
+        icon: 'none',
+      });
     });
   }
 };

src/pages/shop/confirmOrder.vue

@@ -541,7 +541,7 @@ page {
     border-radius: 16 * 2rpx;
     margin: 0 auto;
     box-sizing: border-box;
-    margin-top: 108rpx;
+    margin-top: 20rpx;
     background: #ffffff;
     display: flex;
     flex-direction: column;

src/pages/shop/paymentSuccessful.vue

@@ -108,7 +108,7 @@ page {
 
 .container {
   .content {
-    padding-top: 44px;
+    padding-top: 20px;
     display: flex;
     flex-direction: column;
     gap: 20rpx;