安徒生车辆修改

pages/index/index.vue

@@ -8,19 +8,22 @@
 		<view style="height: 43px;"></view>
 		<view class="topBox" :style="{background:'#'+themeColor}" v-if="getwxLoing"></view>
 		<view class="yuanhu" :style="{background:'#'+themeColor}" v-if="getwxLoing"></view>
-		<view class="shoptopbox2"  v-if="!carInfo">
+		<view class="shoptopbox2"  v-if="!userInfo&&getwxLoing">
 		  <view class="carinfoBox2">
 		    <view class="carinfoBoxNocar" @click="addCar">
-		        <img src="../../static/timg/addcar.png" alt="" class="carinfonocarIcon">
+		        <!-- <img src="../../static/timg/addcar.png" alt="" class="carinfonocarIcon">
 		        <view class="carinfoBoxNocarRight">
 		          <view class="carinfoBoxNocarRightTitle">添加我的爱车</view>
 		          <view class="carinfoBoxNocarRightMS">按照车型推荐合适的商品</view>
-		        </view>
+		        </view> -->
+				<image src="../../static/timg/pic_def_ava@2x.png" mode="" class="carinfonocarIcon"></image>
+				<view class="loginTitle">请先登录</view>
+				<view>{{userInfo}}</view>
 		    </view>
 		
 		  </view>
 		</view>
-		<view class="shoptopbox"  v-if="carInfo">
+		<view class="shoptopbox"  v-if="carInfo" >
 		  <view class="carinfoBox" >
 		      <view class="carinfoBoxTop">
 		        <img :src="carInfo.brandLogo" alt="" class="carLogo" v-if="carInfo.brandLogo">
@@ -308,6 +311,7 @@
 				qrimg:'',
 				qrSHow:false,
 				customerInfo:'',
