Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer

# Conflicts: # pages/index/index.vue # pages/my/my.vue
2023-11-01 22:43:46 +08:00
parent b30196c92a c30a25d632
commit f05c5413a4
7 changed files with 329 additions and 114 deletions
--- 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, // 返回城市信息
--- 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
 				}]