chenrui %!s(int64=4) %!d(string=hai) anos
pai
achega
3e6eeeff54

+ 12 - 0
pages.json

@@ -43,6 +43,18 @@
 				"navigationBarTitleText": "视频巡店"
 			}
 		},
+		{
+			"path": "pages/searchPage/searchPage",
+			"style": {
+				"navigationBarTitleText": "查询"
+			}
+		},
+		{
+			"path": "pages/organization/organization",
+			"style": {
+				"navigationBarTitleText": "查询"
+			}
+		},
 		{
 			"path": "pages/shopTour/shopTour",
 			"style": {

+ 25 - 19
pages/siteInspection/siteInspection.vue

@@ -1,23 +1,21 @@
 <template>
 	<view class="siteInspection-wrap">
-		<!-- <u-sticky> -->
-			<!-- 搜索框 -->
-			<view class="search-con">
-				<u-search placeholder="查找全部门店" v-model="queryValue" @custom="searchHandle(1)" @search="searchHandle(1)" bg-color="#fff" :action-style="{background: '#2979ff',color: '#fff', borderRadius: '6upx',padding: '6upx 0', fontSize: '26upx'}"></u-search>
-			</view>
-			<!-- 定位 -->
-			<view class="location-con">
-				<text class="location-tit">当前位置:</text>
-				<view class="location-main" @click="getLocation">
-					<text class="location-addr">{{location}}</text>
-					<u-icon name="map" color="#2979ff" size="34" class="location-icon"></u-icon>
-				</view>
+		<!-- 搜索框 -->
+		<view class="search-con">
+			<u-search placeholder="查找全部门店" v-model="queryValue" @custom="searchHandle(1)" @search="searchHandle(1)" bg-color="#fff" :action-style="{background: '#2979ff',color: '#fff', borderRadius: '6upx',padding: '6upx 0', fontSize: '26upx'}"></u-search>
+		</view>
+		<!-- 定位 -->
+		<view class="location-con" ref="location">
+			<text class="location-tit">当前位置:</text>
+			<view class="location-main" @click="getLocation">
+				<text class="location-addr">{{location}}</text>
+				<u-icon name="map" color="#2979ff" size="34" class="location-icon"></u-icon>
 			</view>
-		<!-- </u-sticky> -->
+		</view>
 		<!-- 附近的门店 -->
 		<view class="store-con">
 			<text class="store-tit">附近的门店:</text>
-			<scroll-view class="scroll-con" scroll-y @scrolltolower="onreachBottom">
+			<scroll-view class="scroll-con" scroll-y @scrolltolower="onreachBottom" :style="{'height': 'calc(100vh - ' + Height + 'px)'}">
 				<!-- 列表数据 -->
 				<view class="list-con">
 					<view class="list-item" v-for="(item,index) in listdata" :key="index" @click="chooseStore(item)">
@@ -63,11 +61,15 @@
 				pageNo: 1,  //  当前页码
 				pageSize: 10,  //  每页条数
 				total: 0,  //  数据总条数
+				Height: '',  //  滚动区域  元素dom高度
 			}
 		},
 		onShow() {
 			this.init()
 		},
+		onReady() {
+			// console.log(this.$refs.location.$el.offsetHeight)
+		},
 		methods: {
 			// 初始化
 			init(){
@@ -82,8 +84,14 @@
 				    success: function (res) {
 						console.log(res)
 						_this.location = res.address.province + res.address.city + res.address.district + res.address.street + res.address.streetNum +'靠近' + res.address.poiName
-						console.log(_this.location, '城市编码 ', res.address.cityCode)
-						_this.searchHandle(res)
+						setTimeout(()=>{
+							console.log(_this.$refs.location)
+							console.log(String(_this.$refs.location))
+							console.log(_this.$refs.location.$el.offsetHeight)
+							_this.Height = 44 + 62 + Number(_this.$refs.location.$el.offsetHeight)
+							// console.log(_this.Height, Number(_this.$refs.location.offsetHeight))
+							_this.searchHandle(res)
+						}, 5000)
 				    }
 				})
 			},
@@ -136,12 +144,10 @@
 		background-color: #f8f8f8;
 		.search-con{
 			padding: 30upx 30upx;
-			// background-color: #fff;
 		}
 		// 定位
 		.location-con{
 			padding: 0 30upx;
-			background-color: #fff;
 			.location-main{
 				margin-top: 14upx;
 				padding: 20upx;
@@ -162,7 +168,7 @@
 				display: block;
 				padding: 30upx 30upx 20upx;
 			}
-			//  列表
+			//  列表  44 62  
 			.scroll-con{
 				height: calc(100vh - 215px);
 				width: 100%;

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/app-plus/app-config-service.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 13 - 1
unpackage/dist/dev/app-plus/app-service.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 7 - 1
unpackage/dist/dev/app-plus/app-view.js


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio