diff --git a/components/Menu.vue b/components/Menu.vue index 998b82d..e64690d 100644 --- a/components/Menu.vue +++ b/components/Menu.vue @@ -13,8 +13,8 @@ - - {{ item.name }} + + {{ item.name }} diff --git a/components/ShoproLiveCard.vue b/components/ShopLiveCard.vue similarity index 76% rename from components/ShoproLiveCard.vue rename to components/ShopLiveCard.vue index d481eb3..1cc4236 100644 --- a/components/ShoproLiveCard.vue +++ b/components/ShopLiveCard.vue @@ -7,7 +7,7 @@ {{ liveStatus[detail.liveStatus].title }} {{ detail.name }} - + @@ -19,7 +19,7 @@ - + ￥{{ goods.price }} @@ -33,6 +33,7 @@ + + diff --git a/pages/activity/GoodsGroup/index.vue b/pages/activity/GoodsGroup/index.vue index 0ce7ad8..bb629b1 100644 --- a/pages/activity/GoodsGroup/index.vue +++ b/pages/activity/GoodsGroup/index.vue @@ -1,90 +1,228 @@ + + + diff --git a/pages/activity/GoodsSeckill/index.vue b/pages/activity/GoodsSeckill/index.vue index 19bc8d0..7a2229b 100644 --- a/pages/activity/GoodsSeckill/index.vue +++ b/pages/activity/GoodsSeckill/index.vue @@ -6,7 +6,7 @@
- +
diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue index 676e510..e1074a1 100644 --- a/pages/activity/GroupDetails/index.vue +++ b/pages/activity/GroupDetails/index.vue @@ -247,6 +247,24 @@ this.mountedStart(); }, methods: { + onShareAppMessage: function() { + return { + title: this.storeInfo.title, + imageUrl: this.storeInfo.image, + path: "pages/activity/GroupDetails/index?id="+this.storeInfo.id+"&spread=" + uni.getStorageSync("uid"), + success(res) { + uni.showToast({ + title: '分享成功' + }) + }, + fail(res) { + uni.showToast({ + title: '分享失败', + icon: 'none' + }) + } + } + }, openAlone: function () { this.$yrouter.push({ path: "/pages/shop/GoodsCon/index", @@ -295,7 +313,7 @@ } else { that.posterData.title = that.storeInfo.title; } - that.posterData.price = that.storeInfo.price; + that.posterData.price = that.storeInfo.pinkPrice; that.posterData.code = that.storeInfo.code_base; that.domStatus = true; console.log(this.storeInfo) @@ -319,8 +337,8 @@ this.storeInfo.title ); this.$set(this.attr.productSelect, "image", productSelect.image); - this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "stock", productSelect.stock); + this.$set(this.attr.productSelect, "price", productSelect.pinkPrice); + this.$set(this.attr.productSelect, "stock", productSelect.pinkStock); this.$set(this.attr.productSelect, "unique", productSelect.unique); this.$set(this.attr.productSelect, "cart_num", 1); this.$set(this, "attrValue", value.sort().join(",")); @@ -332,7 +350,7 @@ this.storeInfo.title ); this.$set(this.attr.productSelect, "image", this.storeInfo.image); - this.$set(this.attr.productSelect, "price", this.storeInfo.price); + this.$set(this.attr.productSelect, "price", this.storeInfo.pinkPrice); this.$set(this.attr.productSelect, "stock", 0); this.$set(this.attr.productSelect, "unique", ""); this.$set(this.attr.productSelect, "cart_num", 0); @@ -345,8 +363,8 @@ this.storeInfo.title ); this.$set(this.attr.productSelect, "image", this.storeInfo.image); - this.$set(this.attr.productSelect, "price", this.storeInfo.price); - this.$set(this.attr.productSelect, "stock", this.storeInfo.stock); + this.$set(this.attr.productSelect, "price", this.storeInfo.pinkPrice); + this.$set(this.attr.productSelect, "stock", this.storeInfo.pinkStock); this.$set( this.attr.productSelect, "unique", @@ -418,15 +436,15 @@ if (productSelect) { this.attr.productAttr[res.indexw].index = res.indexn; this.$set(this.attr.productSelect, "image", productSelect.image); - this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "stock", productSelect.stock); + this.$set(this.attr.productSelect, "price", productSelect.pinkPrice); + this.$set(this.attr.productSelect, "stock", productSelect.pinkStock); this.$set(this.attr.productSelect, "unique", productSelect.unique); this.$set(this.attr.productSelect, "cart_num", 1); this.$set(this, "attrValue", res.value); this.$set(this, "attrTxt", "已选择"); } else { this.$set(this.attr.productSelect, "image", this.storeInfo.image); - this.$set(this.attr.productSelect, "price", this.storeInfo.price); + this.$set(this.attr.productSelect, "price", this.storeInfo.pinkPrice); this.$set(this.attr.productSelect, "stock", 0); this.$set(this.attr.productSelect, "unique", ""); this.$set(this.attr.productSelect, "cart_num", 0); @@ -434,7 +452,7 @@ this.$set(this, "attrTxt", "请选择"); } }, - + openTeam: function () { var that = this; if (that.attr.cartAttr == false) { diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue index ffc001f..2ca96a4 100644 --- a/pages/activity/SeckillDetails/index.vue +++ b/pages/activity/SeckillDetails/index.vue @@ -16,16 +16,6 @@ - - - - - {{ attrTxt }}： - {{ attrValue }} - - - - @@ -36,6 +26,14 @@ + + + + {{ attrTxt }}： + {{ attrValue }} + + + 产品介绍 @@ -152,6 +150,24 @@ this.mountedStart(); }, methods: { + onShareAppMessage: function() { + return { + title: this.storeInfo.title, + imageUrl: this.storeInfo.image, + path: "pages/activity/GoodsSeckill/index?id="+this.storeInfo.id+"&spread=" + uni.getStorageSync("uid"), + success(res) { + uni.showToast({ + title: '分享成功' + }) + }, + fail(res) { + uni.showToast({ + title: '分享失败', + icon: 'none' + }) + } + } + }, openAlone: function () { this.$yrouter.push({ path: "/pages/shop/GoodsCon/index", @@ -237,8 +253,8 @@ this.storeInfo.title ); this.$set(this.attr.productSelect, "image", productSelect.image); - this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "stock", productSelect.stock); + this.$set(this.attr.productSelect, "price", productSelect.seckillPrice); + this.$set(this.attr.productSelect, "stock", productSelect.seckillStock); this.$set(this.attr.productSelect, "unique", productSelect.unique); this.$set(this.attr.productSelect, "cart_num", 1); this.$set(this, "attrValue", value.sort().join(",")); @@ -250,7 +266,7 @@ this.storeInfo.title ); this.$set(this.attr.productSelect, "image", this.storeInfo.image); - this.$set(this.attr.productSelect, "price", this.storeInfo.price); + this.$set(this.attr.productSelect, "price", this.storeInfo.seckillPrice); this.$set(this.attr.productSelect, "stock", 0); this.$set(this.attr.productSelect, "unique", ""); this.$set(this.attr.productSelect, "cart_num", 0); @@ -263,8 +279,8 @@ this.storeInfo.title ); this.$set(this.attr.productSelect, "image", this.storeInfo.image); - this.$set(this.attr.productSelect, "price", this.storeInfo.price); - this.$set(this.attr.productSelect, "stock", this.storeInfo.stock); + this.$set(this.attr.productSelect, "price", this.storeInfo.seckillPrice); + this.$set(this.attr.productSelect, "stock", this.storeInfo.seckillStock); this.$set( this.attr.productSelect, "unique", @@ -289,7 +305,7 @@ ChangeCartNum: function (res) { var that = this; if (res) { - if (that.attr.productSelect.cart_num < that.storeInfo.stock) { + if (that.attr.productSelect.cart_num < that.storeInfo.seckillStock) { that.attr.productSelect.cart_num++; this.cartNum++; } @@ -307,15 +323,15 @@ if (productSelect) { this.attr.productAttr[res.indexw].index = res.indexn; this.$set(this.attr.productSelect, "image", productSelect.image); - this.$set(this.attr.productSelect, "price", productSelect.price); - this.$set(this.attr.productSelect, "stock", productSelect.stock); + this.$set(this.attr.productSelect, "price", productSelect.seckillPrice); + this.$set(this.attr.productSelect, "stock", productSelect.seckillStock); this.$set(this.attr.productSelect, "unique", productSelect.unique); this.$set(this.attr.productSelect, "cart_num", 1); this.$set(this, "attrValue", res.value); this.$set(this, "attrTxt", "已选择"); } else { this.$set(this.attr.productSelect, "image", this.storeInfo.image); - this.$set(this.attr.productSelect, "price", this.storeInfo.price); + this.$set(this.attr.productSelect, "price", this.storeInfo.seckillPrice); this.$set(this.attr.productSelect, "stock", 0); this.$set(this.attr.productSelect, "unique", ""); this.$set(this.attr.productSelect, "cart_num", 0); diff --git a/pages/home/components/Banner.vue b/pages/home/components/Banner.vue index 1a3dfb3..8146a73 100644 --- a/pages/home/components/Banner.vue +++ b/pages/home/components/Banner.vue @@ -1,7 +1,7 @@ diff --git a/pages/shop/Live/LiveList/index.vue b/pages/shop/Live/LiveList/index.vue index d01f97b..389ac3f 100644 --- a/pages/shop/Live/LiveList/index.vue +++ b/pages/shop/Live/LiveList/index.vue @@ -11,8 +11,8 @@ - - + + @@ -25,11 +25,11 @@ import { yxWechatLive } from "@/api/live"; - import ShoproLiveCard from '@/components/ShoproLiveCard.vue' + import ShopLiveCard from '@/components/ShopLiveCard.vue' export default { components: { - ShoproLiveCard + ShopLiveCard }, data() { return { @@ -40,6 +40,12 @@ name: '全部', code: '' }, + { + title: 'prevue', + name: '预告', + code: '102' + + }, { title: 'living', name: '直播中', diff --git a/pages/shop/StoreList/index.vue b/pages/shop/StoreList/index.vue index e5f6c78..fa8d7e8 100644 --- a/pages/shop/StoreList/index.vue +++ b/pages/shop/StoreList/index.vue @@ -16,7 +16,7 @@ - + @@ -35,7 +35,7 @@