+				userInfo:'',
 			}
 		},
 		onLoad(opt) {
@@ -800,6 +804,8 @@
 					if(this.wxOpenData.loginInfo){
 						this.$store.commit('mutationsuserInfo', that.wxOpenData.loginInfo.openUser)
 						this.userInfo=that.wxOpenData.loginInfo.openUser
+						console.log("this.userInfo")
+						console.log(this.userInfo)
 						that.queryManagerInfo()
 						uni.setStorage({
 							key: 'userInfo',
@@ -1481,6 +1487,13 @@
 		color: #3C3C3C;
 		font-size: 30rpx;
 	}
+	.loginTitle{
+		font-weight: 600;
+		color: #3C3C3C;
+		font-size: 30rpx;
+		padding-left: 20rpx;
+		line-height: 72rpx;
+	}
 	.carinfoBoxNocarRightMS{
 		color: #666666;
 		font-size: 26rpx;

pages/subPack/rescueOrderOrderDetail.vue

@@ -85,6 +85,10 @@
 				<view class="informationNum2" v-if="orderData.openShopHelpSheet.hscene==2">车库</view>
 				<view class="informationNum2" v-if="orderData.openShopHelpSheet.hscene==3">其他</view>
 			</view>
+			<view class="informationLine">
+				<view class="informationTxt">救援手机号：</view>
+				<view class="informationNum" >{{orderData.openShopHelpSheet.mobilePhone}}</view>
+			</view>
 		<!-- 	<view class="informationLine" v-if="orderData.openShopHelpSheet.plateNumber">
 				<view class="informationTxt">车牌号：</view>
 				<view class="informationNum">{{orderData.openShopHelpSheet.plateNumber}}</view>
@@ -118,12 +122,9 @@
 				<view class="informationTxt">下单时间：</view>
 				<view class="informationNum" >{{orderData.openShopHelpSheet.createTime}}</view>
 			</view>
+			
 			<view class="informationLine">
-				<view class="informationTxt">联系人手机号：</view>
-				<view class="informationNum" >{{orderData.openShopHelpSheet.mobilePhone}}</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">下单人：</view>
+				<view class="informationTxt">下单人手机：</view>
 				<view class="informationNum" > <span v-if="orderData.openShopHelpSheet.customerName">{{orderData.openShopHelpSheet.customerName|| '未知'}}/</span> {{orderData.openUser.mobilePhone}}</view>
 			</view>
 			

pages/user/addCar/cailist.vue

@@ -18,7 +18,7 @@
 					</view>
 				</view>
 				<view class="lineBottom">
-					<view class="lineDel" @click.stop="editCar(item.id)">编辑</view>
+					<!-- <view class="lineDel" @click.stop="editCar(item.id)">编辑</view> -->
 					<view class="lineDel" v-if="openMCar.showType==1" @click.stop="maintain(item)">保养信息</view>
 					<!-- <view class="Default" v-show="item.isDefault!=1" @click.stop="defaultCar(item)">设为默认</view>
 					<view class="DefaultYES" v-show="item.isDefault==1">已设为默认</view> -->
@@ -35,13 +35,11 @@
 
 
 
-		<view class="bottomView">
+		<!-- <view class="bottomView">
 			<view class="saveCar" :style="{background:'#'+themeColor}" @click="addBtn">
-				<!-- <image src="../../../static/img/icon_tianjiacheliang.png" mode=""
-					style="width: 44rpx; height: 36rpx; margin-right: 10rpx;"></image> -->
 				<view>添加爱车</view>
 			</view>
-		</view>
+		</view> -->
 
 	</view>
 </template>

pages/user/historyDetail.vue

@@ -47,11 +47,12 @@
 
 			</view>
             <view class="shopBox2">
-            	<view class="newboxTop">
+                <view class="newboxTop">
             		<view class="newline1">{{orderData.billsheet.CustomerName}}</view>
 					<view class="newline1" style="padding-left: 20rpx;">{{orderData.billsheet.PlateNumber}}</view>
             	</view>
-				<view class="CarModel">{{orderData.billsheet.CarModel}}</view>
+				
+				<view class="CarModel" v-if="orderData.billsheet.CarModel">{{orderData.billsheet.CarModel}}</view>
 				<view class="informationLine" >
 					<view class="informationTxt">进店里程：</view>
 					<view class="informationNum" v-if="orderData.billsheet.CurrentMileage>0">
@@ -157,17 +158,20 @@
 				<view class="detailedTitle">项目</view>
 				<view class="detailedLineBox">
 					<view class="detailedLine" v-for="(item,index) in orderData.listItems">
-
-						<view class="detailedName"><span v-if="item.CardDetailID" class="kaColor">卡</span>{{item.ItemName}}
-						</view>
-						<view class="secondBox" :class="{noLine:index == orderData.listItems.length-1}">
-							<view class="comment" v-if="ItemComment">{{item.Comment}}</view>
+                      <view style="display: flex;justify-content: space-between;">
+						  <view class="detailedName"><span v-if="item.CardDetailID" class="kaColor">卡</span>{{item.ItemName}}
+						  </view>
+						  <view class="price" v-if="ItemMoney">
+						  	<span>￥</span>
+						  	{{item.AmountMoney?item.AmountMoney:0}}
+						  </view>
+					  </view>
+						
+						<view class="secondBox" v-if="ItemComment" :class="{noLine:index == orderData.listItems.length-1}">
+							<view class="comment" >{{item.Comment}}</view>
 							<view class="secondRight">
 								<!-- <view class="grayPrice">￥{{item.CheckOutTaxRate}}</view> -->
-								<view class="price" v-if="ItemMoney">
-									<span>￥</span>
-									{{item.AmountMoney?item.AmountMoney:0}}
-								</view>
+								
 							</view>
 						</view>
 
@@ -230,7 +234,7 @@
 				</view>
 				<view class="goodscostLine" >
 					<view class="goodscostTxt">结算方式</view>
-					<view class="goodsCostNum" style="color: #333333;">{{orderData.billsheet.lastPayMethod?orderData.billsheet.lastPayMethod:''}}</view>
+					<view class="goodsCostNumJsfs" style="color: #333333;">{{orderData.billsheet.lastPayMethod?orderData.billsheet.lastPayMethod:''}}</view>
 				</view>
 			</view>
 
@@ -564,6 +568,9 @@
 		display: flex;
 		padding-left: 20rpx;
 		font-size: 30rpx;
+		border-bottom: 1rpx solid #EEEEEE;
+		font-weight: bold;
+		padding-bottom: 15rpx;
 	}
 	.baoyangtis{
 		font-size: 26rpx;
@@ -571,7 +578,10 @@
 	}
 	.CarModel{
 		font-size: 26rpx;
-		padding-left: 20rpx;
+		padding: 15rpx 20rpx;
+	}
+	.baoyangtis{
+		padding: 15rpx 20rpx 0 15rpx;
 	}
 	.box {
 		min-height: 100vh;
@@ -905,7 +915,9 @@
 		color: #FF0000;
 		font-weight: bold;
 	}
-
+    .goodsCostNumJsfs{
+		color: #333333;
+	}
 	.information {
 		width: 702rpx;
 		background: #FFFFFF;