Merge branch 'master' of http://git.sjzkeji.com/panghu/school_webUser

pages-takeout/shop-mod/menu.vue

@@ -184,7 +184,6 @@
         console.log(cartKey)
         console.log(type===2 && cartKey<0)
         if(type===2 && cartKey<0){
-          this.popData.num++
           this.setShopIngAdd(this.popData.goods_id,this.popData.goodsItem.category_id,this.popData.goods_spec_id)
         }else {
           this.setShopIngNumber(this.popData.goods_id,this.popData.goodsItem.category_id,type,this.popData.goods_spec_id)