diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue
index 76410f0..2dba42d 100644
--- a/components/m-buy/goods.vue
+++ b/components/m-buy/goods.vue
@@ -71,7 +71,7 @@
数量
-
+
@@ -125,7 +125,7 @@ export default {
buyType: '', //用于存储促销,拼团等活动类型
parentOrder: '', //父级拼团活动的数据 - 如果是团员则有数据
formatList: [],
- currentSelceted: [],
+ currentSelected: [],
skuList: '',
isClose: false //是否可以点击遮罩关闭
};
@@ -182,12 +182,15 @@ export default {
},
watch: {
num(val) {
+
+ val == 0 ? this.num = 1 : ''
if (val) {
+
//超过库存后修改回库存
- if (val > this.goodsDetail.quantity) {
- this.$nextTick(function() {
- this.num = this.goodsDetail.quantity;
- });
+ if (val > this.goodsDetail.quantity) {
+ this.$nextTick(function() {
+ this.num = this.goodsDetail.quantity;
+ });
}
}
},
@@ -223,20 +226,15 @@ export default {
closeMask() {
this.$emit('closeBuy', false);
},
- numChange() {
- if (this.num > this.goodsDetail.quantity) {
- alert(1);
- this.num = this.goodsDetail.quantity;
- }
- },
+
/**点击规格 */
handleClickSpec(val, index, specValue) {
- this.currentSelceted[index] = specValue.value;
+ this.currentSelected[index] = specValue.value;
let selectedSkuId = this.goodsSpec.find(i => {
let matched = true;
let specValues = i.specValues.filter(j => j.specName !== 'images');
for (let n = 0; n < specValues.length; n++) {
- if (specValues[n].specValue !== this.currentSelceted[n]) {
+ if (specValues[n].specValue !== this.currentSelected[n]) {
matched = false;
return;
}
@@ -246,7 +244,7 @@ export default {
}
});
if (selectedSkuId?.skuId) {
- this.$set(this.currentSelceted, index, specValue.value);
+ this.$set(this.currentSelected, index, specValue.value);
this.selectSkuList = {
spec: {
specName: val.name,
@@ -381,7 +379,7 @@ export default {
item.specValues
.filter(i => i.specName !== 'images')
.forEach((value, _index) => {
- this.currentSelceted[_index] = value.specValue;
+ this.currentSelected[_index] = value.specValue;
this.selectName = value.specValue;
@@ -551,4 +549,4 @@ export default {
color: #333;
}
}
-
+
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index 8bdecc4..6b37161 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -79,50 +79,79 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
{{item.labelName}}
+
+
+
+
+
+
+
{{child.labelName}}
+
+
+
+
+
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -147,7 +176,7 @@ import tpl_menu from "@/pages/tabbar/home/template/tpl_menu"; //五列菜单模
import tpl_search from "@/pages/tabbar/home/template/tpl_search"; //搜索栏
import tpl_group from "@/pages/tabbar/home/template/tpl_group"; //
import tpl_goods from "@/pages/tabbar/home/template/tpl_goods"; //商品分类以及分类中的商品
-
+import goodsTemplate from '@/components/m-goods-list/list'
import { getStoreBaseInfo, getStoreCategory } from "@/api/store.js";
import {
receiveCoupons,
@@ -192,7 +221,7 @@ export default {
},
goodsParams: {
pageNumber: 1,
- pageSize: 50,
+ pageSize: 10,
storeId: "",
},
};
@@ -214,6 +243,7 @@ export default {
flexOne: tpl_flex_one,
goods: tpl_goods,
group: tpl_group,
+ goodsTemplate
// spike: tpl_spike,
// joinGroup: tpl_join_group,
// integral: tpl_integral,
@@ -345,16 +375,21 @@ export default {
let res = await getStoreBaseInfo(this.storeId);
if (res.data.success) {
this.storeInfo = res.data.result;
-
- // 开启了楼层装修店铺
- this.initPageData();
- // 未开启楼层装修店铺
- // 商品信息
- this.getGoodsData();
// 优惠券信息
this.getCouponsData();
- // 店铺分类
- this.getCategoryData();
+ if(res.data.result.pageShow == '1'){
+ // 开启了楼层装修店铺
+ this.initPageData();
+ this.enablePageData = true;
+ }
+ else{
+ // 商品信息
+ this.getGoodsData();
+ // 店铺分类
+ this.getCategoryData();
+
+ this.basePageData = true;
+ }
} else {
uni.reLaunch({
url: "/",