diff --git a/manifest.json b/manifest.json
index 5ba661f..79b8e17 100644
--- a/manifest.json
+++ b/manifest.json
@@ -56,7 +56,7 @@
             "splashscreen" : {
                 "androidStyle" : "default",
                 "android" : {
-                    "hdpi" : "unpackage/res/icons/480_762.9.png",
+                    "hdpi" : "unpackage/res/icons/480_8001.9.png",
                     "xhdpi" : "unpackage/res/icons/720_1242.9.png",
                     "xxhdpi" : "unpackage/res/icons/1080_1882.9.png"
                 },
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 34be958..91259d7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -37,8 +37,9 @@
 		</view>
 		
 		<view v-for="(item,index) in indexDate.zones" :key="item.zone_id">
+			
 			<!-- 轮播图 -->
-			<view class="uni-margin-wrap page_padding" v-if="item.zone_code=='BANNER2' && item.zone_status=='NORMAL'">
+			<view class="uni-margin-wrap page_padding" v-if="item.zone_code=='BANNER' && item.zone_status=='NORMAL'">
 				<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" >
 					<swiper-item v-for="(item1,index1) in item.blocks" :key="item1.block_id">
 						<view class="swiper-item " v-if="item1.block_status=='NORMAL'">
@@ -47,36 +48,56 @@
 					</swiper-item>
 				</swiper>
 			</view>
-		</view>
-		
-		<!-- 宫格 -->
-		<uni-swiper-dot :info="info" :current="current" field="content" mode="default" class="page_padding">
-			<swiper class="grid_swiper" @change="gridSwiper">
-				<swiper-item v-for="(item,index) in info" :key="item.zone_id">
-					<view class="grid_content">
-						<view class="grid_item" v-for="(item1, index1) in item.blocks" :key="item1.zone_id">
-							<template v-if="item1.block_status=='NORMAL'">
-								<view class="grid_item_img">
-									<image :src="item1.block_pic" mode=""></image>
-								</view>
-								<text>{{item.block_title}}</text>
-							</template>
-							
+			
+			<!-- 宫格 -->
+			<uni-swiper-dot :info="info" :current="current" field="content" mode="default" class="page_padding" 
+			v-if="item.zone_code=='ICON' && item.zone_status=='NORMAL' && item.zone_code!=indexDate.zones[index-1].zone_code">
+				<swiper class="grid_swiper" @change="gridSwiper">
+					<swiper-item v-for="(item1,index1) in info" :key="item1.zone_id">
+						<view class="grid_content">
+							<view class="grid_item" v-for="(item2, index2) in item1.blocks" :key="item2.block_id">
+								<template v-if="item2.block_status=='NORMAL'">
+									<view class="grid_item_img">
+										<image :src="item2.block_pic" mode=""></image>
+									</view>
+									<text>{{item2.block_title}}</text>
+								</template>
+								
+							</view>
 						</view>
-					</view>
-				</swiper-item>
-			</swiper>
-		</uni-swiper-dot>
+					</swiper-item>
+				</swiper>
+			</uni-swiper-dot>
 			
 			<!-- 打折 -->
-			<image src="../../static/img/index_discount.png" mode="" class="discount page_padding"></image>
+			<!-- class="discount page_padding" -->
+			<view class="ONEPIC" v-if="item.zone_code=='ONEPIC' && item.zone_status=='NORMAL'">
+				<image :src="item.blocks[0].block_pic" mode=""  ></image>
+			</view>
+			<view class="TWOPIC" v-if="item.zone_code=='TWOPIC' && item.zone_status=='NORMAL'">
+				<image :src="item.blocks[0].block_pic" mode="" ></image>
+			</view>
+			<view class="THREEPIC" v-if="item.zone_code=='THREEPIC' && item.zone_status=='NORMAL'">
+				<image :src="item.blocks[0].block_pic" mode=""  ></image>
+			</view>
+			<view class="FOURPIC" v-if="item.zone_code=='FOURPIC' && item.zone_status=='NORMAL'">
+				<image :src="item.blocks[0].block_pic" mode=""  ></image>
+			</view>
+			<view class="FIVEPIC" v-if="item.zone_code=='FIVEPIC' && item.zone_status=='NORMAL'">
+				<image :src="item.blocks[0].block_pic" mode=""  ></image>
+			</view>
+			<view class="SIXPIC" v-if="item.zone_code=='SIXPIC' && item.zone_status=='NORMAL'">
+				<image :src="item.blocks[0].block_pic" mode=""  ></image>
+			</view>
+			
+			
 			
 			<!-- 标题 -->
-			<navigator url="/pages/index/flashSale">
+			<navigator url="/pages/index/flashSale" v-if="item.zone_code=='SPIKE1' && item.zone_status=='NORMAL'">
 				<view class="index_title page_padding">
 					<text>Flash Sale</text>
 					<view class="title_right">
-						<uni-countdown :showDay="false" :hour="23" :minute="0" :second="0" color="#FFFFFF" background-color="#1B1B1B" />
+						<uni-countdown :showDay="false" :hour="curEndTime |hours" :minute="curEndTime|minutes" :second="curEndTime|seconds" color="#FFFFFF" background-color="#1B1B1B" />
 						<image src="../../static/img/right.png" mode=""></image>
 					</view>
 				</view>
@@ -84,11 +105,13 @@
 			
 			
 			<!-- SPIKE 1 -->
-			<scroll-view class="spike1 page_padding_left" scroll-x="true" :show-scrollbar="false">
-				<view class="spike1_item" v-for="(item,index) in 8"  :key="index" @click="goPage">
-					<view class="spike1_item_img"></view>
+			<scroll-view class="spike1 page_padding_left" scroll-x="true" :show-scrollbar="false" v-if="item.zone_code=='SPIKE1' && item.zone_status=='NORMAL'">
+				<view class="spike1_item" v-for="(item1,index1) in item.blocks"  :key="item1.block_id" @click="goPage">
+					<view class="spike1_item_img">
+						<image :src="item1.block_pic" mode=""></image>
+					</view>
 					<view class="spike1_item_bottom">
-						<text>US$314.00</text>
+						<text>US${{item1.block_price}}</text>
 						<view class="spike1_item_text">US$12.5</view>
 					</view>
 					
@@ -96,8 +119,8 @@
 			</scroll-view>
 			
 			<!-- 标题 -->
-			<view class="index_title page_padding">
-				<text>Hot Selle</text>
+			<view class="index_title page_padding" v-if="item.zone_code=='TITLE' && item.zone_status=='NORMAL'">
+				<text>{{item.blocks[0].block_title}}</text>
 				<view class="title_right">
 					<image src="../../static/img/right.png" mode=""></image>
 				</view>
@@ -105,59 +128,71 @@
 			
 			<!-- HOT SELLS 1 -->
 			
-			<view class="hotSells1 page_padding">
-				<view class="hotSells1_item" v-for="(item,index) in 2" :key="index">
-					<view class="hotSells1_item_img"></view>
-					<text>DazzlingBlue Black</text>
-				</view>
-				<view class="hotSells2_item" v-for="(item,index) in 3" :key="index">
-					<view class="hotSells2_item_img"></view>
-					<text>DazzlingBlue</text>
-				</view>
+			<view class="hotSells1 page_padding" v-if="item.zone_code=='GOODSTWO1' || item.zone_code=='GOODSTHREE1'">
+				<template v-if="item.zone_code=='GOODSTWO1' && item.zone_status=='NORMAL'">
+					<view class="hotSells1_item" v-for="(item1,index1) in item.blocks"  :key="item1.block_id" >
+						<view class="hotSells1_item_img">
+							<image :src="item1.block_pic" mode=""></image>
+						</view>
+						<text>{{item1.block_title}}</text>
+					</view>
+				</template>
+				<template v-if="item.zone_code=='GOODSTHREE1' && item.zone_status=='NORMAL'">
+					<view class="hotSells2_item" v-for="(item1,index1) in item.blocks"  :key="item1.block_id">
+						<view class="hotSells2_item_img">
+							<image :src="item1.block_pic" mode=""></image>
+						</view>
+						<text>{{item1.block_title}}</text>
+					</view>
+				</template>
 			</view>
 			
 			<!-- 标题 -->
-			<view class="index_title page_padding">
+			<!-- <view class="index_title page_padding">
 				<text>Hot Selle</text>
 				<view class="title_right">
 					<image src="../../static/img/right.png" mode=""></image>
 				</view>
-			</view>
+			</view> -->
 			
 			<!-- HOT SELLS 2 -->
-			<scroll-view class="spike1 page_padding_left" scroll-x="true" :show-scrollbar="false">
-				<view class="spike1_item" v-for="(item,index) in 8"  :key="index">
-					<view class="spike1_item_img"></view>	
+			<scroll-view class="spike1 page_padding_left" scroll-x="true" :show-scrollbar="false" v-if="item.zone_code=='HONLIST2' && item.zone_status=='NORMAL'">
+				<view class="spike1_item" v-for="(item1,index1) in item.blocks"  :key="item1.block_id">
+					<view class="spike1_item_img">
+						<image :src="item1.block_pic" mode=""></image>
+					</view>	
 				</view>
 			</scroll-view>
 			
 			<!-- 标题 -->
-			<view class="index_title page_padding">
+			<!-- <view class="index_title page_padding">
 				<text>Hot Selle</text>
 				<view class="title_right">
 					<image src="../../static/img/right.png" mode=""></image>
 				</view>
-			</view>
+			</view> -->
 			
 			<!-- HOT SELLS 3 -->
-			<scroll-view class="spike1 page_padding_left" scroll-x="true" :show-scrollbar="false">
-				<view class="spike1_item" v-for="(item,index) in 8"  :key="index">
-					<view class="spike1_item_img"></view>
+			<scroll-view class="spike1 page_padding_left" scroll-x="true" :show-scrollbar="false" v-if="item.zone_code=='HONLIST3' && item.zone_status=='NORMAL'">
+				<view class="spike1_item" v-for="(item1,index1) in item.blocks"  :key="item1.block_id">
+					<view class="spike1_item_img">
+						<image :src="item1.block_pic" mode=""></image>
+					</view>	
 					<view class="spike1_item_bottom">
-						<text>US$314.00</text>
-						<view class="spike1_item_text1">Creative styling</view>
+						<text>US${{item1.block_price}}</text>
+						<view class="spike1_item_text1">{{item1.block_title}}</view>
 					</view>
 					
 				</view>
 			</scroll-view>
 			
 			<!-- GOODSTHREE 2 -->
-			<view class="goodsthree2">
+			<!-- <view class="goodsthree2">
 				<view class="goodsthree2_item" v-for="(item,index) in 3"  :key="index"></view>
-			</view>
+			</view> -->
 			
 			<!-- 轮播图 -->
-			<view class="uni-margin-wrap">
+			<!-- <view class="uni-margin-wrap">
 				<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" >
 					<swiper-item>
 						<view class="swiper-item uni-bg-red">A</view>
@@ -169,29 +204,28 @@
 						<view class="swiper-item uni-bg-blue">C</view>
 					</swiper-item>
 				</swiper>
-			</view>
+			</view> -->
 			
 			<!-- SPIKE 1 -->
-			<scroll-view class="spike1 page_padding_left" scroll-x="true" :show-scrollbar="false">
+			<!-- <scroll-view class="spike1 page_padding_left" scroll-x="true" :show-scrollbar="false">
 				<view class="spike1_item" v-for="(item,index) in 8"  :key="index">
 					<view class="spike1_item_img"></view>
 					<view class="spike1_item_bottom1">
 						<view class="spike1_item_text">Adidas Yeezy Boost 350  DazzlingBlue Black</view>
 						<text>US$314.00</text>
 					</view>
-					
 				</view>
-			</scroll-view>
+			</scroll-view> -->
 			
 			<!-- 瀑布流标题 -->
-			<view class="index_title1">PRODUCTS FRO YOU</view>
+			<view class="index_title1" v-if="item.zone_code=='LIST1' && item.zone_status=='NORMAL'">PRODUCTS FRO YOU</view>
 			
-			<view class="waterfall">
-				<custom-waterfalls-flow :value="list">
-					<template v-slot:default="item">
+			<view class="waterfall" v-if="item.zone_code=='LIST1' && item.zone_status=='NORMAL'">
+				<custom-waterfalls-flow :value="item.blocks" imageKey="block_pic">
+					<template v-slot:default="item1">
 							<view class="item">
-									<view class="title">{{item.title}}</view>
-									<view class="desc">{{item.desc}}</view>
+									<view class="title">{{item1.title}}</view>
+									<view class="desc">{{item1.block_price}}</view>
 							</view>
 					</template>
 				</custom-waterfalls-flow>
@@ -216,11 +250,42 @@
 					{ image: 'https://via.placeholder.com/200x200.png/2878ff', title: 'Adidas Yeezy Boost 350  DazzlingBlue Black', desc: 'US$314.00' }
 				],
 				indexDate:{},
