commit -m 测试

pages.json

@@ -152,8 +152,6 @@
 				"style": {
 					"navigationBarTitleText": "活动专区",
 					"enablePullDownRefresh":true,
-					"backgroundColor":"#ff457b",
-					"backgroundTextStyle":"light",
 					"onReachBottomDistance":50
 				}
 			}

pages/user/activity/activity-list.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container activity">
-		<view class="activity-content">
+		<view class="activity-content" v-if="activityList.length > 0">
 			<view class="activity-list" v-for="(activity,index) in activityList" :key="index" @click="NavigatorPath(activity)">
 				<view class="activity-list-pic">
 					<image class="activity-image" :src="activity.listImage" mode=""></image>
@@ -10,11 +10,18 @@
 					<view class="activity-numbe">商品数：<text class="color">{{ activity.productCount }}</text> </view>
 					<view class="activity-times">
 						<text class="label">活动时间：</text>
-						<text class="color">{{ activity.beginTime }}~{{ activity.endTime }}</text>
+						<text class="color">{{ activity.beginTime }} ~ {{ activity.endTime }}</text>
 					</view>
 				</view>
 			</view>
 		</view>
+		<view v-else class="activity-content-empty">
+			<view  class="empty-container">
+				<image class="empty-container-image" :src="StaticUrl+'icon-empty-activity.png'" mode="aspectFit"></image>
+				<text class="error-text">您还没有活动哟~</text>
+				<text class="error-text">可联系采美帮您设置活动~</text>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -164,5 +171,7 @@
 			}
 		}
 	}
-	
+	.activity-content-empty{
+		position: relative;
+	}
 </style>