diff --git a/components/inputAndSwiper/inputAndSwiper.vue b/components/InputAndSwiper/InputAndSwiper.vue
similarity index 99%
rename from components/inputAndSwiper/inputAndSwiper.vue
rename to components/InputAndSwiper/InputAndSwiper.vue
index 6492322..6697869 100644
--- a/components/inputAndSwiper/inputAndSwiper.vue
+++ b/components/InputAndSwiper/InputAndSwiper.vue
@@ -51,7 +51,7 @@
 			// this.getLocation()
 		},
 		methods: {
-			getLocation(){
+			getLocation() {
 				uni.getLocation({
 					type: 'wgs84',
 					// geocode: true, // 返回城市信息
diff --git a/components/TabBar/TabBar.vue b/components/TabBar/TabBar.vue
index e9a3a18..ba0daa1 100644
--- a/components/TabBar/TabBar.vue
+++ b/components/TabBar/TabBar.vue
@@ -58,7 +58,7 @@
 					path: "/pages/my/my",
 					icon: "/static/tabbar/di_icon_wdh.png",
 					selectIcon: "/static/tabbar/di_icon_wd.png",
-					text: "店铺转让",
+					text: "我的",
 					centerItem: false
 				}]
 
diff --git a/pages.json b/pages.json
index 4a76590..44ee586 100644
--- a/pages.json
+++ b/pages.json
@@ -1,104 +1,121 @@
 {
-	"easycom": {
-		"autoscan": true, //是否自动扫描组件
-		"custom": {
-			"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue",
-			"^ua-(.*)": "@/components/uview-ui/components/u-$1/u-$1.vue",
-			"^customer-(.*)": "@/components/uni-$1.vue" // 匹配components目录内的vue文件
-		}
-	},
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "速配商铺",
-				"navigationBarTextStyle": "black",
-				"navigationBarBackgroundColor": "#FFFFFF",
-				//导航栏取消
-				// "navigationStyle": "custom",
-				//是否开启下拉刷新
-				"enablePullDownRefresh": true
+    "easycom" : {
+        "autoscan" : true, //是否自动扫描组件
+        "custom" : {
+            "^u-(.*)" : "uview-ui/components/u-$1/u-$1.vue",
+            "^ua-(.*)" : "@/components/uview-ui/components/u-$1/u-$1.vue",
+            "^customer-(.*)" : "@/components/uni-$1.vue" // 匹配components目录内的vue文件
+        }
+    },
+    "pages" : [
+        //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+        {
+            "path" : "pages/index/index",
+            "style" : {
+                "navigationBarTitleText" : "速配商铺",
+                "navigationBarTextStyle" : "black",
+                "navigationBarBackgroundColor" : "#FFFFFF",
+                //导航栏取消
+                // "navigationStyle": "custom",
+                //是否开启下拉刷新
+                "enablePullDownRefresh" : true
+            }
+        },
+        {
+            "path" : "pages/shopTransfer/shopTransfer",
+            "style" : {
+                "navigationBarTitleText" : "店铺转让",
+                "navigationBarTextStyle" : "black",
+                "navigationBarBackgroundColor" : "#FFFFFF",
+                "enablePullDownRefresh" : false
+            }
+        },
+        //+
+        {
+            "path" : "pages/shopAddress/shopAddress",
+            "style" : {
+                "navigationBarTitleText" : "找店地址",
+                "navigationBarTextStyle" : "black",
+                "navigationBarBackgroundColor" : "#FFFFFF",
+                "enablePullDownRefresh" : false
+            }
+        },
+        {
+            "path" : "pages/my/my",
+            "style" : {
+                "navigationBarTitleText" : "我的",
+                "navigationBarTextStyle" : "black",
+                "navigationBarBackgroundColor" : "#FFFFFF",
+                "enablePullDownRefresh" : false
+            }
+        },
+        {
+            "path" : "pages/publish/publish",
+            "style" : {
+                "navigationBarTitleText" : "",
+                "enablePullDownRefresh" : false
+            }
+        },
+        {
+            "path" : "pages/detail/detail",
+            "style" : {
+				"navigationBarTitleText" : "商品详情"
 			}
-		},
-		{
-			"path": "pages/shopTransfer/shopTransfer",
-			"style": {
-				"navigationBarTitleText": "店铺转让",
-				"navigationBarTextStyle": "black",
-				"navigationBarBackgroundColor": "#FFFFFF",
-				"enablePullDownRefresh": false
-			}
-		},
-		//+
-		{
-			"path": "pages/shopAddress/shopAddress",
-			"style": {
-				"navigationBarTitleText": "找店地址",
-				"navigationBarTextStyle": "black",
-				"navigationBarBackgroundColor": "#FFFFFF",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/my/my",
-			"style": {
-				"navigationBarTitleText": "我的",
-				"navigationBarTextStyle": "black",
-				"navigationBarBackgroundColor": "#FFFFFF",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path" : "pages/publish/publish",
-			"style" : 
+        }
+    ],
+    "tabBar" : {
+        "color" : "#CCCCCC",
+        "borderStyle" : "white",
+        "backgroundColor" : "#FFFFFF",
+        "custom" : true,
+        "list" : [
+            {
+                "pagePath" : "pages/index/index",
+                "text" : "首页",
+                "iconPath" : "static/tabbar/di_icon_syh.png",
+                "selectedIconPath" : "static/tabbar/di_icon_sy.png"
+            },
+            {
+                "pagePath" : "pages/shopTransfer/shopTransfer",
+                "text" : "店铺转让",
+                "iconPath" : "static/tabbar/di_icon_zrh.png",
+                "selectedIconPath" : "static/tabbar/di_icon_zr.png"
+            },
+            {
+                "pagePath" : "pages/publish/publish",
+                "text" : "发布",
+                "iconPath" : "static/tabbar/di_icon_fb.png",
+                "selectedIconPath" : "static/tabbar/di_icon_fb.png"
+            },
+            {
+                "pagePath" : "pages/shopAddress/shopAddress",
+                "text" : "找店地址",
+                "iconPath" : "static/tabbar/di_icon_dzh.png",
+                "selectedIconPath" : "static/tabbar/di_icon_dz.png"
+            },
+            {
+                "pagePath" : "pages/my/my",
+                "text" : "店铺转让",
+                "iconPath" : "static/tabbar/di_icon_wdh.png",
+                "selectedIconPath" : "static/tabbar/di_icon_wd.png"
+            }
+        ]
+    },
+    "globalStyle" : {
+        "navigationBarTextStyle" : "black",
+        "navigationBarTitleText" : "uni-app",
+        "navigationBarBackgroundColor" : "#F8F8F8",
+        "backgroundColor" : "#F8F8F8"
+    },
+    "uniIdRouter" : {},
+	"condition" : { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [
 			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false
-			}
-		}
-	],
-	"tabBar": {
-		"color": "#CCCCCC",
-		"borderStyle": "white",
-		"backgroundColor": "#FFFFFF",
-		"custom":true,
-		"list": [{
-				"pagePath": "pages/index/index",
-				"text": "首页",
-				"iconPath": "static/tabbar/di_icon_syh.png",
-				"selectedIconPath": "static/tabbar/di_icon_sy.png"
-			},
-			{
-				"pagePath": "pages/shopTransfer/shopTransfer",
-				"text": "店铺转让",
-				"iconPath": "static/tabbar/di_icon_zrh.png",
-				"selectedIconPath": "static/tabbar/di_icon_zr.png"
-			},
-			{
-				"pagePath": "pages/publish/publish",
-				"text": "发布",
-				"iconPath": "static/tabbar/di_icon_fb.png",
-				"selectedIconPath": "static/tabbar/di_icon_fb.png"
-			},
-			{
-				"pagePath": "pages/shopAddress/shopAddress",
-				"text": "找店地址",
-				"iconPath": "static/tabbar/di_icon_dzh.png",
-				"selectedIconPath": "static/tabbar/di_icon_dz.png"
-			},
-			{
-				"pagePath": "pages/my/my",
-				"text": "店铺转让",
-				"iconPath": "static/tabbar/di_icon_wdh.png",
-				"selectedIconPath": "static/tabbar/di_icon_wd.png"
+				"name": "", //模式名称
+				"path": "", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
 			}
 		]
-	},
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-	},
-	"uniIdRouter": {}
-}
\ No newline at end of file
+	}
+}
diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue
new file mode 100644
index 0000000..8329b3a
--- /dev/null
+++ b/pages/detail/detail.vue
@@ -0,0 +1,149 @@
+<template>
+	<view class="detail">
+		<view class="swiper">
+				<u-swiper :list="list" height="300rpx" radius="0"></u-swiper>
+		</view>
+		<view class="sub-detail u-flex">
+			<view class="title">
+				石锅饭铺面转让石锅饭铺面转让石锅饭铺面转
+			</view>
+			<view>
+				<u-grid :col="3">
+						<u-grid-item>
+							<view class="grid-text">22</view>
+							<view class="grid-text">租金</view>
+						</u-grid-item>
+						<u-grid-item>
+							<view class="grid-text">22</view>
+							<view class="grid-text">转让费</view>
+						</u-grid-item>
+						<u-grid-item>
+							<view class="grid-text">22</view>
+							<view class="grid-text">面积</view>
+						</u-grid-item>
+					</u-grid>
+			</view>
+		</view>
+		<view class="location-detail">
+				<text>行业：</text>
+				<text>区域：</text>
+				<text>地址：</text>
+		</view>
+		<view class="seller-shop-detail">
+			<view class="avator">
+				<u-avatar :src="src"></u-avatar>
+				<u-cell title="张先生" label="123456"></u-cell>
+			</view>
+			<u-cell title="店铺介绍" label="美食杂货店是一个主打食品和日用杂货的淘宝222222222222222222222美食杂货店是一个主打食品和日用杂货的淘宝美食杂货店是一个主打食品和日用杂货的淘宝"></u-cell>
+		</view>
+		<view class="bottom">
+			<view class="bot-tab">
+				<view class="tab-left">
+					<view class="share">
+						<u-icon name="share-fill" color="green"></u-icon>
+						分享
+					</view>
+					<view class="customer">
+						<u-icon name="server-fill" color="green"></u-icon>
+						客服
+					</view>
+				</view>
+				<view class="tab-right">
+					<view class="call">
+						打电话
+					</view>
+				</view>
+			</view>
+	</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			list: {
+				type: Array,
+				default () {
+					return [
+						"https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg",
+						"https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg",
+						"https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg"
+					]
+				}
+			},
+			
+			},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.detail{
+		// background-color: #F8F8F8;
+		height: 100%;
+	}
+	.swiper {
+		}
+	.title{
+		padding: 20rpx;
+		background-color: #fff;
+	}
+	.location-detail{
+		display: flex;
+		margin-top: 20rpx;
+		background-color: #fff;
+		flex-direction: column;
+		padding-left: 16rpx;
+		line-height: 33px;
+		font-size: 15px;
+	}
+	.seller-shop-detail{
+		margin-top: 50rpx;
+	}
+	.avator{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-left: 16rpx;
+	}
+	.bottom{
+		position: fixed;
+		bottom: 0;
+		background-color: #fff;
+		width: 100%;
+		z-index: 100;
+		height: 100rpx;
+	}
+	.bot-tab{
+		display: flex;
+		// flex: 1;
+		justify-content: space-evenly;
+	}
+	.tab-left{
+		width: 50%;
+		display: flex;
+		justify-content: space-around;
+		height: 100px;
+	}
+	.coustom{
+		height: 100px;
+	}
+	.tab-right{
+		width: 50%;
+		height: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.share{
+		
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e4e498f..026bb9b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,5 +1,11 @@
 <template>
 	<view class="home-base-bg">
+	<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>
+			</u-input> -->
+		</view>
 		<InputAndSwiper></InputAndSwiper>
 		<TabBar :current-page="0"></TabBar>
 		<view class="nav-card">
@@ -69,15 +75,7 @@
 			
 		},
 		methods: {
-			// 头部区域
-			//获取热点搜索词、背景URL
-			getHeaderAreaURL() {
-				this.headerBgList = [];
-				this.hotSearchWord = ''
-			}
-		},
-		computed:{
-			
+		
 		}
 	}
 </script>
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 2d30c91..20f3c16 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,6 +1,25 @@
 <template>
 	<view>