-				info:[]
+				info:[],
+				banner:{}
 			}
 		},
 		onLoad() {
 			this.getIndex()
+			console.info(this.curEndTime)
+		},
+		computed:{
+			//当天结束时间
+			curEndTime(){
+				const endtime = new Date(new Date().setHours(23,59,59,999)).getTime()
+				 // 获取当前时间
+				const nowtime=(new Date()).getTime();
+				var date3 = nowtime - endtime;   //时间差的毫秒数      
+				date3 = Math.abs(date3)
+			  return date3;
+			}
+		},
+		filters:{
+			hours (timestamp){
+				var leave1=timestamp%(24*3600*1000)    //计算天数后剩余的毫秒数
+				var hours=Math.floor(leave1/(3600*1000))
+				return hours
+			},
+			minutes(timestamp){
+				var leave2=(timestamp%(24*3600*1000))%(3600*1000)        //计算小时数后剩余的毫秒数
+				var minutes=Math.floor(leave2/(60*1000))
+				return minutes
+			},
+			seconds(timestamp){
+				var leave3=((timestamp%(24*3600*1000))%(3600*1000))%(60*1000)      //计算分钟数后剩余的毫秒数
+				var seconds=Math.round(leave3/1000)
+				return seconds
+			}
+			
 		},
 		methods: {
 			// 获取首页数据配置
@@ -236,7 +301,6 @@
 								this.info.push(item)
 							}
 						})
