更新

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'https://apitest.eliangeyun.com',
+	// baseUrlNew: 'http://192.168.110.67:8099',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/news/index.vue

@@ -1,10 +1,11 @@
 <template>
-	<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-		style="background-color: #F5F6FA;">
+		<view>
 		<u-navbar title="消息中心" leftIconSize='0' :bgColor="bgColor" :placeholder='true' leftIconColor="#fff"
 			titleStyle='color:#fff' rightText='一键已读' @rightClick="rightClick">
 		</u-navbar>
 		<view class="top-bgc"></view>
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+			style="background-color: #F5F6FA;">
 		<view class="content">
 			<view class="info-item flex" v-for="(item,index) in news" :key="index" @click="read(item)">
 				<view class="left">
@@ -49,6 +50,7 @@
 			</u-modal>
 		</view>
 	</mescroll-body>
+	</view>
 </template>
 
 <script>

pages/order/index.vue

@@ -1,7 +1,6 @@
 <!-- 货源 -->
 <template>
 	<view class="content">
-		<view class="fixed1"></view>
 		<!-- <view v-if="!isSearch"> -->
 		<!-- 		<view class="fixed">
 				<view class='title flex flex-center'>
@@ -15,25 +14,30 @@
 							}"></u-tabs>
 			</view> -->
 		<view class="top-content">
-			<u-search placeholder="搜索订单" v-model="searchKeyWord" bgColor='white' :actionStyle='searchStyle'
-				@custom="getSearch" @search="getSearch" :clearabled="true"></u-search>
-			<view class="tab-content">
-				<u-tabs :list="tabList" @click="clickTab" lineColor='transparent' :current='tabIndex'
-					:inactiveStyle="{color:'white'}" :activeStyle="{
-									color: '#2772FB',
-									fontWeight: 'bold',
-									transform: 'scale(1.05)',
-									background:'white',
-									padding:'10rpx 20rpx',
-									'border-radius':'40rpx'
-								}" class="tabs"></u-tabs>
-				<view class="right-btn" @click="showMenu=true">
-					<u-icon name="grid-fill" color="white" size="28"></u-icon>
-					<view class="">
-						全部
+			
+				<view class="fixed1"></view>
+			<view class="fix-content">
+				<u-search placeholder="搜索订单" v-model="searchKeyWord" bgColor='white' :actionStyle='searchStyle'
+					@custom="getSearch" @search="getSearch" :clearabled="true"></u-search>
+				<view class="tab-content">
+					<u-tabs :list="tabList" @click="clickTab" lineColor='transparent' :current='tabIndex'
+						:inactiveStyle="{color:'white'}" :activeStyle="{
+										color: '#2772FB',
+										fontWeight: 'bold',
+										transform: 'scale(1.05)',
+										background:'white',
+										padding:'10rpx 20rpx',
+										'border-radius':'40rpx'
+									}" class="tabs"></u-tabs>
+					<view class="right-btn" @click="showMenu=true">
+						<u-icon name="grid-fill" color="white" size="28"></u-icon>
+						<view class="">
+							全部
+						</view>
 					</view>
 				</view>
 			</view>
+		
 		</view>
 		<view class="all-menu">
 			<u-transition :show="showMenu" mode="fade">
@@ -217,6 +221,7 @@
 					position: "absolute",
 					right: "30rpx",
 					padding: "6rpx 20rpx",
+					margin:'0 20rpx 0 0',
 					"border-radius": '30rpx'
 				},
 				searchKeyWord: '',
