1.选择城市

components/chose-city/chose-city.vue

@@ -1,725 +0,0 @@
-<template>
-	<view class="chose-city">
-		<view>
-			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}" v-if="topshow"></view>
-			<view class="nav" v-if="topshow">城市选择
-				<image src="../../static/img/goback.png" mode="" class="foback" @click="closeModal"></image>
-			</view>
-		</view>
-		<!-- 城市搜索 -->
-		<view class="city-search-wrap">
-			<view class="search">
-				<view class="l-search">
-					<view class="icon-search">
-						<!-- <view class="cuIcon-search"></view> -->
-						<image src="../../static/img/icon_search.png" mode="" class="cuIcon-search"></image>
-					</view>
-					<input class="input-search" type="text" :value="inputValue" placeholder="请输入城市"
-						placeholder-style="color:#8E8F97" :focus="searchFocus" @input="searchChange" />
-					<text class="clear-input iconfont icon-icon-test" v-if="isClearBtn" @click="inputValue = ''"></text>
-				</view>
-				<view class="r-cancel" @click="closeModal">取消</view>
-			</view>
-			<!-- 搜索列表  -->
-			<view class="reach-content" v-show="inputValue">
-				<block v-show="searchData.length">
-					<view class="li" v-for="item in searchData" :key="item.citycode" @click="selectCity(item)">
-						{{item.name}}
-					</view>
-				</block>
-				<view class="has-no-data" v-show="hasNoData">没有找到匹配数据~</view>
-			</view>
-		</view>
-		<!-- 城市列表 -->
-		<scroll-view class="scroll-view" scroll-y scroll-with-animation="true" enable-back-to-top="true"
-			:scroll-into-view="toIndex" @scroll="scrollHandle" v-if="!inputValue">
-			<view class="block">
-				<!-- 您所在的地区 -->
-				<view class="area list-item" id="area">
-					<view class="title-wrapp">
-						<view class="c-title">
-							<text class="l">定位城市</text>
-						</view>
-					</view>
-					<view class="ul">
-						
-						<view v-if="citydw.name" @click="selectCity(citydw)" class="dingweiCity">{{citydw.name}}</view>
-						<view v-else class="dingweiCity" style="color: #999999;">未获取</view>
-						
-						<view class="dingBg" @click="againDingWei()">
-							<image src='../../static/img/icon_location.png' class="icon"></image>
-							<text class="text">重新定位</text>
-						</view>
-					</view>
-				</view>
-				<!-- 历史记录 -->
-				<!-- <view class="area list-item" id="record" v-if="recordList.length">
-					<view class="title-wrapp">
-						<view class="c-title">
-							<text class="l">历史记录</text>
-						</view>
-					</view>
-					<view class="ul">
-						<view class="li font-clamp" v-for="item in recordList" :key="item.citycode" @click="selectCity(item)">
-							{{ item.name }}
-						</view>
-					</view>
-				</view> -->
-			</view>
-			<!-- 城市列表  -->
-			<view class="city-list">
-				<view class="list list-item" v-for="(item, key) of cityList" :key="key" :id="item.nameType">
-					<view class="c-title">{{ item.nameType }}</view>
-					<view class="item" v-for="innerItem in item.list" :key="innerItem.citycode"
-						@click="selectCity(innerItem)">
-						{{ innerItem.name }}
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-
-		<!-- 字母列表 -->
-		<view class="alphabet" @touchstart="touchStart" @touchend="touchEnd" @touchmove.stop="touchMove">
-			<view v-for="(item, index) in alphabet" :key="index" @touchstart="getLetter" @touchend="setLetter"
-				:id="item">
-				<view class="item" :class="{ active: currentLetter == item }">
-					{{ item == 'area' ? '当前' : item == 'record' ? '历史' : item }}
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import cityJson from '@/static/dataJson/city.json'
-	export default {
-		props: {
-			topshow: { //参数名
-				type: Boolean, //定义传值的类型
-				default: false //参数默认
-			}
-		},
-		data() {
-			return {
-				isIPX: null,
-				regionId: null, // 区域ID
-				isToggle: true,
-				isReach: false,
-				inputValue: '',
-				searchData: [], // 搜索的数据
-				isClearBtn: false,
-				toIndex: '', // 跳转的索引的字母
-				tipsLetter: '', // 滑动显示字母
-				timer: null,
-				hasNoData: false,
-				searchFocus: false,
-				letterDetails: [],
-				currentLetter: 'area', //默认选择
-				cityArr: [],
-				recordList: [],
-				cityList: [],
-				hasLocation: false,
-				myCityObj: {},
-				alphabet: [],
-				iStatusBarHeight: '',
-				lng: '',
-				lat: '',
-				cityname: '',
-				cityCode: '',
-				citydw: {
-					name: '',
-					citycode: '',
-				}
-			};
-		},
-		mounted() {
-			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-			this.cityArr = cityJson.data.list
-			if (this.cityArr && this.cityArr[0]) {
-				this.cityArr.map(v => {
-					v.nameType = v.pinyin.substr(0, 1)
-				})
-				this.cityList = this.groupArr(this.cityArr, 'nameType')
-			}
-			this.recordList = cityJson.data.recordList
-			this.alphabet = cityJson.data.alphabet
-			this.getLocation()
-		},
-		watch: {
-			// 城市搜索输入框
-			inputValue(newVal) {
-				this.isClearBtn = newVal ? true : false;
-
-				if (this.timer) {
-					clearTimeout(this.timer);
-				}
-
-				if (!this.inputValue) {
-					this.searchData = [];
-					return;
-				}
-				this.timer = setTimeout(() => {
-					const result = [];
-					this.cityList.map(v => {
-						v.list.forEach((item) => {
-							if (/^[a-zA-Z]+$/.test(item.pinyin) && item.pinyin.toLowerCase()
-								.includes(this.inputValue.toLowerCase()) ||
-								item.name.includes(this.inputValue)) {
-								result.push(item);
-							}
-						});
-					})
-					this.searchData = result;
-					if (this.searchData.length === 0) {
-						this.hasNoData = true;
-					} else {
-						this.hasNoData = false;
-					}
-				}, 500);
-			},
-			isReach(val) {
-				this.searchFocus = val;
-			},
-		},
-		methods: {
-			againDingWei(){
-				uni.showModal({
-					title:'重新获取位置',
-					success() {
-						
-					}
-				})
-				this.getLocation();
-			},
-			getLocation() {
-				
-				const that = this
-				/* uni.getLocation({
-					// #ifdef MP-ALIPAY
-					type: 'gcj02',
-					// #endif
-					success(res) {
-						console.log('---',res)
-						res.name = res.city
-						res.citycode = res.cityAdcode
-						that.myCityObj = res
-						that.hasLocation = true
-						uni.setStorageSync('nowCityObj', res)
-					},
-					fail(err) {
-						that.hasLocation = false
-						uni.showToast({
-							icon:'none',
-							title: '重新定位失败，请稍后重试'
-						})
-					},
-				}) */
-				console.log("定位")
-				uni.getLocation({
-					type: 'gcj02',
-					success: function(res) {
-						console.log(res)
-						that.lng = res.longitude
-						that.lat = res.latitude
-						that.getAdress();
-
-					},
-					fail(err) {
-						console.log(err)
-						// that.cityname = uni.getStorageSync("location").cityname;
-						// that.citydw.name = uni.getStorageSync("location").cityname
-						// that.citydw.citycode = uni.getStorageSync("location").cityCode
-						uni.showToast({
-							icon:'none',
-							title: '重新定位失败，请稍后重试'
-						})
-					}
-				});
-			},
-			getAdress() {
-				var location = this.lng + ',' + this.lat
-				uni.request({
-					url: 'https://restapi.amap.com/v3/place/around', //仅为示例，并非真实接口地址。
-					data: {
-						key: '064b6a4a8ade55656edcde2f528876de',
-						location: location,
-						types: "190000",
-						extensions: "all",
-						radius: 100
-					},
-					dataType: "json",
-					success: (res) => {
-						console.log(res);
-						this.cityname = res.data.pois[0].cityname;
-						var cityCode = res.data.pois[0].adcode
-						cityCode = cityCode.slice(0, -2)
-						cityCode = cityCode + '00'
-						this.cityCode = cityCode
-						this.citydw.name = this.cityname
-						this.citydw.citycode = this.cityCode
-					}
-				});
-			},
-			groupArr(list, field) {
-				var fieldList = [],
-					att = [];
-				list.map((e) => {
-					fieldList.push(e[field])
-				})
-				//数组去重
-				fieldList = fieldList.filter((e, i, self) => {
-					return self.indexOf(e) == i
-				})
-				for (var j = 0; j < fieldList.length; j++) {
-					//过滤出匹配到的数据
-					var arr = list.filter((e) => {
-						return e[field] == fieldList[j];
-					})
-					att.push({
-						nameType: arr[0].nameType,
-						list: arr
-					})
-				}
-				return att;
-			},
-			selectCity(item, type) {
-				if (type === 'refresh' && !this.hasLocation) {
-					// 获取定位
-					return this.getLocation()
-				}
-				// console.log('选择的城市：', item);
-				uni.setStorageSync('myCityObj', item)
-				this.$emit('selectCity', item)
-				// 当前项目是需要选择到区域，所以选择城市后回到区县的地方
-				this.toIndex = 'area';
-				setTimeout(() => {
-					this.toIndex = '';
-				}, 1000);
-			},
-			closeModal() {
-				this.$emit('closeModal')
-			},
-			//列表滚动，和右边字母表对应
-			scrollHandle(e) {
-				let view = uni.createSelectorQuery().in(this).selectAll('.list-item');
-				view
-					.boundingClientRect((d) => {
-						let top = d[0].top;
-						d.forEach((item) => {
-							item.top = item.top - top;
-							item.bottom = item.bottom - top;
-							this.letterDetails.push({
-								id: item.id,
-								top: item.top,
-								bottom: item.bottom,
-							});
-						});
-					})
-					.exec();
-
-				const scrollTop = e.detail.scrollTop;
-				this.letterDetails.some((item) => {
-					if (scrollTop >= item.top && scrollTop <= item.bottom - 20) {
-						this.currentLetter = item.id;
-						//当前固定用的是粘性定位，如果不用粘性定位，在这里设置
-						return true;
-					}
-				});
-			},
-
-			//搜索
-			searchChange(e) {
-				let {
-					value
-				} = e.detail;
-				this.inputValue = value;
-			},
-			// 触发开始
-			touchStart(e) {
-				// console.log(e);
-			},
-			//移动时
-			touchMove(e) {
-				uni.vibrateShort();
-				let y = e.touches[0].clientY;
-				let offsettop = e.currentTarget.offsetTop;
-
-				//判断选择区域,只在选择区才会生效
-				if (y > offsettop) {
-					let num = parseInt((y - offsettop) / 15); //右边每个字母元素的高度
-					let letter = this.alphabet[num];
-					this.tipsLetter = letter;
-
-					let curentLetter = this.letterTransform(letter);
-					uni.showToast({
-						title: curentLetter,
-						icon: 'none',
-					});
-				}
-			},
-			//触发结束
-			touchEnd() {
-				this.toIndex = this.tipsLetter;
-			},
-			//移动开始获取字母，并放大提示
-			getLetter(e) {
-				uni.vibrateShort();
-				let {
-					id
-				} = e.currentTarget;
-				this.tipsLetter = id;
-
-				let curentLetter = this.letterTransform(id);
-				uni.showToast({
-					title: curentLetter,
-					icon: 'none',
-				});
-			},
-			//移动结束设置字母，赋值到toIndex
-			setLetter() {
-				this.toIndex = this.tipsLetter;
-			},
-
-			//提示字母转换
-			letterTransform(letter) {
-				let str = '';
-				if (letter == 'area') {
-					str = '当前';
-				} else if (letter == 'record') {
-					str = '历史';
-				} else {
-					str = letter;
-				}
-				return str;
-			},
-		},
-	}
-</script>
-
-<style lang="less" scoped>
-	.chose-city {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 999;
-		background: #fff;
-	}
-
-	.city-search-wrap {
-		width: 100%;
-		box-sizing: border-box;
-
-		.search {
-			width: 750rpx;
-			height: 110rpx;
-			display: flex;
-			align-items: center;
-			font-size: 28rpx;
-			color: #222;
-			padding: 14rpx 36rpx;
-			box-sizing: border-box;
-			background: #fff;
-
-			.l-search {
-				width: 597rpx;
-				position: relative;
-				height: 72rpx;
-				line-height: 72rpx;
-
-				.icon-search {
-					font-size: 28rpx;
-					position: absolute;
-					left: 0rpx;
-					top: 0;
-					color: #8e8f97;
-					font-weight: 700;
-					height: 72rpx;
-					line-height: 72rpx;
-				}
-
-				.cuIcon-search {
-					width: 40rpx;
-					height: 40rpx;
-					padding: 20rpx;
-				}
-
-				.input-search {
-					width: 597rpx;
-					height: 72rpx;
-					box-sizing: border-box;
-					padding: 0 84rpx 0 84rpx;
-					text-align: left;
-					background: #f4f5f9;
-					border-radius: 12rpx;
-					border: 0;
-				}
-
-				.clear-input {
-					font-size: 30rpx;
-					position: absolute;
-					right: 10rpx;
-					top: 50%;
-					transform: translateY(-50%);
-					padding: 10rpx;
-					color: #8e8f97;
-				}
-			}
-
-			.r-cancel {
-				width: 80rpx;
-				box-sizing: border-box;
-				padding-left: 24rpx;
-				font-size: 28rpx;
-				height: 72rpx;
-				line-height: 72rpx;
-				background: transparent;
-				border: 0;
-				color: #519AD2;
-			}
-		}
-	}
-
-	.reach-content {
-		padding-left: 36rpx;
-		box-sizing: border-box;
-
-		.li {
-			width: 714rpx;
-			font-size: 28rpx;
-			height: 100rpx;
-			line-height: 100rpx;
-			color: #333;
-			position: relative;
-			box-sizing: border-box;
-			border-bottom: 2rpx solid #F5F5F5;
-		}
-	}
-
-	.block {
-		// padding: 0 36rpx;
-		padding-left: 36rpx;
-		padding-right: 20rpx;
-		box-sizing: border-box;
-	}
-
-	.top-search {
-		line-height: 72rpx;
-		padding: 14rpx 30rpx 0;
-		box-sizing: border-box;
-		margin-bottom: 26rpx;
-
-		.item {
-			background: #F5F5F5;
-			border-radius: 12rpx;
-			font-size: 28rpx;
-			text-align: center;
-			color: #999999;
-			/* #ifdef MP-ALIPAY */
-			height: 72rpx;
-			line-height: 72rpx;
-
-			/* #endif */
-			text {
-				padding-left: 20rpx;
-				color: #c1c2cd;
-				vertical-align: middle;
-				position: relative;
-				top: -4rpx;
-			}
-
-		}
-	}
-
-	.scroll-view {
-		width: 100%;
-		height: calc(100vh - 110rpx);
-		box-sizing: border-box;
-	}
-
-	.area {
-		margin-bottom: 8rpx;
-
-		.title-wrapp {
-			position: sticky;
-			top: 0;
-			left: 0;
-			background: #fff;
-		}
-
-		.c-title {
-			width: 100%;
-			box-sizing: border-box;
-			font-size: 28rpx;
-			color: #999999;
-			margin-bottom: 24rpx;
-			display: inline-flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.r {
-				font-size: 24rpx;
-				color: #8e8f97;
-				display: inline-block;
-				align-items: center;
-
-				.iconfont {
-					font-size: 24rpx;
-				}
-			}
-		}
-
-		.dingweiCity {
-			background-color: #F4F5F7;
-			border-radius: 49rpx;
-			width: 140rpx;
-			height: 64rpx;
-			text-align: center;
-			line-height: 64rpx;
-			font-size: 26rpx;
-		}
-
-		.ul {
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-
-			.li {
-				width: 155rpx;
-				padding: 0 10rpx;
-				box-sizing: border-box;
-				height: 72rpx;
-				line-height: 68rpx;
-				text-align: center;
-				font-size: 32rpx;
-				color: #333;
-				border-radius: 8rpx;
-				margin: 0 18rpx 28rpx 0;
-				// border: 2rpx solid #E2E2E2;
-
-				&:nth-child(4n) {
-					margin-right: 0;
-				}
-
-				&.now {
-					width: auto;
-					padding: 0 32rpx 0 22rpx;
-
-					.icon {
-						width: 33rpx;
-						height: 33rpx;
-						background-size: 100%;
-						vertical-align: middle;
-						position: relative;
-						top: -4rpx;
-					}
-
-					.text {
-						padding-left: 10rpx;
-						color: #3F90F7;
-						font-size: 26rpx;
-					}
-				}
-
-				&.active {
-					font-weight: 500;
-					background: #ffde45;
-				}
-			}
-
-			.hover {
-				background: #ffde45;
-			}
-		}
-	}
-
-	.city-list {
-		width: 750rpx;
-		padding-bottom: 50rpx;
-
-		.c-title {
-			height: 60rpx;
-			line-height: 60rpx;
-			font-size: 30rpx;
-			font-weight: 500;
-			color: #272636;
-			background: #fff;
-			box-sizing: border-box;
-			padding-left: 36rpx;
-			position: sticky;
-			top: 0;
-			left: 0;
-			z-index: 2;
-		}
-
-		.item {
-			width: 714rpx;
-			margin-left: 36rpx;
-			padding: 0 36rpx 0 0;
-			height: 100rpx;
-			line-height: 100rpx;
-			color: #333;
-			font-size: 28rpx;
-			box-sizing: border-box;
-			border-bottom: 2rpx solid #F5F5F5;
-		}
-	}
-
-	.alphabet {
-		position: fixed;
-		right: 0;
-		bottom: 12%;
-		width: calc(750rpx - 680rpx);
-		text-align: center;
-		font-size: 20rpx;
-		font-weight: 700;
-		color: #8e8f97;
-		z-index: 99;
-
-		.item {
-			height: 15px;
-			line-height: 15px;
-		}
-
-		.active {
-			color: #222;
-		}
-	}
-
-	.has-no-data {
-		font-size: 24rpx;
-		text-align: center;
-		color: #8e8f97;
-		margin-top: 50rpx;
-	}
-
-	.nav {
-		height: 44px;
-		line-height: 44px;
-		text-align: center;
-		font-size: 26rpx;
-		color: #3C3C3C;
-		position: relative;
-	}
-
-	.foback {
-		position: absolute;
-		width: 15px;
-		height: 15px;
-		left: 24rpx;
-		top: 15px;
-	}
-	.dingBg{
-		display: flex;
-		align-items: center;
-		color: #3F90F7;
-		font-size: 26rpx;
-		
-	}
-	.icon{
-		width: 33rpx;
-		height: 33rpx;
-		margin-right: 5rpx;
-	}
-</style>

