From c443043533559cbc371278581aa18618b4bbd7c6 Mon Sep 17 00:00:00 2001
From: LuoShijie <rowe_jason@outlook.com>
Date: Wed, 8 Nov 2023 00:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=97=E4=B8=96=E6=9D=B0=EF=BC=9Afaet?=
 =?UTF-8?q?=EF=BC=9A=E5=BA=97=E9=93=BA=E8=BD=AC=E8=AE=A9=E3=80=81=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E9=80=89=E5=9D=80=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/DropDown/DropDown.vue              |  50 ++++++++++++++++++
 components/DropDown/DropDownItem.vue          |   8 +++
 components/ShowShopList/ShowShopList.vue      |   2 +-
 .../{ => HomeMainContent}/HomeNavCard.vue     |   0
 .../{ => HomeMainContent}/HomeNoticeBar.vue   |   0
 .../{ => HomeMainContent}/Statistics.vue      |   0
 pages/index/index.vue                         |   8 +--
 pages/shopAddress/shopAddress.vue             |  19 +++++--
 pages/shopTransfer/shopTransfer.vue           |  45 ++++++++++++++--
 static/dropdown/dp_icon_hlxia.png             | Bin 0 -> 270 bytes
 static/dropdown/dp_icon_lxia.png              | Bin 0 -> 273 bytes
 11 files changed, 118 insertions(+), 14 deletions(-)
 create mode 100644 components/DropDown/DropDown.vue
 create mode 100644 components/DropDown/DropDownItem.vue
 rename pages/index/{ => HomeMainContent}/HomeNavCard.vue (100%)
 rename pages/index/{ => HomeMainContent}/HomeNoticeBar.vue (100%)
 rename pages/index/{ => HomeMainContent}/Statistics.vue (100%)
 create mode 100644 static/dropdown/dp_icon_hlxia.png
 create mode 100644 static/dropdown/dp_icon_lxia.png

