Parcourir la source

1.改样式
2. 钣金喷漆

guo il y a 2 ans
Parent
commit
d95b5e3c67

+ 14 - 9
pages/index/discountCard.vue

@@ -1,18 +1,20 @@
 <template>
 	<view class="box">
-		<view class="tab">
+		<!-- <view class="tab">
 
 			<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">可使用</view>
 			<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">可赠送</view>
 
-		</view>
+		</view> -->
 		
 		<view class="main" :class="{mainActive:tabIndex==1}">
 			<view class="okBox" v-if="tabIndex==1">
 				<view class="tabLine2" :class="{tabActive2:tabIndex2==0}" @click="tabClick2(0)">可使用</view>
 				<view class="tabLine2" :class="{tabActive2:tabIndex2==2}" @click="tabClick2(2)">已使用</view>
 				<view class="tabLine2" :class="{tabActive2:tabIndex2==1}" @click="tabClick2(1)">已过期</view>
-			</view>
+			</view>
+			
+			<view style="height: 92rpx;"></view>
 			<view class="itemBg" v-for="(item,index) in currentList">
 				<view class="itemTop">
 					<view class="leftB">
@@ -39,7 +41,9 @@
 				<view class="itemBottom">
 					<view v-if="tabIndex==1">可用次数:{{item.avaQty}}</view>
 					<view v-else>可分享次数:{{item.shareQty}}</view>
-					<view @click="goDetail(item.id)">查看详情 ></view>
+					<view @click="goDetail(item.id)" style="align-items: center;">查看详情 
+					<image src="../../static/img/little_rightArrow.png" mode="" style="width: 24rpx;height: 24rpx;"></image>
+					</view>
 					
 				</view>
 			</view>
@@ -170,12 +174,12 @@
 	}
 
 	.main {
-		padding-top: 92rpx;
+		/* padding-top: 92rpx; */
 		padding-bottom: 20rpx;
 		background-color: #F4F5F7;
 	}
 	.mainActive{
-		padding-top: 184rpx;
+		/* padding-top: 184rpx; */
 		padding-bottom: 20rpx;
 		background-color: #F4F5F7;
 	}
@@ -185,12 +189,12 @@
 		display: flex;
 		justify-content: flex-start;
 		align-items: center;
-		border-top: 1rpx solid #EEEEEE;
+		/* border-top: 1rpx solid #EEEEEE; */
 		position: fixed;
 		width: 100vw;
 		padding-left: 24rpx;
 		padding-right: 24rpx;
-		margin-top: -93rpx;
+		/* margin-top: -93rpx; */
 		height: 92rpx;
 		z-index: 11;
 	}
@@ -293,7 +297,8 @@
 		border-top: 1rpx solid #EEEEEE;
 		font-size: 24rpx;
 		color: #999999;
