Merge remote-tracking branch 'origin/master'

components/common/buyOrCar/buyComponent.vue

@@ -45,7 +45,7 @@
                     }
                   } else {
                     if (response.data.data && response.data.data.unvailable === 1) {
-                      this.$message.error('产品信息已失效')
+                      this.$message.error('产品信息已失效，请刷新界面')
                     } else {
                       this.$message.error(response.data.message)
                     }
@@ -78,7 +78,11 @@
                       })
                     }
                   } else {
-                    this.$message.error(response.data.message)
+                    if (response.data.message === '该产品已失效') {
+                      this.$message.error(response.data.message + '，请刷新页面')
+                    } else {
+                      this.$message.error(response.data.message)
+                    }
                   }
                 })
             }

components/store/CommodityInfo.vue

@@ -308,7 +308,7 @@ export default {
                   }
                 } else {
                   if (response.data.data && response.data.data.unvailable === 1) {
-                    this.$message.error('产品信息已失效')
+                    this.$message.error('产品信息已失效，请刷新界面')
                   } else {
                     this.$message.error(response.data.message)
                   }

components/store/RecommendProduct.vue

@@ -43,6 +43,7 @@
     },
     methods: {
       buyNow: function (isBuy, item) {
+        console.log(item)
         if (!this.$store.state.option.user.logged) {
           this.$http.get('/login/page').then(response => {
             if (response.data) {
@@ -59,7 +60,7 @@
                 storeid: item.storeId,
                 storeUuid: item.storeUuid,
                 currencyName: item.currency,
-                minPackQty: item.minPackQty
+                minPackQty: item.minPackQty ? item.minPackQty : item.minBuyQty
               }])
                 .then(response => {
                   //        window.location.href = '/user#/order/pay/' + this.enidfilter(response.data.orderid)
@@ -78,7 +79,7 @@
                     }
                   } else {
                     if (response.data.data && response.data.data.unvailable === 1) {
-                      this.$message.error('产品信息已失效')
+                      this.$message.error('产品信息已失效，请刷新界面')
                     } else {
                       this.$message.error(response.data.message)
                     }
@@ -95,7 +96,7 @@
                 storeid: item.storeId,
                 storeUuid: item.storeUuid,
                 currencyName: item.currency,
-                minPackQty: item.minPackQty
+                minPackQty: item.minPackQty ? item.minPackQty : item.minBuyQty
               })
                 .then(response => {
                   if (response.data.success) {