diff --git a/components/DropDown/DropDown.vue b/components/DropDown/DropDown.vue
new file mode 100644
index 0000000..80034ea
--- /dev/null
+++ b/components/DropDown/DropDown.vue
@@ -0,0 +1,50 @@
+<template>
+	<view class="container">
+		<view 
+			class="title-view"
+			v-for="item in title"
+		>
+			<text>{{item}}</text>
+			<view class="arrow">
+				<u-image src="/static/dropdown/dp_icon_lxia.png" width="14rpx" height="11rpx"/>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"DropDown",
+		data() {
+			return {
+				title: ['行业','区域','面积','筛选']
+			};
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.container{
+	height: 100rpx;
+	background-color: #fff;
+	display: flex;
+	justify-content: space-around;
+	.title-view {
+		display: flex;
+		>text {
+			font-size: 14px;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+		}
+	}
+	.arrow {
+		margin-left: 8rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+}
+	
+</style>
\ No newline at end of file
diff --git a/components/DropDown/DropDownItem.vue b/components/DropDown/DropDownItem.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/components/DropDown/DropDownItem.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/components/ShowShopList/ShowShopList.vue b/components/ShowShopList/ShowShopList.vue
index d6c99dc..043493c 100644
--- a/components/ShowShopList/ShowShopList.vue
+++ b/components/ShowShopList/ShowShopList.vue
@@ -29,7 +29,7 @@
 			showStyle:{
 				type: Number,
 				default() {
-					return 1
+					return 0
 				}
 			},
 			isADshow: {
diff --git a/pages/index/HomeNavCard.vue b/pages/index/HomeMainContent/HomeNavCard.vue
similarity index 100%
rename from pages/index/HomeNavCard.vue
rename to pages/index/HomeMainContent/HomeNavCard.vue
diff --git a/pages/index/HomeNoticeBar.vue b/pages/index/HomeMainContent/HomeNoticeBar.vue
similarity index 100%
rename from pages/index/HomeNoticeBar.vue
rename to pages/index/HomeMainContent/HomeNoticeBar.vue
diff --git a/pages/index/Statistics.vue b/pages/index/HomeMainContent/Statistics.vue
similarity index 100%
rename from pages/index/Statistics.vue
rename to pages/index/HomeMainContent/Statistics.vue
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0f2f41c..78900ff 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -20,9 +20,9 @@
 </template>
 
 <script>
-	import HomeNoticeBar from "./HomeNoticeBar.vue"
-	import HomeNavCard from "./HomeNavCard.vue"
-	import Statistics from "./Statistics.vue"
+	import HomeNoticeBar from "./HomeMainContent/HomeNoticeBar.vue"
+	import HomeNavCard from "./HomeMainContent/HomeNavCard.vue"
+	import Statistics from "./HomeMainContent/Statistics.vue"
 	export default {
 		components: {
 			HomeNavCard,
@@ -32,7 +32,7 @@
 		data() {
 			return {
 				notice: '寒雨连江夜入吴 平明送客楚山孤 洛阳亲友如相问 一片冰心在玉壶',
-				chooseIndex: 1,
+				chooseIndex: 0,
 				statisticsNum: [231753, 1345]
 			}
 		},
diff --git a/pages/shopAddress/shopAddress.vue b/pages/shopAddress/shopAddress.vue
index e467055..92bb5e8 100644
--- a/pages/shopAddress/shopAddress.vue
+++ b/pages/shopAddress/shopAddress.vue
@@ -1,6 +1,12 @@
 <template>
-	<view>
-		找店地址
+	<view class="root">
+		<InputAndSwiper></InputAndSwiper>
+		
+		<view style="margin-top: 10px;">
+			<DropDown></DropDown>
+		</view>
+		
+		<SearchShopList :showStyle="1"></SearchShopList>
 		<TabBar :current-page="3"></TabBar>
 	</view>
 </template>
@@ -18,6 +24,11 @@
 	}
 </script>
 
-<style>
-
+<style lang="scss">
+	page {
+		background-color: $uni-bg-color-grey;
+	}
+	.root{
+		margin: 0 10px;
+	}
 </style>
diff --git a/pages/shopTransfer/shopTransfer.vue b/pages/shopTransfer/shopTransfer.vue
index 7cbd61a..6ed7966 100644
--- a/pages/shopTransfer/shopTransfer.vue
+++ b/pages/shopTransfer/shopTransfer.vue
@@ -1,6 +1,12 @@
 <template>
-	<view>
-		店铺转让
+	<view class="root">
+		<InputAndSwiper></InputAndSwiper>
+		
+		<view style="margin-top: 10px;">
+			<DropDown></DropDown>
+		</view>
+		
+		<ShowShopList :showStyle="1"></ShowShopList>
 		<TabBar :current-page="1"></TabBar>
 	</view>
 </template>
@@ -9,7 +15,30 @@
 	export default {
 		data() {
 			return {
-				
+				value1: 1,
+								value2: 2,
+								options1: [{
+										label: '默认排序',
+										value: 1,
+									},
+									{
+										label: '距离优先',
+										value: 2,
+									},
+									{
+										label: '价格优先',
+										value: 3,
+									}
+								],
+								options2: [{
+										label: '去冰',
+										value: 1,
+									},
+									{
+										label: '加冰',
+										value: 2,
+									},
+								],
 			}
 		},
 		methods: {
@@ -18,6 +47,12 @@
 	}
 </script>
 
-<style>
-
+<style lang="scss">
+	page {
+		background-color: $uni-bg-color-grey;
+	}
+	.root {
+		margin: 0 10px;
+	}
+	
 </style>
diff --git a/static/dropdown/dp_icon_hlxia.png b/static/dropdown/dp_icon_hlxia.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8ecd9824f0a2a127b2eccc12d237683724586d4
GIT binary patch
literal 270
zcmV+p0rCEcP)<h;3K|Lk000e1NJLTq000gE000XJ1^@s6Pldc<00001b5ch_0Itp)
z=>Px#$Vo&&R47xGkFgEHFc3xmxr7N2f&rikwjyR=2m%!YumvN~5Y_>kG=Ux>3I+fv
z60(saVnvZH!Ik&_yZfKu8OeDMz#0I(%W^Z#^GDl8?S<sL1K<E){MF6?VxiQl>Ggp-
z0E^baR4BC!f|BzDK<bNcj|rvrwdOvaqG+TUvk|)i@X54}Cs}r}dIfrV1z5PgHR$UV
zf~&rC6k<-sxa=W!bI*tplAK=w41WQf$C$eXZvX~=fk0uS&PeMmi26Um1tVI00AE=?
UM~jXRW&i*H07*qoM6N<$f^1`Hb^rhX

literal 0
HcmV?d00001

diff --git a/static/dropdown/dp_icon_lxia.png b/static/dropdown/dp_icon_lxia.png
new file mode 100644
index 0000000000000000000000000000000000000000..646d6117b037da847d0cf2412c97f2d86c75211c
GIT binary patch
literal 273
zcmV+s0q*{ZP)<h;3K|Lk000e1NJLTq000gE000XJ1^@s6Pldc<00001b5ch_0Itp)
z=>Px#%Sl8*R47xG&^-=<KoAAsx0BGUCoo12pgrEfgoXq*G=h}}@D?7yMyxi3l3Q4-
zy%Gx#;FcRR6vQ7yoNhAnP4=w_!*C{q*Z>%yTa^HoLMe3tFzjaPt&-sx!01nSWjF`0
z`xC~3fl_J<AnAzHEXx)Z^gK^WDfa*-Kk(5Q;}%6>D##TC!I+2`_rBn}wbsq^{KWGb
zauY>SY^_b3AQ2^6>-sNVU`yUA*Ym*-*pT;NjG1z-R>(u&_xq0HtT+l0t+m#-_vb$V
XMKnE)V-co~00000NkvXXu0mjfyw7e{

literal 0
HcmV?d00001