1

pages/index/index.vue

@@ -60,26 +60,26 @@
 					<block v-for="(item, index) in styleConfig" :key="index" >
 						<view v-show="navIndex == 0">
 							<homeComb v-if="item.name == 'homeComb' && !smallPage" :isMenu="isMenu" :dataConfig="item" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy"></homeComb>
-							<!-- <activeParty v-if="item.name == 'activeParty'" :dataConfig="item"></activeParty> -->
-							<!-- <bargain v-if="item.name == 'bargain'" :dataConfig="item"></bargain> -->
-							<!-- <blankPage v-if="item.name == 'blankPage'" :dataConfig="item"></blankPage> -->
-							<!-- <combination v-if="item.name == 'combination'" :dataConfig="item"></combination> -->
+							<activeParty v-if="item.name == 'activeParty'" :dataConfig="item"></activeParty>
+							<bargain v-if="item.name == 'bargain'" :dataConfig="item"></bargain>
+							<blankPage v-if="item.name == 'blankPage'" :dataConfig="item"></blankPage>
+							<combination v-if="item.name == 'combination'" :dataConfig="item"></combination>
 							<topic v-if="item.name == 'topic'" :dataConfig="item"></topic>
 							<coupon v-if="item.name == 'coupon'" :dataConfig="item"></coupon>
-							<!-- <customerService v-if="item.name == 'customerService'" :dataConfig="item"></customerService> -->
+							<customerService v-if="item.name == 'customerService'" :dataConfig="item"></customerService>
 							<goodList v-if="item.name == 'goodList'" :dataConfig="item" @detail="goDetail"></goodList>
 							<guide v-if="item.name == 'guide'" :dataConfig="item"></guide>
 							<!-- <liveBroadcast v-if="item.name == 'liveBroadcast'" :dataConfig="item"></liveBroadcast> -->
 							<menus v-if="item.name == 'menus'" :class="isMenu ? 'transform-view' : ''" :dataConfig="item"></menus>
-							<!-- <news v-if="item.name == 'news'" :dataConfig="item"></news> -->
+							<news v-if="item.name == 'news'" :dataConfig="item"></news>
 							<presellList v-if="item.name == 'presellList'" :dataConfig="item"></presellList>
-							<!-- <plantList v-if="item.name == 'plantList'" :dataConfig="item"></plantList> -->
-							<!-- <hotRanking v-if="item.name == 'hotRanking' && hot_ranking_switch != 0" :dataConfig="item"></hotRanking> -->
+							<plantList v-if="item.name == 'plantList'" :dataConfig="item"></plantList>
+							<hotRanking v-if="item.name == 'hotRanking' && hot_ranking_switch != 0" :dataConfig="item"></hotRanking>
 							<promotionList v-if="item.name == 'promotionList'" :dataConfig="item" @changeTab="changeTab" :tempArr="tempArr" @detail="goDetail"></promotionList>
-							<!-- <richText v-if="item.name == 'richText'" :dataConfig="item"></richText> -->
-							<!-- <seckill v-if="item.name == 'seckill'" :dataConfig="item"></seckill> -->
+							<richText v-if="item.name == 'richText'" :dataConfig="item"></richText>
+							<seckill v-if="item.name == 'seckill'" :dataConfig="item"></seckill>
 							<swiperBg v-if="item.name == 'swiperBg'" :dataConfig="item"></swiperBg>
-							<!-- <pictureCube v-if="item.name == 'pictureCube'" :dataConfig="item"></pictureCube> -->
+							<pictureCube v-if="item.name == 'pictureCube'" :dataConfig="item"></pictureCube>
 							<titles v-if="item.name == 'titles'" :dataConfig="item"></titles>
 							<shopList v-if="item.name == 'shopList' && hide_mer_status != 1" :dataConfig="item"></shopList>
 						</view>
@@ -92,7 +92,7 @@
 						<!-- 首页推荐 -->
 						<view v-if="recommend_switch == 1" class="index-product-wrapper">
 							<!-- 首发新品 -->
-							<!-- <recommend :hostProduct="hostProduct" :indexP="true" :isLogin="isLogin"></recommend> -->
+							<recommend :hostProduct="hostProduct" :indexP="true" :isLogin="isLogin"></recommend>
 							<view class="loadingicon acea-row row-center-wrapper" v-if="hostProduct.length > 0">
 								<text class="loading iconfont icon-jiazai" :hidden="hotLoading == false"></text>
 								{{ hotTitle }}

pages/user/index.vue

@@ -47,7 +47,7 @@
 							<!--#endif-->
 							<view class="name" v-if="userInfo.uid">
 								{{userInfo.nickname}}<image v-if="member_status" class="level_icon" :src="userInfo.member_icon" alt="">
-								<view class="flagUser">{{userInfo.group_name}}</view>
+								<view class="flagUser" v-if="userInfo.group_name">{{userInfo.group_name}}</view>
 								<view class="vip" v-if="userInfo.is_svip > 0 && svip_switch_status == 1">
 									<image :src="`${domain}/static/images/svip.png`"></image>
 								</view>