1.改样式

pages/changeStore/changeStore.vue

@@ -166,7 +166,7 @@
 						
 						uni.showModal({
 						    title: '更换门店申请成功，请等待平台处理',
-						    content: '您可以在【我的-更换门店申请记录】列表里具体查看申请的处理进度哦~',
+						    content: '您可以在【我的-更换门店申请记录】里查看申请的处理进度哦',
 							showCancel:false,
 							confirmText:'知道了',
 						    success: function (res) {
@@ -204,7 +204,7 @@
 						
 						uni.showModal({
 						    title: '更换门店申请成功，请等待平台处理',
-						    content: '您可以在【我的-更换门店申请记录】列表里具体查看申请的处理进度哦~',
+						    content: '您可以在【我的-更换门店申请记录】里查看申请的处理进度哦',
 							showCancel:false,
 							confirmText:'知道了',
 						    success: function (res) {

pages/changeStore/changeStoreDetail.vue

@@ -224,7 +224,7 @@
 				});
 			},
 			cancelBtn(){
-				
+				var that = this
 					uni.showLoading({
 						title: '加载中'
 					})
@@ -244,9 +244,7 @@
 								duration: 2000,
 							});
 							setTimeout(function() {
-								uni.navigateBack({
-									
-								})
+								that.getData()
 							}, 2000); 	
 						}
 						

pages/iPhone/phoneList.vue

@@ -94,7 +94,7 @@ export default {
 		display: flex;
 		justify-content: space-between;
 		padding: 30rpx;
-		border-bottom: 1px solid #DDDDDD;
+		border-bottom: 1rpx solid #EEEEEE;
 	}
 	.phoneEdit{
 		width: 40rpx;

pages/index/cailist.vue

@@ -249,7 +249,7 @@
 		font-size: 22rpx;
 		margin-left: 20rpx;
 		margin-top: 5rpx;
-		width: 120rpx;
+		
 	}
 
 	.carMS {

pages/index/index.vue

@@ -53,7 +53,7 @@
 			
 			<view class="mesView">
 				<view class="leftTitle">车型</view>
-				<view class="carModBtn selectColor" v-if="memberCar">{{memberCar.carModel}}</view>
+				<view class="carModBtn selectColor carMod" v-if="memberCar">{{memberCar.carModel}}</view>
 				<view class="carModBtn noSelectColor" v-else>车型</view>
 
 			</view>
@@ -417,7 +417,15 @@
 		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;

pages/me/aboutMe.vue

@@ -46,7 +46,7 @@
 	.content {
 		background: #F4F5F7;
 		min-height: 100vh;
-
+		padding: 0 24rpx;
 	}
 	
 </style>

pages/me/discountDetail.vue

@@ -18,12 +18,12 @@
 				
 				<view  v-if="detailData.EndOffsetDays===null||detailData.EndOffsetDays==='null'||detailData.EndOffsetDays===''">
 					
-					<view class="valid same" >有效期：{{detailData.StartTime.slice(0,detailData.StartTime.length-8)}}至 {{detailData.EndTime.slice(0,detailData.EndTime.length-8)}}</view>
+					<view class="same" >有效期：{{detailData.StartTime.slice(0,detailData.StartTime.length-8)}}至 {{detailData.EndTime.slice(0,detailData.EndTime.length-8)}}</view>
 				</view>
 				<view v-else>
 				
-					<view class="valid same" v-if="detailData.EndOffsetDays>-1">有效期：自领取后，{{detailData.EndOffsetDays}}天有效</view>
-				     <view class="valid same" v-if="detailData.EndOffsetDays==-1||detailData.EndOffsetDays==null||detailData.EndOffsetDays=='null'">有效期：{{detailData.StartTime.slice(0,detailData.StartTime.length-8)}}至 {{detailData.EndTime.slice(0,detailData.EndTime.length-8)}}</view>
+					<view class="same" v-if="detailData.EndOffsetDays>-1">有效期：自领取后，{{detailData.EndOffsetDays}}天有效</view>
+				     <view class="same" v-if="detailData.EndOffsetDays==-1||detailData.EndOffsetDays==null||detailData.EndOffsetDays=='null'">有效期：{{detailData.StartTime.slice(0,detailData.StartTime.length-8)}}至 {{detailData.EndTime.slice(0,detailData.EndTime.length-8)}}</view>
 				</view>
 				
 				
@@ -32,16 +32,16 @@
 
 			<!-- thirdView -->
 			<view class="thirdView">
-				<view class="thirdTitle">使用说明</view>
+				<view class="thirdTitle">适用门店</view>
 				<view class="store">
-					<view class="grayPoint"></view>
-					<view class="same">适用门店：{{detailData.shopNames}}</view>
+					<!-- <view class="grayPoint"></view> -->
+					<view class="same">{{detailData.shopNames}}</view>
 				</view>
 			</view>
 			
 			<!-- 列表 -->
 			<view class="itemContent">
-				<view class="thirdTitle">注意事项</view>
+				<view class="thirdTitle">使用说明</view>
 				<rich-text :nodes="couContent" style="color: #666666; font-size: 26rpx;"></rich-text>
 				<!-- <view v-for="(item,index) in itemData" :key="index">
 					<view class="store">
@@ -155,11 +155,10 @@
 
 	.secondView {
 		padding: 30rpx 40rpx;
+		
 	}
 
-	.valid {
-		margin-bottom: 20rpx;
-	}
+
 
 	.same {
 		font-size: 28rpx;

pages/me/intimity.vue

@@ -46,7 +46,7 @@
 	.content {
 		background: #F4F5F7;
 		min-height: 100vh;
-
+		padding: 0 24rpx;
 	}
 	
 </style>

pages/me/me.vue

@@ -76,6 +76,7 @@
 				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
 			</view>
 			
+			<view class="grayline"></view>
 			<view class="rowBox" @click="gonavigateTo('../changeStore/changeStoreList')">
 				<view class="leftView">
 					<image src="../../static/img/icon_tihuan.png" mode="" class="liftIcon"></image>

pages/me/treaty.vue

@@ -46,6 +46,6 @@
 	.content {
 		background: #F4F5F7;
 		min-height: 100vh;
-
+		padding: 0 24rpx;
 	}
 </style>

pages/module/confirmOrder.vue

@@ -491,7 +491,7 @@ export default {
 <style scoped>
 	.topTIs{
 		font-size: 26rpx;
-		text-align: center;
+		padding-left: 16rpx;
 		color: #C8841C;
 		height: 72rpx;
 		background: #FFF7EB;

pages/order/myorder.vue

@@ -222,19 +222,23 @@
 		justify-content: space-between;
 		line-height: 92rpx;
 		position: fixed;
-		width: 100%;
+		width: calc(100vw - 48rpx);
+		padding-left: 24rpx;
+		padding-right: 24rpx;
 		height: 92rpx;
 		z-index: 11;
 	}
 
 	.tabLine {
-		width: 180rpx;
+		
+		font-size: 30rpx;
 		text-align: center;
 	}
 
 	.tabActive {
 		color: #FF4F00;
 		border-bottom: 4rpx solid #FF4F00;
+		
 	}
 
 	.main {

pages/refundMoney/refundMoney.vue

@@ -128,7 +128,7 @@
 					if(res.code==0){
 						uni.showModal({
 						    title: '退款申请成功，请等待平台处理',
-						    content: '您可以在【我的-退款申请记录】列表里具体查看申请的处理进度哦~',
+						    content: '您可以在【我的-退款申请记录】里查看申请的处理进度哦',
 							showCancel:false,
 							confirmText:'知道了',
 						    success: function (res) {
@@ -161,7 +161,7 @@
 					if(res.code==0){
 						uni.showModal({
 						    title: '退款申请成功，请等待平台处理',
-						    content: '您可以在【我的-退款申请记录】列表里具体查看申请的处理进度哦~',
+						    content: '您可以在【我的-退款申请记录】里查看申请的处理进度哦',
 							showCancel:false,
 							confirmText:'知道了',
 						    success: function (res) {

pages/refundMoney/refundMoneyDetail.vue

@@ -207,6 +207,7 @@
 			},
 			cancelBtn(){
 				
+					var that = this
 					uni.showLoading({
 						title: '加载中'
 					})
@@ -226,9 +227,7 @@
 								duration: 2000,
 							});
 							setTimeout(function() {
-								uni.navigateBack({
-									
-								})
+								that.getData()
 							}, 2000); 	
 						}
 						

pages/shop/shopList.vue

@@ -313,11 +313,12 @@
 	.screen {
 		display: flex;
 		justify-content: space-around;
-		padding: 0 24rpx 16rpx 24rpx;
+		padding: 0 24rpx 24rpx;
+		align-items: center;
 		border-bottom: 2rpx solid #EEEEEE;
 		position: relative;
 		background: #FFFFFF;
-		height: 60rpx;
+		
 	}
 
 	.screenLine {