Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/IntegralMall/productDetail.vue

@@ -310,9 +310,23 @@ export default {
       if(this.isActivityType!=0){
         this.Error('该商品为活动商品，不能兑换');
       }else{
-        this.$router.push({name: 'confirOrder', query: { id: this.id, num: this.numbers}})
+        let msg = {
+          goodsId:this.detail.id,
+          goodsQuota:this.detail.quota,
+          buyNum:this.numbers
+        }
+        this.apiJavaPost("/api/orderForm/gitQuotaNum",msg,res => {
+            if (res.data.resultCode === 1) { 
+              this.$router.push({name: 'confirOrder', query: { id: this.id, num: this.numbers}})
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
       }
     },
+
     getChildInfo(val){
       this.id = val;
       this.getDetail();