1.选择城市逻辑 重写

components/chose-city/chose-city.vue

@@ -43,7 +43,8 @@
 					</view>
 					<view class="ul">
 						
-						<view @click="selectCity(citydw)" class="dingweiCity">{{citydw.name}}</view>
+						<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>
@@ -182,6 +183,12 @@
 		},
 		methods: {
 			againDingWei(){
+				uni.showModal({
+					title:'重新获取位置',
+					success() {
+						
+					}
+				})
 				this.getLocation();
 			},
 			getLocation() {
@@ -203,7 +210,7 @@
 						that.hasLocation = false
 						uni.showToast({
 							icon:'none',
-							title: '获取用户定位失败，请手动选择当前城市'
+							title: '重新定位失败，请稍后重试'
 						})
 					},
 				}) */
@@ -224,7 +231,7 @@
 						// that.citydw.citycode = uni.getStorageSync("location").cityCode
 						uni.showToast({
 							icon:'none',
-							title: '获取用户定位失败，请手动选择当前城市'
+							title: '重新定位失败，请稍后重试'
 						})
 					}
 				});

pages.json

@@ -292,6 +292,15 @@
 		    
 		}
 		
+        ,{
+            "path" : "pages/chooseCity/chooseCity",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "选择城市",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"tabBar": {
 		"color": "#8a8a8a",

pages/chooseCity/chooseCity.vue

@@ -0,0 +1,404 @@
+<template>
+	<view class="content">
+		<view class="topView">
+			<!-- 搜索 -->
+			<view class="searchBoxBg">
+				<searchBox placeholder="请输入城市名称" @search='search($event)'></searchBox>
+			</view>
+		</view>
+
+		<!-- 城市列表 -->
+		<scroll-view class="scroll-view" scroll-y scroll-with-animation="true" enable-back-to-top="true"
+			:scroll-into-view="toIndex" v-if="!searchValue">
+
+			<!-- 您所在的地区 -->
+			<view class="nowArea">
+				<view class="area">定位城市</view>
+				<view class="dingwBox">
+					<view v-if="locationCity.city" @click="selectCity(locationCity)" class="dingweiCity">
+						{{locationCity.city}}
+					</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="listContent">
+				<view class="city-list">
+					<!-- 城市列表  -->
+					<view v-for="(item, index) in cityData">
+						<view class="c-title">{{item['首字母']}}</view>
+						<view class="item" v-for="(city,index2) in item['城市列表']" @click="selectCity(city)">
+							{{city.city}}
+						</view>
+					</view>
+				</view>
+
+				<!-- 字母列表 -->
+				<view>
+					<view v-for="(item, index) in alphabet">
+						<view class="alphabet" :class="{select:toIndex == item}" @click="tap(item)">
+							{{item}}
+						</view>
+					</view>
+				</view>
+			</view>
+
+
+
+		</scroll-view>
+		
+		
+		<!-- 搜索列表  -->
+		<view class="reach-content" v-show="searchValue">
+			<block v-show="searchData.length">
+				<view v-for="(item, index) in cityData">
+					<view class="item" v-for="(city,index2) in item['城市列表']" @click="selectCity(city)">
+						{{city.city}}
+					</view>
+				</view>
+			</block>
+			<!-- 无数据空白页 -->
+			<view class="nodataBox" v-if="searchData.length == 0">
+				<image src="../../static/img/pic_empty_def.png" mode="widthFix" class="nodataImg"></image>
+				<view class="noTxt">暂无数据</view>
+			</view>
+		</view>
+
+
+
+		
+
+	</view>
+</template>
+
+<script>
+	import searchBox from '@/components/searchBox/searchBox.vue'
+	export default {
+		components: {
+			searchBox
+		},
+
+		data() {
+			return {
+				searchValue: '',
+				cityData: [],
+				alphabet: [],
+				toIndex: '', //跳转的索引的字母
+				searchData:[],
+				locationCity: {
+					city: '',
+					code: '',
+				},
+				location: {
+					lng: '',
+					lat: '',
+				},
+
+			}
+		},
+		onLoad() {
+			this.getData();
+		},
+		onShow() {
+			var nowCity = uni.getStorageSync("locationCity");
+			if (nowCity) {
+				this.locationCity = nowCity
+			} else {
+
+				this.getLocation()
+			}
+			this.getData();
+		},
+		methods: {
+			tap(item) {
+				console.log('字母点击', item);
+				this.toIndex = item
+			},
+			againDingWei() {
+				console.log('重新定位');
+				this.getLocation();
+			},
+			getLocation() {
+
+				const that = this
+				uni.getLocation({
+					type: 'gcj02',
+					success: function(res) {
+						console.log('定位', res)
+						that.location.lng = res.longitude
+						that.location.lat = res.latitude
+
+						uni.setStorage({
+							key: 'location',
+							data: that.location,
+							success: function() {
+								console.log('定位,保存成功');
+							}
+						})
+						that.getAdress();
+
+					},
+					fail(err) {
+						console.log(err)
+
+					}
+				});
+			},
+			getAdress() {
+				// 根据经纬度 逆城市地理编码 获取城市信息
+				var location = this.location.lng + ',' + this.location.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);
+						let cityname = res.data.pois[0].cityname;
+						var cityCode = res.data.pois[0].adcode
+						cityCode = cityCode.slice(0, -2)
+						cityCode = cityCode + '00'
+						this.locationCity.city = cityname
+						this.locationCity.code = cityCode
+
+						uni.setStorage({
+							key: 'locationCity',
+							data: this.locationCity,
+							success: function() {
+								console.log('定位城市,保存成功');
+							}
+						})
+					}
+				});
+			},
+			search(val) {
+				// console.log(val);
+				this.searchValue = val
+
+				this.getData()
+			},
+			getData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+
+				let url = 'worldKeepCar/worldHome/queryCityRole',
+					params = {
+						city: this.searchValue ? this.searchValue : '',
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading()
+
+					if (res.code == 0) {
+						this.cityData = res.data
+						var arr = []
+						this.cityData.forEach((item, index) => {
+							arr.push(item.首字母)
+						});
+					}
+					this.alphabet = arr
+					console.log(this.alphabet);
+					console.log(this.cityData);
+
+
+				})
+			},
+			selectCity(city) {
+
+				console.log('选择的城市：', city);
+
+				uni.setStorage({
+					key: 'selectCity',
+					data: city,
+					success: function() {
+						console.log('选择的城市,保存成功');
+					}
+				})
+
+				uni.navigateBack({
+
+				})
+
+			},
+
+		},
+
+
+		onPullDownRefresh() {
+
+			this.getData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+
+	}
+</script>
+
+<style>
+	
+	.content {
+		
+		background: #FFFFFF;
+		min-height: 100vh;
+	}
+
+	.topView {
+		background: #FFFFFF;
+		position: fixed;
+		width: 100%;
+		height: 120rpx;
+		z-index: 99;
+	}
+
+	.searchBoxBg {
+
+		width: 100%;
+		background-color: #FFFFFF;
+		border-top: 1rpx solid #EEEEEE;
+	}
+
+	.searchBox {
+		display: flex;
+		height: 72rpx;
+		margin: 24rpx;
+		background-color: #F4F5F7;
+		border-radius: 36rpx;
+	}
+
+	.scroll-view {
+		width: 100%;
+		height: calc(100vh - 120rpx);
+		box-sizing: border-box;
+		padding: 120rpx 24rpx 20rpx;
+
+	}
+
+	.nowArea {
+		width: 100%;
+		height: 147rpx;
+	}
+
+	.area {
+		color: #999999;
+		font-size: 24rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.dingwBox {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.dingweiCity {
+		background-color: #F4F5F7;
+		border-radius: 49rpx;
+		width: 140rpx;
+		height: 64rpx;
+		text-align: center;
+		line-height: 64rpx;
+		font-size: 26rpx;
+	}
+
+	.dingBg {
+		display: flex;
+		align-items: center;
+		color: #3F90F7;
+		font-size: 26rpx;
+
+	}
+
+	.icon {
+		width: 33rpx;
+		height: 33rpx;
+		margin-right: 5rpx;
+	}
+
+	.listContent {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.city-list {
+		display: flex;
+		flex-direction: column;
+		width: 95%;
+	}
+
+
+	.c-title {
+		color: #999999;
+		font-size: 24rpx;
+		height: 33rpx;
+		line-height: 33rpx;
+		padding-top: 30rpx;
+	}
+
+	.item {
+		width: 100%;
+		height: 46rpx;
+		padding: 30rpx 13rpx;
+		color: #3C3C3C;
+		font-size: 28rpx;
+		border-bottom: 1rpx solid #EEEEEE;
+	}
+
+	.alphabet {
+		font-size: 22rpx;
+		font-weight: bold;
+		color: #999999;
+		width: 4%;
+		margin: 20rpx 0;
+		text-align: center;
+	}
+
+	.select {
+		color: #FF4F00;
+	}
+
+	
+	.reach-content{
+		width: 100%;
+		height: calc(100vh - 120rpx);
+		box-sizing: border-box;
+		padding: 120rpx 24rpx 20rpx;
+	}
+
+
+
+
+
+
+
+
+
+
+
+	/* 空白页css */
+	.nodataBox {
+		text-align: center;
+	}
+
+	.nodataImg {
+		width: 400rpx;
+		padding-top: 300rpx;
+	}
+
+	.noTxt {
+		font-size: 30rpx;
+		color: #999999;
+		padding-top: 50rpx;
+	}
+</style>

pages/index/cailist.vue

@@ -1,288 +1,314 @@
-<template>
-	<view class="box">
-		<view class="carlistBox">
-			<view class="line" v-for="(item,index) in carList" @click="itemClick(item)">
-				<view class="lineCont" >
-					<view>
-						<image :src="item.brandLogo" mode="widthFix" class="brandLogo"></image>
-					</view>
-					<view style="padding-left: 29rpx;">
-						<view class="carName">
-						   <span>{{item.brand}} {{item.series}}</span>
-						   <view class="plateNumber">{{item.plateNumber}}</view>
-						</view>
-						<view class="carMS">{{item.carModel}}</view>
-					</view>
-				</view>
-				<view class="lineBottom">
-					<view class="lineDel" @click.stop="delCar(item.id)">删除</view>
-					<view class="lineDel" @click.stop="editCar(item.id)">编辑</view>
-					<view class="Default" v-show="item.isDefault!=1" @click.stop="defaultCar(item)">设为默认</view>
-					<view class="DefaultYES" v-show="item.isDefault==1">已设为默认</view>
-				</view>
-				<view class="DefaultIcon" v-show="item.isDefault==1" >默认</view>
-			</view>
-		</view>
-		<view v-if="carList==''&&loding" class="nodataBox">
-			<image src="../../static/img/nodata.png" mode="widthFix" class="nodataImg"></image>
-			<view class="noTxt">暂无数据</view>
-		</view>
-		
-		
-			
-		<view class="bottomView">
-			<view class="saveCar" @click="addBtn">
-				<image src="../../static/img/icon_tianjiacheliang.png" mode="" style="width: 44rpx; height: 36rpx; margin-right: 10rpx;"></image>
-				<view>添加爱车</view>
-				</view>
-		</view>	
-			
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			carList:'',
-			loding:false,
-			type:'',
-			carId:'',
-			fromMe:false,
-		}
-	},
-	onLoad(opt) {
-		this.$common.isUserId()
-       this.type=opt.type;
-	  // console.log(this.type)
-	  this.fromMe = opt.fromMe
-	},
-	onShow() {
-		this.getqueryMyBMemberCar();
-		this.carId=uni.getStorageSync("maintainCarData").id
-	},
-	methods: {
-		getqueryMyBMemberCar(){
-			uni.showLoading({ });
-			this.loding=false;
-			this.$http('worldKeepCar/worldHome/queryMyTMemberCar', {
-			  
-			 },'GET').then(res => {
-				uni.hideLoading();
-				this.carList=res.data;
-				this.loding=true;
-			})
-		},
-        addBtn(){
-			var length=this.carList.length
-			if(length>4){
-				uni.showToast({
-				     title: '库最多放五辆车，如果想添加，请先删除',
-				 	 icon:'none',
-				     duration: 3000
-				 });
-			}else{
-				uni.navigateTo({
-					url:'addCar'
-				})
-			}
-			
-		},
-		editCar(id){
-			
-			uni.navigateTo({
-				url:'addCar?id='+id + '&isEditCar=true'
-			})
-		},
-		delCar(id){
-			var that=this;
-			uni.showModal({
-			    title: '提示',
-			    content: '确定要删除车辆吗',
-			    success: function (res) {
-			        if (res.confirm) {
-			          uni.showLoading({ });
-			          that.$http('worldKeepCar/worldHome/deleteTMemberCar', {
-			            id:id
-			           },'POST').then(res => {
-			          	uni.hideLoading();
-						if(res.code==0){
-							if(that.carId==id){
-								uni.removeStorageSync('maintainCarData');
-							}
-						}
-			            that.getqueryMyBMemberCar()
-			          })
-			        } else if (res.cancel) {
-			           
-			        }
-			    }
-			});
-		},
-		defaultCar(item){
-			var that=this;
-			uni.showLoading({ });
-			that.$http('worldKeepCar/worldHome/updateTCarIsdefault', {
-			  id:item.id
-			 },'POST').then(res => {
-				uni.hideLoading();
-				if(res.code==0){
-					uni.showToast({
-					     title: '操作成功',
-					 	 icon:'none',
-					     duration: 3000
-					 });
-					
-				}else{
-					uni.showToast({
-					     title: res.msg,
-					 	 icon:'none',
-					     duration: 3000
-					 });
-				}
-			  that.getqueryMyBMemberCar()
-			})
-		},
-		itemClick(item){
-			if (this.fromMe == 'true') {
-				return
-			}
-			uni.setStorage({
-				key: 'maintainCarData',
-				data: item,
-				success: function () {
-						uni.navigateBack({
-							delta:1
-						})
-						
-			     }
-			}); 
-		}
-	}
-}
-</script>
-
-<style scoped>
-	.box{
-		min-height: 100vh;
-		background:#F4F5F7 ;
-	}
-	.nodataImg{
-	  width: 400rpx;
-	  padding-top: 100rpx;
-	}
-	.noTxt{
-		font-size: 36rpx;
-		color: #999999;
-		padding-top: 50rpx;
-	}
-	.nodataBox{
-		text-align: center;
-	}
-	.bottomView {
-		background-color: #FFFFFF;
-		width: 100%;
-		height: 120rpx;
-		position: fixed;
-		bottom: 0rpx;
-	}
-	
-	.saveCar {
-	
-		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
-		margin: 23rpx 30rpx;
-		height: 74rpx;
-		
-		border-radius: 37rpx;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		font-weight: bold;
-		
-		align-items: center;
-		display: flex;
-		justify-content: center;
-	}
-	.carlistBox{
-		padding-bottom: 120rpx;
-	}
-	.carlistBox{
-		padding: 24rpx;
-		padding-bottom: 120rpx;
-	}
-	.brandLogo{
-		width: 63rpx;
-	}
-	.line{
-		background: #FFFFFF;
-		padding: 27rpx 20rpx;
-		border-radius: 10rpx;
-		margin-bottom: 20rpx;
-	    position: relative;
-	}
-	.lineCont{
-			display: flex;
-	}
-	.carName{
-		color: #3C3C3C;font-size: 30rpx;display: flex;
-	}
-	.plateNumber{
-		border-radius: 4px;
-		border: 1px solid #F19D01;
-		height: 32rpx;
-		line-height: 32rpx;
-		padding: 0 10rpx;color: #F19D01;
-		font-size: 22rpx;
-		margin-left: 20rpx;
-		margin-top: 5rpx;
-	}
-	.carMS{
-		color: #666666;
-		font-size: 26rpx;
-		padding-top: 5px;
-	}
-	.lineBottom{
-		display: flex;
-		justify-content: flex-end;
-		padding-top: 20rpx;
-	}
-	.lineDel{
-		width: 94rpx;
-		height: 50rpx;
-		border-radius: 25rpx;
-		border: 1px solid #DDDDDD;
-		text-align: center;line-height: 50rpx;
-		font-size: 26rpx;color: #3C3C3C;
-		margin-right: 29rpx;
-	}
-	.Default{
-		width: 148rpx;
-		height: 50rpx;
-		border-radius: 25rpx;
-		border: 1px solid #FF4F00;
-		line-height: 50rpx;
-		text-align: center;
-		color: #FF4F00;font-size: 26rpx;
-	}
-	.DefaultYES{
-		width: 148rpx;
-		height: 50rpx;
-		border-radius: 25rpx;
-		border: 1px solid #DDDDDD;
-		line-height: 50rpx;
-		text-align: center;
-		color: #999999;font-size: 26rpx;
-	}
-	.DefaultIcon{
-		position: absolute;
-		top: 0;
-		right: 0;
-		width: 109rpx;
-		height: 40rpx;
-		background: linear-gradient(131deg, #FFA72C 0%, #FF450F 100%);
-		border-radius: 0px 10rpx 0px 10rpx;
-		text-align: center;
-		line-height: 40rpx;
-		color: #FFFFFF;
-		font-size: 22rpx;
-	}
+<template>
+	<view class="box">
+		<view class="carlistBox">
+			<view class="line" v-for="(item,index) in carList" @click="itemClick(item)">
+				<view class="lineCont">
+					<view>
+						<image :src="item.brandLogo" mode="widthFix" class="brandLogo"></image>
+					</view>
+					<view style="padding-left: 29rpx;">
+						<view class="carName">
+							<span>{{item.brand}} {{item.series}}</span>
+							<view class="plateNumber">{{item.plateNumber}}</view>
+						</view>
+						<view class="carMS">{{item.carModel}}</view>
+					</view>
+				</view>
+				<view class="lineBottom">
+					<view class="lineDel" @click.stop="delCar(item.id)">删除</view>
+					<view class="lineDel" @click.stop="editCar(item.id)">编辑</view>
+					<view class="Default" v-show="item.isDefault!=1" @click.stop="defaultCar(item)">设为默认</view>
+					<view class="DefaultYES" v-show="item.isDefault==1">已设为默认</view>
+				</view>
+				<view class="DefaultIcon" v-show="item.isDefault==1">默认</view>
+			</view>
+		</view>
+		<view v-if="carList==''&&loding" class="nodataBox">
+			<image src="../../static/img/nodata.png" mode="widthFix" class="nodataImg"></image>
+			<view class="noTxt">暂无数据</view>
+		</view>
+
+
+
+		<view class="bottomView">
+			<view class="saveCar" @click="addBtn">
+				<image src="../../static/img/icon_tianjiacheliang.png" mode=""
+					style="width: 44rpx; height: 36rpx; margin-right: 10rpx;"></image>
+				<view>添加爱车</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				carList: '',
+				loding: false,
+				type: '',
+				carId: '',
+				fromMe: false,
+			}
+		},
+		onLoad(opt) {
+			this.$common.isUserId()
+			this.type = opt.type;
+			// console.log(this.type)
+			this.fromMe = opt.fromMe
+		},
+		onShow() {
+			this.getqueryMyBMemberCar();
+			this.carId = uni.getStorageSync("maintainCarData").id
+		},
+		methods: {
+			getqueryMyBMemberCar() {
+				uni.showLoading({});
+				this.loding = false;
+				this.$http('worldKeepCar/worldHome/queryMyTMemberCar', {
+
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					this.carList = res.data;
+					this.loding = true;
+				})
+			},
+			addBtn() {
+				var length = this.carList.length
+				if (length > 4) {
+					uni.showToast({
+						title: '库最多放五辆车，如果想添加，请先删除',
+						icon: 'none',
+						duration: 3000
+					});
+				} else {
+					uni.navigateTo({
+						url: 'addCar'
+					})
+				}
+
+			},
+			editCar(id) {
+
+				uni.navigateTo({
+					url: 'addCar?id=' + id + '&isEditCar=true'
+				})
+			},
+			delCar(id) {
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定要删除车辆吗',
+					success: function(res) {
+						if (res.confirm) {
+							uni.showLoading({});
+							that.$http('worldKeepCar/worldHome/deleteTMemberCar', {
+								id: id
+							}, 'POST').then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									if (that.carId == id) {
+										uni.removeStorageSync('maintainCarData');
+									}
+								}
+								that.getqueryMyBMemberCar()
+							})
+						} else if (res.cancel) {
+
+						}
+					}
+				});
+			},
+			defaultCar(item) {
+				var that = this;
+				uni.showLoading({});
+				that.$http('worldKeepCar/worldHome/updateTCarIsdefault', {
+					id: item.id
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						uni.showToast({
+							title: '操作成功',
+							icon: 'none',
+							duration: 3000
+						});
+
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+					that.getqueryMyBMemberCar()
+				})
+			},
+			itemClick(item) {
+				if (this.fromMe == 'true') {
+					return
+				}
+				uni.setStorage({
+					key: 'maintainCarData',
+					data: item,
+					success: function() {
+						uni.navigateBack({
+							delta: 1
+						})
+
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+	}
+
+	.nodataImg {
+		width: 400rpx;
+		padding-top: 100rpx;
+	}
+
+	.noTxt {
+		font-size: 36rpx;
+		color: #999999;
+		padding-top: 50rpx;
+	}
+
+	.nodataBox {
+		text-align: center;
+	}
+
+	.bottomView {
+		background-color: #FFFFFF;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0rpx;
+	}
+
+	.saveCar {
+
+		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		margin: 23rpx 30rpx;
+		height: 74rpx;
+
+		border-radius: 37rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		font-weight: bold;
+
+		align-items: center;
+		display: flex;
+		justify-content: center;
+	}
+
+	.carlistBox {
+		padding-bottom: 120rpx;
+	}
+
+	.carlistBox {
+		padding: 24rpx;
+		padding-bottom: 120rpx;
+	}
+
+	.brandLogo {
+		width: 63rpx;
+	}
+
+	.line {
+		background: #FFFFFF;
+		padding: 27rpx 20rpx;
+		border-radius: 10rpx;
+		margin-bottom: 20rpx;
+		position: relative;
+	}
+
+	.lineCont {
+		display: flex;
+	}
+
+	.carName {
+		color: #3C3C3C;
+		font-size: 30rpx;
+		display: flex;
+	}
+
+	.plateNumber {
+		border-radius: 4px;
+		border: 1px solid #F19D01;
+		height: 32rpx;
+		line-height: 32rpx;
+		padding: 0 10rpx;
+		color: #F19D01;
+		font-size: 22rpx;
+		margin-left: 20rpx;
+		margin-top: 5rpx;
+		width: 120rpx;
+	}
+
+	.carMS {
+		color: #666666;
+		font-size: 26rpx;
+		padding-top: 5px;
+	}
+
+	.lineBottom {
+		display: flex;
+		justify-content: flex-end;
+		padding-top: 20rpx;
+	}
+
+	.lineDel {
+		width: 94rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		border: 1px solid #DDDDDD;
+		text-align: center;
+		line-height: 50rpx;
+		font-size: 26rpx;
+		color: #3C3C3C;
+		margin-right: 29rpx;
+	}
+
+	.Default {
+		width: 148rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		border: 1px solid #FF4F00;
+		line-height: 50rpx;
+		text-align: center;
+		color: #FF4F00;
+		font-size: 26rpx;
+	}
+
+	.DefaultYES {
+		width: 148rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		border: 1px solid #DDDDDD;
+		line-height: 50rpx;
+		text-align: center;
+		color: #999999;
+		font-size: 26rpx;
+	}
+
+	.DefaultIcon {
+		position: absolute;
+		top: 0;
+		right: 0;
+		width: 109rpx;
+		height: 40rpx;
+		background: linear-gradient(131deg, #FFA72C 0%, #FF450F 100%);
+		border-radius: 0px 10rpx 0px 10rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #FFFFFF;
+		font-size: 22rpx;
+	}
 </style>

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=true">请选择</view>
-				<view class="cityBtn selectColor" v-else @click="showCity=true">{{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>
 
@@ -67,36 +67,32 @@
 
 
 		<view class="look4s" @click="gomodule">查看4S店保养价格</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 {
 				imgData: [],
 				uid: '',
 				cityname: '',
-				showCity: false,
+				cityCode: '',
 				memberCar: '',
 				location: {
 					lng:'',
 					lat:'',
-					cityname:'',
-					cityCode:'',
 				},
-				cityCode: '',
+				
 				time: '',
 				mileage: '',
-                autoplay:true,
+				autoplay: true,
+				interval: 2000,
+				duration: 500,
 				brand:'',
 			}
 		},
@@ -106,48 +102,106 @@
 		onShow() {
 
 			var that = this;
-			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+			that.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 
-			this.uid = uni.getStorageSync("logodata").uid;
-
-			var location = uni.getStorageSync("location");
+			that.uid = uni.getStorageSync("logodata").uid;
+			
+			
+			var selectCity = uni.getStorageSync("selectCity");
+			
+			if (selectCity) {
+				//有选择的城市
+				that.cityname = selectCity.city
+				that.cityCode = selectCity.code
+			} else{
+				//定位到的城市
+				var nowCity = uni.getStorageSync("locationCity");
+				if (nowCity) {
+					that.cityname = nowCity.city
+					that.cityCode = nowCity.code
+					
+					if (that.uid) {
+						that.queryHomeDetail();
+					}
+				} else {
+					// 重新去定位城市
+					that.getLocation()
+				}
+			}
+			
 			
-			if (this.uid) {
+			if (that.uid) {
 				that.queryHomeDetail();
 			}
 
-			if (location) {
-				this.lng = location.lng;
-				this.lat = location.lat;
-				this.cityname = location.cityname;
-				this.cityCode = location.cityCode;
-                this.location=location
-				if (this.uid) {
-					that.queryHomeDetail();
-				}
-				
-			} else {
-				/* uni.showToast({
-					title: '请选择城市'
-				}) */
-				uni.getLocation({
-				    type: 'gcj02',
-				    success: function (res) {
-				       console.log(res)
-						that.lng=res.longitude
-						that.lat=res.latitude
-						that.getAdress();
-						
-				    },
-					 fail(err) {
-						
-					 }
-				}); 
-			}
+			
 
 		},
 
 		methods: {
+			getLocation() {
+			
+				const that = this
+				uni.getLocation({
+					type: 'gcj02',
+					success: function(res) {
+						console.log('定位', res)
+						that.location.lng = res.longitude
+						that.location.lat = res.latitude
+			
+						uni.setStorage({
+							key: 'location',
+							data: that.location,
+							success: function() {
+								console.log('定位,保存成功');
+							}
+						})
+						that.getAdress();
+			
+					},
+					fail(err) {
+						console.log(err)
+			
+					}
+				});
+			},
+			getAdress() {
+				// 根据经纬度 逆城市地理编码 获取城市信息
+				var location = this.location.lng + ',' + this.location.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);
+						let cityname = res.data.pois[0].cityname;
+						var cityCode = res.data.pois[0].adcode
+						cityCode = cityCode.slice(0, -2)
+						cityCode = cityCode + '00'
+						this.locationCity.city = cityname
+						this.locationCity.code = cityCode
+			
+						uni.setStorage({
+							key: 'locationCity',
+							data: this.locationCity,
+							success: function() {
+								console.log('定位城市,保存成功');
+							}
+						})
+					}
+				});
+			},
+			showCity(){
+				uni.navigateTo({
+					url:'../chooseCity/chooseCity'
+				})
+			},
 			goLonIn(){
 				uni.navigateTo({
 					url:'../login/login'
@@ -189,6 +243,7 @@
 				})
 			},
 			gomodule() {
+				
 				if (!this.uid) {
 					this.goLonIn();
 				}
@@ -223,67 +278,15 @@
 
 				})
 			},
-			selectCity(item) {
-				console.log('-您选择的城市-', item)
-				console.log(this.location)
-				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;
-
-			},
-			closeModal() {
-				this.showCity = false
-
-			},
+			
+			
 
 
 			bindChange(e) {
 				console.log(e);
 				this.time = e.target.value
 			},
-            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
-            			var obj={
-            				cityname:this.cityname,
-            				lng:this.lng,
-            				lat:this.lat,
-            				cityCode:cityCode
-            			}
-            			uni.setStorage({
-            				key: 'location',
-            				data: obj,
-            				success: function () {}
-            			}); 
-            			if (this.uid) {
-            				that.queryHomeDetail();
-            			}
-            	    }
-            	});
-            },
+           
 
 
 		}

