bug修复

components/goods-sku-popup/index.vue

@@ -657,7 +657,8 @@
           }
         } else {
           that.selectShop = {};
-        }
+        }
+		// uni.$emit("checkSelectShop",that.selectShop)
       },
       // 检查路径
       checkInpath(clickIndex) {

pages/activity/intimate.vue

@@ -40,9 +40,9 @@
 							<view class="n">￥<text>{{a.server_price}}</text></view>
 							<view class="o">￥{{a.line_price}}</view>
 						</view>
-						<view class="desc">
+						<!-- <view class="desc">
 							{{a.comment_num}}条评论 {{a.comment_rate}}好评率
-						</view>
+						</view> -->
 					</view>
 					<u-empty v-if="isShow" text="暂无信息" mode="list"></u-empty>
 					<u-divider v-if="list1.length == total && total>=1">没有更多了</u-divider>
@@ -296,7 +296,7 @@
 
 					.item {
 						width: 270rpx;
-						height: 389rpx;
+						height: 369rpx;
 						background: #FFFFFF;
 						border-radius: 7rpx;
 						opacity: 1;

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() {

pages/goods/detail.vue

@@ -81,7 +81,7 @@
 					</view>
 					<view class="operaImg">
 						<image :src="$picUrl+'/static/detail/miaosha.png'" v-if="isSeckill" class="tips"></image>
-						<image :src="$picUrl+'/static/detail/tip.png'" @click="toJDdetal(goods.goods_id)" class="tips">
+						<image :src="$picUrl+'/static/detail/tip.png'" v-if="goods_sku_no" @click="toJDdetal()" class="tips">
 						</image>
 						<!-- <image :src="$picUrl+'/static/detail/ys.png'" class="tips"></image> -->
 					</view>
@@ -376,7 +376,7 @@
 			<image :src="$picUrl+'/static/toTop.png?=1'"></image>
 		</view>
 		<view v-if="isTodo">
-			<SkuPopup v-model="showSkuPopup" :skuMode="skuMode" :goods="goods" @addCart="onAddCart" />
+			<SkuPopup v-model="showSkuPopup" :skuMode="skuMode" :goods="goods" @addCart="onAddCart"  />
 		</view>
 		<setPrice ref="setRange" @getprice="getprice" />
 		<!-- 海报图弹层 -->
@@ -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 = {}

pages/goods/list.vue

@@ -177,8 +177,8 @@
 						</template>
 					</u-waterfall>
 				</view>
-				<view style="margin-top: 250rpx;">
-					<u-empty text="暂无数据显示哦～" v-if="list.data.length==0 && total == 0" mode="list"></u-empty>
+				<view style="margin-top: 250rpx;" v-if="list.data.length==0 && total == 0">
+					<u-empty text="暂无数据显示哦～" mode="list"></u-empty>
 				</view>	
 			</view>
 		</mescroll-body>
@@ -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 {

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;

pages/news/recycling/detail.vue

@@ -10,7 +10,7 @@
 			<view class="a">
 				<view class="price" v-if="type== 1">￥<text>{{info.server_price}}</text></view>
 				<view class="b" v-if="type== 2">{{info.recovery_name}}</view>
-				<view class="exchange">已售{{info.sold}}</view>
+				<!-- <view class="exchange">已售{{info.sold}}</view> -->
 			</view>
 			<view class="b" v-if="type== 1">{{info.server_name}}</view>
 			<!-- <view class="c" v-if="type== 1">{{info.server_category}}</view> -->

pages/user/vip/goods.vue

@@ -18,6 +18,7 @@
 		</scroll-view>
 		<view class="goods-bd">
 			<scroll-view scroll-y class="a">
+				<view class="item" @click="tabItem(-1)" :class="tabIndex==-1?'item-on':''">全部</view>
 				<view class="item" v-for="(item,index) in categoryChildren" :key="index" @click="tabItem(index,item)"
 					:class="tabIndex==index?'item-on':''">{{item.name}}</view>
 			</scroll-view>
@@ -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)
 			},