-		我的
+		
+		<view class="my">
+		<view class="profile">
+			<image src="../../static/img/wo_bj_ll@2x.png" mode="aspectFit" class="profile-bgi"></image>
+			<view class="avator">
+				<u-avatar :src="src"></u-avatar>
+			</view>
+			<view class="username">{{username}}</view>
+			<view class="account">账号:{{account}}</view>
+		</view>
+		<view class="publish">
+			<u-cell-group>
+					<u-cell icon="setting-fill" title="发布的店铺转让" is-link="true"></u-cell>
+					<u-cell icon="integral-fill" title="发布的找店选址" is-link="true"></u-cell>
+					<u-cell icon="integral-fill" title="发布的店铺出租" is-link="true"></u-cell>
+					<u-cell icon="integral-fill" title="发布的项目招商" is-link="true"></u-cell>
+					<u-cell icon="integral-fill" title="成功合伙人" is-link="true"></u-cell>
+			</u-cell-group>
+		</view>
+		</view>
 		<TabBar :current-page="4"></TabBar>
 	</view>
 </template>
@@ -9,7 +28,9 @@
 	export default {
 		data() {
 			return {
-
+				src: 'https://cdn.uviewui.com/uview/album/2.jpg',
+				account:'11111111',
+				username:'用户名'
 			}
 		},
 		onLoad() {
@@ -26,6 +47,36 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+	.profile{
+		color: #fff;
+		display: flex;
+		width: 100%;
+		height: auto;
+		margin-bottom: 36rpx;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+		gap: 10rpx;
+		.profile-bgi{
+			position: absolute;
+			z-index: -1;
+		}
+		.avator{
+			margin-top: 20rpx;
+		}
+		.username{
+			font-size: 18px;
+			font-weight: 1rpx;
+		}
+		.account{
+			font-size: 15px;
+			font-weight: 1rpx;
+		}
 
-</style>
+	}
+	
+		
+	
+	
+</style>
\ No newline at end of file
diff --git a/static/img/wo_bj_ll@2x.png b/static/img/wo_bj_ll@2x.png
new file mode 100644
index 0000000..e4ca1c2
Binary files /dev/null and b/static/img/wo_bj_ll@2x.png differ