Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

src/api/live.js

@@ -9,6 +9,10 @@ export default {
   getProductInfo(options) {
     return requestPOST1(`${process.env.OLSHOP_URL}/product/get_product_info?productId=${options}`);
   },
+  // 查询商品详情（传productInfoId和 terminalProductId）
+  getProductInfoTwo(options) {
+    return requestPOST1(`${process.env.OLSHOP_URL}/product/get_product_info?productId=${options.productInfoId}&terminalProductId=${options.terminalProductId}`);
+  },
   // 查询所有产品规格详情
   getProductGoodsByProductInfo(options) {
     return requestPOST1(`${process.env.OLSHOP_URL}/product/get_product_goods_by_product_info`, options);
@@ -97,4 +101,4 @@ export default {
   queryPlaybackComments(options){
     return requestPOST(`${process.env.OLSHOP_URL}/liveBroadcastInfo/getLiveGuestAndLikeNumById`,options);
   }
-};
\ No newline at end of file
+};

src/components/common/TwoBAddCart.vue

@@ -53,6 +53,7 @@
             <p>
               商品金额：<span>￥{{ selectPrice}}</span>
             </p>
+            <p v-if="goodsInfoData.wholePurchaseMultiple && goodsInfoData.wholePurchaseMultiple > 1">此款所有规格数量合计 需满足{{goodsInfoData.wholePurchaseMultiple}}的倍数</p>
           </div>
         </div>
         <div class="bottom flex">
@@ -79,6 +80,7 @@ export default {
       addCartLoading: false,
       defaultImg: `this.src="https://cdn.mayi888.com/product/85pdScJ5ch.jpg?x-oss-process=image/resize,m_pad,limit_0,w_800,h_800"`,
       selectList: [],
+      goodsInfoData:{}
     };
   },
   components: {},
@@ -144,6 +146,18 @@ export default {
           });
         }
       })
+
+      live.getProductInfoTwo(query).then(res2 => {
+        let res = res2.data;
+        if (res.code == 200) {
+          this.goodsInfoData = res.data
+        } else {
+           wx.showToast({
+            title: res.msg,
+            icon: 'none',
+          });
+        }
+      })
     },
     close() {
       this.show = false;
@@ -434,7 +448,7 @@ export default {
   height: 49px;
   align-items: center;
   background: #fff;
-  
+
   .addCart {
     width: 100%;
     height: 38px;