chenrui 4 éve
szülő
commit
5975027a3e

+ 4 - 6
libs/tools.js

@@ -416,12 +416,10 @@ export const getGpsLocation = function(callback){
 		},
 		fail: function(error){
 			console.log(error)
-			if(JSON.parse(error.errMsg.replace('getLocation:fail ','')).message){
-				uni.showToast({
-					icon: 'none',
-					title: JSON.parse(error.errMsg.replace('getLocation:fail ','')).message
-				})
-			}
+			uni.showToast({
+				icon: 'none',
+				title: JSON.stringify(error.errMsg)
+			})
 		}
 	});
 }

+ 1 - 1
pages/myShopTour/myShopTour.vue

@@ -60,7 +60,7 @@
 			</swiper>
 		</view>
 		<!-- 筛选弹框 -->
-		<search-modal :visible="openScreen" :defaultParams="searchForm" @openPicke="openPicker" @refresh="refresh" @close="openScreen=false"></search-modal>
+		<search-modal :visible="openScreen" :defaultParams="searchForm" @refresh="refresh" @close="openScreen=false"></search-modal>
 	</view>
 </template>
 

+ 1 - 1
pages/shopTourCompleted/shopTourCompleted.vue

@@ -105,7 +105,7 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 	page{
 		background-color: #f8f8f8;
 		height: calc(100vh - 44px);

+ 3 - 1
pages/shopTourDetails/shopTourDetails.vue

@@ -92,6 +92,8 @@
 	.shopTourDetails-wrap{
 		height: 100%;
 		background-color: #f8f8f8;
+		display: flex;
+		justify-content: space-between;
 		.scroll-con-l{
 			display: inline-block;
 			width: 28%;
@@ -125,7 +127,7 @@
 		}
 		.scroll-con-r{
 			display: inline-block;
-			width: 69%;
+			width: 68%;
 			height: 99%;
 			margin: 1% 1% 0 0;
 			.item-con{

+ 60 - 57
pages/shopTourRecord/screenModule.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="uDropdown-wrap">
 		<!-- 顶部筛选条件 -->
 		<u-dropdown ref="uDropdown" class="uDropdown" @close="closeDropdownItem">
 			<u-dropdown-item v-model="searchForm.inspectorId" :title="isAll" @change="dropdownChange" :options="screenClass"></u-dropdown-item>
@@ -204,66 +204,69 @@
 </script>
 
 <style lang="scss">
-	// 筛选条件
-	.uDropdown{
-		background-color: #fff;
-		.screen-dropdown{
-			.slot-content{
-				background-color: #fff;
-				.scroll-view{
-					height: 300upx;
-					padding: 20upx 0;
-					box-sizing: border-box;
-					.screen-module{
-						margin: 0 30upx;
-						padding: 14upx 0;
-						display: flex;
-						align-items: center;
-						.screen-tit{
-							color: #464646;
-							font-size: 26upx;
-							width: 140upx;
-							flex-shrink: 0;
-						}
-						.screen-time-val{
-							flex-grow: 1;
-							font-size: 26upx;
-							background-color: #f4f4f4;
-							border-radius: 12upx;
-							padding: 10upx 14upx;
-							text-align: center;
-							text{
-								display: inline-block;
-								width: 85%;
-							}
-							.close-circle{
-								display: inline-block;
-								padding-left: 3%;
-								vertical-align: bottom;
-							}
-						}
-						.screen-inp-val{
-							flex-grow: 1;
-							.screen-inp{
+	.uDropdown-wrap{
+		height: 100vh;
+		// 筛选条件
+		.uDropdown{
+			background-color: #fff;
+			.screen-dropdown{
+				.slot-content{
+					background-color: #fff;
+					.scroll-view{
+						height: 300upx;
+						padding: 20upx 0;
+						box-sizing: border-box;
+						.screen-module{
+							margin: 0 30upx;
+							padding: 14upx 0;
+							display: flex;
+							align-items: center;
+							.screen-tit{
 								color: #464646;
 								font-size: 26upx;
+								width: 140upx;
+								flex-shrink: 0;
+							}
+							.screen-time-val{
+								flex-grow: 1;
+								font-size: 26upx;
+								background-color: #f4f4f4;
+								border-radius: 12upx;
+								padding: 10upx 14upx;
+								text-align: center;
+								text{
+									display: inline-block;
+									width: 85%;
+								}
+								.close-circle{
+									display: inline-block;
+									padding-left: 3%;
+									vertical-align: bottom;
+								}
+							}
+							.screen-inp-val{
+								flex-grow: 1;
+								.screen-inp{
+									color: #464646;
+									font-size: 26upx;
+								}
 							}
 						}
-					}
-					.status-item {
-						display: inline-block;
-						width: 30%;
-						text-align: center;
-						line-height: 60upx;
-						background-color: #F8F8F8;
-						color: #333;
-						border-radius: 6upx;
-						font-size: 24upx;
-						margin: 0 10upx;
-					}
-					.active {
-						background-color: #ffaa00;
-						color: #fff;
+						.status-item {
+							display: inline-block;
+							width: 30%;
+							text-align: center;
+							line-height: 60upx;
+							background-color: #F8F8F8;
+							color: #333;
+							border-radius: 6upx;
+							font-size: 24upx;
+							margin: 0 10upx;
+						}
+						.active {
+							background-color: #ffaa00;
+							color: #fff;
+						}
 					}
 				}
 			}

+ 8 - 3
pages/shopTourRecord/shopTourRecord.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="shopTourRecord-wrap">
-		<u-sticky offset-top="0">
-			<screenModule :defaultParams="searchForm" @refresh="refresh" />
+		<u-sticky offset-top="0" z-index="4" bg-color="#f8f8f8">
+			<screenModule class="screenModule" :defaultParams="searchForm" @refresh="refresh" />
 		</u-sticky>
 		<!-- 列表数据 -->
 		<view class="list-con">
 			<scroll-view scroll-y class="scroll-con" @scrolltolower="onreachBottom">
 				<view class="record-con">
-					<u-sticky offset-top="80">
+					<u-sticky offset-top="80" z-index="3">
 						<view v-show="searchForm.creatTime.length != 0" class="alert-tips">
 							<text>创建时间:{{searchForm.creatTime[0]}} 至 {{searchForm.creatTime[1]}}</text>
 						</view>
@@ -192,8 +192,13 @@
 		height: calc(100vh - 44px);
 	}
 	.shopTourRecord-wrap{
+		position: relative;
 		// 列表数据
 		.list-con{
+			position: absolute;
+			left: 0;
+			top: 80upx;
+			width: 100%;
 			.scroll-con{
 				height: 100%;
 				width: 100%;

+ 2 - 3
pages/siteInspection/siteInspection.vue

@@ -51,7 +51,6 @@
 		},
 		onReady() {
 			this.getLocation()
-			// this.getAddressInfo({lng:108.9657195398708,lat:34.30901776030821})
 		},
 		methods: {
 			// 获取当前位置
@@ -66,7 +65,7 @@
 					if(res.platform == 'android'){  //  安卓
 						_this.getAddressInfo({ lng: gps[0], lat: gps[1] })
 						// 按照经纬度查询
-						_this.searchHandle({ lng: gps[0], lat: gps[1] })
+						_this.searchHandle({ point: { lng: gps[0], lat: gps[1] } })
 					}else if(res.platform == 'ios'){  //  ios
 						const province = gps.address.province ? gps.address.province : ''  //  	省份名称
 						const city = gps.address.city ? gps.address.city : ''  //  城市名称
@@ -76,7 +75,7 @@
 						const streetNum = gps.address.streetNum ? gps.address.streetNum : ''  //  获取街道门牌号信息
 						_this.location = province + city + district + poiName + '(' + street + streetNum + ')'
 						// 按照经纬度查询
-						_this.searchHandle({ lng: gps.longitude, lat: gps.latitude })
+						_this.searchHandle({ point: { lng: gps.longitude, lat: gps.latitude } })
 					}
 					
 				})

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 9 - 9
unpackage/dist/dev/app-plus/app-service.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 49 - 49
unpackage/dist/dev/app-plus/app-view.js


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott