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

.env.development

@@ -4,5 +4,8 @@ VITE_APP_ENV = 'development'
 # URL路径
 VITE_APP_BASE_URL = '/api'
 
-# 照片url路径
+# 照片url路径 （开发环境）
 VITE_APP_IMG_URL = 'http://file.rhhzkj.com:8080'
+
+# 照片url路径（正式环境）
+# VITE_APP_IMG_URL = 'https://file.rddyz.com' 

src/Components/index/FoodDetails.vue

@@ -131,6 +131,7 @@ const toShop = (id) => {
       display: flex;
       align-items: center;
       margin: 20rpx 0;
+      flex-wrap: wrap;
       view {
         margin-right: 8rpx;
         display: inline-block;
@@ -140,6 +141,7 @@ const toShop = (id) => {
         font-size: 18rpx;
         color: #abaaaa;
         background-color: rgba(243, 243, 243, 1);
+        margin-bottom: 5rpx;
       }
     }
     .groupPurchasePrice {

src/pages/assistingAgriculture/index/presale.vue

@@ -65,8 +65,8 @@
         style="width: 670rpx; height: 670rpx; border-radius: 16rpx"
       />
       <view>
-        <text class="retail-price">零售价：￥{{ item.oriPrice }}/盒</text>
-        <text class="presale-price">预售价：￥{{ item.price }}/盒</text>
+        <text class="retail-price">零售价：￥{{ item.price }}/盒</text>
+        <text class="presale-price">预售价：￥{{ item.oriPrice }}/盒</text>
       </view>
       <view>
         <img
@@ -117,7 +117,7 @@
             <text class="introduction">{{ item.introduction }}</text>
           </view>
           <view class="price-info">
-            <text class="good-price">￥{{ item.price }}</text>
+            <text class="good-price">￥{{ item.oriPrice }}</text>
             <img class="add" src="/static/assistingAgriculture/presale/add.png" />
           </view>
         </view>

src/pages/index/index.vue

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

src/pages/packageDetails/packageDetails.vue

@@ -930,6 +930,10 @@ page {
     p {
       font-size: 22rpx;
     }
+    li {
+      font-size: 22rpx;
+      margin-top: 8rpx;
+    }
     .rich-more-btn {
       width: 315 * 2rpx;
       display: flex;

src/pages/shop/confirmOrder.vue

@@ -272,7 +272,7 @@ function groupBuyUpdateFn(couponUserId) {
     }
   });
 }
-const submitOrder = debounce(() => {
+const submitOrder = () => {
   // TODO: 跳转到确认订单页面，并��带所选的支付方式
 
   //   id String 是 临时订单的id或key
@@ -286,14 +286,14 @@ const submitOrder = debounce(() => {
     tradeType: selectType.value,
   };
   xma.showLoading({
-    title:'正在支付',
-    mask:true,
-  })
+    title: '正在支付',
+    mask: true,
+  });
   groupBuyCreate(params).then((res) => {
     if (res.code === 0) {
       const { paymentUrl, outTradeNo } = res.data.result;
       outTradeNos.value = outTradeNo;
-      xma.hideLoading()
+      xma.hideLoading();
       window.location.href = paymentUrl;
       // 设置一个延时器
       const start = Date.now();
@@ -313,7 +313,7 @@ const submitOrder = debounce(() => {
       groupBuyConfirmFn(prodIds.value, skuIds.value);
     }
   });
-}, 1000);
+};
 </script>
 
 <style lang="scss" scoped>

vite.config.ts

@@ -42,14 +42,15 @@ export default defineConfig({
     proxy: {
       '/api': {
         target: 'http://test.rhhzkj.com:8080',
+        // target: 'https://api.rddyz.com',
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, ''),
       },
       '/ws/geocoder': {
         target: 'https://apis.map.qq.com',
         changeOrigin: true,
-        bypass: (req, res, options) => res.setHeader("x-req-proxyUr1", options.target + req.url)
-      }
+        bypass: (req, res, options) => res.setHeader('x-req-proxyUr1', options.target + req.url),
+      },
     },
   },
 });