@@ -597,7 +602,11 @@
 				});
 			},
 			upCallback(page) {
-				if (this.searchType == 0) this.searchType = ''
+				
+					debugger
+				if (!this.searchType) {
+					this.searchType = 0
+				}
 				this.$request.baseRequest('get', '/orderInfo/selectCargoOwnerOrder', {
 						cargoCommonId: this.userInfo.id,
 						searchKeyWord: this.searchKeyWord,
@@ -639,11 +648,22 @@
 </script>
 
 <style scoped lang="scss">
+	.content{
+		padding-bottom: 160px;
+	}
 	.top-content {
 		background: url(../../static/images/order/bg.png) no-repeat;
 		background-size: cover;
 		padding: 20rpx;
-		padding-bottom: 320rpx;
+		position: fixed;
+		z-index: 99;
+		width: 100%;
+		// margin-top: var(--status-bar-height);
+		// padding-bottom: 320rpx;
+	}
+	.fix-content{
+		// width: 96%;
+		margin-right: 20rpx;
 	}
 
 	// .banner {
@@ -679,6 +699,8 @@
 		top: 0;
 		height: var(--status-bar-height);
 		background: #317AFE;
+		// position: fixed;
+		// z-index: 9999;
 	}
 
 	// .banner-img {
@@ -886,7 +908,7 @@
 
 	.mescroll {
 		// margin-top: calc(var(--status-bar-height) + 140rpx);
-		top: -320rpx;
+		top: 280rpx;
 	}
 
 	.sline {

pages/release/addAddress.vue

@@ -115,32 +115,42 @@
 			toMap() {
 				let that = this
 				// this.isShowMap = true
-				uni.chooseLocation({
-					success: function(res) {
-						console.log(res);
-						console.log('位置名称：' + res.name);
-						console.log('详细地址：' + res.address);
-						console.log('纬度：' + res.latitude);
-						console.log('经度：' + res.longitude);
-						// let _address = that.$helper.formatLocation(res.address)
-						// console.log('----------------------------')
-						// console.log(_address)
-						// that.addressInfo.latitude = res.latitude
-						// that.addressInfo.longitude = res.longitude
-						// that.addressInfo.detailedAddress = _address.Village
-						// that.addressInfo.province = _address.Province
-						// that.addressInfo.city = _address.City
-						// that.addressInfo.area = _address.Country
-						// that.addressInfo.commonId = that.userInfo.id
-						// that.$forceUpdate()
-					},
-					fail(err) {
-						console.log(err)
-					},
-					complete(res1) {
-						console.log(res1)
+				uni.getLocation({
+					type: 'wgs84',
+					success: function (res) {
+						console.log('当前位置的经度：' + res.longitude);
+						console.log('当前位置的纬度：' + res.latitude);
+						uni.chooseLocation({
+							latitude: res.latitude,
+							longitude: res.longitude,
+							success: function(res) {
+								console.log(res);
+								console.log('位置名称：' + res.name);
+								console.log('详细地址：' + res.address);
+								console.log('纬度：' + res.latitude);
+								console.log('经度：' + res.longitude);
+								let _address = that.$helper.formatLocation(res.address)
+								console.log('----------------------------')
+								console.log(_address)
+								that.addressInfo.latitude = res.latitude
+								that.addressInfo.longitude = res.longitude
+								that.addressInfo.detailedAddress = _address.Village
+								that.addressInfo.province = _address.Province
+								that.addressInfo.city = _address.City
+								that.addressInfo.area = _address.Country
+								that.addressInfo.commonId = that.userInfo.id
+								that.$forceUpdate()
+							},
+							fail(err) {
+								console.log(err)
+							},
+							complete(res1) {
+								console.log(res1)
+							}
+						});
 					}
-				});
+				})
+				
 				// console.log(123)
 				// uni.$u.route('/pages/release/map', {
 				// 	id: 1,

pages/release/editAddress.vue

@@ -114,26 +114,41 @@
 			toMap() {
 				let that = this
 				// this.isShowMap = true
-				uni.chooseLocation({
-					success: function(res) {
-						console.log(res);
-
-						console.log('位置名称：' + res.name);
-						console.log('详细地址：' + res.address);
-						console.log('纬度：' + res.latitude);
-						console.log('经度：' + res.longitude);
-						let _address = that.$helper.formatLocation(res.address)
-						console.log(_address)
-						that.addressInfo.latitude = res.latitude
-						that.addressInfo.longitude = res.longitude
-						that.addressInfo.detailedAddress = _address.village
-						that.addressInfo.province = _address.province
-						that.addressInfo.city = _address.city
-						that.addressInfo.area = _address.county
-						that.addressInfo.commonId = that.userInfo.id
-
+				uni.getLocation({
+					type: 'wgs84',
+					success: function (res) {
+						console.log('当前位置的经度：' + res.longitude);
+						console.log('当前位置的纬度：' + res.latitude);
+						uni.chooseLocation({
+							latitude: res.latitude,
+							longitude: res.longitude,
+							success: function(res) {
+								console.log(res);
+								console.log('位置名称：' + res.name);
+								console.log('详细地址：' + res.address);
+								console.log('纬度：' + res.latitude);
+								console.log('经度：' + res.longitude);
+								let _address = that.$helper.formatLocation(res.address)
+								console.log('----------------------------')
+								console.log(_address)
+								that.addressInfo.latitude = res.latitude
+								that.addressInfo.longitude = res.longitude
+								that.addressInfo.detailedAddress = _address.Village
+								that.addressInfo.province = _address.Province
+								that.addressInfo.city = _address.City
+								that.addressInfo.area = _address.Country
+								that.addressInfo.commonId = that.userInfo.id
+								that.$forceUpdate()
+							},
+							fail(err) {
+								console.log(err)
+							},
+							complete(res1) {
+								console.log(res1)
+							}
+						});
 					}
-				});
+				})
 				// console.log(123)
 				// uni.$u.route('/pages/release/map', {
 				// 	id: 1,

pages/release/selectAddress.vue

@@ -69,7 +69,7 @@
 				dataList: [],
 				searchKeyWord: '',
 				radiolist1: [
-					
+
 					{
 						name: '默认装货',
 						disabled: false
@@ -89,7 +89,7 @@
 			console.log(options)
 			this.type = options.type
 			that = this
-			
+
 		},
 		onShow() {
 			this.getList()
@@ -103,7 +103,7 @@
 				}
 				// uni.$u.route('/pages/release/release');
 				uni.navigateBack({
-					delta:1
+					delta: 1
 				})
 			},
 			getList() {
@@ -128,7 +128,7 @@
 									this.dataList[i].radiovalue = '默认卸货'
 								}
 							}
-							
+
 							uni.hideLoading()
 						}
 
@@ -225,178 +225,159 @@
 				// 0临时地址 1 新增地址
 				if (type == 0) {
 					let that = this
-					uni.chooseLocation({
+					uni.getLocation({
+						type: 'wgs84',
 						success: function(res) {
-							console.log(res);
-							console.log('位置名称：' + res.name);
-							console.log('详细地址：' + res.address);
-							console.log('纬度：' + res.latitude);
-							console.log('经度：' + res.longitude);
-							var locationObj = that.$helper.formatLocation(res);
-							console.log(locationObj)
-							that.temporaryAddress.latitude = res.latitude
-							that.temporaryAddress.longitude = res.longitude
-							that.temporaryAddress.detailedAddress = locationObj.ADDRESS
-							that.temporaryAddress.province = locationObj.REGION_PROVINCE
-							that.temporaryAddress.city = locationObj.REGION_CITY
-							that.temporaryAddress.area = locationObj.REGION_COUNTRY
-							that.temporaryAddress.commonId = that.userInfo.id
-							that.configAddress(that.temporaryAddress)
-						},
-						fail: function() {
-							uni.getSetting({
+							console.log('当前位置的经度：' + res.longitude);
+							console.log('当前位置的纬度：' + res.latitude);
+							uni.chooseLocation({
 								success: function(res) {
-									var statu = res.authSetting;
-									if (!statu['scope.userLocation']) {
-										uni.showModal({
-											title: '是否授权当前位置',
-											content: '需要获取您的地理位置，请确认授权，否则地图功能将无法使用',
-											success: function(tip) {
-												if (tip.confirm) {
-													uni.openSetting({
-														success: function(
-															data) {
-															if (data
-																.authSetting[
-																	"scope.userLocation"
-																] === true
-															) {
-																uni.showToast({
-																	title: '授权成功',
-																	icon: 'success',
-																	duration: 1000
-																})
-																//授权成功之后，再调用chooseLocation选择地方
-																uni.chooseLocation({
-																	success: function(
-																		res
-																	) {
-																		console
-																			.log(
-																				res
-																			);
-																		console
-																			.log(
-																				'位置名称：' +
-																				res
-																				.name
-																			);
-																		console
-																			.log(
-																				'详细地址：' +
-																				res
-																				.address
-																			);
-																		console
-																			.log(
-																				'纬度：' +
-																				res
-																				.latitude
-																			);
-																		console
-																			.log(
-																				'经度：' +
-																				res
-																				.longitude
-																			);
-																		var locationObj =
-																			that
-																			.$helper
-																			.formatLocation(
-																				res
-																			);
-																		console
-																			.log(
-																				locationObj
-																			)
-																		that.temporaryAddress
-																			.latitude =
-																			res
-																			.latitude
-																		that.temporaryAddress
-																			.longitude =
-																			res
-																			.longitude
-																		that.temporaryAddress
-																			.detailedAddress =
-																			locationObj
-																			.ADDRESS
-																		that.temporaryAddress
-																			.province =
-																			locationObj
-																			.REGION_PROVINCE
-																		that.temporaryAddress
-																			.city =
-																			locationObj
-																			.REGION_CITY
-																		that.temporaryAddress
-																			.area =
-																			locationObj
-																			.REGION_COUNTRY
-																		that.temporaryAddress
-																			.commonId =
-																			that
-																			.userInfo
-																			.id
-																		that.configAddress(
-																			that
-																			.temporaryAddress
-																		)
-																	},
-																})
-															} else {
-																uni.showToast({
-																	title: '授权失败',
-																	icon: 'none',
-																	duration: 1000
-																})
-															}
-														}
-													})
-												}
-											}
-										})
-									}
+									console.log(res);
+									console.log('位置名称：' + res.name);
+									console.log('详细地址：' + res.address);
+									console.log('纬度：' + res.latitude);
+									console.log('经度：' + res.longitude);
+									var locationObj = that.$helper.formatLocation(res);
+									console.log(locationObj)
+									that.temporaryAddress.latitude = res.latitude
+									that.temporaryAddress.longitude = res.longitude
+									that.temporaryAddress.detailedAddress = locationObj.ADDRESS
+									that.temporaryAddress.province = locationObj.REGION_PROVINCE
+									that.temporaryAddress.city = locationObj.REGION_CITY
+									that.temporaryAddress.area = locationObj.REGION_COUNTRY
+									that.temporaryAddress.commonId = that.userInfo.id
+									that.configAddress(that.temporaryAddress)
 								},
-								fail: function(res) {
-									uni.showToast({
-										title: '调用授权窗口失败',
-										icon: 'none',
-										duration: 1000
-									})
+								fail: function() {
+								// 	uni.getSetting({
+								// 		success: function(res) {
+								// 			var statu = res.authSetting;
+								// 			if (!statu['scope.userLocation']) {
+								// 				uni.showModal({
+								// 					title: '是否授权当前位置',
+								// 					content: '需要获取您的地理位置，请确认授权，否则地图功能将无法使用',
+								// 					success: function(tip) {
+								// 						if (tip.confirm) {
+								// 							uni.openSetting({
+								// 								success: function(
+								// 									data
+								// 									) {
+								// 									if (data
+								// 										.authSetting[
+								// 											"scope.userLocation"
+								// 										] ===
+								// 										true
+								// 									) {
+								// 										uni.showToast({
+								// 											title: '授权成功',
+								// 											icon: 'success',
+								// 											duration: 1000
+								// 										})
+								// 										//授权成功之后，再调用chooseLocation选择地方
+								// 										uni.chooseLocation({
+								// 											success: function(
+								// 												res
+								// 											) {
+								// 												console
+								// 													.log(
+								// 														res
+								// 													);
+								// 												console
+								// 													.log(
+								// 														'位置名称：' +
+								// 														res
+								// 														.name
+								// 													);
+								// 												console
+								// 													.log(
+								// 														'详细地址：' +
+								// 														res
+								// 														.address
+								// 													);
+								// 												console
+								// 													.log(
+								// 														'纬度：' +
+								// 														res
+								// 														.latitude
+								// 													);
+								// 												console
+								// 													.log(
+								// 														'经度：' +
+								// 														res
+								// 														.longitude
+								// 													);
+								// 												var locationObj =
+								// 													that
+								// 													.$helper
+								// 													.formatLocation(
+								// 														res
+								// 													);
+								// 												console
+								// 													.log(
+								// 														locationObj
+								// 													)
+								// 												that.temporaryAddress
+								// 													.latitude =
+								// 													res
+								// 													.latitude
+								// 												that.temporaryAddress
+								// 													.longitude =
+								// 													res
+								// 													.longitude
+								// 												that.temporaryAddress
+								// 													.detailedAddress =
+								// 													locationObj
+								// 													.ADDRESS
+								// 												that.temporaryAddress
+								// 													.province =
+								// 													locationObj
+								// 													.REGION_PROVINCE
+								// 												that.temporaryAddress
+								// 													.city =
+								// 													locationObj
+								// 													.REGION_CITY
+								// 												that.temporaryAddress
+								// 													.area =
+								// 													locationObj
+								// 													.REGION_COUNTRY
+								// 												that.temporaryAddress
+								// 													.commonId =
+								// 													that
+								// 													.userInfo
+								// 													.id
+								// 												that.configAddress(
+								// 													that
+								// 													.temporaryAddress
+								// 												)
+								// 											},
+								// 										})
+								// 									} else {
+								// 										uni.showToast({
+								// 											title: '授权失败',
+								// 											icon: 'none',
+								// 											duration: 1000
+								// 										})
+								// 									}
+								// 								}
+								// 							})
+								// 						}
+								// 					}
+								// 				})
+								// 			}
+								// 		},
+								// 		fail: function(res) {
+								// 			uni.showToast({
+								// 				title: '调用授权窗口失败',
+								// 				icon: 'none',
+								// 				duration: 1000
+								// 			})
+								// 		}
+								// 	})
+								
 								}
-							})
+							});
 						}
 					})
-					// that.$helper.getLocation(that.temporaryAddress)
-					// console.log('1111111111111111111111111111111111')
-					// console.log(that.temporaryAddress)
-					// let that = this
-					// // this.isShowMap = true
-					// uni.chooseLocation({
-					// 	success: function(res) {
-					// 		console.log(res);
-					// 		console.log('位置名称：' + res.name);
-					// 		console.log('详细地址：' + res.address);
-					// 		console.log('纬度：' + res.latitude);
-					// 		console.log('经度：' + res.longitude);
-					// 		// let _address = that.$helper.getAddress(res.address)
-					// 		let _address = that.$helper.getLocation(res.address)
-					// 		console.log(_address)
-					// 		// that.temporaryAddress.latitude = res.latitude
-					// 		// that.temporaryAddress.longitude = res.longitude
-					// 		// that.temporaryAddress.detailedAddress = _address.village
-					// 		// that.temporaryAddress.province = _address.province
-					// 		// that.temporaryAddress.city = _address.city
-					// 		// that.temporaryAddress.area = _address.county
-					// 		// that.temporaryAddress.commonId = that.userInfo.id
-					// 		// that.configAddress(that.temporaryAddress)
-					// 	}
-					// });
-					// // console.log(123)
-					// // uni.$u.route('/pages/release/map', {
-					// // 	id: 1,
-					// // });
 				} else {
 					uni.$u.route('/pages/release/addAddress', {
 						type: type,