Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan into main

pages/goods/detail.vue

@@ -338,7 +338,7 @@
 						{{goods.goods_name}}
 					</view>
 					<view class="sharePrice">
-						￥{{goods.goods_price_min}}
+						￥{{goods.goods_price_min?Number(goods.goods_price_min):goods.goods_price_min}}
 					</view>
 				</view>
 				<view class="shareOpera">

pages/goods/list.vue

@@ -81,7 +81,8 @@
 								</view>
 								<!-- 商品价格 -->
 								<view class="desc-footer">
-									<text class="price-x">¥{{ item.goods_price_min>0?Number(item.goods_price_min):'' }}</text>
+									<text
+										class="price-x">¥{{ item.goods_price_min>0?Number(item.goods_price_min):'' }}</text>
 									<text class="price-y col-9"
 										v-if="item.line_price_min > 0">¥{{ item.line_price_min>0?Number(item.line_price_min):'' }}</text>
 								</view>
@@ -115,8 +116,9 @@
 							</view>
 							<!-- 商品价格 -->
 							<view class="detail-price oneline-hide">
-								<text class="goods-price f-30 col-m">￥{{ item.goods_price_min>0?Number(item.goods_price_min):'' }} <text
+								<text
-										class="delPrice">到手价</text></text>
+									class="goods-price f-30 col-m">￥{{ item.goods_price_min>0?Number(item.goods_price_min):'' }}
+									<text class="delPrice">到手价</text></text>
 								<text v-if="item.line_price_min > 0"
 									class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):''  }}</text>
 							</view>
@@ -126,6 +128,7 @@
 						</view>
 					</view>
 				</view>
+				<u-empty text="暂无数据显示哦～" v-if="list.data.length==0" mode="list"></u-empty>
 			</view>
 		</mescroll-body>
 	</view>
@@ -217,13 +220,24 @@
 			},
 			onChage(item, type) {
 				if (type == 1) {
+					if (item.category_id == this.isBanrdActive) {
+						this.isBanrdActive = '';
+						this.keyName1 = ''
+					} else {
 						this.isBanrdActive = item.category_id;
 						this.keyName1 = item.name
 					}
+				}
 				if (type == 2) {
-					this.isActive = item.category_id
+					if (item.category_id == this.isActive) {
+						this.isActive = '';
+						this.keyName2 = ''
+					} else {
+						this.isActive = item.category_id;
 						this.keyName2 = item.name
 					}
+				}
+
 				this.getGoodsList()
 			},
 			/**
@@ -267,8 +281,9 @@
 					categoryId: app.options.categoryId || 0,
 					goodsName: app.options.search || '',
 					page: pageNo,
-					keywords: keywords
+					keywords: keywords.length > 0 ? keywords.join(',') : ''
 				}
+				console.log(param)
 				return new Promise((resolve, reject) => {
 					GoodsApi.list(param)
 						.then(result => {
@@ -361,6 +376,10 @@
 </script>
 
 <style lang="scss" scoped>
+	::v-deep .u-empty {
+		padding: 100rpx 0;
+	}
+
 	// 页面头部
 	.header {
 		background-color: #fff;