Browse Source

1.首页
2.新增,编辑车辆,
3.我的车库, 删除,设为默认,

guo 3 years ago
parent
commit
5b34a6d05b
54 changed files with 1238 additions and 986 deletions
  1. 202 32
      pages/index/addCar.vue
  2. 32 63
      pages/index/cailist.vue
  3. 11 33
      pages/index/carModel.vue
  4. 64 138
      pages/index/index.vue
  5. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  6. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/chose-city/chose-city.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/nodata/nodata.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/tki-qrcode/tki-qrcode.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-plate-input/uni-plate-input.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/iPhone/addphone.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/iPhone/phoneList.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/addCar.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/cailist.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/carModel.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/empower.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/iphoneLogin.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/intimity.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/me.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/setup.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/treaty.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/evaluate.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/myorder.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderDetail.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/shopList.js.map
  29. 2 0
      unpackage/dist/dev/mp-weixin/app.json
  30. 2 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  31. 142 2
      unpackage/dist/dev/mp-weixin/common/vendor.js
  32. 15 15
      unpackage/dist/dev/mp-weixin/components/chose-city/chose-city.js
  33. 14 14
      unpackage/dist/dev/mp-weixin/components/nodata/nodata.js
  34. 15 15
      unpackage/dist/dev/mp-weixin/components/tki-qrcode/tki-qrcode.js
  35. 14 14
      unpackage/dist/dev/mp-weixin/components/uni-plate-input/uni-plate-input.js
  36. 16 16
      unpackage/dist/dev/mp-weixin/pages/iPhone/addphone.js
  37. 127 127
      unpackage/dist/dev/mp-weixin/pages/iPhone/phoneList.js
  38. 198 25
      unpackage/dist/dev/mp-weixin/pages/index/addCar.js
  39. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/addCar.wxml
  40. 45 76
      unpackage/dist/dev/mp-weixin/pages/index/cailist.js
  41. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/cailist.wxml
  42. 163 170
      unpackage/dist/dev/mp-weixin/pages/index/carModel.js
  43. 3 1
      unpackage/dist/dev/mp-weixin/pages/index/carModel.json
  44. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/carModel.wxml
  45. 41 111
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  46. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  47. 2 2
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  48. 16 16
      unpackage/dist/dev/mp-weixin/pages/me/intimity.js
  49. 16 16
      unpackage/dist/dev/mp-weixin/pages/me/setup.js
  50. 16 16
      unpackage/dist/dev/mp-weixin/pages/me/treaty.js
  51. 16 16
      unpackage/dist/dev/mp-weixin/pages/order/evaluate.js
  52. 18 18
      unpackage/dist/dev/mp-weixin/pages/order/myorder.js
  53. 18 18
      unpackage/dist/dev/mp-weixin/pages/order/orderDetail.js
  54. 2 2
      unpackage/dist/dev/mp-weixin/pages/shop/shopList.js

+ 202 - 32
pages/index/addCar.vue

@@ -15,8 +15,8 @@
 
 			<view class="mesView" @click="goCarModel()">
 				<view class="leftTitle">车型</view>
-				<view class="carModBtn noSelectColor" v-if="!carMod">请添加您的爱车</view>
-				<view class="carModBtn selectColor" v-else>{{carMod}}</view>
+				<view class="carModBtn noSelectColor" v-if="!carModelInfo.value">请选择车型</view>
+				<view class="carModBtn selectColor" v-else>{{carModelInfo.value}}</view>
 				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
 			</view>
 
@@ -41,7 +41,7 @@
 
 
 		<view class="bottomView">
-			<view class="saveCar">保存爱车</view>
+			<view class="saveCar" @click="saveCar()">保存爱车</view>
 		</view>
 
 
@@ -57,43 +57,213 @@
 
 		data() {
 			return {
-				homeData: '',
-				shopId: '',
+
 				plateNo: '',
 				plateShow: false,
-				joinFirst: false,
-				carMod: '',
+				carModelInfo: '',
 				time: '',
 				mileage: '',
+				carId: '',
+				isEditCar: false,
 
 			}
 		},
