111

pages/index/index.vue

@@ -138,72 +138,78 @@
 			</swiper>
 		</view>
 		<!-- 热门活动 -->
-		<view class="Hot">
-			<view class="hotTop">
-				<view class="hotLeft">
-					<view class="hotSx" :style="{background:'#'+themeColor}"></view>
-					<view class="hottitle">热门活动</view>
-				</view>
-				<view class="hotRight" @click="moreJk">
-					<view class="hotMore">更多</view>
-					<img src="../../static/timg/icon_arrow_right.png" alt="" class="hotMoreJt">
-				</view>
-			</view>
-			<view class="hotLine" @click="goJk(item)" v-for="(item,index) in homeCardList.openMActivity.openCollectingList" v-if="index<homeCardList.openMActivity.showCount"> 
-				<view class="hotLineTop">
-					<image class="hotLineTopImg" :src="item.img" mode=""></image>
-				    <view class="hotlineTimebox">
-				    	<!-- <view class="hotlinestate1" v-if="item.state==2">进行中</view>
-						<view class="hotlinestate2" v-if="item.state==1">未开始</view> -->
-						<image class="jkStateImg" v-if="item.state==2" src="../../static/img/bg_huangse.png" mode="" ></image>
-						<image class="jkStateImg" v-if="item.state==1" src="../../static/img/bg_hongse.png" mode="" ></image>
-						<view class="hotTime">{{item.startTime.slice(0,10)}}-{{item.endTime.slice(0,10)}}</view>
-				    </view>
-				</view>
-				<view class="hotName">{{item.activityName}}</view>
-			</view>
-			
-		</view>
-		<!-- 热门车型 -->
-		<view class="" v-if="homeCardList">
-			<view class="Hot" v-if="homeCardList.openMGoods.showType==1">
+		<view v-if="homeCardList.openMActivity">
+			<view class="Hot" v-if="homeCardList.openMActivity.openCollectingList.length>0">
 				<view class="hotTop">
 					<view class="hotLeft">
 						<view class="hotSx" :style="{background:'#'+themeColor}"></view>
-						<view class="hottitle">热门商品</view>
+						<view class="hottitle">热门活动</view>
 					</view>
-					<view class="hotRight" @click="goShop">
+					<view class="hotRight" @click="moreJk">
 						<view class="hotMore">更多</view>
 						<img src="../../static/timg/icon_arrow_right.png" alt="" class="hotMoreJt">
 					</view>
 				</view>
-				<view class="hotGoodsLine" v-for="(item,index) in homeCardList.openMGoods.goodsList" @click="goGoods(item)" v-if="index<homeCardList.openMGoods.showCount">
-					<view>
-						<image :src="item.url" mode="" class="hotGoodsLineImg"></image>
+				<view class="hotLine" @click="goJk(item)" v-for="(item,index) in homeCardList.openMActivity.openCollectingList" v-if="index<homeCardList.openMActivity.showCount"> 
+					<view class="hotLineTop">
+						<image class="hotLineTopImg" :src="item.img" mode=""></image>
+					    <view class="hotlineTimebox">
+					    	<!-- <view class="hotlinestate1" v-if="item.state==2">进行中</view>
+							<view class="hotlinestate2" v-if="item.state==1">未开始</view> -->
+							<image class="jkStateImg" v-if="item.state==2" src="../../static/img/bg_huangse.png" mode="" ></image>
+							<image class="jkStateImg" v-if="item.state==1" src="../../static/img/bg_hongse.png" mode="" ></image>
+							<view class="hotTime">{{item.startTime.slice(0,10)}}-{{item.endTime.slice(0,10)}}</view>
+					    </view>
 					</view>
-					<view class="hotGoodsLineRIght">
-						<view class="goodsName">{{item.name}}</view>
-					    <view class="Sold">
-							<view v-if="item.showLabel&&item.showLabel.indexOf('3')!=-1">
-								已售 {{item.saleQty>0?item.saleQty:0}}
-							</view>
+					<view class="hotName">{{item.activityName}}</view>
+				</view>
+				
+			</view>
+		</view>
+		
+		<!-- 热门车型 -->
+		<view v-if="homeCardList.openMGoods">
+			<view class="" v-if="homeCardList.openMGoods.length>0">
+				<view class="Hot" v-if="homeCardList.openMGoods.showType==1">
+					<view class="hotTop">
+						<view class="hotLeft">
+							<view class="hotSx" :style="{background:'#'+themeColor}"></view>
+							<view class="hottitle">热门商品</view>
+						</view>
+						<view class="hotRight" @click="goShop">
+							<view class="hotMore">更多</view>
+							<img src="../../static/timg/icon_arrow_right.png" alt="" class="hotMoreJt">
 						</view>
-						<view class="goodsPrice">
-							<view class="goodsPrice1" >{{item.saleLabel}}</view><!-- :style="{color:'#'+themeColor}" -->
-							<view class="goodsPrice2" >￥</view>
-							<view class="goodsPrice3" >{{item.salePrice}}
-							  <span v-if="item.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
+					</view>
+					<view class="hotGoodsLine" v-for="(item,index) in homeCardList.openMGoods.goodsList" @click="goGoods(item)" v-if="index<homeCardList.openMGoods.showCount">
+						<view>
+							<image :src="item.url" mode="" class="hotGoodsLineImg"></image>
+						</view>
+						<view class="hotGoodsLineRIght">
+							<view class="goodsName">{{item.name}}</view>
+						    <view class="Sold">
+								<view v-if="item.showLabel&&item.showLabel.indexOf('3')!=-1">
+									已售 {{item.saleQty>0?item.saleQty:0}}
+								</view>
+							</view>
+							<view class="goodsPrice">
+								<view class="goodsPrice1" >{{item.saleLabel}}</view><!-- :style="{color:'#'+themeColor}" -->
+								<view class="goodsPrice2" >￥</view>
+								<view class="goodsPrice3" >{{item.salePrice}}
+								  <span v-if="item.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
+								</view>
+								<view class="goodsPrice4" v-if="item.showLabel&&item.scribingPrice&&item.showLabel.indexOf('1')!=-1">￥{{item.scribingPrice}}</view>
 							</view>
-							<view class="goodsPrice4" v-if="item.showLabel&&item.scribingPrice&&item.showLabel.indexOf('1')!=-1">￥{{item.scribingPrice}}</view>
 						</view>
 					</view>
+					
 				</view>
-				
 			</view>
 		</view>
 		
 		
 		
+		
 		<view style="height: 60rpx;"></view>
 		<!-- 手机号授权 -->
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">