From 1f0a6d881b9ed61bcaab913fe4b2b553e8b4cee6 Mon Sep 17 00:00:00 2001
From: luojie <rowe_jason@outlook.com>
Date: Thu, 19 Oct 2023 15:00:06 +0800
Subject: [PATCH 1/6] test for push

---
 pages/index/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index deee3c1..8f37d66 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,7 +5,9 @@
 				prefixIconStyle="font-size: 22px;color: #909399;margin-left:30rpx" readonly>
 			</u-input>
 		</view>
+		<h2>上传测试</h2>
 	</view>
+	
 </template>
 
 <script>

From f9266cdd8f0f31b36940af56fa425ddc9e7d950a Mon Sep 17 00:00:00 2001
From: luojie <rowe_jason@outlook.com>
Date: Fri, 27 Oct 2023 14:22:24 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=BD=97=E4=B8=96=E6=9D=B0=EF=BC=9A?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95uview=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore            |  1 +
 App.vue               |  3 ++-
 manifest.json         |  2 +-
 pages/index/index.vue | 11 +++++++++--
 pages/my/my.vue       | 36 ++++++++++++------------------------
 5 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index 78a752d..193a671 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ selenium-debug.log
 
 package-lock.json
 yarn.lock
+/manifest.json
diff --git a/App.vue b/App.vue
index 8c2b732..9cf333c 100644
--- a/App.vue
+++ b/App.vue
@@ -12,6 +12,7 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
 	/*每个页面公共css */
+	@import 'uview-ui/index.scss';
 </style>
diff --git a/manifest.json b/manifest.json
index 066ca83..88ed076 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx78efc832a9373884",
         "setting" : {
             "urlCheck" : false
         },
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8f37d66..8fa33e2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,10 +2,16 @@
 	<view class="search_box">
 		<view class="search_box_border">
 			<u-input placeholder="搜索优质产品" placeholder-style="color: #969696" prefixIcon="search"
-				prefixIconStyle="font-size: 22px;color: #909399;margin-left:30rpx" readonly>
+				prefixIconStyle="font-size: 22px;color: #909399;margin-left:30rpx" >
 			</u-input>
 		</view>
-		<h2>上传测试</h2>
+		<h2>上传测试222</h2>
+		<view class="u-border-bottom ">
+			夫人之相与，俯仰一世，或取诸怀抱，悟言一室之内；或因寄所托，放浪形骸之外
+		</view>
+		<view class="u-line-1">
+			是日也，天朗气清，惠风和畅，仰观宇宙之大，俯察品类之盛，所以游目骋怀，足以极视听之娱，信可乐也
+		</view>
 	</view>
 	
 </template>
@@ -27,6 +33,7 @@
 </script>
 
 <style lang="scss">
