1.调样式

pages/homePage/allDiscountCard.vue

@@ -19,17 +19,19 @@
 							</view>
 
 							<view class="rightView">
-								<view class="firstView">
-									<view class="cardName">{{item.ActName}}</view>
-									<view class="rightBtn" v-if="item.pickNum<=0" @click="lingqu(item, index)">立即领取</view>
+								<view class="firstView">
+									<view class="cardName">{{item.ActName}}</view>
+									<view class="rightBtn" v-if="item.pickNum<=0" @click="lingqu(item, index)">立即领取
+									</view>
 								</view>
 								<!-- 时间截取 -->
 								<view class="valid" v-if="item.EndOffsetDays == -1">
 									{{item.StartTime.slice(0,item.StartTime.length-8)}}至
-									{{item.EndTime.slice(0,item.EndTime.length-8)}}</view>
+									{{item.EndTime.slice(0,item.EndTime.length-8)}}
+								</view>
 								<view class="valid" v-else>领取后 {{item.EndOffsetDays}} 天有效</view>
 							</view>
-							
+
 
 						</view>
 
@@ -44,7 +46,7 @@
 		</view>
 
 		<view class="bottomViewBtn" v-if="itemData.length!=0">
-			<view class="saveCar" @click="alllingqu" v-if="allHave==false">一键领取</view>
+			<view class="saveCar" @click="alllingqu" v-if="allHave==false">一键领取</view>
 			<view class="saveCar" style="background-color: #FF9566;" v-else>已全部领取</view>
 		</view>
 
@@ -67,7 +69,7 @@
 				itemData: [],
 				page: 1,
 				noMoreShow: false,
