From 839b1728f0d9cc7c2350135381843bc2931539ab Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 28 Aug 2020 22:54:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8D=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/zhibo/index.nvue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/zhibo/index.nvue b/pages/zhibo/index.nvue
index 876bf7a..cf26a68 100644
--- a/pages/zhibo/index.nvue
+++ b/pages/zhibo/index.nvue
@@ -18,7 +18,7 @@
     <view class="hot" :style="{'top': top + 10 * rpx}">
       <text class="hottext">{{room.onlineUsers.users.length}}</text>
     </view>
-    <image class="cart" src="../../static/cart.png" @click="show = true">
+    <image v-if="list.length != 0" class="cart" src="../../static/cart.png" @click="show = true">
 
     </image>
     <view class="danmufasongbox" @click="danmu = $store.state.hasLogin">
-- 
2.45.2


From 97c9774cc4fafcde3048bb339812fc6f96106021 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 28 Aug 2020 23:11:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=20=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E7=9A=84=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/shop.js       | 3 ++-
 pageC/classify/goods.vue | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/common/api/shop.js b/common/api/shop.js
index fccbc0e..ab442b0 100644
--- a/common/api/shop.js
+++ b/common/api/shop.js
@@ -86,11 +86,12 @@ export default {
 				return vm.$u.post('Goods/getGoodsClassRecommend');
 			},
 			// goodsListByClassId
-			goodsListByClassId({ gc_id, page, order }) {
+			goodsListByClassId({ gc_id, page, order, keyword }) {
 				return vm.$u.post('goods/goodsListByClassId', {
 					gc_id: gc_id,
 					page: page,
 					order: order,
+					keyword:keyword
 				});
 			},
 			// 商品推荐
diff --git a/pageC/classify/goods.vue b/pageC/classify/goods.vue
index c6305a8..97c6bee 100644
--- a/pageC/classify/goods.vue
+++ b/pageC/classify/goods.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="classify-goods">
+		<u-search style="padding: 0 30rpx" placeholder="日照香炉生紫烟" v-model="keyword" @search="select" @custom="select"></u-search>
 		<view class="tab-container">
 			<view class="salenum" :class="{ 'current' : current == 0 }" @click="switchCurrent(0)">销量</view>
 			<view class="price" :class="{ 'current' : current == 1 }" @click="switchCurrent(1)">
@@ -42,6 +43,8 @@ export default {
 			scrollHeight: '',
 			loadStatus: 'loadmore',
 			timer: true, // 防止上拉加载短时间内多次调用
+			keyword:"",
+			sel:""
 		}
 	},
 	watch: {
@@ -80,6 +83,7 @@ export default {
 				gc_id: this.cid, 
 				page: this.page,
 				order: sort,
+				keyword:this.sel
 			})
 			this.timer = true;
 			if(res.errCode == 0) {
@@ -123,6 +127,11 @@ export default {
 				id: id,
 				type: 1 // 商品详情 商品类型 1普通 2拼团 3秒杀 4优惠券
 			});
+		},
+		select(){
+			this.sel = this.keyword;
+			this.page = 1;
+			this.goodsListByClassId({ laod: 'reload' });
 		}
 	}
 };
-- 
2.45.2