+	// @import url();
 	// 搜索框样式
 	.search_box {
 		background: linear-gradient(135deg, #12CA64 0%, #1ACA67 100%);
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 6e7c990..92a21ef 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,30 +1,18 @@
 <template>
-	<view>
-		我的
+	<view class="u-border-bottom">
+		夫人之相与，俯仰一世，或取诸怀抱，悟言一室之内；或因寄所托，放浪形骸之外
 	</view>
+
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		onLoad() {
-			// this.getInfo()
-		},
-		methods: {
-			//---------页面调用接口示例------------
-			// getInfo() {
-			// 	this.$api.getUserInfo().then(res => {
-			// 		console.log('userInfo', res);
-			// 	})
-			// }
-		}
+export default {
+	data() {
+		return {
+			show:false,
+			title:'标题',
+			content:'uView的目标是成为uni-app生态最优秀的UI框架'
+		};
 	}
-</script>
-
-<style lang="scss">
-
-</style>
\ No newline at end of file
+};
+</script>
\ No newline at end of file

From 23b65d18f2b784af20dd3501b0dfb983b074609e Mon Sep 17 00:00:00 2001
From: luojie <rowe_jason@outlook.com>
Date: Sat, 28 Oct 2023 16:30:52 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=BD=97=E4=B8=96=E6=9D=B0=EF=BC=9A?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A4=B4=EF=BC=9A=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=E3=80=81=E8=BD=AE=E6=92=AD=E5=9B=BE=E5=88=9D=E6=AD=A5=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json          |  1 +
 pages/index/index.vue | 93 ++++++++++++++++++++++++-------------------
 2 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/package.json b/package.json
index 49fd105..93e4c3f 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "scss": "^0.2.4",
     "uview-ui": "^2.0.36"
   }
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8fa33e2..e3298ec 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,65 +1,78 @@
 <template>
-	<view class="search_box">
-		<view class="search_box_border">
-			<u-input placeholder="搜索优质产品" placeholder-style="color: #969696" prefixIcon="search"
-				prefixIconStyle="font-size: 22px;color: #909399;margin-left:30rpx" >
-			</u-input>
-		</view>
-		<h2>上传测试222</h2>
-		<view class="u-border-bottom ">
-			夫人之相与，俯仰一世，或取诸怀抱，悟言一室之内；或因寄所托，放浪形骸之外
-		</view>
-		<view class="u-line-1">
-			是日也，天朗气清，惠风和畅，仰观宇宙之大，俯察品类之盛，所以游目骋怀，足以极视听之娱，信可乐也
-		</view>
-	</view>
-	
+	<home-header></home-header>
 </template>
 
 <script>
+	import HomeHeader from './childComps/HomeHeader.vue'
 	export default {
+		components:{
+			HomeHeader,
+		},
 		data() {
 			return {
-
+				hotSearchWord:'热门关键词',
+				headerBgList:["https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg"]
 			}
 		},
 		onLoad() {
-
+			
 		},
 		methods: {
-
+			// 头部区域
+			//获取热点搜索词、背景URL
+			getHeaderAreaURL() {
+				
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	// @import url();
-	// 搜索框样式
+	// 搜索区域样式
 	.search_box {
-		background: linear-gradient(135deg, #12CA64 0%, #1ACA67 100%);
-
+		background: #000;
+		position: relative;
 		.search_box_border {
-			width: 94.6%;
-			height: 124rpx;
-			background: linear-gradient(320deg, #36E182 0%, #26DD76 100%, #26DD76 100%);
-			margin: 0 auto;
-			box-shadow: 0 -1px 3px 0 #31B96D;
-			border-radius: 38rpx 38rpx 0 0;
-
-			.u-border {
+			width: 84.6%;
+			height: 25px;
+			z-index: 1;
+			
+			position: absolute;
+			left: 50%;  
+			transform: translate(-50%, 0%); 
+			
+			border-radius: 10px;
+			padding-top: 3px !important;
+			margin-top: 8px;
+			background-color: #fff;
+			.u-border{
 				border: none;
-				padding-top: 16px !important;
-
-				.u-input__content {
-					height: 64rpx;
-					border-radius: 32rpx;
-					background-color: #fff;
-
-					.u-input__content__field-wrapper__field {
-						font-size: 26rpx !important;
-					}
+			}
+			// .u
+			.u-input__content {
+				background-color: #fff;
+				border-radius: 1;
+				height: 10px;
+				.u-input__content__field-wrapper__field {
+					height: 10px !important;
+					font-size: 10px !important;
 				}
 			}
 		}
+		.header-bgimg {
+			width: 100vw;
+			// z-index: 0;
+		}
+		
 	}
+	// 轮播图样式
+	.swiper {
+		.u-swiper {
+			border-radius:0 !important;
+		}
+		.u-swiper__wrapper__item__wrapper__image{
+			border-radius:0 !important;
+		}
+	}
+	
 </style>
\ No newline at end of file

From 50a12d9ccb7d15f8570c6be28237df34424cc708 Mon Sep 17 00:00:00 2001
From: luojie <rowe_jason@outlook.com>
Date: Mon, 30 Oct 2023 10:30:07 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=BD=97=E4=B8=96=E6=9D=B0=EF=BC=9Afeat?=
 =?UTF-8?q?=EF=BC=9A=E6=90=9C=E7=B4=A2=E6=A1=86=E5=AE=9A=E4=BD=8D=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/childComps/HomeHeader.vue | 112 ++++++++++++++++++++++++++
 pages/index/index.vue                 |  48 +----------
 2 files changed, 114 insertions(+), 46 deletions(-)
 create mode 100644 pages/index/childComps/HomeHeader.vue

diff --git a/pages/index/childComps/HomeHeader.vue b/pages/index/childComps/HomeHeader.vue
new file mode 100644
index 0000000..e4b5465
--- /dev/null
+++ b/pages/index/childComps/HomeHeader.vue
@@ -0,0 +1,112 @@
+<template>
+	<view class="header-area">
+		<view class="search-box u-flex u-flex-nowarp u-row-between">
+			<view class="search-box-input" >
+				<u-input 
+					:placeholder="hotSearchWord"
+					prefixIcon="search"
+					prefixIconStyle="font-size: 14px;color: #909399;margin-left:30rpx" 
+				/>
+			</view>
+			<view class="search-box-location">
+				<view><u-icon name="map" color="#909399" size="15"></u-icon></view>
+				<view class="localtion-text"><text>{{position}}</text></view>
+			</view>
+		</view>
+		
+		<view class="swiper">
+			<u-swiper :list="headerBgList"/>
+			<!-- <u-image :src=headerBgURL
+			class="header-bgimg" width="100vw" height="25vh"/> -->
+		</view> 
+		
+	</view>
+</template>
+
+<script>
+	export default{
+		name: "HomeHeader",
+		props: {
+			
+		},
+		data() {
+			return {
+				hotSearchWord:'热门关键词',
+				headerBgList:["https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg"]
+			}
+		},
+		options: {
+			styleIsolation: 'shared' // 解除样式隔离
+		},
+		computed:{
+			position(){
+				return  '定位中...'
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	// 搜索区域样式
+	.header-area {
+		position: relative;
+		.search-box {
+			// background: #000;
+			position: absolute;
+			z-index: 1;
+			left: 50%;
+			width: 84.6%;
+			transform: translateX(-50%); 
+			.search-box-input {
+				border-radius: 10px;
+				padding-top: 3px !important;
+				margin-top: 8px;
+				background-color: #fff;
+				.u-border{
+					border: none;
+				}
+				// 组件内部样式修改
+				.u-input__content {
+					background-color: #fff;
+					border-radius: 1;
+					height: 10px;
+					.u-input__content__field-wrapper__field {
+						// height: 10px !important;
+						font-size: 10px !important;
+					}
+				}
+			}
+			.search-box-location{
+				position: absolute;
+				z-index: 1;
+				height: 25px;
+				// width: 15vw;
+				top: 15px;
+				right: 10%;
+				
+				// transform: translate(-100%);
+				
+				display: flex;
+				.localtion-text{
+					padding-left: 8px;
+					font-size: 10px;
+				}
+			}
+			.header-bgimg {
+				width: 100vw;
+				z-index: 0;
+			}
+		}
+		// 轮播图样式
+		.swiper {
+			.u-swiper {
+				border-radius:0 !important;
+			}
+			.u-swiper__wrapper__item__wrapper__image{
+				border-radius:0 !important;
+			}
+		}
+		
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e3298ec..5626c1d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,5 +1,6 @@
 <template>
 	<home-header></home-header>
+	
 </template>
 
 <script>
@@ -28,51 +29,6 @@
 </script>
 
 <style lang="scss">
-	// 搜索区域样式
-	.search_box {
-		background: #000;
-		position: relative;
-		.search_box_border {
-			width: 84.6%;
-			height: 25px;
-			z-index: 1;
-			
-			position: absolute;
-			left: 50%;  
-			transform: translate(-50%, 0%); 
-			
-			border-radius: 10px;
-			padding-top: 3px !important;
-			margin-top: 8px;
-			background-color: #fff;
-			.u-border{
-				border: none;
-			}
-			// .u
-			.u-input__content {
-				background-color: #fff;
-				border-radius: 1;
-				height: 10px;
-				.u-input__content__field-wrapper__field {
-					height: 10px !important;
-					font-size: 10px !important;
-				}
-			}
-		}
-		.header-bgimg {
-			width: 100vw;
-			// z-index: 0;
-		}
-		
-	}
-	// 轮播图样式
-	.swiper {
-		.u-swiper {
-			border-radius:0 !important;
-		}
-		.u-swiper__wrapper__item__wrapper__image{
-			border-radius:0 !important;
-		}
-	}
+	
 	
 </style>
\ No newline at end of file

From 312666c186adbb2cdb256ffbe1a5847f4edc7296 Mon Sep 17 00:00:00 2001
From: luojie <rowe_jason@outlook.com>
Date: Mon, 30 Oct 2023 20:06:48 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E7=BD=97=E4=B8=96=E6=9D=B0=EF=BC=9Afeat?=
 =?UTF-8?q?=EF=BC=9A=E9=80=9A=E7=9F=A5=E6=9D=A1=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E3=80=81=E5=AF=BC=E8=88=AA=E5=8D=A1=E7=89=87=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/childComps/HomeHeader.vue | 27 +++++++--
 pages/index/index.vue                 | 80 +++++++++++++++++++++++++--
 2 files changed, 95 insertions(+), 12 deletions(-)

diff --git a/pages/index/childComps/HomeHeader.vue b/pages/index/childComps/HomeHeader.vue
index e4b5465..6a3e041 100644
--- a/pages/index/childComps/HomeHeader.vue
+++ b/pages/index/childComps/HomeHeader.vue
@@ -27,21 +27,36 @@
 	export default{
 		name: "HomeHeader",
 		props: {
-			
+			hotSearchWord:{
+				type: String,
+				default() {
+					return '热门关键词'
+				}
+			},
+			headerBgList:{
+				type: Array,
+				default() {
+				    return ["https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg","https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg"]
+				}
+			},
+			position:{
+				type: String,
+				default() {
+					return '定位中'
+				}
+			}
 		},
 		data() {
 			return {
-				hotSearchWord:'热门关键词',
-				headerBgList:["https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg"]
+				// hotSearchWord:'',
+				// headerBgList:[]
 			}
 		},
 		options: {
 			styleIsolation: 'shared' // 解除样式隔离
 		},
 		computed:{
-			position(){
-				return  '定位中...'
-			}
+			
 		}
 	}
 </script>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5626c1d..e70bd26 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,18 +1,65 @@
 <template>
-	<home-header></home-header>
+	<view class="base-bg-color">
+		<home-header></home-header>
+		<view class="nav-card">
+			<u-grid :col="4">
+					<u-grid-item>
+						<u-icon name="photo" :size="30"></u-icon>
+						<view class="grid-text">图片</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="lock" :size="30"></u-icon>
+						<view class="grid-text">锁头</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="hourglass" :size="30"></u-icon>
+						<view class="grid-text">沙漏</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="hourglass" :size="30"></u-icon>
+						<view class="grid-text">沙漏</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="photo" :size="30"></u-icon>
+						<view class="grid-text">图片</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="lock" :size="30"></u-icon>
+						<view class="grid-text">锁头</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="hourglass" :size="30"></u-icon>
+						<view class="grid-text">沙漏</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="hourglass" :size="30"></u-icon>
+						<view class="grid-text">沙漏</view>
+					</u-grid-item>
+				</u-grid>
+		</view>
+		<view class="news-box">
+			<u-notice-bar
+				:text="newsTextLists"
+				:bg-color="$uni-bg-color"
+			></u-notice-bar>
+		</view>
+	</view>
 	
 </template>
 
 <script>
 	import HomeHeader from './childComps/HomeHeader.vue'
 	export default {
-		components:{
+		components: {
 			HomeHeader,
 		},
 		data() {
 			return {
-				hotSearchWord:'热门关键词',
-				headerBgList:["https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg"]
+				newsTextLists: [
+					'寒雨连江夜入吴',
+					'平明送客楚山孤',
+					'洛阳亲友如相问',
+					'一片冰心在玉壶'],
 			}
 		},
 		onLoad() {
@@ -22,13 +69,34 @@
 			// 头部区域
 			//获取热点搜索词、背景URL
 			getHeaderAreaURL() {
-				
+				this.headerBgList = [];
+				this.hotSearchWord = ''
+			}
+		},
+		computed:{
+			newsText() {
+				// return "寒雨连江夜入吴 平明送客楚山孤 洛阳亲友如相问 一片冰心在玉壶"
+				return this.newsTextLists.join('')
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	
+	.base-bg-color {
+		background-color: $u-bg-color;
+	}
+	.nav-card {
+		margin: 15px 7px;
+		padding: 10px 0;
+		background-color: $uni-bg-color;
+		
+		border-radius: $uni-border-radius-lg;
+		box-shadow: 0 3px 3px 0 $u-border-color;
+		// border: solid 2px black;
+		.grid-text {
+			font-size: 14px;
+		}
+	}
 	
 </style>
\ No newline at end of file

From 284fc39203f24ab569257ec8e65b19040510145c Mon Sep 17 00:00:00 2001
From: luojie <rowe_jason@outlook.com>
Date: Tue, 31 Oct 2023 19:42:43 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=BD=97=E4=B8=96=E6=9D=B0=EF=BC=9Arefacto?=
 =?UTF-8?q?r=EF=BC=9A=E6=9A=82=E6=97=B6=E5=88=A0=E9=99=A4header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index e70bd26..24d5c21 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="base-bg-color">
-		<home-header></home-header>
+		
 		<view class="nav-card">
 			<u-grid :col="4">
 					<u-grid-item>
@@ -43,15 +43,18 @@
 				:bg-color="$uni-bg-color"
 			></u-notice-bar>
 		</view>
+		<view>
+			<store-show-list></store-show-list>
+		</view>
 	</view>
 	
 </template>
 
 <script>
-	import HomeHeader from './childComps/HomeHeader.vue'
+	import StoreShowList from '@/components/content/StoreShowList.vue'
 	export default {
 		components: {
-			HomeHeader,
+			
 		},
 		data() {
 			return {