-		line-height: 33rpx;
+		line-height: 33rpx;
+		
 	}
 	.couponlineTopImg{
 		width: 118rpx;

+ 10 - 10
pages/index/discountCardDetail.vue

@@ -23,7 +23,8 @@
 		<view class="comtentBox">
 			<view style="margin-bottom: 30rpx;">
 				<view class="titleBox">
-					<view class="redPoint"></view>
+					
+					<image src="../../static/img/icon_youhui_red.png" mode="" class="redPoint"></image>
 					<view class="title">可用次数</view>
 				</view>
 				<view class="content">{{detail.avaQty}}次</view>
@@ -31,7 +32,7 @@
 			</view>
 			<view style="margin-bottom: 30rpx;">
 				<view class="titleBox">
-					<view class="redPoint"></view>
+					<image src="../../static/img/icon_youhui_red.png" mode="" class="redPoint"></image>
 					<view class="title">适用门店</view>
 					</view>
 
@@ -44,10 +45,11 @@
 
 			<view>
 				<view class="titleBox">
-					<view class="redPoint"></view>
+					<image src="../../static/img/icon_youhui_red.png" mode="" class="redPoint"></image>
 					<view class="title">使用说明</view>
 					</view>
-					<view v-if="detail.couContent" v-html="detail.couContent"></view>
+					<view v-if="detail.couContent" v-html="detail.couContent"></view>
+					<view v-else class="content">暂无</view>
 				</view>
 
 
@@ -100,13 +102,13 @@
 		margin: -100rpx 24rpx 0rpx;
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
-		padding: 40rpx 20rpx 20rpx;
+		padding: 20rpx;
 	}
 
 	.detailTop {
 		display: flex;
 		justify-content: flex-start;
-		margin-bottom: 40rpx;
+		
 	}
 
 	.use {
@@ -151,14 +153,14 @@
 
 		font-weight: 500;
 		color: #333333;
-		line-height: 42rpx;
+		line-height: 56rpx;
 	}
 
 	.time {
 		font-size: 24rpx;
 
 		color: #666666;
-		margin-top: 15rpx;
+		
 	}
 
 	.leftB {
@@ -180,8 +182,6 @@
 	.redPoint {
 		width: 18rpx;
 		height: 18rpx;
-		background: #FF0000;
-		border-radius: 9rpx;
 		margin-right: 10rpx;
 	}
 

+ 236 - 59
pages/index/paint.vue

@@ -1,59 +1,236 @@
-<template>
-	<view class="box">
-		<view class="top">
-			<view class="left">
-				<image :src="item.brandLogo" mode="widthFix" class="brandLogo">
-					<view class="car">奥迪 A5 2.0 双离合变速器(DCT)  2017 3.0...</view>
-				</image>
-			</view>
-			<image src="../../static/img/rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-	.box{
-		min-height: 100vh;
-		background-color: #f4f5f7;
-	}
-	.top{
-		
-		background-color: #FFFFFF;
-		padding: 30rpx 20rpx;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-	.left{
-		display: flex;
-		align-items: center;
-	}
-	.car{
-		
-		font-size: 28rpx;
-		
-		color: #333333;
-		line-height: 40rpx;
-		/* 隐藏文字显示 ...不换行 */
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-	.brandLogo {
-		width: 42rpx;
-		height: 42rpx;
-	}
-</style>
+<template>
+	<view class="box">
+		<view class="top">
+			<view class="left">
+				<image :src="carInfo.brandLogo" mode="widthFix" class="brandLogo" v-if="carInfo.brandLogo">
+					<img src="../../static/timg/nocar.png" alt="" class="brandLogo" v-else>
+					<view class="car" v-if="carInfo.carModel">{{carInfo.carModel}}</view>
+					<view class="car" v-else>暂无</view>
+				</image>
+			</view>
+			<image src="../../static/img/big_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
+		</view>
+
+		<view class="main" v-if="itemList">
+			<view class="mainLeft">
+				<view class="mainLeftLine" v-for="(item,index) in itemList" :class="{lineLeftActive:leftIndex==index}"
+					@click="leftClick(item,index)">
+					<span class="leftTitle">{{item.name}}</span>
+					<view class="lineNum" v-show="item.num!=0">{{item.num}}</view>
+				</view>
+			</view>
+
+
+			<view class="mainRight">
+				<view class="rightTop">{{itemList[leftIndex].name}}</view>
+				<view class="mainRightLine" v-for="(item2,index) in itemList[leftIndex].list" :key="index">
+					<view class="itemTop">
+						<view class="itemName">{{item2.ItemName}}</view>
+
+						<span class="rightState" v-if="item2.open==false" @click="changeState(item2)">展开<image
+								src="../../static/img/icon_arrow_down.png" mode=""
+								style="width: 20rpx;height: 11rpx; padding: 5rpx 8rpx;"></image>
+						</span>
+
+						<span class="rightState" v-else @click="changeState(item2)">收起<image
+								src="../../static/img/icon_arrow_up.png" mode=""
+								style="width: 20rpx;height: 11rpx; padding: 5rpx 8rpx;"></image>
+						</span>
+
+					</view>
+
+					<!--  -->
+					<view class="itemBox">
+						<view class="type">
+							<view class="typeName">喷漆</view>
+							<view class=""><span class="renminbi">¥</span>{{item2.PSalePrice}}</view>
+						</view>
+						<view class="type">
+							<view class="typeName">钣金喷漆</view>
+							<view class=""><span class="renminbi">¥</span>{{item2.BPSalePrice}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				carInfo: '',
+				itemList: [],
+				leftIndex: 0,
+			}
+		},
+		onShow() {
+			this.carInfo = this.$store.state.carInfo
+		},
+		onLoad() {
+			this.getData();
+		},
+		methods: {
+			changeState(item) {
+				item.open = !item.open
+			},
+			leftClick(item, index) {
+				this.leftIndex = index
+			},
+			getData() {
+				uni.showLoading({
+					title: '加载中'
+				});
+
+				this.$http('openSheetMetalSprayPaint/queryPackageList', {
+
+					// id: this.id,
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					this.itemList = res.data;
+
+
+
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	.box {
+		min-height: 100vh;
+		background-color: #f4f5f7;
+	}
+
+	.top {
+
+		background-color: #FFFFFF;
+		padding: 30rpx 20rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.left {
+		display: flex;
+		align-items: center;
+	}
+
+	.car {
+
+		font-size: 28rpx;
+
+		color: #333333;
+		line-height: 40rpx;
+		margin-left: 10rpx;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.brandLogo {
+		width: 42rpx;
+		height: 42rpx;
+	}
+
+	.main {
+		display: flex;
+		height: calc(100vh - 310rpx);
+	}
+
+	.mainLeft {
+		width: 154rpx;
+		background: #F4F5F7;
+	}
+
+	.mainLeftLine {
+		color: #3C3C3C;
+		padding: 30rpx 20rpx;
+		font-size: 26rpx;
+		text-align: center;
+		position: relative;
+	}
+
+	.leftTitle {
+		color: #333333;
+		font-weight: bold;
+		font-size: 26rpx;
+	}
+
+	.lineNum {
+		position: absolute;
+		background: #FF270A;
+		width: 40rpx;
+		height: 26rpx;
+		text-align: center;
+		line-height: 26rpx;
+		font-size: 20rpx;
+		color: #FFFFFF;
+		border-radius: 13rpx;
+		top: 10rpx;
+		right: 10rpx;
+	}
+
+	.lineLeftActive {
+		background: #FFFFFF;
+	}
+
+	.mainRight {
+		width: 596rpx;
+		background-color: #FFFFFF;
+	}
+
+	.rightTop {
+		padding: 13rpx 24rpx;
+		background-color: #F9F9F9;
+
+		font-size: 26rpx;
+
+		color: #959595;
+		line-height: 37rpx;
+	}
+
+	.mainRightLine {
+		padding: 30rpx 24rpx;
+		background-color: #FFFFFF;
+
+	}
+
+	.itemTop {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.itemName {
+		font-size: 28rpx;
+		font-weight: bold;
+		color: #333333;
+	}
+
+	.rightState {
+		font-size: 24rpx;
+		color: #6666666;
+
+	}
+
+	.itemBox {
+		display: flex;
+		border-bottom: 1rpx solid #EEEEEE;
+		padding: 30rpx 0;
+	}
+
+	.type {
+		border-radius: 10rpx;
+
+		border: 2rpx solid #CCCCCC;
+		margin-right: 20rpx;
+		width: 50%;
+		text-align: center;
+	}
+</style>

+ 12 - 7
pages/index/shopList.vue

@@ -175,7 +175,7 @@
 
 	.shopName {
 		color: #333333;
-		font-size: 26rpx;
+		font-size: 28rpx;
 		font-weight: 600;
 	}
 
@@ -209,12 +209,17 @@
 	.brandsBg {
 		display: flex;
 
-		flex-wrap: wrap;
 		align-items: center;
-		overflow: hidden;
-		padding: 5rpx 0rpx;
-
-	}
+		
+		padding: 5rpx 0rpx;
+		width: 24.5%;
+		
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+	
 
 	.brands {
 		border-radius: 4rpx;
@@ -235,7 +240,7 @@
 
 	.shopTime {
 		color: #666666;
-		font-size: 22rpx;
+		font-size: 24rpx;
 	}
 
 	.addressBox {

+ 46 - 24
pages/index/vipCard.vue

@@ -25,8 +25,14 @@
 			</view>
 
 			<view class="tab">
-				<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">计次</view>
-				<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">储值</view>
+				<view>
+					<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">计次</view>
+					<view :class="{line:tabIndex==1}"></view>
+				</view>
+				<viw>
+					<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">储值</view>
+					<view :class="{line:tabIndex==2}"></view>
+				</viw>
 			</view>
 		</view>
 
@@ -66,7 +72,7 @@
 							<view class="time" v-if="v.ExpireTime">有效期:{{v.ExpireTime.slice(0,10)}}</view>
 							<view class="time" v-else>有效期:永久</view>
 							<view>剩余/总:<span
-									style="color: #FF3B30;font-weight: bold;">{{v.AmountQty}}</span>/{{v.TotalQty}}
+									style="color: #FF3B30;">{{v.AmountQty}}</span>/{{v.TotalQty}}
 							</view>
 						</view>
 
@@ -82,7 +88,7 @@
 								<view class="time" v-if="v.ExpireTime">有效期:{{v.ExpireTime.slice(0,10)}}</view>
 								<view class="time" v-else>有效期:永久</view>
 								<view>剩余/总:<span
-										style="color: #FF3B30;font-weight: bold;">{{v.AmountQty}}</span>/{{v.TotalQty}}
+										style="color: #FF3B30;">{{v.AmountQty}}</span>/{{v.TotalQty}}
 								</view>
 							</view>
 					
@@ -135,8 +141,8 @@
 				<view class="itemBottom" :class="{active:item.open}">
 					<view class="shopName">{{item.ShopName}}</view>
 
-					<view style="font-size: 24rpx; color: #FF3B30;">¥<span class="money">{{item.Money}}</span> <span
-							style="color: #999999;font-size: 24rpx;">(充{{item.ChargeMoney}}送{{item.GiftMoney}})</span>
+					<view class="moneyBox"><span style="font-size: 24rpx; color: #FF3B30; padding-top: 2rpx;">¥</span><span class="money">{{item.Money}}</span> <span
+							style="color: #999999;font-size: 24rpx;">( 充{{item.ChargeMoney}}送{{item.GiftMoney}} )</span>
 					</view>
 					<image @click="changeState(item)" v-if="item.open==false" src="../../static/img/icon_arrow_down.png"
 						mode="" style="width: 34rpx;height: 22rpx;"></image>
@@ -166,8 +172,8 @@
 				<view class="itemBottom" :class="{active:item.open}">
 					<view class="shopName">{{item.ShopName}}</view>
 				
-					<view style="font-size: 24rpx; color: #FF3B30;">¥<span class="money">{{item.Money}}</span> <span
-							style="color: #999999;font-size: 24rpx;">(充{{item.ChargeMoney}}送{{item.GiftMoney}})</span>
+					<view class="moneyBox"><span style="font-size: 24rpx; color: #FF3B30; padding-top: 2rpx;">¥</span><span class="money">{{item.Money}}</span> <span
+							style="color: #999999;font-size: 24rpx;">( 充{{item.ChargeMoney}}送{{item.GiftMoney}} )</span>
 					</view>
 					<image @click="changeState(item)" v-if="item.open==false" src="../../static/img/icon_arrow_down.png"
 						mode="" style="width: 34rpx;height: 22rpx;"></image>
@@ -316,13 +322,13 @@
 
 	.headerBox {
 		background-color: #171723;
-		height: 530rpx;
+		height: 527rpx;
 		width: 100vw;
 		padding: 30rpx 0rpx;
-		position: fixed;
+		/* position: fixed;
 		left: 0;
 		top: 0;
-		z-index: 999;
+		z-index: 999; */
 	}
 
 	.vip {
@@ -402,20 +408,27 @@
 	.tabLine {
 
 		font-size: 30rpx;
-		font-weight: bold;
+		
 		line-height: 42rpx;
 		color: #3C3C3C;
 		text-align: center;
+	}
+	.line{
+		width: 40rpx;
+		margin: 0rpx 10rpx;
+		height: 4rpx;
+		background: #FF0000;
+		margin-top: 8rpx;
 	}
 
 	.tabActive {
-		color: #3C3C3C;
-		border-bottom: 6rpx solid #D83342;
-
+		color: #3C3C3C;
+		font-weight: bold;
+	
 	}
 
 	.mainBox {
-		margin-top: 590rpx;
+		/* margin-top: 590rpx; */
 		background-color: #F4F5F7;
 		padding: 24rpx;
 		min-height: 100vh;
@@ -520,10 +533,16 @@
 
 		font-size: 36rpx;
 		font-weight: bold;
-		color: #FF3B30;
+		color: #FF0000;
 		line-height: 50rpx;
 	}
-
+	.moneyBox{
+		flex-grow: 1;
+		display: flex;
+		justify-content: flex-end;
+		margin-right: 10rpx;
+		align-items: center;
+	}
 	.count {
 		color: #FF0000;
 	}
@@ -531,7 +550,7 @@
 	.shiyongBox {
 		width: 100%;
 		height: 100vh;
-		background: rgba(0, 0, 0, 0.5);
+		background: rgba(0, 0, 0, 0.4);
 		position: fixed;
 		left: 0;
 		top: 0;
@@ -549,8 +568,8 @@
 	}
 
 	.shiyongContTopX {
-		width: 25rpx;
-		height: 25rpx;
+		width: 36rpx;
+		height: 36rpx;
 	}
 
 	.shiyongContTop {
@@ -559,11 +578,13 @@
 		padding: 24rpx;
 		color: #3C3C3C;
 		font-size: 30rpx;
-		border-bottom: 1rpx solid #EEEEEE;
+		border-bottom: 1rpx solid #EEEEEE;
+		align-items: center;
 	}
 
 	.shiyongContTopTitle {
-		font-size: 30rpx;
+		font-size: 30rpx;
+		color: #3C3C3C;
 	}
 
 	.shiyonghtml {
@@ -573,6 +594,7 @@
 	}
 
 	.shiyongno {
-		color: #666666;
+		color: #666666;
+		font-size: 26rpx;
 	}
 </style>

+ 105 - 94
pages/user/addCar/addCar.vue

@@ -11,32 +11,32 @@
 				<plate-input v-if="plateShow" :plate="plateNo" @export="setPlate" @close="plateShow=false" />
 
 			
-			</view>
-			<view class="line"></view>
-			
-			<view class="mesView">
-				<view class="leftTitle">VIN</view>
-				<input class="vinInput selectColor" type="text" v-model="vin" placeholder="请输入"
-					placeholder-style="color:#999999" />
-				<view class="kmStr"></view>
-			</view>
+			</view>
+			<view class="line"></view>
+			
+			<view class="mesView">
+				<view class="leftTitle">VIN</view>
+				<input class="vinInput selectColor" type="text" v-model="vin" placeholder="请输入"
+					placeholder-style="color:#999999" />
+				<view class="kmStr"></view>
+			</view>
 			<view class="line"></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>
+				<image src="../../../static/img/big_rightArrow.png" class="big_rightArrow"></image>
+			</view>
+			<view class="line"></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 class="line"></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 class="line"></view>
 			
 			<view class="mesView">
 				<view class="leftTitle">注册登记时间</view>
@@ -44,7 +44,7 @@
 					<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>
+				<image src="../../../static/img/big_rightArrow.png" class="big_rightArrow"></image>
 			</view>
 
 
@@ -242,40 +242,9 @@
 						duration: 3000
 					});
 					return false;
-				}
-				if (this.vin == '') {
-					uni.showToast({
-						title: '请填写vin',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				if (this.carModelInfo == '') {
-					uni.showToast({
-						title: '请选择车型',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				if (this.mileage == '') {
-					uni.showToast({
-						title: '请输入行驶里程',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				if (this.time == '') {
-					uni.showToast({
-						title: '请选择注册登记时间',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
 				}
 				
+				
 				if (this.isEditCar == 'true') {
 					this.updateTMemberCar()
 				} else {
@@ -285,24 +254,46 @@
 			},
 
 			addTMemberCar() {
-				this.$http('opencarInfoOwner/addCarOwner', {
+				var cardata = {
 					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,
+					milage: this.mileage?this.mileage:0,
+					brand: "",
+					displacement: "",
+					series: "",
+					annualmoney: "",
+					carModel: "",
+					saleName: "",
+					transmissionType: "",
+					model: "",
+					nLevelID: "",
+					engineType: "",
+					brandLogo: "",
 					buyDate: this.time,
-					guidePrice: this.carModelInfo.carModelInfo.guidePrice,
+					guidePrice: "",
 					vIN: this.vin,
-				}, 'POST').then(res => {
+				};
+				if(this.carModelInfo){
+					cardata = {
+						plateNumber: this.plateNo,
+						milage: this.mileage?this.mileage:0,
+						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,
+						buyDate: this.time,
+						guidePrice: this.carModelInfo.carModelInfo.guidePrice,
+						vIN: this.vin,
+					}
+				}
+				
+				this.$http('opencarInfoOwner/addCarOwner', cardata, 'POST').then(res => {
 					uni.hideLoading();
 					if (res.code == 0) {
 						uni.showToast({
@@ -344,25 +335,45 @@
 				})
 			},
 			updateTMemberCar() {
-				this.$http('opencarInfoOwner/addCarOwner', {
+				var cardata = {
 					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,
+					brand: "",
+					displacement: "",
+					series: "",
+					annualmoney: "",
+					carModel: "",
+					saleName: "",
+					transmissionType: "",
+					model: "",
+					nLevelID: "",
+					engineType: "",
+					brandLogo: "",
 					buyDate: this.time,
-					guidePrice: this.carModelInfo.carModelInfo.guidePrice,
+					guidePrice: "",
 					vIN: this.vin,
-					id: this.carId,
-				}, 'POST').then(res => {
+				};
+				if(this.carModelInfo){
+					cardata = {
+						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,
+						buyDate: this.time,
+						guidePrice: this.carModelInfo.carModelInfo.guidePrice,
+						vIN: this.vin,
+					}
+				}
+				this.$http('opencarInfoOwner/addCarOwner', cardata, 'POST').then(res => {
 					uni.hideLoading();
 					if (res.code == 0) {
 						uni.showToast({
@@ -444,7 +455,7 @@
 		-webkit-box-orient: vertical;
 	}
 
-	.rightArrow {
+	.big_rightArrow {
 		margin-right: 28rpx;
 		width: 14rpx;
 		height: 23rpx;
@@ -475,10 +486,10 @@
 	.mileageInput {
 		width: 20%;
 		font-size: 28rpx;
-	}
-	.vinInput{
-		width: 60%;
-		font-size: 28rpx;
+	}
+	.vinInput{
+		width: 60%;
+		font-size: 28rpx;
 	}
 
 	.kmStr {
@@ -508,12 +519,12 @@
 		font-size: 30rpx;
 		font-weight: bold;
 
-		text-align: center;
+		text-align: center;
 		line-height: 74rpx;
-	}
-	.line{
-		margin: 1rpx 28rpx;
-		background-color: #EEEEEE;
-		height: 1rpx;
 	}
-</style>
+	.line{
+		margin: 1rpx 28rpx;
+		background-color: #EEEEEE;
+		height: 1rpx;
+	}
+</style>

+ 2 - 27
pages/user/addCar/cailist.vue

@@ -87,18 +87,7 @@
 				})
 				
 				
-				// var length = this.carList.length
-				// if (length > 4) {
-				// 	uni.showToast({
-				// 		title: '库最多放五辆车,如果想添加,请先删除',
-				// 		icon: 'none',
-				// 		duration: 3000
-				// 	});
-				// } else {
-				// 	uni.navigateTo({
-				// 		url: 'addCar'
-				// 	})
-				// }
+	
 
 			},
 			editCar(id) {
@@ -114,21 +103,7 @@
 				})
 			},
 			
-			// itemClick(item) {
-			// 	if (this.fromMe == 'true') {
-			// 		return
-			// 	}
-			// 	uni.setStorage({
-			// 		key: 'maintainCarData',
-			// 		data: item,
-			// 		success: function() {
-			// 			uni.navigateBack({
-			// 				delta: 1
-			// 			})
-
-			// 		}
-			// 	});
-			// }
+			
 		}
 	}
 </script>

+ 1 - 1
pages/user/bespeakDetail.vue

@@ -330,7 +330,7 @@
 		font-size: 30rpx;
 		font-weight: bold;
 		color: #3C3C3C;
-		line-height: 42rpx;
+		line-height: 45rpx;
 	}
 
 	.Address {

+ 11 - 3
pages/user/myBespeak.vue

@@ -137,7 +137,7 @@
 	}
 
 	.carPlate {
-		margin-bottom: 20rpx;
+		margin-bottom: 22rpx;
 
 		display: flex;
 		align-items: center;
@@ -162,11 +162,19 @@
 
 	}
 
-	.shopName,
+	.shopName{
+		color: #666666;
+		font-size: 24rpx;
+		margin: 16rpx 0rpx;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 	.itemContent {
 		color: #666666;
 		font-size: 24rpx;
-		margin: 15rpx 0rpx;
+		
 		/* 隐藏文字显示 ...不换行 */
 		overflow: hidden;
 		text-overflow: ellipsis;

+ 11 - 11
pages/user/user.vue

@@ -3,7 +3,7 @@
 		<view class="topBox">
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 			<view class="nav" :style="{top: iStatusBarHeight + 'px'}">
-				<view>我的</view>
+				<view></view>
 			</view>
 		</view>
 
@@ -92,7 +92,7 @@
 			<view class="address">
 				<view class="Address">{{numList.shopInfo.provinceName}}{{numList.shopInfo.cityName}}{{numList.shopInfo.areaName}}{{numList.shopInfo.address}}
 				</view>
-				<view class="distance" v-if="numList.shopInfo.distance&&numList.shopInfo.distance!= '0.00'">{{numList.shopInfo.distance}}km</view>
+				<!-- <view class="distance" v-if="numList.shopInfo.distance&&numList.shopInfo.distance!= '0.00'">{{numList.shopInfo.distance}}km</view> -->
 			</view>
 
 
@@ -107,7 +107,7 @@
 					<image src="../../static/img/icon_me1.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">服务专家</view>
 				</view>
-				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
 
 
@@ -116,7 +116,7 @@
 					<image src="../../static/img/icon_me2.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">我的车库</view>
 				</view>
-				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
 
 
@@ -125,7 +125,7 @@
 					<image src="../../static/img/icon_me3.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">我的预约</view>
 				</view>
-				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
 
 
@@ -134,7 +134,7 @@
 					<image src="../../static/img/icon_me4.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">历史消费</view>
 				</view>
-				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
 
 			<view class="rowBox" @click="gonavigateTo('checkReport')">
@@ -142,7 +142,7 @@
 					<image src="../../static/img/icon_me5.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">车检报告</view>
 				</view>
-				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
 
 			<view class="rowBox" @click="gonavigateTo('invite')">
@@ -150,7 +150,7 @@
 					<image src="../../static/img/icon_me6.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">分享给好友</view>
 				</view>
-				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
 
 			<view class="rowBox" @click="gonavigateTo('invite')">
@@ -158,7 +158,7 @@
 					<image src="../../static/img/icon_me7.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">意见反馈</view>
 				</view>
-				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
 
 			<view class="rowBox" @click="gonavigateTo('')">
@@ -166,7 +166,7 @@
 					<image src="../../static/img/icon_me8.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">清除缓存</view>
 				</view>
-				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
 
 		</view>
@@ -480,7 +480,7 @@
 		z-index: 11;
 	}
 
-	.rightArrow {
+	.big_rightArrow {
 		margin-right: 20rpx;
 		width: 30rpx;
 		height: 30rpx;

BIN
static/img/big_rightArrow.png


BIN
static/img/icon_youhui_red.png


BIN
static/img/little_rightArrow.png


BIN
static/img/rightArrow.png