111

mer_uniapp/components/discoverFlowItem/discoverFlowItem.vue

@@ -42,10 +42,14 @@
 					</view> -->
 					<view class="like" @click.stop="likeToggle(items)">
 
-						<view class="like_count">
+						<view class="like_count mr-20">
 							<text class="iconfont" :class="items.userIsLike ? 'icon-shoucang1' : 'icon-dianzan'"></text>
 							<text class="collect">{{items.likeNum ? items.likeNum < 10000 ? items.likeNum : (items.likeNum / 10000).toFixed(2) + 'w' : '0' }}</text>
 						</view>
+						<view class="like_count">
+							<text class="iconfont icon-pinglun"></text>
+							<text class="collect">{{items.replyNum || 0}}</text>
+						</view>
 					</view>
 				</view>
 			</view>

mer_uniapp/pages/confession_wall/home/index.vue

@@ -79,8 +79,8 @@
 				<scroll-view class="bg--w111-fff pt-10 pb-10 pl-32" scroll-x style="white-space: nowrap; vertical-align: middle;border-top-right-radius: 23rpx;"
 				 show-scrollbar="false">
 					<view class='flex-y-center'>
-						<text v-for="(item,index) in navList" :key="index" class='wall-nav' :class='active==item.id ? "wall-nav-on": ""'
-						 @click="tabSelect(item.id, index)">
+						<text v-for="(item,index) in navList" :key="index" class='wall-nav'
+						 :class='active==item.id ? "wall-nav-on": ""' @click.stop="tabSelect(item.id, index)">
 							<text>{{item.name}}</text>
 						</text>
 					</view>
@@ -827,7 +827,7 @@
 
 			// 点击列表头部
 			selectMenu(item, index, isScroll) {
-				if (tabClick == index) return
+				if (this.tabClick == index) return
 				this.active = 0
 				this.triggeredDiscover = false;
 				this.categoryId = item.id;
@@ -842,6 +842,9 @@
 			tabSelect(active, e) {
 				if (this.active == active) return
 				this.active = active;
+				this.triggeredDiscover = false;
+				this.discoverList[this.categoryId].loading = false
+				this.discoverList[this.categoryId].loadend = false
 				this.getDiscoverList();
 			},
 		}
@@ -1300,16 +1303,17 @@
 
 		/* 移出视图 */
 	}
+
 	.wall-nav {
 		font-weight: 500;
 		font-size: 23rpx;
 		color: #999999;
 	}
-	
+
 	.wall-nav~.wall-nav {
 		margin-left: 38rpx;
 	}
-	
+
 	.wall-nav-on {
 		font-weight: 600;
 		font-size: 27rpx;

mer_uniapp/pages/merchant/home/index.vue

@@ -60,7 +60,7 @@
 		</view>
 		<view class="let-box">
 			<view @click="onTabChang(0)" class="let-box1">
-				<text :class="{ 'actave1': tabindex == 0 }" class="let-txt">点菜</text>
+				<text :class="{ 'actave1': tabindex == 0 }" class="let-txt">下单</text>
 				<view :class="{ 'actave': tabindex == 0 }" class="let-line"></view>
 			</view>
 			<view @click="onTabChang(1)" class="let-box1">