From ebf0d585fcd4c5d2fdca586409774515683bbc0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Wed, 18 May 2022 15:30:17 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/myOrder.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue index 88cae7e..0683258 100644 --- a/pages/order/myOrder.vue +++ b/pages/order/myOrder.vue @@ -326,10 +326,10 @@ export default { // this.loadData(this.status); }, onShow() { - if (this.tabCurrentIndex) { - this.initData(this.tabCurrentIndex); + if (!this.tabCurrentIndex) { + this.initData(0); } else { - this.initData(0); + } // this.loadData(this.status); }, @@ -340,7 +340,8 @@ export default { * 替换onLoad下代码即可 */ let status = Number(options.status); - this.status = status; + this.status = status; + this.tabCurrentIndex = status; // if (status == 0) { // this.loadData(status); @@ -434,6 +435,7 @@ export default { */ loadData(index) { this.params.pageNumber = this.navList[index].pageNumber; + // this.params.tag = this.orderStatus[index].orderStatus; getOrderList(this.params).then((res) => { uni.stopPullDownRefresh(); if (!res.data.success) { From 68cdcd8587dab5cc0904500992ae747022c7b597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Thu, 19 May 2022 09:31:32 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=88=91=E7=9A=84?= =?UTF-8?q?=E8=B6=B3=E8=BF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/myTracks.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/mine/myTracks.vue b/pages/mine/myTracks.vue index b485793..4768c70 100644 --- a/pages/mine/myTracks.vue +++ b/pages/mine/myTracks.vue @@ -116,12 +116,12 @@ uni.stopPullDownRefresh(); uni.hideLoading(); if (res.statusCode == 200) { - res.data.result && - res.data.result.forEach((item) => { + res.data.result.records.length && + res.data.result.records.forEach((item) => { item.show = false; }); - let data = res.data.result; + let data = res.data.result.records; if (data.total == 0) { this.whetherEmpty = true; } else { From 1dc42e13336e92b7bbe61d43f4df2974c15548ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Fri, 27 May 2022 10:32:08 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/m-buy/goods.vue | 926 +++++++++++++++++++------------------ 1 file changed, 464 insertions(+), 462 deletions(-) diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue index cca176f..e505028 100644 --- a/components/m-buy/goods.vue +++ b/components/m-buy/goods.vue @@ -1,515 +1,517 @@ + .promotion-box { + line-height: 1; + display: flex; + align-items: center; + text-decoration: line-through; + color: #999; + margin-left: 10rpx; + + /deep/ span { + font-size: 30rpx; + } + } + + .promotion { + font-size: 30rpx; + } + + .goods-price-promotionShow { + font-size: 48rpx; + } + + .goods-check-skus { + font-size: 24rpx; + color: #999; + + >.goods-check-skus-name { + margin-left: 4rpx; + } + + >span { + color: #333; + } + } + From a3d8a8037fbcb942cff2f9c5dd7c8ff5c70983d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Fri, 27 May 2022 15:45:37 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=20=E7=A9=BA=E6=95=B0=E6=8D=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/navigation/search/searchPage.vue | 31 ++++++++++++++------------ 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pages/navigation/search/searchPage.vue b/pages/navigation/search/searchPage.vue index d0da958..b953834 100644 --- a/pages/navigation/search/searchPage.vue +++ b/pages/navigation/search/searchPage.vue @@ -129,18 +129,6 @@ -
- - - - - - -

没有找到相关的商品信息

-

请换一个关键词试试吧

- -
-
+ + + + + + +

没有找到相关的商品信息

+

请换一个关键词试试吧

+ +
@@ -281,6 +280,7 @@ import storage from "@/utils/storage"; export default { data() { return { + empty:false, scrollTop: 0, loadIndex: 10, oldKeywordIndex: "", @@ -709,8 +709,11 @@ export default { let goodsList = await getGoodsList(this.params); if (goodsList.data.result.content.length < 10) { - this.loadingType = "noMore"; - } + this.loadingType = "noMore"; + this.empty = true + } else { + this.empty = false + } this.goodsList.push(...goodsList.data.result.content); this.initSortGoods(); uni.hideLoading(); From 6e04a5d3daa26db7b84c7eea5b9d84275525d61e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Fri, 27 May 2022 18:17:23 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=89=B9=E5=8F=91=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/m-buy/goods.vue | 57 +++++++++++++++++--------- pages/navigation/search/searchPage.vue | 4 ++ pages/product/goods.vue | 7 +++- pages/tabbar/cart/cartList.vue | 1 + 4 files changed, 48 insertions(+), 21 deletions(-) diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue index e505028..075b1da 100644 --- a/components/m-buy/goods.vue +++ b/components/m-buy/goods.vue @@ -36,29 +36,30 @@ -
- - ￥ - {{ - formatPrice(goodsDetail.price)[0] - }} - .{{ formatPrice(goodsDetail.price)[1] }} - -
+ -
-
- +
+
+ ￥ {{ - formatPrice(goodsDetail.price)[0] + formatPrice(item.price)[0] }} - .{{ formatPrice(goodsDetail.price)[1] }} + .{{ formatPrice(item.price)[1] }} + + + {{item.num}}{{goodsDetail.goodsUnit}}
-
- 23-30 -
+
+
+ + ￥ + {{ + formatPrice(goodsDetail.price)[0] + }} + .{{ formatPrice(goodsDetail.price)[1] }} +
@@ -132,10 +133,15 @@ formatList: [], currentSelceted: [], skuList: "", - isClose: false, //是否可以点击遮罩关闭 + isClose: false, //是否可以点击遮罩关闭 + }; }, - props: { + props: { + wholesaleList:{ + type: null, + default: false, + }, buyMask: { type: Boolean, default: false, @@ -164,6 +170,14 @@ default: "", type: null, }, + }, + computed: { + wholesalePrice(key){ + return this.wholesaleList.length ? this.wholesaleList.map(item=>{ return item.price }) :[] + }, + wholesaleNum(key){ + return this.wholesaleList.length ? this.wholesaleList.map(item=>{ return item.num }) :[] + } }, watch: { num(val){ @@ -454,6 +468,11 @@ border-radius: 30rpx; } } + } + .wholesale-item{ + color: #999 !important; + font-size: 24rpx; + margin:0 20rpx; } .goods-header { diff --git a/pages/navigation/search/searchPage.vue b/pages/navigation/search/searchPage.vue index d0da958..72b4929 100644 --- a/pages/navigation/search/searchPage.vue +++ b/pages/navigation/search/searchPage.vue @@ -164,12 +164,16 @@
+
+ 批 +
劵 满减 秒杀
+
已售 {{ item.content.buyCount || "0" }} {{ item.content.commentNum || "0" }}条评论 diff --git a/pages/product/goods.vue b/pages/product/goods.vue index 5125e34..0f24955 100644 --- a/pages/product/goods.vue +++ b/pages/product/goods.vue @@ -347,7 +347,8 @@ :isGroup="isGroup" :id="productId" v-if="goodsDetail.id" - :pointDetail="pointDetail" + :pointDetail="pointDetail" + :wholesaleList="wholesaleList" @handleClickSku="selectSku" :buyMask="buyMask" /> @@ -522,7 +523,8 @@ export default { startTimer: false, //未开启 是false routerVal: "", - IMLink: "", // IM地址 + IMLink: "", // IM地址 + wholesaleList:[] }; }, @@ -661,6 +663,7 @@ export default { } /**商品信息以及规格信息存储 */ this.goodsDetail = response.data.result.data; + this.wholesaleList = response.data.result.wholesaleList; this.goodsSpec = response.data.result.specs; this.PromotionList = response.data.result.promotionMap; this.goodsParams = response.data.result.goodsParamsDTOList || []; diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue index 0623bfa..c4b234f 100644 --- a/pages/tabbar/cart/cartList.vue +++ b/pages/tabbar/cart/cartList.vue @@ -74,6 +74,7 @@

{{skuItem.goodsSku.simpleSpecs}}

+

批发商品

From 42d20f0fd9c3bbeb2aec844cfd67d9ed233a22ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Mon, 30 May 2022 16:37:50 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=B0=81=E8=A3=85=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=AE=A1=E7=90=86=E6=A0=BC=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E6=97=A7=E7=89=88=E5=95=86=E5=93=81=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/m-goods-list/README.md | 10 + components/m-goods-list/list.vue | 293 ++++++++++++++++++ components/m-goods-recommend/index.vue | 21 +- pages/navigation/search/search.scss | 180 ----------- pages/navigation/search/searchPage.vue | 96 +----- .../product/goods/-goods-recommend.vue | 161 +--------- pages/product/shopPage.vue | 64 +--- pages/product/shopPageGoods.vue | 204 +++++------- 8 files changed, 402 insertions(+), 627 deletions(-) create mode 100644 components/m-goods-list/README.md create mode 100644 components/m-goods-list/list.vue diff --git a/components/m-goods-list/README.md b/components/m-goods-list/README.md new file mode 100644 index 0000000..74fa4c2 --- /dev/null +++ b/components/m-goods-list/README.md @@ -0,0 +1,10 @@ +## 商品列表展示 + +### OBJECT 参数说明 + +| 属性 | 说明 | 类型 | 必填 | +| ----------- | ---------------------------------------------------------- | ------- | ---- | +| `res` | 显示数据 | Array | 是 | +| `type` | 商品展示类型 oneColumns twoColumns ，默认展示一行两列商品 | String | 否 | +| `storeName` | 是否展示店铺名称，默认展示 | Boolean | 否 | + diff --git a/components/m-goods-list/list.vue b/components/m-goods-list/list.vue new file mode 100644 index 0000000..55446b7 --- /dev/null +++ b/components/m-goods-list/list.vue @@ -0,0 +1,293 @@ + + + + + diff --git a/components/m-goods-recommend/index.vue b/components/m-goods-recommend/index.vue index dbd5815..8f60967 100644 --- a/components/m-goods-recommend/index.vue +++ b/components/m-goods-recommend/index.vue @@ -1,27 +1,11 @@ - diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue index 07f050c..161bcf6 100644 --- a/pages/product/shopPage.vue +++ b/pages/product/shopPage.vue @@ -60,18 +60,7 @@
暂无商品信息 - - - - -
{{ item.content.goodsName }}
-
-
￥{{ item.content.price | unitPrice }}
-
- -
已售 {{ item.content.buyCount || "0" }}
- - +
@@ -94,7 +83,8 @@ - - \ No newline at end of file + + + + + From ded0ab5381b4b6e947d8cedfee40456bc6e6f26f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Tue, 31 May 2022 12:06:30 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E4=B8=AD=20=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/set/securityCenter/editPassword.vue | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pages/mine/set/securityCenter/editPassword.vue b/pages/mine/set/securityCenter/editPassword.vue index 7be7247..7da13e0 100644 --- a/pages/mine/set/securityCenter/editPassword.vue +++ b/pages/mine/set/securityCenter/editPassword.vue @@ -1,12 +1,13 @@ \ No newline at end of file From 3c9f0d3c5c725149f458d21b94922494e21229e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Tue, 31 May 2022 15:42:21 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=86=E5=8A=B5?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=9A=84=E9=80=BB=E8=BE=91=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/cart/coupon/couponCenter.vue | 549 ++++++++++++++--------------- uni.scss | 8 + 2 files changed, 280 insertions(+), 277 deletions(-) diff --git a/pages/cart/coupon/couponCenter.vue b/pages/cart/coupon/couponCenter.vue index 0a48d22..c7f9457 100644 --- a/pages/cart/coupon/couponCenter.vue +++ b/pages/cart/coupon/couponCenter.vue @@ -1,299 +1,294 @@ + .receive { + color: #ffffff; + background-color: $main-color; + border-radius: 50%; + width: 86rpx; + height: 86rpx; + text-align: center; + margin-right: 30rpx; + vertical-align: middle; + padding-top: 8rpx; + position: relative; + z-index: 2; + } + + .bg-quan { + width: 244rpx; + height: 244rpx; + border: 6rpx solid $main-color; + border-radius: 50%; + opacity: 0.1; + color: $main-color; + text-align: center; + padding-top: 30rpx; + font-size: 130rpx; + position: absolute; + right: -54rpx; + bottom: -60rpx; + } + } + } + } + } + + .coupon-title { + width: 260rpx; + + } + diff --git a/uni.scss b/uni.scss index 7fe2f11..20c6fca 100644 --- a/uni.scss +++ b/uni.scss @@ -168,4 +168,12 @@ $font-weight: 400; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden; +} + +.wes-3 { + /* 适用于webkit内核和移动端 */ + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; + overflow: hidden; } From b8fe2aacf132edee4f62a8da3bb2e52d55485b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Wed, 1 Jun 2022 10:58:54 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=B9=E5=8F=91?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=B1=95=E7=A4=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/m-buy/goods.vue | 5 ++++- pages/product/goods.vue | 11 ++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue index 075b1da..60724a3 100644 --- a/components/m-buy/goods.vue +++ b/components/m-buy/goods.vue @@ -473,6 +473,8 @@ color: #999 !important; font-size: 24rpx; margin:0 20rpx; + display: flex; + justify-content: center; } .goods-header { @@ -492,7 +494,8 @@ .goods-price { color: $price-color; - line-height: 80rpx; + line-height: 80rpx; + margin-right: 20rpx; >* { color: $price-color; line-height: 80rpx; diff --git a/pages/product/goods.vue b/pages/product/goods.vue index 0f24955..f6178d7 100644 --- a/pages/product/goods.vue +++ b/pages/product/goods.vue @@ -150,9 +150,14 @@ - ¥{{ formatPrice(goodsDetail.price)[0] }}.{{ formatPrice(goodsDetail.price)[1] }} + From ddcd03f0967666c66f48dc37f2a3c4567bbefe93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Wed, 1 Jun 2022 11:02:25 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/product/goods.vue | 50 ++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/pages/product/goods.vue b/pages/product/goods.vue index f6178d7..8e1af3c 100644 --- a/pages/product/goods.vue +++ b/pages/product/goods.vue @@ -150,14 +150,14 @@ - + + ¥{{ formatPrice(wholesaleList[wholesaleList.length-1].price)[0] }}.{{ formatPrice(wholesaleList[wholesaleList.length-1].price)[1] }} + ~ + ¥{{ formatPrice(wholesaleList[0].price)[0] }}.{{ formatPrice(wholesaleList[0].price)[1] }} + + + ¥{{ formatPrice(goodsDetail.price)[0] }}.{{ formatPrice(goodsDetail.price)[1] }} + @@ -352,7 +352,7 @@ :isGroup="isGroup" :id="productId" v-if="goodsDetail.id" - :pointDetail="pointDetail" + :pointDetail="pointDetail" :wholesaleList="wholesaleList" @handleClickSku="selectSku" :buyMask="buyMask" @@ -528,12 +528,12 @@ export default { startTimer: false, //未开启 是false routerVal: "", - IMLink: "", // IM地址 + IMLink: "", // IM地址 wholesaleList:[] }; }, - computed: { + computed: { // udesk IM IM() { return this.IMLink + this.storeDetail.merchantEuid; @@ -716,21 +716,21 @@ export default { }, linkMsgDetail() { - // lili 基础客服 - - uni.navigateTo({ - url: `/pages/tabbar/home/web-view?IM=${this.storeDetail.storeId}`, - }); - - // udesk 代码 - // if (this.storeDetail.merchantEuid) { - // uni.navigateTo({ - // url: `/pages/tabbar/home/web-view?src=${this.IM}`, - // }); - // } - + // lili 基础客服 + + uni.navigateTo({ + url: `/pages/tabbar/home/web-view?IM=${this.storeDetail.storeId}`, + }); + + // udesk 代码 + // if (this.storeDetail.merchantEuid) { + // uni.navigateTo({ + // url: `/pages/tabbar/home/web-view?src=${this.IM}`, + // }); + // } - // 客服 云智服代码 + + // 客服 云智服代码 // // #ifdef MP-WEIXIN // const params = { // storeName: this.storeDetail.storeName, From 470995c13d3bfa9fb8cd16e42e06ebbcc5b8873c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Wed, 1 Jun 2022 11:30:23 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=AD=E5=8F=91=E7=8E=B0=E7=9A=84=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- pages/product/goods.vue | 20 +++++++++---------- .../product/goods/-goods-recommend.vue | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/manifest.json b/manifest.json index 119a102..4cc39c1 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "lili商城", - "appid" : "__UNI__83F0C3D", + "appid" : "__UNI__EC9FD60", "description" : "", "versionName" : "4.2.5", "versionCode" : 4000250, diff --git a/pages/product/goods.vue b/pages/product/goods.vue index 8e1af3c..1cf8b5c 100644 --- a/pages/product/goods.vue +++ b/pages/product/goods.vue @@ -7,7 +7,7 @@ - + {{ goodsDetail.goodsName || "" }} @@ -410,7 +410,6 @@ export default { return { setup, promotionShow: false, //弹窗开关 - promotionFlag: true, //活动开关 // #ifdef H5 navbarListX: 110, //导航栏列表栏x轴 navbarListY: 80, //导航栏列表栏y轴 @@ -447,9 +446,10 @@ export default { }, ], popupsSwitch: false, //导航栏列表栏开关 - shareFlage: false, + enableShare: false, selectedGoods: "", //选择的商品规格昵称 isGroup: false, // 是否是拼团活动 + isSeckill:false, // 是否秒杀活动 pointDetail: "", // 是否是积分商品 assemble: "", //拼团的sku navbarOnlyBack: { @@ -485,7 +485,6 @@ export default { id: "4", }, ], - oldtabScrollTop: 0, tabScrollTop: null, scrollArr: [], scrollId: "1", @@ -547,10 +546,7 @@ export default { this.$refs.popupGoods.buyType = "PINTUAN"; clearInterval(timer); }, 100); - - this.promotionFlag = false; } else { - this.promotionFlag = true; this.$refs.popupGoods.buyType = ""; } }, @@ -684,6 +680,10 @@ export default { if (item.indexOf("POINTS_GOODS") == 0) { this.pointDetail = this.PromotionList[item]; } + // 秒杀 + if (item.indexOf("SECKILL") == 0) { + this.isSeckill = true + } }); // 轮播图 this.imgList = this.goodsDetail.goodsGalleryList; @@ -1074,7 +1074,7 @@ export default { * 点击分享 */ async shareChange() { - this.shareFlage = true; + this.enableShare = true; }, }, }; diff --git a/pages/product/product/goods/-goods-recommend.vue b/pages/product/product/goods/-goods-recommend.vue index 3e3dadc..e2f9655 100644 --- a/pages/product/product/goods/-goods-recommend.vue +++ b/pages/product/product/goods/-goods-recommend.vue @@ -1,14 +1,14 @@ -