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

src/api/confirmOrder.js

@@ -8,3 +8,20 @@ export function groupBuyConfirm(data) {
     data,
   });
 }
+
+// 修改临时订单-使用优惠券时需要调用
+export function groupBuyUpdate(data) {
+  return request({
+    url: `/sgyrdd/previewOrder/groupBuy/update`,
+    method: 'POST',
+    data,
+  });
+}
+// 修改临时订单-提交订单并返回支付信息
+export function groupBuyCreate(data) {
+  return request({
+    url: `/sgyrdd/sgyOrder/groupBuy/create`,
+    method: 'POST',
+    data,
+  });
+}

src/api/packageDetail.js

@@ -26,7 +26,7 @@ export function getCouponShopList(prodId, shopId) {
 export function receiveCoupon(data) {
   return request({
     url: `/sgyrdd/coupon/receiveCoupon`,
-    method: 'POST',
+    method: 'GET',
     data,
   });
-}
+}
\ No newline at end of file

src/pages/packageDetails/packageDetails.vue

@@ -156,7 +156,7 @@
     <!-- card-end -->
     <view class="rich-text-card">
       <text class="title">商品详情</text>
-      <rich-text :nodes="prodInfo.content"></rich-text>
+      <rich-text class="desc" :nodes="prodInfo.content"></rich-text>
     </view>
     <view class="rich-text-card">
       <text class="title">购买须知</text>
@@ -509,6 +509,7 @@ page {
       display: flex;
       flex-direction: column;
       margin-top: 12rpx;
+      border: 1 * 2rpx solid #f3f3f3;
       .ticket-box {
         display: flex;
 
@@ -841,6 +842,9 @@ page {
     margin-top: 10rpx;
     border-radius: 8 * 2rpx;
     box-shadow: 0 -8rpx 22 * 2rpx 0 rgba(255, 255, 255, 0.6);
+    .desc {
+      white-space: pre-line;
+    }
     .purchase-information {
       display: flex;
       flex-direction: column;