pages.json

@@ -185,14 +185,7 @@
 			}
 
 		},
-		{
-			"path": "pages/shop/ckShop",
-			"style": {
-				"navigationBarTitleText": "选择门店",
-				"navigationBarBackgroundColor": "#FFFFFF",
-				"enablePullDownRefresh": true
-			}
-		},
+		
 		 {
 			"path": "pages/shop/shopDetail",
 			"style": {

pages/chooseCity/chooseCity.vue

@@ -15,8 +15,8 @@
 			<view class="nowArea">
 				<view class="area">定位城市</view>
 				<view class="dingwBox">
-					<view v-if="locationCity.city" @click="selectCity(locationCity)" class="dingweiCity">
-						{{locationCity.city}}
+					<view v-if="locationCity.cityName" @click="selectDingCity(locationCity)" class="dingweiCity">
+						{{locationCity.cityName}}
 					</view>
 					<view v-else class="dingweiCity" style="color: #999999;">未获取</view>
 
@@ -93,13 +93,12 @@
 				toIndex: '', //跳转的索引的字母
 				searchData:[],
 				locationCity: {
-					city: '',
-					code: '',
-				},
-				location: {
-					lng: '',
+					cityName: '',
+					cityCode: '',
+					lng: '',
 					lat: '',
 				},
+				
 
 			}
 		},
