[200~1.兼容中国台湾、中国香港手机号码

pages/goods/order/index.vue

@@ -2,7 +2,7 @@
   <view class="container commonPageBox commonDetailPage">
     <!-- 公共组件-每个页面必须引入 -->
     <public-module></public-module>
-    <z-nav-bar title="确认订单" bgColor="#258feb" fontColor="#fff"></z-nav-bar>
+    <z-nav-bar title="确认订单"></z-nav-bar>
 
     <common-order-submit
       v-if="showOrder"
@@ -33,32 +33,19 @@
         >
       </template>
       <template slot="goodsInfoImgSlot" slot-scope="slotProps">
+		  <image
+			v-if="pageType == 'vip'"
+			src="/static/icon/vip.png"
+			class="goods_item_img"
+			mode="widthFix"
+		  ></image>
         <image
-          v-if="pageType == 'vip'"
-          src="/static/icon/vip.png"
-          class="goods_item_img"
-          mode="widthFix"
-          @click="goDetail(slotProps.row.productId)"
-        ></image>
-        <image
-          v-else-if="
-            (pageType == 'goods' || pageType == 'fudu') &&
-            slotProps.row.productImages &&
-            slotProps.row.productImages != ''
-          "
+          v-if="pageType!= 'vip'&&slotProps.row.productImages && slotProps.row.productImages != ''"
           class="goods_item_img"
           :src="slotProps.row.productImages"
           mode="aspectFit"
         >
         </image>
-
-        <image
-          v-else
-          src="/static/nobg1.jpg"
-          class="goods_item_img"
-          mode="widthFix"
-          @click="goDetail(slotProps.row.productId)"
-        ></image>
       </template>
       <template slot="goodsInfoNameSlot" slot-scope="slotProps">
         <span v-if="pageType == 'vip'"
@@ -173,7 +160,6 @@ export default {
       //vip订单
       this.pageType = "vip";
       this.showNumber = false;
-      // this.isHideAddress = true;
       this.priceKey = "rebateFee";
       await this.getVipDataInfo();
     } else {
@@ -221,7 +207,7 @@ export default {
           productList: this.options.goods.map((e) => {
             return {
               productId: e.productId || e.id,
-              quantity: 1,
+              quantity: e.productAmount,
             };
           }),
         };
@@ -295,7 +281,6 @@ export default {
           this.goodsDataList = res.productList.filter(
             (e) => this.options.goods[0].productName == e.productName
           );
-         
         });
     },
 
@@ -320,7 +305,6 @@ export default {
             {
               ...data,
               productId: data.id,
-
               price: data.rebateFee,
             },
           ];
@@ -340,7 +324,11 @@ export default {
           },
         })
         .then(async (res) => {
-          this.goodsDataList = res.shopProductList;
+			res.shopProductList.forEach(product => {
+			  const cartItem = this.options.goods.find(item => item.productId === product.productId);
+			  product.productAmount = cartItem ? cartItem.productAmount : 1;
+			});
+			this.goodsDataList = res.shopProductList;
         });
     },
   },
@@ -353,6 +341,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.commonPage, .commonPageBox {
+    height: calc(100vh - 50px);
+}
 .goodsvipLabel {
   position: absolute;
   z-index: 10;