diff --git a/components/goods-sku-popup/index.vue b/components/goods-sku-popup/index.vue index 0f10929..5e2b50a 100644 --- a/components/goods-sku-popup/index.vue +++ b/components/goods-sku-popup/index.vue @@ -657,7 +657,8 @@ } } else { that.selectShop = {}; - } + } + // uni.$emit("checkSelectShop",that.selectShop) }, // 检查路径 checkInpath(clickIndex) { diff --git a/pages/activity/intimate.vue b/pages/activity/intimate.vue index ec137c2..5ae2eba 100644 --- a/pages/activity/intimate.vue +++ b/pages/activity/intimate.vue @@ -40,9 +40,9 @@ {{a.server_price}} ¥{{a.line_price}} - + 没有更多了 @@ -296,7 +296,7 @@ .item { width: 270rpx; - height: 389rpx; + height: 369rpx; background: #FFFFFF; border-radius: 7rpx; opacity: 1; diff --git a/pages/activity/newPeople.vue b/pages/activity/newPeople.vue index 1bf9668..29ea22e 100644 --- a/pages/activity/newPeople.vue +++ b/pages/activity/newPeople.vue @@ -145,6 +145,8 @@ onChosed(index) { let app = this; app.current = index; + app.goodList = [] + app.$refs.uWaterfall1.clear(); app.getListgoodData(index != 0 ? app.menuList[index].category_id : '') }, openPage() { diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue index 7cbedc2..74b441a 100644 --- a/pages/goods/detail.vue +++ b/pages/goods/detail.vue @@ -81,7 +81,7 @@ - + @@ -376,7 +376,7 @@ - + @@ -399,6 +399,7 @@ }, data() { return { + goods_sku_no: "", isTodo: true, result: {}, max_price: "", @@ -408,7 +409,6 @@ cityInfo: {}, currenIndex: 0, isTop: false, - skuMode: 1, goodShow: false, showSkuPopup: false, allPicture: '', @@ -462,6 +462,14 @@ that.selectShop = selectShop that.selectShop.price = that.selectShop.price / 100 }) + // uni.$on("checkSelectShop", function(selectShop) { + // console.log("checkSelectShop1",selectShop) + // if(selectShop && selectShop.goods_sku_id){ + // that.goodsId = selectShop.goods_id + // that.getGoodsDetail(); + // } + // }) + }, onShow() { if (uni.getStorageSync('AccessToken')) { @@ -558,10 +566,10 @@ .catch() }, //跳转京东小程序详情 - toJDdetal(sku) { + toJDdetal() { wx.navigateToMiniProgram({ appId: 'wx91d27dbf599dff74', - path: '/pages/item/detail/detail?sku=' + sku, + path: '/pages/item/detail/detail?sku=' + this.goods_sku_no, envVersion: 'release', success(res) { // 打开成功 @@ -655,7 +663,6 @@ if (res.status == 200) { that.addressList = res.data.list if (res.data.list && res.data.list.length > 0) { - console.log(1111) that.getDefaultAddress() } else { console.log(222) @@ -757,6 +764,10 @@ this.$set(this.goods, item, info[item]) // that.goods[item] = info[item] }) + that.goods_sku_no ="" + if(info.skuList && info.skuList.length > 0){ + that.goods_sku_no = info.skuList[0].goods_sku_no + } that.allPicture = info.goods_images.length; if (type == 1) { that.selectShop = {} diff --git a/pages/goods/list.vue b/pages/goods/list.vue index 785695c..f18fbd1 100644 --- a/pages/goods/list.vue +++ b/pages/goods/list.vue @@ -177,8 +177,8 @@ - - + + @@ -582,8 +582,13 @@ .goods-name { margin-top: 10rpx; min-height: 68rpx; - line-height: 1.3; - white-space: normal; + white-space: normal; + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + -webkit-line-clamp: 2; + height: 90rpx; + line-height: 45rpx; color: #484848; font-size: 26rpx; } @@ -665,7 +670,13 @@ white-space: normal; color: #484848; font-size: 26rpx; - margin-bottom: 4rpx; + margin-bottom: 4rpx; + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + -webkit-line-clamp: 2; + height: 90rpx; + line-height: 45rpx; } .detail-price { diff --git a/pages/index/index.vue b/pages/index/index.vue index a6f07a0..f2592b9 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1747,7 +1747,12 @@ display: flex; align-items: center; margin-top: 14rpx; - + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + -webkit-line-clamp: 2; + height: 90rpx; + line-height: 45rpx; .ziying { padding: 4rpx 10rpx; background: #FF4438; diff --git a/pages/news/recycling/detail.vue b/pages/news/recycling/detail.vue index 4141875..f24ab8c 100644 --- a/pages/news/recycling/detail.vue +++ b/pages/news/recycling/detail.vue @@ -10,7 +10,7 @@ {{info.server_price}} {{info.recovery_name}} - 已售{{info.sold}} + {{info.server_name}} diff --git a/pages/user/vip/goods.vue b/pages/user/vip/goods.vue index 708efc7..3f2c2d7 100644 --- a/pages/user/vip/goods.vue +++ b/pages/user/vip/goods.vue @@ -18,6 +18,7 @@ + 全部 {{item.name}} @@ -83,7 +84,7 @@ // 正在加载 isLoading: true, tabIndex1: 0, - tabIndex: 0, + tabIndex: -1, filterIndex: 0, keyword: "", categoryList: [], @@ -176,16 +177,19 @@ this.tabIndex = index; this.page = 1; this.list = []; + this.$refs.uWaterfall1.clear(); this.category_id = item.category_id this.getBrandList(item.category_id) }, tabItem1(item, index) { this.tabIndex1 = index; let app = this; + this.tabIndex = -1; this.page = 1; app.categoryChildren = []; app.categoryChildren = item.children; app.list = []; + this.$refs.uWaterfall1.clear(); app.category_id = item.category_id this.getBrandList(item.category_id) },