Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/groupPurchase-miniapp

.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/assistingAgriculture/index/presale.vue

@@ -404,14 +404,14 @@ page {
   width: 360rpx;
   display: flex;
   flex-direction: row;
-  height: 442rpx;
 }
 
 .wt-item {
-  border-radius: 8px 8px 8px 8px;
+  border-radius: 16rpx 16rpx 16rpx 16rpx;
   margin-bottom: 15rpx;
   background-color: #ffffff;
   margin-left: 10rpx;
+  height: max-content;
 }
 
 .item-img image {

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',
+      });
     });
   }
 };