diff --git a/.env.development b/.env.development index 79f835e..bee31c8 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ ENV = 'development' # http://mer.crmeb.net/admin # base api # www.shop.xyz -VUE_APP_BASE_API = 'http://testg.tropjoin.com' +VUE_APP_BASE_API = 'http://zkx.tropjoin.com' # VUE_APP_BASE_API = 'http://test.tropjoin.com' # VUE_APP_BASE_API = 'https://api.tropjoin.com' diff --git a/src/assets/images/aq-btn.png b/src/assets/images/aq-btn.png new file mode 100644 index 0000000..685dc82 Binary files /dev/null and b/src/assets/images/aq-btn.png differ diff --git a/src/components/mobileConfig/c_home_goods_list.vue b/src/components/mobileConfig/c_home_goods_list.vue index af7c166..5aef77c 100644 --- a/src/components/mobileConfig/c_home_goods_list.vue +++ b/src/components/mobileConfig/c_home_goods_list.vue @@ -72,6 +72,10 @@ export default { { components: toolCom.c_is_show, configNme: 'couponShow' + }, + { + components: toolCom.c_is_show, + configNme: 'grabShow' } ], manual: [ @@ -94,6 +98,10 @@ export default { { components: toolCom.c_is_show, configNme: 'couponShow' + }, + { + components: toolCom.c_is_show, + configNme: 'grabShow' } ], setUp: 0, @@ -158,6 +166,7 @@ export default { ] this.rCom = arr.concat(tempArr) } + console.log(this.rCom); }, deep: true }, @@ -194,6 +203,8 @@ export default { this.$nextTick(() => { let value = JSON.parse(JSON.stringify(this.$store.state.mobildConfig.defaultArray[this.num])) this.configObj = value; + console.log(this.configObj); + this.getCategory(); }) }, diff --git a/src/components/mobilePage/home_goods_list.vue b/src/components/mobilePage/home_goods_list.vue index 9fd9b97..01c52e8 100644 --- a/src/components/mobilePage/home_goods_list.vue +++ b/src/components/mobilePage/home_goods_list.vue @@ -25,6 +25,9 @@ +
+ +
@@ -337,6 +340,10 @@ export default { title: '是否显示优惠券', val: true }, + grabShow:{ + title: '是否显示抢', + val: false + }, selectConfig: { title: '商品分类', activeValue: [], @@ -490,6 +497,7 @@ export default { titleShow: true, // opriceShow: true, priceShow: true, + grabShow: true, couponShow: true, bgStyle:0, conStyle:1 @@ -513,6 +521,7 @@ export default { this.titleShow = data.titleShow.val; // this.opriceShow = data.opriceShow.val; this.priceShow = data.priceShow.val; + this.grabShow = data.grabShow.val; this.couponShow = data.couponShow.val; this.bgStyle = data.bgStyle.type; this.conStyle = data.conStyle.type; @@ -801,9 +810,19 @@ export default { flex: 1; margin-left: 5px; padding: 5px 10px; + position: relative; .num{ font-weight: bold; } + .right { + position: absolute; + right: 20px; + bottom: 0; + img { + width: 75px; + height: 46px; + } + } } } &.itemB{ diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue index 7f476ca..6bb0c48 100644 --- a/src/views/product/productExamine/index.vue +++ b/src/views/product/productExamine/index.vue @@ -103,7 +103,7 @@ --> - + - + + + + - + 备注：5星为最高推荐级别，1星为最低推荐级别，设置后会在商城商品列表、搜索商品列表中体现。 - + + 特惠专区产品：{{ projectData.is_benefit ? "是" : "否" }} 定制产品：{{ projectData.is_customize ? "是" : "否" }} @@ -627,6 +630,16 @@ > + + + 否 + 是 + +