-				allHave:true,
+				allHave: true,
 			}
 		},
 		onLoad(opt) {
@@ -76,7 +78,7 @@
 
 		},
 		methods: {
-			
+
 			lingqu(item, index) {
 				uni.showLoading({
 					title: '领取中'
@@ -85,36 +87,36 @@
 					couponID: item.ID,
 				}, 'POST').then(res => {
 					uni.hideLoading();
-					if (res.code==0) {
-						var itemData = this.itemData[index]
-						itemData.pickNum = 1
-						console.log('itemData.pickNum',itemData.pickNum);
-						uni.showToast({
-							title: '领取成功',
-							icon: 'success',
-							duration: 2000
-						});
+					if (res.code == 0) {
+						var itemData = this.itemData[index]
+						itemData.pickNum = 1
+						console.log('itemData.pickNum', itemData.pickNum);
+						uni.showToast({
+							title: '领取成功',
+							icon: 'success',
+							duration: 2000
+						});
+					}
+				})
+			},
+			alllingqu() {
+				uni.showLoading({
+					title: '领取中'
+				})
+				this.$http('worldKeepCar/keepCarMy/pickTCouponAll', {
+
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						this.myOrderCoupon()
+						this.allHave = true
+						uni.showToast({
+							title: '领取成功',
+							icon: 'success',
+							duration: 2000
+						});
 					}
 				})
-			},
-			alllingqu() {
-				uni.showLoading({
-					title: '领取中'
-				})
-				this.$http('worldKeepCar/keepCarMy/pickTCouponAll', {
-					
-				}, 'POST').then(res => {
-					uni.hideLoading();
-					if (res.code==0) {
-						this.myOrderCoupon()
-						this.allHave = true
-						uni.showToast({
-							title: '领取成功',
-							icon: 'success',
-							duration: 2000
-						});
-					}
-				})
 			},
 			myOrderCoupon() {
 				uni.showLoading({
@@ -145,18 +147,18 @@
 						this.noMoreShow = true
 					} else {
 						this.noMoreShow = false
-					}
-					
-					if (this.itemData.length != 0) {
-						this.itemData.forEach((item, index) => {
-							if (item.pickNum <= 0) {
-								this.allHave = false
-							}
-						})
-					}
-					
-					
-					
+					}
+
+					if (this.itemData.length != 0) {
+						this.itemData.forEach((item, index) => {
+							if (item.pickNum <= 0) {
+								this.allHave = false
+							}
+						})
+					}
+
+
+
 				})
 			},
 			goDiscountDetail(item) {
@@ -196,8 +198,8 @@
 
 
 	.itemContent {
-		padding: 20rpx 24rpx;
-		
+		padding: 20rpx 24rpx;
+
 	}
 
 	.item {
@@ -229,13 +231,16 @@
 		margin-right: 40rpx;
 
 	}
-	.rightView{
-		flex-grow: 1;
-	}
-	.firstView{
-		display: flex;
-		justify-content: space-between;
+
+	.rightView {
+		flex-grow: 1;
+	}
+
+	.firstView {
+		display: flex;
+		justify-content: space-between;
 	}
+
 	.moneyView {
 		display: flex;
 		justify-content: flex-start;
@@ -257,9 +262,9 @@
 		font-weight: bold;
 		color: #333333;
 		margin-top: 10rpx;
-		margin-bottom: 15rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
+		margin-bottom: 15rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
 
@@ -302,6 +307,8 @@
 		height: 120rpx;
 		position: fixed;
 		bottom: 0rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
 	}
 
 	.saveCar {

pages/index/addCar.vue

@@ -1,480 +1,480 @@
-<template>
-	<view class="content">
-
-		<!-- 填写车辆信息 -->
-		<view class="carMessage">
-
-			<view class="mesView">
-				<view class="leftTitle">车牌号</view>
-				<input class="plateNumber" placeholder-style="color:#999999" placeholder="请输入车牌号" disabled="true"
-					@tap="plateShow=true" v-model.trim="plateNo" />
-				<plate-input v-if="plateShow" :plate="plateNo" @export="setPlate" @close="plateShow=false" />
-
-
-			</view>
-
-			<view class="mesView" @click="goCarModel()">
-				<view class="leftTitle">车型</view>
-				<view class="carModBtn noSelectColor" v-if="!carModelInfo.value">请选择车型</view>
-				<view class="carModBtn selectColor carMod" v-else>{{carModelInfo.value}}</view>
-				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
-			</view>
-
-			<view class="mesView">
-				<view class="leftTitle">购车时间</view>
-				<picker class="timeBtn" @change="bindChange" mode="date" :end="currentdate" :value="time">
-					<view class="uni-input selectColor" v-if="time">{{time}}</view>
-					<view class="uni-input noSelectColor" v-else>请选择您的购车时间</view>
-				</picker>
-				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
-			</view>
-
-			<view class="mesView">
-				<view class="leftTitle">行驶里程</view>
-				<input class="mileageInput selectColor" type="number" v-model="mileage" placeholder="请输入"
-					placeholder-style="color:#999999" />
-				<view class="kmStr">km</view>
-			</view>
-
-
-		</view>
-
-
-		<view class="bottomView">
-			<view class="saveCar" @click="saveCar()">
-				<image src="../../static/img/icon_tianjiacheliang.png" mode="" style="width: 44rpx; height: 36rpx; margin-right: 10rpx;"></image>
-				<view>保存爱车</view>
-				</view>
-		</view>
-        <view>
-			 <w-picker
-			        :visible.sync="visible"
-			        mode="selector"
-			        value="2"
-			        default-type="value"
-			        :default-props="defaultProps"
-			        :options="sbPlate"
-			        @confirm="onConfirm($event,'selector')"
-			        @cancel="onCancel"
-			        ref="selector" 
-			    ></w-picker>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import plateInput from "@/components/uni-plate-input/uni-plate-input.vue"
-	import wPicker from "@/components/w-picker/w-picker.vue";
-	export default {
-		components: {
-			plateInput,wPicker
-		},
-
-		data() {
-			return {
-
-				plateNo: '',
-				plateShow: false,
-				carModelInfo: '',
-				time: '',
-				mileage: '',
-				carId: '',
-				isEditCar: false,
-				currentdate:'',
-				plate_type:'',
-                sbPlate:[],
-				visible:false,
-				defaultProps:{"label":"value","value":"ids"},
-				vin:'',
-			}
-		},
-		onLoad(opt) {
-			uni.removeStorageSync('carModelInfo');
-			
-			this.getNowFormatDate();	
-			
-			console.log(opt);
-			this.isEditCar = opt.isEditCar
-			this.carId = opt.id
-			if (this.isEditCar == 'true') {
-				
-				this.getEditData()
-				uni.setNavigationBarTitle({
-					title:'编辑爱车'
-				})
-			}
-		},
-		onShow() {
-			var carModelInfo = uni.getStorageSync("carModelInfo");
-			if (carModelInfo) {
-				this.carModelInfo = carModelInfo;
-			}
-		},
-		methods: {
-			onConfirm(e){
-				console.log(e)
-				this.carModelInfo=e.obj
-			},
-			onCancel(){
-				this.visible=false
-			},
-			getNowFormatDate(){
-				
-				var date = new Date();
-				var seperator1 = "-";
-				var year = date.getFullYear();
-				var month = date.getMonth() + 1;
-				var day = date.getDate();
-				if (month >= 1 && month <= 9) {
-					month = "0" + month;
-				}
-				if (day >= 0 && day <= 9) {
-					day = "0" + day;
-				}
-				var currentdate = year + seperator1 + month + seperator1 + day;
-				 this.currentdate = currentdate;
-			},
-			getEditData() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				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.productionYear = res.data.annualmoney;
-					carModelInfo.carModelInfo.carModel = res.data.carModel;
-					carModelInfo.carModelInfo.guidePrice = res.data.guidePrice;
-					carModelInfo.carModelInfo.engineModel = res.data.engineType;
-					carModelInfo.carModelInfo.nLevelID = res.data.nLevelID;
-					carModelInfo.carModelInfo.salesName = res.data.saleName;
-					
-					
-					// 展示时
-					this.plateNo = res.data.plateNumber;
-					carModelInfo.value = res.data.carModel;
-					if (res.data.acarTime) {
-						this.time = res.data.acarTime.slice(0,res.data.createTime.length-8);
-					}
-					this.mileage = res.data.milage;
-
-					this.carModelInfo = carModelInfo;
-					this.vin = res.data.vIN
-					
-					console.log('this carModelInfo',this.carModelInfo);
-				})
-			},
-			goCarModel() {
-				uni.navigateTo({
-					url: 'carModel'
-				})
-			},
-			setPlate(plate) {
-				console.log(plate)
-				if (plate.length >= 7) this.plateNo = plate;
-				this.plateShow = false;
-				if(plate.length == 7){
-					this.plate_type=2
-				}else{
-					this.plate_type=52
-				}
-				this.queryCarmodelByPlateNumber() 
-			},
-            queryCarmodelByPlateNumber(){
-				uni.showLoading({
-					title: '加载中'
-				})
-				this.$http('worldKeepCar/worldHome/queryCarmodelByPlateNumber', {
-					license_plate: this.plateNo,
-					plate_type: this.plate_type,
-					
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					console.log(res);
-					if (res.data) {
-						this.vin = res.data.vin
-						if (res.data.buyTime) {
-							this.time = res.data.buyTime.slice(0,res.data.buyTime.length-8);
-						}
-						
-					}
-					if(res.data.list&&res.data.list.length>0){
-						this.sbPlate=res.data.list
-						//this.sbPlate=this.sbPlate.concat(this.sbPlate)
-						if(this.sbPlate.length==1){
-							//this.carModelInfo.value=res.data[0].value
-							this.carModelInfo=res.data.list[0]
-						}else{
-							this.visible=true
-						}
-					}
-					
-				})
-			},
-
-			bindChange(e) {
-				console.log(e);
-				this.time = e.target.value
-			},
-
-			saveCar() {
-				uni.showLoading({
-					title: '保存中'
-				})
-				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 == 'true') {
-					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.value,
-					saleName: 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,
-					vIN:this.vin,
-				}, '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.value,
-					saleName: 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,
-					vIN:this.vin,
-					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>
-
-<style>
-	.content {
-		min-height: 100vh;
-		background-color: #F4F5F7;
-		padding-top: 20rpx;
-	}
-
-
-
-	.carMessage {
-		margin: 0rpx 24rpx 40rpx;
-		padding-top: 20rpx;
-		height: 500rpx;
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-	}
-
-	.mesView {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 120rpx;
-		background-color: #FFFFFF;
-	}
-
-	.leftTitle {
-		margin: 28rpx;
-		width: 120rpx;
-		font-size: 28rpx;
-		color: #666666;
-	}
-
-
-	.noSelectColor {
-		color: #999999;
-
-	}
-
-	.selectColor {
-		color: #333333;
-
-	}
-	.carMod{
-		text-overflow: -o-ellipsis-lastline;
-		  overflow: hidden;
-		  text-overflow: ellipsis;
-		  display: -webkit-box;
-		  -webkit-line-clamp: 2;
-		  line-clamp: 2;
-		  -webkit-box-orient: vertical;
-	}
-	.rightArrow {
-		margin-right: 28rpx;
-		width: 14rpx;
-		height: 23rpx;
-
-	}
-
-	.cityBtn {
-		width: 65%;
-		font-size: 28rpx;
-	}
-
-	.plateNumber {
-		width: 55%;
-		font-size: 28rpx;
-	}
-
-
-	.carModBtn {
-		width: 65%;
-		font-size: 28rpx;
-	}
-
-	.timeBtn {
-		width: 65%;
-		font-size: 28rpx;
-	}
-
-	.mileageInput {
-		width: 20%;
-		font-size: 28rpx;
-	}
-
-	.kmStr {
-		font-size: 28rpx;
-		color: #333333;
-
-	}
-
-	.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;
-	}
+<template>
+	<view class="content">
+
+		<!-- 填写车辆信息 -->
+		<view class="carMessage">
+
+			<view class="mesView">
+				<view class="leftTitle">车牌号</view>
+				<input class="plateNumber" placeholder-style="color:#999999" placeholder="请输入车牌号" disabled="true"
+					@tap="plateShow=true" v-model.trim="plateNo" />
+				<plate-input v-if="plateShow" :plate="plateNo" @export="setPlate" @close="plateShow=false" />
+
+
+			</view>
+
+			<view class="mesView" @click="goCarModel()">
+				<view class="leftTitle">车型</view>
+				<view class="carModBtn noSelectColor" v-if="!carModelInfo.value">请选择车型</view>
+				<view class="carModBtn selectColor carMod" v-else>{{carModelInfo.value}}</view>
+				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
+			</view>
+
+			<view class="mesView">
+				<view class="leftTitle">购车时间</view>
+				<picker class="timeBtn" @change="bindChange" mode="date" :end="currentdate" :value="time">
+					<view class="uni-input selectColor" v-if="time">{{time}}</view>
+					<view class="uni-input noSelectColor" v-else>请选择您的购车时间</view>
+				</picker>
+				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
+			</view>
+
+			<view class="mesView">
+				<view class="leftTitle">行驶里程</view>
+				<input class="mileageInput selectColor" type="number" v-model="mileage" placeholder="请输入"
+					placeholder-style="color:#999999" />
+				<view class="kmStr">km</view>
+			</view>
+
+
+		</view>
+
+
+		<view class="bottomView">
+			<view class="saveCar" @click="saveCar()">
+				<image src="../../static/img/icon_tianjiacheliang.png" mode=""
+					style="width: 44rpx; height: 36rpx; margin-right: 10rpx;"></image>
+				<view>保存爱车</view>
+			</view>
+		</view>
+		<view>
+			<w-picker :visible.sync="visible" mode="selector" value="2" default-type="value"
+				:default-props="defaultProps" :options="sbPlate" @confirm="onConfirm($event,'selector')"
+				@cancel="onCancel" ref="selector"></w-picker>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import plateInput from "@/components/uni-plate-input/uni-plate-input.vue"
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	export default {
+		components: {
+			plateInput,
+			wPicker
+		},
+
+		data() {
+			return {
+
+				plateNo: '',
+				plateShow: false,
+				carModelInfo: '',
+				time: '',
+				mileage: '',
+				carId: '',
+				isEditCar: false,
+				currentdate: '',
+				plate_type: '',
+				sbPlate: [],
+				visible: false,
+				defaultProps: {
+					"label": "value",
+					"value": "ids"
+				},
+				vin: '',
+			}
+		},
+		onLoad(opt) {
+			uni.removeStorageSync('carModelInfo');
+
+			this.getNowFormatDate();
+
+			console.log(opt);
+			this.isEditCar = opt.isEditCar
+			this.carId = opt.id
+			if (this.isEditCar == 'true') {
+
+				this.getEditData()
+				uni.setNavigationBarTitle({
+					title: '编辑爱车'
+				})
+			}
+		},
+		onShow() {
+			var carModelInfo = uni.getStorageSync("carModelInfo");
+			if (carModelInfo) {
+				this.carModelInfo = carModelInfo;
+			}
+		},
+		methods: {
+			onConfirm(e) {
+				console.log(e)
+				this.carModelInfo = e.obj
+			},
+			onCancel() {
+				this.visible = false
+			},
+			getNowFormatDate() {
+
+				var date = new Date();
+				var seperator1 = "-";
+				var year = date.getFullYear();
+				var month = date.getMonth() + 1;
+				var day = date.getDate();
+				if (month >= 1 && month <= 9) {
+					month = "0" + month;
+				}
+				if (day >= 0 && day <= 9) {
+					day = "0" + day;
+				}
+				var currentdate = year + seperator1 + month + seperator1 + day;
+				this.currentdate = currentdate;
+			},
+			getEditData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				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.productionYear = res.data.annualmoney;
+					carModelInfo.carModelInfo.carModel = res.data.carModel;
+					carModelInfo.carModelInfo.guidePrice = res.data.guidePrice;
+					carModelInfo.carModelInfo.engineModel = res.data.engineType;
+					carModelInfo.carModelInfo.nLevelID = res.data.nLevelID;
+					carModelInfo.carModelInfo.salesName = res.data.saleName;
+
+
+					// 展示时
+					this.plateNo = res.data.plateNumber;
+					carModelInfo.value = res.data.carModel;
+					if (res.data.acarTime) {
+						this.time = res.data.acarTime.slice(0, res.data.createTime.length - 8);
+					}
+					this.mileage = res.data.milage;
+
+					this.carModelInfo = carModelInfo;
+					this.vin = res.data.vIN
+
+					console.log('this carModelInfo', this.carModelInfo);
+				})
+			},
+			goCarModel() {
+				uni.navigateTo({
+					url: 'carModel'
+				})
+			},
+			setPlate(plate) {
+				console.log(plate)
+				if (plate.length >= 7) this.plateNo = plate;
+				this.plateShow = false;
+				if (plate.length == 7) {
+					this.plate_type = 2
+				} else {
+					this.plate_type = 52
+				}
+				this.queryCarmodelByPlateNumber()
+			},
+			queryCarmodelByPlateNumber() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$http('worldKeepCar/worldHome/queryCarmodelByPlateNumber', {
+					license_plate: this.plateNo,
+					plate_type: this.plate_type,
+
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					console.log(res);
+					if (res.data) {
+						this.vin = res.data.vin
+						if (res.data.buyTime) {
+							this.time = res.data.buyTime.slice(0, res.data.buyTime.length - 8);
+						}
+
+					}
+					if (res.data.list && res.data.list.length > 0) {
+						this.sbPlate = res.data.list
+						//this.sbPlate=this.sbPlate.concat(this.sbPlate)
+						if (this.sbPlate.length == 1) {
+							//this.carModelInfo.value=res.data[0].value
+							this.carModelInfo = res.data.list[0]
+						} else {
+							this.visible = true
+						}
+					}
+
+				})
+			},
+
+			bindChange(e) {
+				console.log(e);
+				this.time = e.target.value
+			},
+
+			saveCar() {
+				uni.showLoading({
+					title: '保存中'
+				})
+				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 == 'true') {
+					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.value,
+					saleName: 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,
+					vIN: this.vin,
+				}, '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.value,
+					saleName: 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,
+					vIN: this.vin,
+					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>
+
+<style>
+	.content {
+		min-height: 100vh;
+		background-color: #F4F5F7;
+		padding-top: 20rpx;
+	}
+
+
+
+	.carMessage {
+		margin: 0rpx 24rpx 40rpx;
+		padding-top: 20rpx;
+		height: 500rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+
+	.mesView {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 120rpx;
+		background-color: #FFFFFF;
+	}
+
+	.leftTitle {
+		margin: 28rpx;
+		width: 120rpx;
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+
+	.noSelectColor {
+		color: #999999;
+
+	}
+
+	.selectColor {
+		color: #333333;
+
+	}
+
+	.carMod {
+		text-overflow: -o-ellipsis-lastline;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+
+	.rightArrow {
+		margin-right: 28rpx;
+		width: 14rpx;
+		height: 23rpx;
+
+	}
+
+	.cityBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.plateNumber {
+		width: 55%;
+		font-size: 28rpx;
+	}
+
+
+	.carModBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.timeBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.mileageInput {
+		width: 20%;
+		font-size: 28rpx;
+	}
+
+	.kmStr {
+		font-size: 28rpx;
+		color: #333333;
+
+	}
+
+	.bottomView {
+		background-color: #FFFFFF;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.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;
+	}
 </style>

pages/index/cailist.vue

@@ -64,8 +64,8 @@
 		},
 		methods: {
 			getqueryMyBMemberCar() {
-				uni.showLoading({
-					title: '加载中'
+				uni.showLoading({
+					title: '加载中'
 				})
 				this.loding = false;
 				this.$http('worldKeepCar/worldHome/queryMyTMemberCar', {
@@ -124,8 +124,8 @@
 			},
 			defaultCar(item) {
 				var that = this;
-				uni.showLoading({
-					title: '保存中'
+				uni.showLoading({
+					title: '保存中'
 				})
 				that.$http('worldKeepCar/worldHome/updateTCarIsdefault', {
 					id: item.id
@@ -194,6 +194,8 @@
 		height: 120rpx;
 		position: fixed;
 		bottom: 0rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
 	}
 
 	.saveCar {
@@ -253,7 +255,7 @@
 		font-size: 22rpx;
 		margin-left: 20rpx;
 		margin-top: 5rpx;
-		
+
 	}
 
 	.carMS {

pages/me/commissionHistory.vue

@@ -48,7 +48,7 @@
 		<!-- 上拉 加载更多 -->
 		<view class="noMore" v-if="noMoreShow">没有更多数据</view>
 
-		<view style="height: 120rpx;"></view>
+		<view class="emptyView"></view>
 		<view class="bottomView">
 			<view class="goExtract" @click="gonavigateTo('extract?okMoney='+ detailData.cantidatMoney)">去提现</view>
 		</view>
@@ -249,7 +249,11 @@
 		margin: 0 15rpx;
 		
 	}
-
+	.emptyView {
+		height: 120rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
 	.bottomView {
 		width: 100%;
 		height: 120rpx;
@@ -257,7 +261,9 @@
 		position: fixed;
 		left: 0;
 		bottom: 0;
-		background-color: #FFFFFF;
+		background-color: #FFFFFF;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
 	}
 
 	.goExtract {

pages/me/extract.vue

@@ -134,7 +134,7 @@
 	.allBtn {
 		font-size: 26rpx;
 		color: #FF4F00;
-		width: 170rpx;
+		width: 180rpx;
 	}
 
 	.zongMoney {

pages/me/feedBack.vue

@@ -1,265 +1,270 @@
-<template>
-	<view class="content">
-		<view class="main">
-			<!-- 建议 -->
-			<view class="firstView">
-				<view class="title">您的问题或建议</view>
-				<view>
-					<textarea placeholder-style="color:#999999" placeholder="输入个人意见反馈" v-model="exeContent"
-						class="textareaCont" maxlength="-1" auto-height="true" @confirm="feedDone" />
-				</view>
-			</view>
-
-			<!-- 图片 -->
-			<view class="secondView">
-				<view class="title">上传图片</view>
-				<view class="imgBox">
-					<view class="imgLine" v-for="(img,imgindex) in imgArr">
-						<image :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
-						<image src="../../static/img/icon_del_red.png" mode="" class="delImg"
-							@click="delimg(imgindex)"></image>
-					</view>
-					<view class="imgLine" @click="uploadImg">
-						<image src="../../static/img/btn_pic.png" mode="" class="itemImg"></image>
-					</view>
-				</view>
-			</view>
-
-
-		</view>
-
-		<view class="bottom">
-			<view class="shoreDz" @click="submit">提交</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import nodata from '@/components/nodata/nodata.vue'
-	export default {
-		components: {
-			nodata
-		},
-		data() {
-			return {
-				imgArr: [],
-				exeContent: '',
-				
-			}
-		},
-		
-		methods: {
-			feedDone(e) {
-				this.exeContent = e.target.value
-				
-			},
-			uploadImg() {
-
-				var that = this;
-				var length=this.imgArr.length;
-				var num=9;
-				if(length>8){
-					uni.showToast({
-						title: '最多上传9张',
-						icon: 'none',
-						duration: 2000,
-					});
-					return false;
-				}
-				uni.chooseImage({
-					sourceType: ['album','camera'],
-					count:num-length, 
-					success: (chooseImageRes) => {
-						const tempFilePaths = chooseImageRes.tempFilePaths;
-						/* uni.uploadFile({
-				            url: that.$request.baseUrl+'accompany/SuperCheckSheet/uploadFile', //仅为示例，非真实的接口地址
-				            filePath: tempFilePaths[0],
-				            name: 'file',
-				            formData: {
-				                'user': 'test'
-				            },
-				            success: (uploadFileRes) => {
-				                console.log(JSON.parse(uploadFileRes.data).data );
-								that.imgArr=that.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
-								
-				            }
-				        }); */
-						tempFilePaths.forEach(v => {
-							console.log(that.$request.baseUrl + 'tuhuUploadFile');
-							uni.uploadFile({
-								url: that.$request.baseUrl + 'tuhuUploadFile',
-								filePath: v,
-								name: 'file',
-								formData: {
-									'user': 'test'
-								},
-								
-								success: (uploadFileRes) => {
-
-									console.log(JSON.parse(uploadFileRes.data).data);
-									that.imgArr = that.imgArr.concat(JSON.parse(
-										uploadFileRes.data).data);
-								}
-							});
-						})
-						/* that.$http('accompany/SuperCheckSheet/uploadFile', tempFilePaths[0], 'POST').then(res => {
-							
-						}) */
-					}
-				});
-			},
-			delimg(index) {
-				this.imgArr.splice(index, 1)
-			},
-			submit() {
-				if (!this.exeContent) {
-					uni.showToast({
-						title: '请输入个人意见反馈',
-						icon: 'none',
-						duration: 2000,
-					});
-					return ;
-				}
-				// if (this.imgArr.length == 0) {
-				// 	uni.showToast({
-				// 		title: '请上传图片',
-				// 		icon: 'none',
-				// 		duration: 2000,
-				// 	});
-				// 	return ;
-				// }
-				uni.showLoading({
-					title: '保存中'
-				})
-				var exeImg = this.imgArr.join(',')
-				this.$http('worldKeepCar/keepCarMy/addTMemberSuggest', {
-					
-					contents: this.exeContent,
-					img: exeImg
-				}, 'POST').then(res => {
-					//this.submitSuperCheckSheet()
-					if(res.code==0){
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none',
-							duration: 2000,
-						});
-						setTimeout(function() {
-							uni.navigateBack({
-								
-							})
-						}, 2000); 	
-					}else{
-						uni.showToast({
-							title: '提交失败',
-							icon: 'none',
-							duration: 2000,
-						});
-					}
-					
-					
-
-				})
-			}
-
-		}
-	}
-</script>
-
-<style scoped>
-	.content {
-		background: #F4F5F7;
-		min-height: 100vh;
-
-	}
-
-	/* #ifdef H5 */
-	.content {
-		background: #F4F5F7;
-		min-height: calc(100vh - 44px);
-
-	}
-
-	/* #endif */
-	.main {
-		background: #F4F5F7;
-		padding: 20rpx 24rpx;
-	}
-
-	.firstView,
-	.secondView {
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-	}
-
-	.firstView {
-		margin-bottom: 20rpx;
-	}
-
-	.title {
-		font-size: 30rpx;
-		color: #3C3C3C;
-		padding: 20rpx;
-	}
-
-	.textareaCont {
-		padding: 20rpx;
-		min-height: 150rpx;
-		width: 95%;
-	}
-
-
-	.imgBox {
-		display: flex;
-		flex-wrap: wrap;
-		padding: 20rpx;
-
-	}
-	.imgLine{
-		position: relative;
-		margin-right: 10rpx;
-	}
-	.itemImg {
-		width: 150rpx;
-		height: 150rpx;
-		margin-right: 5rpx;
-	}
-
-	/* .img4 {
-		margin-right: 20rpx;
-		
-	} */
-
-	.delImg {
-		width: 32rpx;
-		height: 32rpx;
-		position: absolute;
-		right: 0rpx;
-		top: 0rpx;
-	}
-
-
-	.bottom {
-		width: 750rpx;
-		height: 120rpx;
-		background: #FFFFFF;
-		box-shadow: 0px -4px 8px 0px rgba(153, 153, 153, 0.08);
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		justify-content: space-around;
-	}
-
-	.shoreDz {
-		width: 702rpx;
-		height: 74rpx;
-		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
-		border-radius: 37rpx;
-		text-align: center;
-		line-height: 74rpx;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		margin-top: 24rpx;
-	}
+<template>
+	<view class="content">
+		<view class="main">
+			<!-- 建议 -->
+			<view class="firstView">
+				<view class="title">您的问题或建议</view>
+				<view>
+					<textarea placeholder-style="color:#999999" placeholder="输入个人意见反馈" v-model="exeContent"
+						class="textareaCont" maxlength="-1" auto-height="true" @confirm="feedDone" />
+				</view>
+			</view>
+
+			<!-- 图片 -->
+			<view class="secondView">
+				<view class="title">上传图片</view>
+				<view class="imgBox">
+					<view class="imgLine" v-for="(img,imgindex) in imgArr">
+						<image :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
+						<image src="../../static/img/icon_del_red.png" mode="" class="delImg" @click="delimg(imgindex)">
+						</image>
+					</view>
+					<view class="imgLine" @click="uploadImg">
+						<image src="../../static/img/btn_pic.png" mode="" class="itemImg"></image>
+					</view>
+				</view>
+			</view>
+
+
+		</view>
+
+		<view class="bottom">
+			<view class="shoreDz" @click="submit">提交</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import nodata from '@/components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata
+		},
+		data() {
+			return {
+				imgArr: [],
+				exeContent: '',
+
+			}
+		},
+
+		methods: {
+			feedDone(e) {
+				this.exeContent = e.target.value
+
+			},
+			uploadImg() {
+
+				var that = this;
+				var length = this.imgArr.length;
+				var num = 9;
+				if (length > 8) {
+					uni.showToast({
+						title: '最多上传9张',
+						icon: 'none',
+						duration: 2000,
+					});
+					return false;
+				}
+				uni.chooseImage({
+					sourceType: ['album', 'camera'],
+					count: num - length,
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						/* uni.uploadFile({
+				            url: that.$request.baseUrl+'accompany/SuperCheckSheet/uploadFile', //仅为示例，非真实的接口地址
+				            filePath: tempFilePaths[0],
+				            name: 'file',
+				            formData: {
+				                'user': 'test'
+				            },
+				            success: (uploadFileRes) => {
+				                console.log(JSON.parse(uploadFileRes.data).data );
+								that.imgArr=that.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
+								
+				            }
+				        }); */
+						tempFilePaths.forEach(v => {
+							console.log(that.$request.baseUrl + 'tuhuUploadFile');
+							uni.uploadFile({
+								url: that.$request.baseUrl + 'tuhuUploadFile',
+								filePath: v,
+								name: 'file',
+								formData: {
+									'user': 'test'
+								},
+
+								success: (uploadFileRes) => {
+
+									console.log(JSON.parse(uploadFileRes.data).data);
+									that.imgArr = that.imgArr.concat(JSON.parse(
+										uploadFileRes.data).data);
+								}
+							});
+						})
+						/* that.$http('accompany/SuperCheckSheet/uploadFile', tempFilePaths[0], 'POST').then(res => {
+							
+						}) */
+					}
+				});
+			},
+			delimg(index) {
+				this.imgArr.splice(index, 1)
+			},
+			submit() {
+				if (!this.exeContent) {
+					uni.showToast({
+						title: '请输入个人意见反馈',
+						icon: 'none',
+						duration: 2000,
+					});
+					return;
+				}
+				// if (this.imgArr.length == 0) {
+				// 	uni.showToast({
+				// 		title: '请上传图片',
+				// 		icon: 'none',
+				// 		duration: 2000,
+				// 	});
+				// 	return ;
+				// }
+				uni.showLoading({
+					title: '保存中'
+				})
+				var exeImg = this.imgArr.join(',')
+				this.$http('worldKeepCar/keepCarMy/addTMemberSuggest', {
+
+					contents: this.exeContent,
+					img: exeImg
+				}, 'POST').then(res => {
+					//this.submitSuperCheckSheet()
+					if (res.code == 0) {
+						uni.showToast({
+							title: '提交成功',
+							icon: 'none',
+							duration: 2000,
+						});
+						setTimeout(function() {
+							uni.navigateBack({
+
+							})
+						}, 2000);
+					} else {
+						uni.showToast({
+							title: '提交失败',
+							icon: 'none',
+							duration: 2000,
+						});
+					}
+
+
+
+				})
+			}
+
+		}
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+
+	}
+
+	/* #ifdef H5 */
+	.content {
+		background: #F4F5F7;
+		min-height: calc(100vh - 44px);
+
+	}
+
+	/* #endif */
+	.main {
+		background: #F4F5F7;
+		padding: 20rpx 24rpx;
+	}
+
+	.firstView,
+	.secondView {
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+
+	.firstView {
+		margin-bottom: 20rpx;
+	}
+
+	.title {
+		font-size: 30rpx;
+		color: #3C3C3C;
+		padding: 20rpx;
+	}
+
+	.textareaCont {
+		padding: 20rpx;
+		min-height: 150rpx;
+		width: 95%;
+	}
+
+
+	.imgBox {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 20rpx;
+
+	}
+
+	.imgLine {
+		position: relative;
+		margin-right: 10rpx;
+	}
+
+	.itemImg {
+		width: 150rpx;
+		height: 150rpx;
+		margin-right: 5rpx;
+	}
+
+	/* .img4 {
+		margin-right: 20rpx;
+		
+	} */
+
+	.delImg {
+		width: 32rpx;
+		height: 32rpx;
+		position: absolute;
+		right: 0rpx;
+		top: 0rpx;
+	}
+
+
+	.bottom {
+		width: 750rpx;
+		height: 120rpx;
+		background: #FFFFFF;
+		box-shadow: 0px -4px 8px 0px rgba(153, 153, 153, 0.08);
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: space-around;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+
+	}
+
+	.shoreDz {
+		width: 702rpx;
+		height: 74rpx;
+		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+		border-radius: 37rpx;
+		text-align: center;
+		line-height: 74rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		margin-top: 24rpx;
+	}
 </style>

pages/me/invite.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="box">
 
-		<view class="header">
-		<image :src="detailData.tSSetting.bannerImg" mode="" class="bar"></image>
+		<view class="header">
+			<image :src="detailData.tSSetting.bannerImg" mode="" class="bar"></image>
 			<image src="../../static/img/btn_act@2x.png" mode="" class="guizeBtn" @click="guize"></image>
 		</view>
 
@@ -36,33 +36,35 @@
 		</view>
 
 		<!-- 明细 -->
-		<view class="mingxiBg"  v-if="arr.length > 0">
+		<view class="mingxiBg" v-if="arr.length > 0">
 			<view class="mingxi">
 				<view v-for="(item,index) in arr" :key="index">
 					<view class="itemBg">
-						<image :src='item.MemberHeadImg' mode="" style="width: 72rpx; height: 72rpx; border-radius: 36rpx;"></image>
+						<image :src='item.MemberHeadImg' mode=""
+							style="width: 72rpx; height: 72rpx; border-radius: 36rpx;"></image>
 						<view class="nickName" v-if="item.MemberNickName">{{item.MemberNickName}}</view>
 						<view class="time">{{item.CreateTime.slice(0,item.CreateTime.length-8)}}</view>
 						<view class="jine">+{{item.Money}}</view>
 					</view>
 				</view>
-			</view>
-			<!-- 查看更多 -->
-			<view class="moreView">
-				<view style="color: #3F90F7; font-size: 30rpx;" @click="gonavigateTo('commissionHistory')">查看更多</view>
-				<image src="../../static/img/icon_arrow_blue.png" mode="" style="width: 24rpx; height: 24rpx;"></image>
 			</view>
-		</view>
-		<view class="mingxiBg" v-else>
-			<image :src="emptyImg" mode="" class="emptyImg"></image>
+			<!-- 查看更多 -->
+			<view class="moreView">
+				<view style="color: #3F90F7; font-size: 30rpx;" @click="gonavigateTo('commissionHistory')">查看更多</view>
+				<image src="../../static/img/icon_arrow_blue.png" mode="" style="width: 24rpx; height: 24rpx;"></image>
+			</view>
+		</view>
+		<view class="mingxiBg" v-else>
+			<image :src="emptyImg" mode="" class="emptyImg"></image>
 		</view>
 
-		<view style="height: 180rpx;"></view>
-		<view class="bottomView">
-			<view class="bottomImg" @click="gonavigateTo('inviteImg')">
-				<image src="../../static/img/icon_ma@2x.png" mode="" style="width: 30rpx; height: 30rpx; margin-right: 10rpx;">面对面邀请</image>
-			</view>
-			<button  class="bottomImg2" open-type="share">立即邀请</button>
+		<view class="emptyView"></view>
+		<view class="bottomView">
+			<view class="bottomImg" @click="gonavigateTo('inviteImg')">
+				<image src="../../static/img/icon_ma@2x.png" mode=""
+					style="width: 30rpx; height: 30rpx; margin-right: 10rpx;">面对面邀请</image>
+			</view>
+			<button class="bottomImg2" open-type="share">立即邀请</button>
 		</view>
 
 	</view>
@@ -71,60 +73,60 @@
 <script>
 	export default {
 		data() {
-			return {
-				detailData:{},
-				arr: [],
-				emptyImg:'http://123.56.219.146:10086/keepCar/jqsy.png',
-				uidStr:'',
-				share:{
-					title:'车蓝图4S店养车服务',
-					path: 'pages/homePage/homePage?scene=' + this.uidStr,
-					imageUrl:'',
-					desc:'',
-					content:''
+			return {
+				detailData: {},
+				arr: [],
+				emptyImg: 'http://123.56.219.146:10086/keepCar/jqsy.png',
+				uidStr: '',
+				share: {
+					title: '车蓝图4S店养车服务',
+					path: 'pages/homePage/homePage?scene=' + this.uidStr,
+					imageUrl: '',
+					desc: '',
+					content: ''
 				}
 			}
-		},
-		onLoad() {
-			this.uidStr = uni.getStorageSync("logodata").uid.replace(/\-/g, "")
-		},
-		onShow() {
-			this.getDetailData();
 		},
-		methods: {
-			onShareAppMessage:function() {
-				
-			},
-			guize(){
-				
-				uni.navigateTo({
-					url:'guize?couContent=' + this.detailData.tSSetting.activityRules
-				})
-			},
-			getDetailData() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				let url = 'worldKeepCar/worldDistribution/queryDistributionIndexDetail',
-					params = {
-						
-					}
-				this.$http(url, params, 'GET').then(res => {
-					uni.hideLoading();
-					var data = res.data
-					
-					
-					// 处理 undefined和null转为空白字符串
-					
-						for (const key in data) {
-							data[key] = this.$praseStrEmpty(data[key])
-						}
-					
-					this.detailData = data
-					this.arr = this.detailData.recentEarnings
-					
-					
-				})
+		onLoad() {
+			this.uidStr = uni.getStorageSync("logodata").uid.replace(/\-/g, "")
+		},
+		onShow() {
+			this.getDetailData();
+		},
+		methods: {
+			onShareAppMessage: function() {
+
+			},
+			guize() {
+
+				uni.navigateTo({
+					url: 'guize?couContent=' + this.detailData.tSSetting.activityRules
+				})
+			},
+			getDetailData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'worldKeepCar/worldDistribution/queryDistributionIndexDetail',
+					params = {
+
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+					var data = res.data
+
+
+					// 处理 undefined和null转为空白字符串
+
+					for (const key in data) {
+						data[key] = this.$praseStrEmpty(data[key])
+					}
+
+					this.detailData = data
+					this.arr = this.detailData.recentEarnings
+
+
+				})
 			},
 			gonavigateTo(url) {
 
@@ -132,23 +134,23 @@
 					url: url
 				})
 			}
-		},
-		
-		// 下拉刷新 上拉加载更多
-		onPullDownRefresh() {
-			
-			this.getDetailData()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		// onReachBottom() {
-		// 	this.page++;
-		
-		// 	this.getItemData()
-		
-		// },
-		
+		},
+
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+
+			this.getDetailData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		// onReachBottom() {
+		// 	this.page++;
+
+		// 	this.getItemData()
+
+		// },
+
 	}
 </script>
 
@@ -162,16 +164,17 @@
 		width: 100%;
 		height: 750rpx;
 		position: relative;
-	}
-	.bar{
-		width: 100%;
-		height: 750rpx;
 	}
 
-	.guizeBtn {
+	.bar {
+		width: 100%;
+		height: 750rpx;
+	}
+
+	.guizeBtn {
 		position: absolute;
-		
-		left: 580rpx;
+
+		left: 580rpx;
 		top: 48rpx;
 		width: 169rpx;
 		height: 56rpx;
@@ -212,23 +215,26 @@
 
 		background-color: #EEEEEE;
 	}
-	.mingxiBg{
-		margin: 0rpx 24rpx;
-		background-color: #FFFFFF;
-		
-		border-radius: 10rpx;
+
+	.mingxiBg {
+		margin: 0rpx 24rpx;
+		background-color: #FFFFFF;
+
+		border-radius: 10rpx;
 	}
+
 	.mingxi {
 		background-image: url('http://123.56.219.146:10086/keepCar/jqsy2.png');
-		background-size: 100%;
+		background-size: 100%;
 		background-repeat: no-repeat;
-		padding-top: 89rpx;
-		
-	}
-	.emptyImg{
-		
-		height: 493rpx;
-		width: 100%;
+		padding-top: 89rpx;
+
+	}
+
+	.emptyImg {
+
+		height: 493rpx;
+		width: 100%;
 	}
 
 	.itemBg {
@@ -239,78 +245,88 @@
 		justify-content: space-between;
 		align-items: center;
 	}
-	
-	.nickName {
-		font-size: 30rpx;
-		color: #3C3C3C;
-		width: 40%;
-		margin: 0 15rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-	
-	.time {
-		font-size: 30rpx;
-		color: #999999;
-		
-		width: 27%;
-	}
-	
-	.jine {
-		font-size: 32rpx;
-		color: #FF4F00;
-		font-weight: bold;
-		margin: 0 15rpx;
-		
-	}
-	.moreView{
-		height: 92rpx;
-		
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-	
-	.bottomView{
-		background-color: #FFFFFF;
-		width: 100%;
-		height: 120rpx;
-		position: fixed;
-		bottom: 0rpx;
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-	}
-	
-	
-	.bottomImg{
-		
-		background-color: #FFFFFF;
-		border: #FF4F00 1rpx solid;
-		margin: 23rpx 30rpx;
-		height: 74rpx;
-		width: 50%;
-		border-radius: 37rpx;
-		color: #FF4F00;
-		font-size: 30rpx;
-		
-		text-align: center;
-		line-height: 74rpx;
-		align-items: center;
-		display: flex;
-		justify-content: center;
-	}
-	.bottomImg2{
-		
-		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
-		margin: 23rpx 30rpx;
-		height: 74rpx;
-		width: 50%;
-		border-radius: 37rpx;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		
-		text-align: center;
+
+	.nickName {
+		font-size: 30rpx;
+		color: #3C3C3C;
+		width: 40%;
+		margin: 0 15rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.time {
+		font-size: 30rpx;
+		color: #999999;
+
+		width: 27%;
+	}
+
+	.jine {
+		font-size: 32rpx;
+		color: #FF4F00;
+		font-weight: bold;
+		margin: 0 15rpx;
+
+	}
+
+	.moreView {
+		height: 92rpx;
+
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.emptyView {
+		height: 180rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.bottomView {
+		background-color: #FFFFFF;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0rpx;
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+
+	.bottomImg {
+
+		background-color: #FFFFFF;
+		border: #FF4F00 1rpx solid;
+		margin: 23rpx 30rpx;
+		height: 74rpx;
+		width: 50%;
+		border-radius: 37rpx;
+		color: #FF4F00;
+		font-size: 30rpx;
+
+		text-align: center;
+		line-height: 74rpx;
+		align-items: center;
+		display: flex;
+		justify-content: center;
+	}
+
+	.bottomImg2 {
+
+		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		margin: 23rpx 30rpx;
+		height: 74rpx;
+		width: 50%;
+		border-radius: 37rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+
+		text-align: center;
 	}
 </style>

pages/me/me.vue

@@ -113,7 +113,7 @@
 				</view>
 				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
 			</view>
-			<view class="rowBox" @click="gonavigateTo('invite')">
+			<view class="rowBox" v-if="numList.activityState == 1" @click="gonavigateTo('invite')">
 				<view class="leftView">
 					<image src="../../static/img/icon_yaoqing.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">邀请有礼</view>