@@ -132,16 +131,10 @@
 					type: 'gcj02',
 					success: function(res) {
 						console.log('定位', res)
-						that.location.lng = res.longitude
-						that.location.lat = res.latitude
+						that.locationCity.lng = res.longitude
+						that.locationCity.lat = res.latitude
 
-						uni.setStorage({
-							key: 'location',
-							data: that.location,
-							success: function() {
-								console.log('定位,保存成功');
-							}
-						})
+						
 						that.getAdress();
 
 					},
@@ -153,7 +146,7 @@
 			},
 			getAdress() {
 				// 根据经纬度 逆城市地理编码 获取城市信息
-				var location = this.location.lng + ',' + this.location.lat
+				var location = this.locationCity.lng + ',' + this.locationCity.lat
 				uni.request({
 					url: 'https://restapi.amap.com/v3/place/around',
 					data: {
@@ -170,8 +163,8 @@
 						var cityCode = res.data.pois[0].adcode
 						cityCode = cityCode.slice(0, -2)
 						cityCode = cityCode + '00'
-						this.locationCity.city = cityname
-						this.locationCity.code = cityCode
+						this.locationCity.cityName = cityname
+						this.locationCity.cityCode = cityCode
 
 						uni.setStorage({
 							key: 'locationCity',
@@ -209,11 +202,27 @@
 						});
 					}
 					this.alphabet = arr
-					console.log(this.alphabet);
-					console.log(this.cityData);
+					
 
 
 				})
+			},
+			selectDingCity(locationCity){
+				console.log('选择了定位城市：', locationCity);
+				var city={}
+				city.city = locationCity.cityName
+				city.code = locationCity.cityCode
+				uni.setStorage({
+					key: 'selectCity',
+					data: city,
+					success: function() {
+						console.log('选择了定位城市,保存成功');
+					}
+				})
+				
+				uni.navigateBack({
+				
+				})
 			},
 			selectCity(city) {
 

pages/index/index.vue

@@ -19,8 +19,8 @@
 		<view class="carMessage">
 			<view class="mesView">
 				<view class="leftTitle">城市</view>
-				<view class="cityBtn noSelectColor" v-if="!cityname" @click="showCity">请选择</view>
-				<view class="cityBtn selectColor" v-else @click="showCity">{{cityname}}</view>
+				<view class="cityBtn noSelectColor" v-if="!cityName" @click="showCity">请选择</view>
+				<view class="cityBtn selectColor" v-else @click="showCity">{{cityName}}</view>
 				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
 			</view>
 
@@ -80,12 +80,14 @@
 			return {
 				imgData: [],
 				uid: '',
-				cityname: '',
+				cityName: '',
 				cityCode: '',
 				memberCar: '',
-				location: {
-					lng:'',
-					lat:'',
+				locationCity: {
+					cityName: '',
+					cityCode: '',
+					lng: '',
+					lat: '',
 				},
 				
 				time: '',
@@ -111,14 +113,14 @@
 			
 			if (selectCity) {
 				//有选择的城市
-				that.cityname = selectCity.city
+				that.cityName = selectCity.city
 				that.cityCode = selectCity.code
 			} else{
 				//定位到的城市
 				var nowCity = uni.getStorageSync("locationCity");
 				if (nowCity) {
-					that.cityname = nowCity.city
-					that.cityCode = nowCity.code
+					that.cityName = nowCity.cityName
+					that.cityCode = nowCity.cityCode
 					
 					if (that.uid) {
 						that.queryHomeDetail();
@@ -146,16 +148,10 @@
 					type: 'gcj02',
 					success: function(res) {
 						console.log('定位', res)
-						that.location.lng = res.longitude
-						that.location.lat = res.latitude
+						that.locationCity.lng = res.longitude
+						that.locationCity.lat = res.latitude
 			
-						uni.setStorage({
-							key: 'location',
-							data: that.location,
-							success: function() {
-								console.log('定位,保存成功');
-							}
-						})
+						
 						that.getAdress();
 			
 					},
@@ -167,7 +163,7 @@
 			},
 			getAdress() {
 				// 根据经纬度 逆城市地理编码 获取城市信息
-				var location = this.location.lng + ',' + this.location.lat
+				var location = this.locationCity.lng + ',' + this.locationCity.lat
 				uni.request({
 					url: 'https://restapi.amap.com/v3/place/around',
 					data: {
@@ -184,8 +180,8 @@
 						var cityCode = res.data.pois[0].adcode
 						cityCode = cityCode.slice(0, -2)
 						cityCode = cityCode + '00'
-						this.locationCity.city = cityname
-						this.locationCity.code = cityCode
+						this.locationCity.cityName = cityname
+						this.locationCity.cityCode = cityCode
 			
 						uni.setStorage({
 							key: 'locationCity',
@@ -194,6 +190,11 @@
 								console.log('定位城市,保存成功');
 							}
 						})
+						
+						this.cityName = this.locationCity.cityName
+						this.cityCode = this.locationCity.cityCode
+						
+						
 					}
 				});
 			},
@@ -247,8 +248,8 @@
 				if (!this.uid) {
 					this.goLonIn();
 				}
-				console.log(this.location.cityCode);
-				if (!this.location.cityCode) {
+				
+				if (!this.cityCode) {
 					uni.showToast({
 						title:'请选择城市',
 						icon:'none',

pages/module/maintain.vue

@@ -354,7 +354,7 @@ export default {
 		},
 		getData(){
 			uni.showLoading({ });
-			var location = uni.getStorageSync("location");
+			var location = uni.getStorageSync("locationCity");
 			this.$http('miniApp/tPackageMiniAppController/queryPackageList', {
 			   mileage:this.maintainCarData.milage,
 			   liyangId:this.maintainCarData.nLevelID,

pages/module/orderShop.vue

@@ -67,7 +67,7 @@
 		onLoad(opt) {
 			this.orderData = opt.orderData;
 			this.currentMileage = opt.currentMileage;
-			this.location = uni.getStorageSync("location");
+			this.location = uni.getStorageSync("locationCity");
 			this.brand = opt.brand;
 			
 			this.getqueryShopList()

pages/order/orderDetail.vue

@@ -381,7 +381,7 @@
 		},
 		onLoad(opt) {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-			this.location = uni.getStorageSync("location");
+			this.location = uni.getStorageSync("locationCity");
 			this.id = opt.id
 			this.getData()
 			this.type = opt.type;

pages/shop/ckShop.vue

@@ -1,810 +0,0 @@
-<template>
-	<view class="content">
-		<view class="top">
-
-			<!-- 			<view class="shopMr" v-show="shopDefault">
-				<view class="shopMrMs">默认门店</view>
-				<view class="shopBox">
-					    <view class="">
-						 <image :src="shopDefault.photoPath" mode="" class="shopImg"></image>
-						</view>
-						<view class="shopCont">
-							<view class="shopName">{{shopDefault.shopName}}</view>
-							<view class="flex shopRight">
-								<view>
-								<span class="span2" >暂无评分</span>
-									<span class="span3">服务次数 </span>
-								</view>
-								<view class="shopBq">{{shopDefault.levelName}}</view>
-							</view>
-							<view class="shopTime"><span v-show="shopDefault.startTime">{{shopDefault.startTime}}</span> - <span v-show="shopDefault.endTime">{{shopDefault.endTime}}</span> </view>
-							<view class="flex addressBox">
-								<view class="address" > <span v-show="shopDefault.address"> {{shopDefault.address}}</span></view>
-								<view class="shopKm" v-show="shopDefault.distance">{{shopDefault.distance}}km</view>
-							</view>
-						</view>
-					
-				</view>
-			</view> -->
-			<!-- tab -->
-			<view class="topView">
-
-				<view class="tab">
-					<!-- 93rpx -->
-					<view class="tabLine" :class="{tabActive:tabindex==1}" @click="tabindexClick(1)">全部</view>
-					<view class="tabLine" :class="{tabActive:tabindex==2}" @click="tabindexClick(2)">关注</view>
-					<view class="tabLine" :class="{tabActive:tabindex==3}" @click="tabindexClick(3)">足迹</view>
-				</view>
-			</view>
-
-
-
-			<!-- 全部门店页 -->
-			<view class="allShop" v-show="tabindex==1">
-				<view class="firstTop">
-
-					<view class="search">
-						<!-- 120rpx -->
-						<view class="searchVIew">
-							<image src="../../static/img/icon_search.png" mode="" class="searchIMg"></image>
-							<input type="text" value="" placeholder="请输入门店名称" class="searchInput" v-model="shopName"
-								@confirm="searchList" />
-							<image src="../../static/img/icon_search_del.png" v-show="shopName" mode="" class="ssScImg"
-								@click="searchSc"></image>
-						</view>
-					</view>
-					<view class="screen">
-						<view class="screenLine">
-							<view class="screenLineTxt" @click="showCity=true,comprehensiveShow=false,levelShow=false">
-								{{cityname}}
-							</view>
-							<image src="../../static/img/icon_arrow_gray.png" mode="" v-show="!showCity"
-								class="screenJt">
-							</image>
-							<image src="../../static/img/icon_arrow_cheng.png" mode="" v-show="showCity"
-								class="screenJt">
-							</image>
-						</view>
-						<view class="screenLine" @click="mdlx">
-							<view class="screenLineTxt " :class="{colorCS:levelShow}">门店类型</view>
-							<image src="../../static/img/icon_arrow_gray.png" mode="" class="screenJt"
-								v-show="!levelShow">
-							</image>
-							<image src="../../static/img/icon_arrow_cheng.png" mode="" v-show="levelShow"
-								class="screenJt">
-							</image>
-						</view>
-						<view class="screenLine" @click="juli" :class="{colorCS:comprehensiveShow}">
-							<view class="screenLineTxt" v-if="comprehensive==0">综合排序</view>
-							<view class="screenLineTxt" v-if="comprehensive==1">距离最近</view>
-							<view class="screenLineTxt" v-if="comprehensive==2">评分最高</view>
-							<image src="../../static/img/icon_arrow_gray.png" mode="" v-show="!comprehensiveShow"
-								class="screenJt"></image>
-							<image src="../../static/img/icon_arrow_cheng.png" mode="" v-show="comprehensiveShow"
-								class="screenJt"></image>
-						</view>
-
-					</view>
-
-					<!-- 门店类型弹框 -->
-					<view class="shoplevelBox" v-show="levelShow" @click="levelShow=false">
-						<view class="shoplevelCont">
-							<view class="shoplevelLine" v-for="(item,index) in shopLevel" @click.stop="levelClick(item)"
-								:class="{shoplevalActive:item.ckeck}">{{item.name}}</view>
-						</view>
-						<view class="shoplevelBottom">
-							<view class="shoplevelReset" @click.stop="shoplevelReset">重置</view>
-							<view class="shoplevelsbu" @click.shop="shoplevelsbu">确定</view>
-						</view>
-					</view>
-					<!-- 门店类型弹框 -->
-					<!-- 综合排序 -->
-					<view class="shoplevelBox " v-show="comprehensiveShow" @click="comprehensiveShow=false">
-						<view class="shoplevelCont ">
-							<view class="comprehensivebox">
-								<view class="comprehensiveLine" :class="{comprehensiveACtive:comprehensive==0}"
-									@click.stop="comprehensiveClick(0)">综合排序</view>
-								<view class="comprehensiveLine" :class="{comprehensiveACtive:comprehensive==1}"
-									@click.stop="comprehensiveClick(1)">距离最近</view>
-								<view class="comprehensiveLine" :class="{comprehensiveACtive:comprehensive==2}"
-									@click.stop="comprehensiveClick(2)">评分最高</view>
-							</view>
-
-						</view>
-
-					</view>
-					<!-- 综合排序 -->
-				</view>
-				<view class="shopLineBoxFirst">
-					<view class="shopBox shopBox2" v-for="(item,index) in queryShopList"
-						@click="addBMemberShopIsDefault(item)">
-						<view class="">
-							<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
-							<image src="../../static/img/noimg.png" mode="" class="shopImg" v-else></image>
-						</view>
-						<view class="shopCont">
-							<view class="shopName">{{item.shopName}}</view>
-							<view class="flex shopRight">
-								<view>
-									<span class="span1" v-if="item.shopScore">{{item.shopScore}}</span>
-									<span class="span2" v-if="item.shopScore">分</span>
-									<span class="span2" v-if="!item.shopScore">暂无评分</span>
-									<span class="span3">服务次数  {{item.sheetSum}}</span>
-								</view>
-								<view class="shopBq" v-show="item.levelName">{{item.levelName}}</view>
-							</view>
-							<view class="shopTime"><span v-show="item.startTime">{{item.startTime}}</span> - <span
-									v-show="item.endTime">{{item.endTime}}</span> </view>
-							<view class="flex addressBox">
-								<view class="address"> <span v-show="item.address"> {{item.address}}</span></view>
-								<view class="shopKm" v-show="item.distance">{{item.distance}}km</view>
-							</view>
-
-						</view>
-
-					</view>
-					<view v-if="queryShopList==''" class="nodataBox">
-						<image src="../../static/img/nodata.png" mode="widthFix" class="nodataImg"></image>
-						<view class="noTxt">暂无数据</view>
-					</view>
-				</view>
-
-			</view>
-			<!-- 关注的门店页-->
-			<view class="allShop" v-show="tabindex==2">
-				<view class="shopLineBox">
-					<view class="shopBox shopBox2" v-for="(item,index) in bMemberShopList"
-						@click="addBMemberShopIsDefault(item)">
-						<view class="">
-							<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
-							<image src="../../static/img/noimg.png" mode="" class="shopImg" v-else></image>
-						</view>
-						<view class="shopCont">
-							<view class="shopName">{{item.shopName}}</view>
-							<view class="flex shopRight">
-								<view>
-									<span class="span1" v-if="item.shopScore">{{item.shopScore}}</span>
-									<span class="span2" v-if="item.shopScore">分</span>
-									<span class="span2" v-if="!item.shopScore">暂无评分</span>
-									<span class="span3">服务次数 {{item.sheetSum}} </span>
-								</view>
-								<view class="shopBq" v-show="item.levelName">{{item.levelName}}</view>
-							</view>
-							<view class="shopTime"><span v-show="item.startTime">{{item.startTime}}</span> - <span
-									v-show="item.endTime">{{item.endTime}}</span> </view>
-							<view class="flex addressBox">
-								<view class="address"> <span v-show="item.address"> {{item.address}}</span></view>
-								<view class="shopKm" v-show="item.distance">{{item.distance}}km</view>
-							</view>
-						</view>
-
-					</view>
-					<view v-if="bMemberShopList==''" class="nodataBox">
-						<image src="../../static/img/nodata.png" mode="widthFix" class="nodataImg"></image>
-						<view class="noTxt">暂无数据</view>
-					</view>
-				</view>
-
-			</view>
-
-			<!-- 足迹页 -->
-			<view class="allShop" v-show="tabindex==3">
-				<view class="footLine">
-					<view v-for="(v,i) in shopFootprintList">
-						<view class="timeDate">
-							{{v.date}}
-						</view>
-						<view class="shopBox shopBox2" v-for="(item,index) in v.list"
-							@click="addBMemberShopIsDefault(item)">
-							<view class="">
-								<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
-								<image src="../../static/img/noimg.png" mode="" class="shopImg" v-else></image>
-							</view>
-							<view class="shopCont">
-								<view class="shopName">{{item.shopName}}</view>
-								<view class="flex shopRight">
-									<view>
-										<span class="span1" v-if="item.shopScore">{{item.shopScore}}</span>
-										<span class="span2" v-if="item.shopScore">分</span>
-										<span class="span2" v-if="!item.shopScore">暂无评分</span>
-										<span class="span3">服务次数 {{item.sheetSum}} </span>
-									</view>
-									<view class="shopBq" v-show="item.levelName">{{item.levelName}}</view>
-								</view>
-								<view class="shopTime">{{item.startTime}}-{{item.endTime}}</view>
-								<view class="flex addressBox">
-									<view class="address">{{item.address}}</view>
-									<view class="shopKm">{{item.distance}}km</view>
-								</view>
-							</view>
-
-						</view>
-					</view>
-
-				</view>
-				<view v-if="shopFootprintList==''" class="nodataBox">
-					<image src="../../static/img/nodata.png" mode="widthFix" class="nodataImg"></image>
-					<view class="noTxt">暂无数据</view>
-				</view>
-			</view>
-			<!-- 足迹 -->
-		</view>
-		<chose-city @selectCity="selectCity" v-if="showCity" @closeModal="closeModal"></chose-city>
-	</view>
-</template>
-
-<script>
-	import choseCity from "@/components/chose-city/chose-city"
-	export default {
-		components: {
-			choseCity
-		},
-		data() {
-			return {
-				tabindex: 1,
-				location: '',
-				cityname: '上海市',
-				queryShopList: '',
-				shopName: '',
-				level: '',
-				comprehensive: 0,
-				shopLevel: '',
-				levelShow: false,
-				comprehensiveShow: false,
-				shopDefault: '',
-				bMemberShopList: [],
-				shopFootprintList: [],
-				showCity: false,
-				page: 1,
-			}
-		},
-		onLoad() {
-			this.location = uni.getStorageSync("location");
-			if (this.location) {
-				this.cityname = this.location.cityname
-			} else {
-				//初始化数据
-				this.location = {
-					cityname: '',
-					cityCode: ''
-				}
-			}
-			this.getqueryShopList() //获取全部门店列表
-			this.getqueryBShopLevel() //查询门店等级
-			this.getbMemberShopList() //关注门店
-			this.getShopFootprint()
-			this.shopDefault = uni.getStorageSync("shopData");
-			console.log(this.shopDefault)
-		},
-		methods: {
-			mdlx() {
-				this.levelShow = !this.levelShow;
-				this.comprehensiveShow = false;
-				this.showCity = false
-			},
-			juli() {
-				this.comprehensiveShow = !this.comprehensiveShow;
-				this.levelShow = false;
-				this.showCity = false
-			},
-			selectCity(item) {
-				console.log('-您选择的城市-', item)
-				this.location.cityname = item.name;
-				this.location.cityCode = item.citycode;
-				this.cityname = item.name;
-				console.log(this.location)
-				uni.setStorage({
-					key: 'location',
-					data: this.location,
-					success: function() {}
-				});
-				this.showCity = false;
-				this.getqueryShopList()
-
-
-			},
-			closeModal() {
-				this.showCity = false
-			},
-			addBMemberShopIsDefault(item) {
-				uni.showLoading({});
-				this.$http('miniAppShopInfoController/addBMemberShopIsDefault', {
-					shopId: item.shopId
-				}, 'POST').then(res => {
-					uni.hideLoading();
-					var token = res.data.token;
-					var logodata = uni.getStorageSync("logodata");
-					logodata.token = token;
-					uni.setStorage({
-						key: 'logodata',
-						data: logodata,
-						success: function() {
-							uni.setStorage({
-								key: 'shopData',
-								data: item,
-								success: function() {
-
-									if (res.code == 0) {
-										uni.navigateBack({
-											delta: 1
-										})
-									} else {
-										uni.showToast({
-											title: res.msg,
-											icon: 'none',
-											duration: 3000
-										});
-									}
-								}
-							});
-
-						}
-					});
-
-
-
-
-				})
-			},
-			getqueryShopList() {
-				uni.showLoading({});
-				this.$http('miniAppShopInfoController/queryShopList', {
-					shopName: this.shopName,
-					lat: this.location.lat,
-					lng: this.location.lng,
-					cityCode: this.location.cityCode,
-					comprehensive: this.comprehensive,
-					level: this.level,
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					this.queryShopList = res.data
-				})
-			},
-			getbMemberShopList() { //门店
-				uni.showLoading({});
-				this.$http('miniAppMyBMemberCar/listBMemberShopPage', {
-					lat: this.location.lat,
-					lng: this.location.lng,
-					page: this.page,
-					limit: 10
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					var a = res.data.Items
-					this.bMemberShopList = this.bMemberShopList.concat(a)
-				})
-			},
-			getShopFootprint() { //足迹
-				this.$http('miniAppMyBMemberCar/listBMemberShopFootprintPage', {
-					lat: this.location.lat,
-					lng: this.location.lng,
-					page: this.page,
-					limit: 10
-				}, 'GET').then(res => {
-					var a = res.data.Items;
-					//this.shopFootprintList=this.shopFootprintList.concat(a)
-					if (this.shopFootprintList.length == 0) {
-						this.shopFootprintList = this.shopFootprintList.concat(a);
-					} else {
-						console.log(a[0].date)
-						console.log(this.shopFootprintList[this.shopFootprintList.length - 1].date)
-						if (a[0].date == this.shopFootprintList[this.shopFootprintList.length - 1].date) {
-							this.shopFootprintList[this.shopFootprintList.length - 1].list.concat(a[0].list);
-							a.splice(0, 1);
-							this.shopFootprintList = this.shopFootprintList.concat(a);
-						} else {
-							this.shopFootprintList = this.shopFootprintList.concat(a);
-						}
-					}
-				})
-			},
-			searchList() {
-				this.getqueryShopList()
-			},
-			searchSc(){
-				
-				this.shopName = ''
-				this.getqueryShopList()
-			},
-			getqueryBShopLevel() {
-				this.$http('miniAppShopInfoController/queryBShopLevel', {
-
-				}, 'GET').then(res => {
-					res.data.forEach(item => {
-						item.ckeck = false;
-					})
-					this.shopLevel = res.data
-				})
-			},
-			levelClick(item) {
-				item.ckeck = !item.ckeck
-			},
-			shoplevelReset() {
-				this.shopLevel.forEach(item => {
-					item.ckeck = false;
-				})
-				// this.getqueryShopList()
-				// this.levelShow=false;
-			},
-			shoplevelsbu() {
-				var arr = []
-				this.shopLevel.forEach(item => {
-					if (item.ckeck) {
-						arr.push(item.id)
-					}
-				})
-				this.level = arr.join(',')
-				console.log(this.level)
-				this.levelShow = false;
-				this.getqueryShopList()
-			},
-			comprehensiveClick(num) {
-				this.comprehensive = num;
-				this.comprehensiveShow = false;
-				this.getqueryShopList()
-			},
-			tabindexClick(num) {
-				this.tabindex = num;
-				if (num == 2) {
-					this.page = 1;
-					this.bMemberShopList = [];
-					this.getbMemberShopList()
-				} else if (num == 3) {
-					this.page = 1;
-					this.shopFootprintList = [];
-					this.getShopFootprint()
-				}
-			}
-		},
-		onReachBottom() {
-			this.page++;
-			if (this.tabindex == 2) {
-				this.getbMemberShopList()
-			} else if (this.tabindex == 3) {
-				this.getShopFootprint()
-			}
-			//this.getData()
-		},
-		onPullDownRefresh() {
-			/* this.page=1;
-			  this.data=[];
-		      this.getData() */
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		}
-	}
-</script>
-
-<style scoped>
-	.nodataImg {
-		width: 400rpx;
-		padding-top: 100rpx;
-	}
-
-	.noTxt {
-		font-size: 36rpx;
-		color: #999999;
-		padding-top: 50rpx;
-	}
-
-	.nodataBox {
-		text-align: center;
-	}
-
-	.content {
-		min-height: 100vh;
-		background: #F4F5F7;
-	}
-
-	.shopMr {
-		padding: 34rpx 24rpx;
-		background: #FFFFFF;
-	}
-
-	.shopMrMs {
-		color: #999999;
-		font-size: 24rpx;
-	}
-
-	.shopImg {
-		width: 146rpx;
-		height: 146rpx;
-		border-radius: 6rpx;
-	}
-
-	.shopBox {
-		padding-top: 30rpx;
-		display: flex;
-	}
-
-	.flex {
-		display: flex;
-		justify-content: space-between;
-	}
-
-	.shopCont {
-		padding-left: 22rpx;
-		width: 520rpx;
-	}
-
-	.shopName {
-		color: #333333;
-		font-size: 26rpx;
-		font-weight: 600;
-	}
-
-	.span1 {
-		color: #FF4F00;
-		font-size: 36rpx;
-	}
-
-	.span2 {
-		color: #FF4F00;
-		font-size: 22rpx;
-	}
-
-	.span3 {
-		color: #333333;
-		font-size: 22rpx;
-		padding-left: 22rpx;
-	}
-
-	.shopBq {
-		color: #FF4F00;
-		font-size: 22rpx;
-		border-radius: 4rpx;
-		border: 1px solid #FF4F00;
-		line-height: 30rpx;
-		height: 30rpx;
-		padding: 0rpx 5rpx;
-		margin-top: 10rpx;
-	}
-
-	.shopTime {
-		color: #666666;
-		font-size: 22rpx;
-	}
-
-	.addressBox {
-		color: #666666;
-		font-size: 22rpx;
-	}
-
-	.topView {
-
-		width: 100%;
-		height: 93rpx;
-		background-color: #FFFFFF;
-		left: 0rpx;
-		top: 0rpx;
-		position: fixed;
-		z-index: 99;
-
-	}
-
-	.tab {
-		display: flex;
-		padding: 0 18rpx;
-		border-bottom: 1px solid #F4F5F7;
-		background: #FFFFFF;
-		margin-top: 20rpx;
-		justify-content: space-between;
-
-	}
-
-	.tabLine {
-		line-height: 88rpx;
-		color: #3C3C3C;
-		text-align: center;
-		width: 210rpx;
-		font-size: 30rpx;
-	}
-
-	.tabActive {
-		color: #FF4F00;
-		border-bottom: 4rpx solid #FF4F00;
-	}
-
-	.allShop {
-		background-color: #FFFFFF;
-		padding-top: 111rpx;
-	}
-	.firstTop{
-		width: 100%;
-		height: 175rpx;
-		background-color: #FFFFFF;
-		position: fixed;
-		top: 111rpx;
-		 z-index: 99;
-	}
-
-	.searchIMg {
-		width: 40rpx;
-		height: 40rpx;
-		margin-top: 16rpx;
-		margin-left: 20rpx;
-	}
-
-	.search {
-		padding: 24rpx;
-	}
-
-	.searchVIew {
-		display: flex;
-		background: #F4F5F7;
-		border-radius: 36rpx;
-		height: 72rpx;
-	}
-
-	.searchInput {
-		color: #999999;
-		font-size: 28rpx;
-		padding-left: 16rpx;
-		height: 72rpx;
-		line-height: 72rpx;
-		width: 550rpx;
-	}
-
-	.screenJt {
-		width: 40rpx;
-		height: 40rpx;
-	}
-
-	.screen {
-		display: flex;
-		justify-content: space-between;
-		padding: 0 24rpx 16rpx 24rpx;
-		border-bottom: 2rpx solid #EEEEEE;
-		position: relative;
-	}
-
-	.screenLine {
-		display: flex;
-		color: #333333;
-		font-size: 28rpx;
-
-	}
-	.shopLineBoxFirst{
-		padding: 0 25rpx;
-		padding-top: 175rpx;
-	}
-	.shopLineBox {
-		padding: 0 25rpx;
-		
-	}
-
-	.shopBox2 {
-		border-bottom: 2rpx solid #EEEEEE;
-		padding-bottom: 30rpx;
-	}
-
-	.shoplevelBox {
-		position: fixed;
-		left: 0;
-		width: 750rpx;
-		top: 288rpx;
-		background: rgba(0, 0, 0, 0.4);
-
-		z-index: 11;
-		border-top: 1px solid #EEEEEE;
-		border-bottom: 1px solid #EEEEEE;
-		height: calc(100vh - 288rpx);
-	}
-
-	/* #ifdef H5 */
-	.shoplevelBox {
-
-		top: calc(288rpx + 44px);
-
-	}
-
-	/* #endif */
-	.shoplevelCont {
-		display: flex;
-		flex-wrap: wrap;
-		background: #FFFFFF;
-		padding: 24rpx;
-	}
-
-	.shoplevelLine {
-		color: #333333;
-		line-height: 64rpx;
-		padding: 0 40rpx;
-		height: 64rpx;
-		background: #F4F5F7;
-		border-radius: 32rpx;
-		margin-right: 20rpx;
-		margin-bottom: 30rpx;
-	}
-
-	.shoplevelBottom {
-		display: flex;
-		justify-content: space-between;
-		padding-top: 60rpx;
-		padding-right: 24rpx;
-		background: #FFFFFF;
-		padding: 24rpx;
-	}
-
-	.shoplevelReset {
-		width: 320rpx;
-		height: 74rpx;
-		border-radius: 37rpx;
-		border: 2rpx solid #FF4F00;
-		text-align: center;
-		line-height: 74rpx;
-		font-size: 30rpx;
-		font-family: PingFangSC-Medium, PingFang SC;
-		font-weight: 500;
-		color: #FF4F00;
-	}
-
-	.shoplevelsbu {
-		width: 320rpx;
-		height: 74rpx;
-		background: #FF4F00;
-		border-radius: 37rpx;
-		font-size: 30rpx;
-		font-family: PingFangSC-Medium, PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
-		text-align: center;
-		line-height: 74rpx;
-		border: 2rpx solid #FF4F00;
-	}
-
-	.shoplevalActive {
-		color: #FF4F00;
-		background: rgba(255, 79, 0, 0.08);
-
-	}
-
-	.comprehensiveLine {
-		/* 	width: 200rpx;
-		height: 60rpx;
-		line-height: 60rpx;
-		text-align: center;
-		border: 1px solid rgb(228, 228, 228);
-		border-radius: 10rpx; */
-		font-size: 26rpx;
-		font-family: PingFangSC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #333333;
-		padding: 25rpx 0;
-
-	}
-
-	.comprehensivebox {
-		/* display: flex;justify-content: space-around; */
-	}
-
-	.comprehensiveACtive {
-		color: #FF4F00;
-	}
-
-	.footLine {
-		padding: 24rpx;
-	}
-
-	.timeDate {
-		font-size: 24rpx;
-		color: #999999;
-	}
-
-	.screenJt {
-		width: 24rpx;
-		height: 24rpx;
-		margin-top: 7rpx;
-		margin-left: 5rpx;
-	}
-
-	.ssScImg {
-		width: 40rpx;
-		height: 40rpx;
-		margin-top: 16rpx;
-	}
-
-	.colorCS {
-		color: #FF4F00;
-	}
-</style>

pages/shop/shopDetail.vue

@@ -282,7 +282,7 @@ export default {
 	onLoad(opt) {
 		// this.$common.isUserId()
        this.shopId=opt.id;
-	   this.location=uni.getStorageSync("location");
+	   this.location=uni.getStorageSync("locationCity");
 	   this.maintainCarData=uni.getStorageSync("maintainCarData");
 	   this.getData();
 	  /* this.addBMemberShopFootprint();

pages/shop/shopList.vue

@@ -14,8 +14,8 @@
 				</view>
 				<view class="screen">
 					<view class="screenLine">
-						<view class="screenLineTxt" @click="showCity=true,comprehensiveShow=false,levelShow=false">
-							{{cityname}}
+						<view class="screenLineTxt" @click="showCity(),comprehensiveShow=false,levelShow=false">
+							{{cityName}}
 						</view>
 						<image src="../../static/img/icon_arrow_gray.png" mode="" v-show="!showCity" class="screenJt">
 						</image>
@@ -95,20 +95,22 @@
 			</view>
 
 		</view>
-		<chose-city @selectCity="selectCity" v-if="showCity" @closeModal="closeModal"></chose-city>
+		
 	</view>
 </template>
 
 <script>
-	import choseCity from "@/components/chose-city/chose-city"
+	
 	export default {
-		components: {
-			choseCity
-		},
+		
 		data() {
 			return {
-				location: '',
-				cityname: '上海市',
+				location: {
+					lng:'',
+					lat:'',
+				},
+				cityName: '上海市',
+				cityCode: '',
 				queryShopList: '',
 				shopName: '',
 				level: '',
@@ -122,41 +124,49 @@
 				}],
 				levelShow: false,
 				comprehensiveShow: false,
-				showCity: false,
+				
 				uid: '',
 
 			}
 		},
 		onShow() {
-			this.showCity = false;
+			
 			this.levelShow = false;
 			this.comprehensiveShow = false;
 			// this.$common.isUserId();
+			
+			var selectCity = uni.getStorageSync("selectCity");
+			
+			if (selectCity) {
+				//有选择的城市
+				this.cityName = selectCity.city
+				this.cityCode = selectCity.code
+			} 
+			this.location = uni.getStorageSync("locationCity");
+			
 
-			this.location = uni.getStorageSync("location");
-			if (this.location) {
-				this.cityname = this.location.cityname
-			}
-
-			// this.uid = uni.getStorageSync("logodata").uid;
-			// if (this.uid) {
 			this.getqueryShopList() //获取全部门店列表
-			// this.getqueryBShopLevel() //查询门店等级
-			// }
+			
 		},
 		onLoad() {
 
 		},
-		methods: {
+		methods: {
+			showCity(){
+				console.log('城市');
+				uni.navigateTo({
+					url:'../chooseCity/chooseCity'
+				})
+			},
 			mdlx() {
 				this.levelShow = !this.levelShow;
 				this.comprehensiveShow = false;
-				this.showCity = false
+				
 			},
 			juli() {
 				this.comprehensiveShow = !this.comprehensiveShow;
 				this.levelShow = false;
-				this.showCity = false
+				
 			},
 			searchList() {
 				this.getqueryShopList() //获取全部门店列表
@@ -165,31 +175,14 @@
 				this.shopName = '';
 				this.getqueryShopList() //获取全部门店列表
 			},
-			selectCity(item) {
-				console.log('-您选择的城市-', item)
-				this.location.cityname = item.name;
-				this.location.cityCode = item.citycode;
-				this.cityname = item.name;
-				console.log(this.location)
-				uni.setStorage({
-					key: 'location',
-					data: this.location,
-					success: function() {}
-				});
-				this.showCity = false;
-				this.getqueryShopList() //获取全部门店列表
-			},
-			closeModal() {
-				this.showCity = false
-
-			},
+			
 			getqueryShopList() {
 				uni.showLoading({});
 				this.$http('worldKeepCar/worldHome/getWorldShopInfoList', {
 					name: this.shopName,
 					lat: this.location.lat ? this.location.lat : '',
 					lng: this.location.lng ? this.location.lng : '',
-					cityCode: this.location.cityCode ? this.location.cityCode : '',
+					cityCode: this.cityCode ? this.cityCode : '',
 					comprehensive: this.comprehensive,
 
 				}, 'GET').then(res => {