-						console.info(this.info)
 					}
 				})
 			},
@@ -267,6 +331,53 @@
 		background-color: white;
 		// position: relative;
 	}
+	.ONEPIC{
+		width: 100%;
+		height: auto;
+		image{
+			// height: auto;
+			width: 100%;
+		}
+	}
+	.TWOPIC{
+		width: 100%;
+		display: flex;
+		image{
+			width: 50%;
+		}
+	}
+	.THREEPIC{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		image{
+			width: 33%;
+		}
+	}
+	.FOURPIC{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		image{
+			width: 25%;
+		}
+	}
+	.FIVEPIC{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		image{
+			width: 20%;
+		}
+	}
+	.SIXPIC{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		image{
+			width: 16.6%;
+		}
+	}
 	.body{
 		padding-top: 361.33rpx;
 	}
@@ -493,8 +604,11 @@
 			.spike1_item_img{
 				width: 200rpx;
 				height: 200rpx;
-				
-				background-color: #999999;
+				// background-color: #999999;
+				image{
+					width: 100%;
+					height: 100%;
+				}
 			}
 			.spike1_item_bottom{
 				padding-left: 9.33rpx;
diff --git a/unpackage/res/icons/1080_1882.9.png b/unpackage/res/icons/1080_1882.9.png
index d6908f7..1b01757 100644
Binary files a/unpackage/res/icons/1080_1882.9.png and b/unpackage/res/icons/1080_1882.9.png differ
diff --git a/unpackage/res/icons/480_8001.9.png b/unpackage/res/icons/480_8001.9.png
new file mode 100644
index 0000000..0e1c9dd
Binary files /dev/null and b/unpackage/res/icons/480_8001.9.png differ
diff --git a/unpackage/res/icons/720_1242.9.png b/unpackage/res/icons/720_1242.9.png
index 6629791..d9f4746 100644
Binary files a/unpackage/res/icons/720_1242.9.png and b/unpackage/res/icons/720_1242.9.png differ