Merge remote-tracking branch 'origin/master'

src/pages/order/order.vue

@@ -41,7 +41,9 @@
                       {{ iconList[item.orderType].text }}
                     </text>
                     <!-- <image src="@/static/order/shop.png" /> -->
-                    <view class="title">{{ item.shopName }}</view>
+                    <view class="title">
+                      {{ item.shopName }}
+                    </view>
                   </view>
                   <view class="right">
                     <span class="status">{{ stateList[item.orderType][item.status].label }}</span>
@@ -798,6 +800,10 @@ page {
           color: #333;
           font-size: 32rpx;
           font-family: PingFang SC;
+          width: 420rpx;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
       }
 

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
@@ -313,7 +313,7 @@ const submitOrder = debounce(() => {
       groupBuyConfirmFn(prodIds.value, skuIds.value);
     }
   });
-}, 1000);
+};
 </script>
 
 <style lang="scss" scoped>