pages/login/login.vue

@@ -144,7 +144,7 @@ export default {
 	.container{
 	        width: 100%;
 	        min-height: 100%;
-			background: url('http://phone.66km.cn:8088/thFiles/4E3EB990-959E-4933-9B29-C09C8074CFEA.png');
+			background: url('http://phone.66km.cn:8088/keepCar/keepCarHome.png');
 			background-size: 100%;
 	}
 	.loginLogo{

pages/module/confirmOrder.vue

@@ -26,10 +26,10 @@
 					</view>
 					<view class="topLineRight" @click="gophone">修改></view>
 				</view>
-				<view class="topLine borderB" v-if="!iphoneData">
+				<view class="topLine borderB" v-if="!iphoneData" @click="gophone">
 					<view class="toplineLeft">
 						<view class="topTitle">联系人:</view>
-						<view style="color: #999999; font-size: 28rpx;" @click="gophone">请选择</view>
+						<view style="color: #999999; font-size: 28rpx;" >请选择</view>
 					</view>
 					<view style="width: 14rpx; height: 23rpx; color: #999999;">></view>
 				</view>
@@ -226,6 +226,7 @@ export default {
 			
 			this.$http('worldKeepCar/maintainOrder/myOrderCoupon', {
 			  money:payMoney,
+			  shopId:this.orderShop.shopId,
 			  /* page:1,
 			  limit:2, */
 			 },'GET').then(res => {
@@ -236,7 +237,7 @@ export default {
 			var payMoney=this.goodsMoney+this.itemMoney;
 			//payMoney=40
 			uni.navigateTo({
-				url:'usableDiscountCard?payMoney='+payMoney
+				url:'usableDiscountCard?payMoney='+payMoney+'&shopId='+this.orderShop.shopId
 			})
 		},
 		settlement(){

pages/module/maintain.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="top">
 			<view class="topLeft">
-				<image :src="maintainCarData.brandLogo" mode="" class="brandLogo"></image>
+				<image :src="maintainCarData.brandLogo" mode="aspectFit" class="brandLogo"></image>
 				<view class="carName">{{maintainCarData.brand}}-{{maintainCarData.series}}</view>
 				<image src="../../static/img/icon_edit.png" mode="" class="topEdit" @click="carEdit"></image>
 			</view>
@@ -418,7 +418,8 @@ export default {
 		},
 		carEdit(){
 			uni.navigateTo({
-				url:'../car/cailist?type=2'
+				url:'../index/cailist?type=2'
+				
 			})
 		}
 	}
@@ -526,14 +527,14 @@ export default {
 	.brandLogo{
 		width: 42rpx;
 		height: 42rpx;
+		padding: 0 10rpx;
 	}
 	.topLeft{
      display: flex;
-	 justify-content: space-between;
+	
 	}
 	.carName{
-		margin-left: 10rpx;
-		width: 80%;
+		
 	}
 	.topEdit{
 		width: 30rpx;

pages/module/usableDiscountCard.vue

@@ -56,11 +56,13 @@
 				itemData: [],
 				page: 1,
 				noMoreShow: false,
-				payMoney:'',
+				payMoney:'',
+				shopId:'',
 			}
 		},
 		onLoad(opt) {
-			this.page = 1
+			this.page = 1
+			this.shopId = opt.shopId
 			if(opt.payMoney){
 				this.payMoney=opt.payMoney;
 				this.myOrderCoupon()
@@ -85,7 +87,8 @@
 					title: '加载中'
 				})
 				this.$http('worldKeepCar/maintainOrder/myOrderCoupon', {
-				  money:this.payMoney,
+				  money:this.payMoney,
+				  shopId:this.shopId,
 				  page:this.page,
 				  limit:10,
 				 },'GET').then(res => {

pages/refundMoney/refundMoney.vue

@@ -19,7 +19,7 @@
 				<view class="viewBg2">
 					<image src="../../static/img/icon_xinghao.png" mode="" style="width: 14rpx; height: 14rpx;"></image>
 					<view class="leftTitle">退款金额</view>
-					<input class="blackColor" type="number" v-model="money" :placeholder="'最大可退 ￥'+maxMoney"
+					<input class="blackColor" type="number" v-model="digit" :placeholder="'最大可退 ￥'+maxMoney"
 						placeholder-style="color:#999999" />
 
 				</view>

pages/shop/shopList.vue

@@ -15,7 +15,8 @@
 				<view class="screen">
 					<view class="screenLine">
 						<view class="screenLineTxt" @click="showCity=true,comprehensiveShow=false,levelShow=false">
-							{{cityname}}</view>
+							{{cityname}}
+						</view>
 						<image src="../../static/img/icon_arrow_gray.png" mode="" v-show="!showCity" class="screenJt">
 						</image>
 
@@ -65,7 +66,8 @@
 							<span class="shopScore1" v-if="item.shopScore">{{item.shopScore}}</span>
 							<span class="shopScore2" v-if="item.shopScore">分</span>
 							<span class="shopScore2" v-if="!item.shopScore">暂无评分</span>
-							<view class="brands" v-if="item.brands" v-for="(barnd,index2) in item.brands.split(',')">{{barnd}}</view>
+							<view class="brands" v-if="item.brands" v-for="(barnd,index2) in item.brands.split(',')">
+								{{barnd}}</view>
 						</view>
 
 						<view class="timeBg">
@@ -121,8 +123,8 @@
 				levelShow: false,
 				comprehensiveShow: false,
 				showCity: false,
-				uid: '',
-				
+				uid: '',
+
 			}
 		},
 		onShow() {
@@ -138,8 +140,8 @@
 
 			// this.uid = uni.getStorageSync("logodata").uid;
 			// if (this.uid) {
-				this.getqueryShopList() //获取全部门店列表
-				// this.getqueryBShopLevel() //查询门店等级
+			this.getqueryShopList() //获取全部门店列表
+			// this.getqueryBShopLevel() //查询门店等级
 			// }
 		},
 		onLoad() {
@@ -189,7 +191,7 @@
 					lng: this.location.lng ? this.location.lng : '',
 					cityCode: this.location.cityCode ? this.location.cityCode : '',
 					comprehensive: this.comprehensive,
-					
+
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.queryShopList = res.data
@@ -514,24 +516,26 @@
 
 	.brandsBg {
 		display: flex;
+		flex-wrap: wrap;
 		align-items: center;
+
 	}
 
 	.brands {
-		margin-left: 14rpx;
-		height: 30rpx;
-		font-size: 22rpx;
-		
+		border-radius: 4rpx;
+		line-height: 30rpx;
+		padding: 0 8rpx;
 		color: #FF5800;
+		height: 30rpx;
+		border: 1px solid #FF5800;
+		margin-right: 14rpx;
+		font-size: 24rpx;
 		line-height: 30rpx;
-		border-radius: 4rpx;
-		border: 1rpx solid #F25D24;
-			
 	}
 
 	.timeBg {
 		display: flex;
-		align-items: center;
+		align-items: center;
 		padding-top: 10rpx;
 	}
 
@@ -603,7 +607,8 @@
 
 	.shopScore2 {
 		font-size: 22rpx;
-		color: #FF4F00;
+		color: #FF4F00;
+		margin-right: 14rpx;
 	}
 
 	.shopScore3 {
@@ -612,7 +617,7 @@
 		padding-left: 20rpx;
 	}
 
-	
+
 
 	.Btn {
 		width: 104rpx;