-		onLoad() {
-
-			
-
-
-
+		onLoad(opt) {
+			var carModelInfo = uni.getStorageSync("carModelInfo");
+			if (carModelInfo) {
+				this.carModelInfo = carModelInfo;
+			}
+			console.log(opt);
+			this.isEditCar = opt.isEditCar
+			this.carId = opt.id
+			if (this.isEditCar == 1) {
+				this.getEditData()
+			}
+		},
+		onShow() {
+			var carModelInfo = uni.getStorageSync("carModelInfo");
+			if (carModelInfo) {
+				this.carModelInfo = carModelInfo;
+			}
 		},
 		methods: {
-			goCarModel(){
-				uni.navigateTo({
-					url:'carModel'
-				})
+			getEditData() {
+				uni.showLoading({});
+				var carModelInfo = {
+					carModelInfo: {
+
+					}
+				}
+				this.$http('worldKeepCar/worldHome/queryMyTMemberCarDetail', {
+					id: this.carId
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					carModelInfo.carModelInfo.logo = res.data.brandLogo;
+					carModelInfo.carModelInfo.brand = res.data.brand;
+					carModelInfo.carModelInfo.carSeries = res.data.series;
+					carModelInfo.carModelInfo.displacement = res.data.displacement;
+					carModelInfo.carModelInfo.transmissionType = res.data.transmissionType;
+					carModelInfo.carModelInfo.modelYear = res.data.annualmoney;
+					carModelInfo.carModelInfo.carModel = res.data.carModel;
+					carModelInfo.carModelInfo.guidePrice = res.data.guidePrice;
+					
+
+					
+					// 展示时
+					this.plateNo = res.data.plateNumber;
+					carModelInfo.value = res.data.carModel;
+					this.time = res.data.createTime;
+					this.mileage = res.data.milage;
+
+					this.carModelInfo = carModelInfo;
+
+				})
+			},
+			goCarModel() {
+				uni.navigateTo({
+					url: 'carModel'
+				})
 			},
 			setPlate(plate) {
 				if (plate.length >= 7) this.plateNo = plate;
 				this.plateShow = false;
 			},
 
-			
+
 			bindChange(e) {
 				console.log(e);
 				this.time = e.target.value
 			},
 
-			
-
+			saveCar() {
+				uni.showLoading({});
+				if (this.plateNo == '') {
+					uni.showToast({
+						title: '请填写车牌号',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.carModelInfo == '') {
+					uni.showToast({
+						title: '请选择车型',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.time == '') {
+					uni.showToast({
+						title: '请选择购车时间',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.mileage == '') {
+					uni.showToast({
+						title: '请输入行驶里程',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.isEditCar == 1) {
+					this.updateTMemberCar()
+				}
+				else {
+					this.addTMemberCar()
+				}
+				
+			},
+			
+			addTMemberCar(){
+				this.$http('worldKeepCar/worldHome/addTMemberCar', {
+					plateNumber: this.plateNo,
+					milage: this.mileage,
+					brand: this.carModelInfo.carModelInfo.brand,
+					displacement: this.carModelInfo.carModelInfo.displacement,
+					series: this.carModelInfo.carModelInfo.carSeries,
+					annualmoney: this.carModelInfo.carModelInfo.productionYear,
+					carModel: this.carModelInfo.title,
+					salesName: this.carModelInfo.carModelInfo.salesName,
+					transmissionType: this.carModelInfo.carModelInfo.transmissionType,
+					model: this.carModelInfo.carModelInfo.carModel,
+					nLevelID: this.carModelInfo.carModelInfo.nLevelID,
+					engineType: this.carModelInfo.carModelInfo.engineModel,
+					brandLogo: this.carModelInfo.carModelInfo.logo,
+					AcarTime: this.time,
+					guidePrice: this.carModelInfo.carModelInfo.guidePrice,
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						uni.showToast({
+							title: '保存成功',
+							icon: 'none',
+							duration: 3000
+						});
+						uni.removeStorageSync('carModelInfo');
+						setTimeout(function() {
+							uni.navigateBack({
+				
+							})
+						}, 3000);
+				
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+				
+				})
+			},
+			updateTMemberCar(){
+				this.$http('worldKeepCar/worldHome/updateTMemberCar', {
+					plateNumber: this.plateNo,
+					milage: this.mileage,
+					brand: this.carModelInfo.carModelInfo.brand,
+					displacement: this.carModelInfo.carModelInfo.displacement,
+					series: this.carModelInfo.carModelInfo.carSeries,
+					annualmoney: this.carModelInfo.carModelInfo.productionYear,
+					carModel: this.carModelInfo.title,
+					salesName: this.carModelInfo.carModelInfo.salesName,
+					transmissionType: this.carModelInfo.carModelInfo.transmissionType,
+					model: this.carModelInfo.carModelInfo.carModel,
+					nLevelID: this.carModelInfo.carModelInfo.nLevelID,
+					engineType: this.carModelInfo.carModelInfo.engineModel,
+					brandLogo: this.carModelInfo.carModelInfo.logo,
+					AcarTime: this.time,
+					guidePrice: this.carModelInfo.carModelInfo.guidePrice,
+					
+					id: this.carId,
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						uni.showToast({
+							title: '保存成功',
+							icon: 'none',
+							duration: 3000
+						});
+						uni.removeStorageSync('carModelInfo');
+						setTimeout(function() {
+							uni.navigateBack({
+				
+							})
+						}, 3000);
+				
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+				
+				})
+			},
 		}
 	}
 </script>
@@ -101,11 +271,11 @@
 <style>
 	.content {
 		min-height: 100vh;
-		background-color: #F4F5F7;
+		background-color: #F4F5F7;
 		padding-top: 20rpx;
 	}
 
-	
+
 
 	.carMessage {
 		margin: 0rpx 24rpx 40rpx;
@@ -115,7 +285,7 @@
 		border-radius: 10rpx;
 	}
 
-	
+
 
 	.mesView {
 		display: flex;
@@ -183,7 +353,7 @@
 	}
 
 	.bottomView {
-		background-color: #FFFFFF;
+		background-color: #FFFFFF;
 		width: 100%;
 		height: 120rpx;
 		position: fixed;
@@ -192,14 +362,14 @@
 
 	.saveCar {
 
-		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
-		margin: 23rpx 30rpx;
-		height: 74rpx;
-		line-height: 74rpx;
-		border-radius: 37rpx;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		font-weight: bold;
+		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		margin: 23rpx 30rpx;
+		height: 74rpx;
+		line-height: 74rpx;
+		border-radius: 37rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		font-weight: bold;
 		text-align: center;
 
 	}

+ 32 - 63
pages/index/cailist.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="box">
 		<view class="carlistBox">
-			<view class="line" v-for="(item,index) in carList" @click="lineClick(item)">
+			<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>
@@ -16,6 +16,7 @@
 				</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>
@@ -54,7 +55,7 @@ export default {
 		getqueryMyBMemberCar(){
 			uni.showLoading({ });
 			this.loding=false;
-			this.$http('miniAppMyBMemberCar/queryMyBMemberCar', {
+			this.$http('worldKeepCar/worldHome/queryMyTMemberCar', {
 			  
 			 },'GET').then(res => {
 				uni.hideLoading();
@@ -63,20 +64,26 @@ export default {
 			})
 		},
         addBtn(){
-			// var length=this.carList.length
-			// if(length>4){
-			// 	uni.showToast({
-			// 	     title: '库最多放五辆车,如果想添加,请先删除',
-			// 	 	 icon:'none',
-			// 	     duration: 3000
-			// 	 });
-			// }else{
+			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=1'
+			})
+		},
 		delCar(id){
 			var that=this;
 			uni.showModal({
@@ -85,7 +92,7 @@ export default {
 			    success: function (res) {
 			        if (res.confirm) {
 			          uni.showLoading({ });
-			          that.$http('miniAppMyBMemberCar/deleteMemberCar', {
+			          that.$http('worldKeepCar/worldHome/deleteTMemberCar', {
 			            id:id
 			           },'POST').then(res => {
 			          	uni.hideLoading();
@@ -105,7 +112,7 @@ export default {
 		defaultCar(item){
 			var that=this;
 			uni.showLoading({ });
-			that.$http('miniAppMyBMemberCar/updateCarIsdefault', {
+			that.$http('worldKeepCar/worldHome/updateTCarIsdefault', {
 			  id:item.id
 			 },'POST').then(res => {
 				uni.hideLoading();
@@ -115,13 +122,7 @@ export default {
 					 	 icon:'none',
 					     duration: 3000
 					 });
-					uni.setStorage({
-						key: 'maintainCarData',
-						data: item,
-						success: function () {
-								
-					     }
-					}); 
+					
 				}else{
 					uni.showToast({
 					     title: res.msg,
@@ -132,49 +133,17 @@ export default {
 			  that.getqueryMyBMemberCar()
 			})
 		},
-		lineClick(item){
-			/* var that=this;
-			uni.showLoading({ });
-			that.$http('miniAppMyBMemberCar/updateCarIsdefault', {
-			  id:id
-			 },'POST').then(res => {
-				uni.hideLoading();
-				if(res.code==0){
-					uni.showToast({
-					     title: '操作成功',
-					 	 icon:'none',
-					     duration: 3000
-					 });
-					uni.navigateBack({
-						delta:1
-					})
-				}else{
-					uni.showToast({
-					     title: res.msg,
-					 	 icon:'none',
-					     duration: 3000
-					 });
-				}
-			 
-			}) */
-			if(this.type==2){
-				uni.setStorage({
-					key: 'maintainCarData',
-					data: item,
-					success: function () {
-							uni.navigateBack({
-								delta:1
-							})
-							
-				     }
-				}); 
-			}else{
-				uni.removeStorageSync('carModelInfo');
-				uni.navigateTo({
-					url:'editCar?id='+item.id
-				})
-			}
-			
+		itemClick(item){
+			uni.setStorage({
+				key: 'maintainCarData',
+				data: item,
+				success: function () {
+						uni.navigateBack({
+							delta:1
+						})
+						
+			     }
+			}); 
 		}
 	}
 }

+ 11 - 33
pages/index/carModel.vue

@@ -16,10 +16,10 @@
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 		<view style="height: 44px;"></view>
 		
-		<view class="tab">
+		<!-- <view class="tab">
 			<view class="tabLine" :class="{activeTab:tabIndex==1}" @click="tabIndex=1">手动选车</view>
 			<view class="tabLine" :class="{activeTab:tabIndex==2}" @click="tabIndex=2">VIN识别</view>
-		</view>
+		</view> -->
 		
 		<view class="tab1 " v-if="tabIndex==1">
 			 <scroll-view  class="scroll-view" :scroll-into-view="toView" scroll-y="true" >
@@ -77,7 +77,7 @@
 			</view>
 		</uni-popup>
 		
-		<!-- 排量
+		<!-- 排量 -->
 		<view class="displacementListBox" v-show="displacementListShow">
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 			<view style="height: 44px;"></view>
@@ -91,7 +91,7 @@
 			  </view>
 			</scroll-view>
 		</view>
-		<!-- 排量 -->
+		
 		<!-- 离合器 -->
 		<view class="carGroupListBox" v-show="carGroupListShow">
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
@@ -325,34 +325,12 @@ export default {
 				key: 'carModelInfo',
 				data: carModelInfo,
 				success: function () {
-					/* uni.redirectTo({
-						url:'editCar'
-					}) */
-					/* if(that.type==2){
-						uni.navigateTo({
-							url:'editCar?type=2'
-						})
-					}else{
-						if(that.delId){
-							uni.navigateTo({
-								url:'editCar?delId='+that.delId
-							})
-						}else{
-						uni.navigateTo({
-							url:'editCar'
-						})	
-						}
-						
-					} */
-					if(that.addNum==1){
-						uni.navigateTo({
-							url:'editCar'
-						})	
-					}else{
+					
+					
 						uni.navigateBack({
 							delta:1
 						})
-					}
+					
 					 
 				}
 			}); 
@@ -379,7 +357,7 @@ export default {
 		},
 		getmodelList(){
 			uni.showLoading({ });
-			this.$http('miniAppMyBMemberCar/queryCarModelGroupPackage', {
+			this.$http('worldKeepCar/worldHome/queryCarModelGroupPackage', {
 			  brand:this.brand,
 			  manufactor:this.manufactor,
 			  carSeries:this.carSeries,
@@ -391,7 +369,7 @@ export default {
 		},
 		getdisplacementList(){
 			uni.showLoading({ });
-			this.$http('miniAppMyBMemberCar/queryCarModelGroupPackage', {
+			this.$http('worldKeepCar/worldHome/queryCarModelGroupPackage', {
 			  brand:this.brand,
 			  manufactor:this.manufactor,
 			  carSeries:this.carSeries
@@ -402,7 +380,7 @@ export default {
 		},
 		queryCarModelGroupPackage(){
 			uni.showLoading({ });
-			this.$http('miniAppMyBMemberCar/queryCarModelGroupPackage', {
+			this.$http('worldKeepCar/worldHome/queryCarModelGroupPackage', {
 			  
 			 },'GET').then(res => {
 				uni.hideLoading();
@@ -431,7 +409,7 @@ export default {
 		},
 		getbrand(){
 			uni.showLoading({ });
-			this.$http('miniAppMyBMemberCar/queryCarModelGroupPackage', {
+			this.$http('worldKeepCar/worldHome/queryCarModelGroupPackage', {
 			  brand:this.brand
 			 },'GET').then(res => {
 				uni.hideLoading();

+ 64 - 138
pages/index/index.vue

@@ -3,14 +3,14 @@
 		<!-- 轮播图 -->
 		<view class="bBannerList">
 			<swiper class="swiper" :autoplay="autoplay" :interval="interval" :duration="duration" :circular="true">
-				<swiper-item v-for="(item,index) in homeData.bBannerList" @click="carBswpClick(item)" v-if="!shopId">
+				<swiper-item v-for="(item,index) in imgData" @click="carBswpClick(item)" v-if="!shopId">
 					<view class="swiper-item uni-bg-red">
 						<image :src="item.logo" mode="" class="swpImg"></image>
 					</view>
 				</swiper-item>
-				<swiper-item v-for="(item,index) in homeData.bBannerList" @click="carBswpClickshop(item)" v-if="shopId">
+				<swiper-item v-for="(item,index) in imgData" @click="carBswpClickshop(item)" v-if="shopId">
 					<view class="swiper-item uni-bg-red">
-						<image :src="item.Logo" mode="" class="swpImg"></image>
+						<image :src="item.logo" mode="" class="swpImg"></image>
 					</view>
 				</swiper-item>
 			</swiper>
@@ -26,9 +26,9 @@
 			</view>
 
 			<view class="mesView">
-				<view class="leftTitle">车牌号</view>
-				
-				<view class="rightView"  v-if="!joinFirst">
+				<view class="leftTitle">车牌号</view>
+
+				<view class="rightView" v-if="!memberCar">
 					<view class="plateNumber noSelectColor">请添加您的爱车</view>
 
 					<view class="changeCarBg" @click="addCar()">
@@ -37,14 +37,14 @@
 						<view style="color: #FF2400; font-size: 28rpx;">添加</view>
 					</view>
 				</view>
-				<view class="rightView" v-else>
-					<view class="plateNumber selectColor">{{plateNo}}</view>
-				
-					<view class="changeCarBg" @click="goCarList()">
-						<image src="../../static/img/icon_change.png"
-							style="width: 32rpx; height: 34rpx; margin-right: 5rpx;"></image>
-						<view style="color: #FF2400; font-size: 28rpx;">换车</view>
-					</view>
+				<view class="rightView" v-else>
+					<view class="plateNumber selectColor">{{memberCar.plateNumber}}</view>
+
+					<view class="changeCarBg" @click="goCarList()">
+						<image src="../../static/img/icon_change.png"
+							style="width: 32rpx; height: 34rpx; margin-right: 5rpx;"></image>
+						<view style="color: #FF2400; font-size: 28rpx;">换车</view>
+					</view>
 				</view>
 
 
@@ -52,7 +52,7 @@
 
 			<view class="mesView">
 				<view class="leftTitle">车型</view>
-				<view class="carModBtn selectColor" v-if="!carMod">{{carMod}}</view>
+				<view class="carModBtn selectColor" v-if="memberCar">{{memberCar.carModel}}</view>
 
 			</view>
 
@@ -85,115 +85,74 @@
 
 		data() {
 			return {
-				homeData: '',
+				imgData: [],
 				uid: '',
 				cityname: '',
 				showCity: false,
 				location: '',
-				cityCode: '',
-				joinFirst: false,
-				carMod: '',
-				time: '',
+				memberCar: '',
 				mileage: '',
 
 			}
 		},
 		onLoad() {
 
-			console.log('index-----onLoad')
+		},
+		onShow() {
+
 			var that = this;
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 
-			//#ifdef H5 
-			var logodata = {
-				uid: '10E96C26-92CD-4559-8019-ADBE4F83851A',
-				token: "7994AC696DB441F5A9DCD738CD9943D5",
-				memberInfo: {
-					nickName: '布克',
-					name: '66',
-					headUrl: 'https://thirdwx.qlogo.cn/mmopen/vi_32/PHgdyF2l1fvicOPTicZlAdhuK65E6VFnNJIhA9QWFCUwftgc9hySDltLEEWic27eMLkiaoQG9emzqg0s87JaW28HFQ/132'
-				}
-			}
-			var obj = {
-				cityname: "济南市",
-				lat: 36.68013,
-				lng: 117.06533,
-				cityCode: 370100
-			}
-			uni.setStorage({
-				key: 'location',
-				data: obj,
-				success: function() {}
-			});
-			uni.setStorage({
-				key: 'logodata',
-				data: logodata,
-				success: function() {}
-			});
-			var wxOpend = {
-				openid: "oqeJ-5Lsmi-vM1Oirso6z9-MrD3g",
-				session_key: "sxV2xbqNvOkk+p7i/KosiQ=="
-			}
-			uni.setStorage({
-				key: 'wxOpendata',
-				data: wxOpend,
-				success: function() {}
-			});
-			that.queryHomeDetail();
-			that.getqueryMemberCarShop()
-
-			// #endif
 			this.uid = uni.getStorageSync("logodata").uid;
-			console.log(this.shopId)
+
 			this.location = uni.getStorageSync("location");
+
+
 			if (this.location) {
 				this.lng = this.location.lng;
 				this.lat = this.location.lat;
 				this.cityname = this.location.cityname;
 				this.cityCode = this.location.cityCode;
-				//that.queryHomeDetail();
-				if (that.uid) {
-					that.getqueryMemberCarShop()
-				} else {
-					that.queryHomeDetail();
-				}
-			} else {
-				uni.getLocation({
-					type: 'gcj02',
-					success: function(res) {
-						console.log(res)
-						that.lng = res.longitude
-						that.lat = res.latitude
-
-						that.getAdress();
-						//登录状态下获取车辆信息
-						if (that.uid) {
-							that.getqueryMemberCarShop()
-						} else {
-							that.queryHomeDetail();
-						}
-					},
-					fail(err) {
-						console.log(err)
-						that.queryHomeDetail();
-						//登录状态下获取车辆信息
-						if (that.uid) {
-							that.getqueryMemberCarShop()
-						}
-					}
-				});
-			}
 
 
+				that.queryHomeDetail();
 
 
+			} else {
+				uni.showToast({
+					title: '请选择城市'
+				})
+			}
+
 		},
+
 		methods: {
-<<<<<<< HEAD
-			gomodule(){
+			queryHomeDetail() {
+				uni.showLoading({
+					title: '加载中'
+				})
+
+				this.$http('worldKeepCar/worldHome/queryHomeDetail', {
+					cityCode: this.cityCode
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					this.imgData = res.data.banners
+					this.memberCar = res.data.memberCar
+					this.mileage = res.data.memberCar.milage
+
+					var cardata = uni.getStorageSync("maintainCarData")
+					
+					if (cardata) {
+						this.memberCar = cardata
+					}
+					
+				})
+			},
+			gomodule() {
 				uni.navigateTo({
-					url:'../module/maintain'
-=======
+					url: '../module/maintain'
+				})
+			},
 			goCarList() {
 				if (this.uid) {
 					uni.navigateTo({
@@ -204,7 +163,6 @@
 			addCar() {
 				uni.navigateTo({
 					url: 'addCar'
->>>>>>> 5f1951434fab0da9eac36f8d24ee46ce362c96a8
 				})
 			},
 			selectCity(item) {
@@ -232,39 +190,7 @@
 				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'
-						var obj = {
-							cityname: this.cityname,
-							lng: this.lng,
-							lat: this.lat,
-							cityCode: cityCode
-						}
-						uni.setStorage({
-							key: 'location',
-							data: obj,
-							success: function() {}
-						});
 
-					}
-				});
-			},
 
 		}
 	}
@@ -279,7 +205,7 @@
 	.bBannerList {
 		width: 100%;
 		height: 300rpx;
-		background-color: #3F536E;
+		background-color: #F4F5F7;
 	}
 
 	.swpImg {
@@ -344,13 +270,13 @@
 		width: 65%;
 		font-size: 28rpx;
 	}
-	
-	.rightView{
-		display: flex;
-		justify-content: space-between;
-		width: 80%;
-	}
-	
+
+	.rightView {
+		display: flex;
+		justify-content: space-between;
+		width: 80%;
+	}
+
 	.plateNumber {
 		font-size: 28rpx;
 	}

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/chose-city/chose-city.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/nodata/nodata.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/tki-qrcode/tki-qrcode.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-plate-input/uni-plate-input.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/iPhone/addphone.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/iPhone/phoneList.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/addCar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/cailist.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/carModel.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/empower.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/iphoneLogin.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/intimity.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/me.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/setup.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/treaty.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/evaluate.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/myorder.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderDetail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/shopList.js.map


+ 2 - 0
unpackage/dist/dev/mp-weixin/app.json

@@ -6,6 +6,8 @@
     "pages/login/login",
     "pages/login/empower",
     "pages/login/iphoneLogin",
+    "pages/module/maintain",
+    "pages/module/replaceGoods",
     "pages/index/addCar",
     "pages/index/cailist",
     "pages/index/carModel",

File diff suppressed because it is too large
+ 2 - 2
unpackage/dist/dev/mp-weixin/common/runtime.js


File diff suppressed because it is too large
+ 142 - 2
unpackage/dist/dev/mp-weixin/common/vendor.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/chose-city/chose-city.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/components/nodata/nodata.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/tki-qrcode/tki-qrcode.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/components/uni-plate-input/uni-plate-input.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/iPhone/addphone.js


File diff suppressed because it is too large
+ 127 - 127
unpackage/dist/dev/mp-weixin/pages/iPhone/phoneList.js


File diff suppressed because it is too large
+ 198 - 25
unpackage/dist/dev/mp-weixin/pages/index/addCar.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/addCar.wxml


File diff suppressed because it is too large
+ 45 - 76
unpackage/dist/dev/mp-weixin/pages/index/cailist.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/cailist.wxml


File diff suppressed because it is too large
+ 163 - 170
unpackage/dist/dev/mp-weixin/pages/index/carModel.js


+ 3 - 1
unpackage/dist/dev/mp-weixin/pages/index/carModel.json

@@ -1,4 +1,6 @@
 {
   "navigationStyle": "custom",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
+  }
 }

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/carModel.wxml


File diff suppressed because it is too large
+ 41 - 111
unpackage/dist/dev/mp-weixin/pages/index/index.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -6,7 +6,7 @@
 .bBannerList {
 	width: 100%;
 	height: 300rpx;
-	background-color: #3F536E;
+	background-color: #F4F5F7;
 }
 .swpImg {
 	width: 100%;
@@ -58,7 +58,7 @@
 	width: 65%;
 	font-size: 28rpx;
 }
-.rightView{
+.rightView {
 	display: flex;
 	justify-content: space-between;
 	width: 80%;

File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/me/intimity.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/me/setup.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/me/treaty.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/order/evaluate.js


File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/pages/order/myorder.js


File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/pages/order/orderDetail.js


File diff suppressed because it is too large
+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/shop/shopList.js