`

components/reservationOrder/reservationOrder.vue

@@ -18,7 +18,7 @@
 			</view>
 			<view class="line">
 				<image class="line-icon" src="../../static/icons/order-icon3.png" mode="aspectFit"></image>
-				<text class="line-text">{{orderInfo.busiTypeStr}}</text>
+				<text class="line-text">{{orderInfo.repairTypeText}}</text>
 			</view>
 			<view class="line" v-if="orderInfo.adviser">
 				<text class="line-text">服务顾问：{{orderInfo.adviser.nickname}}  <text @click="callPhone(orderInfo.adviser.mobile)">电话：{{orderInfo.adviser.mobile}}</text></text>

pages-shop/shopDetail/shopDetail.vue

@@ -68,20 +68,6 @@
 		<view class="footer">
 			<view class="btn" @click="gotoReservation">开始预约</view>
 		</view>
-    <view>
-      <!-- 普通弹窗 -->
-      <uni-popup ref="popup" background-color="#fff">
-        <view  :class="{ 'popup-height': type === 'left' || type === 'right' }">
-          <view class="popup-content">
-            <text class="text">{{info.corpName}}申请获取您的个人信息、车辆信息。</text>
-          </view>
-          <view class="popup-button">
-            <button type="default" @click="cancelReservation">取消</button>
-            <button type="primary" @click="gotoReservation">授权</button>
-          </view>
-        </view>
-      </uni-popup>
-    </view>
 	</view>
 </template>
 
@@ -124,25 +110,9 @@
       }
 		},
 		onShow() {
-		  this.cancelReservation()
 			this.getServer()
 		},
 		methods: {
-      /**
-       * 弹出层
-       * @param type 位置
-       */
-      toggle(type) {
-        this.type = type
-        // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
-        this.$refs.popup.open(type)
-      },
-      /**
-       * 取消授权
-       */
-      cancelReservation(){
-        this.$refs.popup.close()
-      },
 			// 去预约
 			gotoReservation() {
 				if(getToken()){

pages/myReservation/addReservation.vue

@@ -26,13 +26,13 @@
 					<view class="cardInfoBody_footer">
 						<view class="nj">
 							年检时间：<text class="date">{{car.nextInspectionDate || '未获取到'}}</text>
-							<image class="cardInfoBody_footerIcon" src="../../static/icons/icon2.png" mode="aspectFit">
+<!--							<image class="cardInfoBody_footerIcon" src="../../static/icons/icon2.png" mode="aspectFit">-->
-							</image>
+<!--							</image>-->
 						</view>
 						<view class="bx">
 							保险时间：<text class="date">{{car.insuranceExpiryDate || '未获取到'}}</text>
-							<image class="cardInfoBody_footerIcon" src="../../static/icons/icon2.png" mode="aspectFit">
+<!--							<image class="cardInfoBody_footerIcon" src="../../static/icons/icon2.png" mode="aspectFit">-->
-							</image>
+<!--							</image>-->
 						</view>
 					</view>
 				</view>
@@ -111,6 +111,7 @@
 	import VNavigationBar from '@/components/VNavigationBar.vue'
   import config from "@/config";
   import {getToken,getUserInfo,getJSONData} from '@/utils/auth'
+  import {formatDate} from '@/utils/utils'
 
 	export default {
 		components: {
@@ -284,6 +285,14 @@
 					url: "/userClient/base/myCar/get",
 					method: "get"
 				})
+        res.data.map((item)=>{
+          if(item.nextInspectionDate){
+            item.nextInspectionDate = formatDate(item.nextInspectionDate)
+          }
+          if(item.insuranceExpiryDate){
+            item.insuranceExpiryDate = formatDate(item.insuranceExpiryDate)
+          }
+        })
 				this.carList = res.data
 				if(this.carList && this.carList.length > 0){
 					this.car = this.carList[0]
@@ -446,7 +455,7 @@
 				display: flex;
 				align-items: center;
 				font-weight: 500;
-				font-size: 28rpx;
+				font-size: 26rpx;
 				color: #333333;
 				padding-top: 20rpx;
 

pages/myReservation/myReservation.vue

@@ -19,14 +19,12 @@
 
 <script>
 	import VNavigationBar from '@/components/VNavigationBar.vue'
-	import tabBarVue from '@/components/tabBar/tabBar.vue'
+	import reservationOrderVue from '@/components/reservationOrder/reservationOrder.vue'
-	import reservationOrderVue from '../../components/reservationOrder/reservationOrder.vue'
   import request from "@/utils/request";
   import {getToken} from '@/utils/auth.js'
 
 	export default {
 		components: {
-			tabBarVue,
 			VNavigationBar,
 			reservationOrderVue
 		},
@@ -112,7 +110,6 @@
             title: item.company.corpName,
             address: item.company.address,
             phone: item.company.mobilePhone,
-            busiTypeStr: item.repairTypeText?item.repairTypeText:"",
             status: item.bookingStatus
           }
         })

pages/myReservation/reservationSuccess.vue

@@ -21,13 +21,13 @@
 						<!-- 15726506879 -->
 						{{info.mobilePhone}}
 					</view>
-					<view class="baseInfo">
+					<view class="baseInfo" v-if="info.serviceName">
 						<image class="baseInfoIcon" src="../../static/icons/order-icon3.png" mode=""></image>
 						<!-- 汽车维修 -->
-						{{info.serviceName || "维修"}}
+						{{info.serviceName}}
 					</view>
-					<view class="baseInfo" @click="callPhone(info.adviserMobile)">
+					<view v-if="info.adviserName" class="baseInfo" @click="callPhone(info.adviserMobile)">
-						服务顾问：{{info.adviserName}}&nbsp;&nbsp;联系电话：{{info.adviserMobile}}
+						感谢您的预约！我是您的专属服务顾问：{{info.adviserName}}，我的联系电话：{{info.adviserMobile}}，有任何问题您可随时与我联系。
 					</view>
 				</view>
 			</view>
@@ -133,7 +133,7 @@
 
 		.baseInfo {
 			font-weight: 500;
-			font-size: 24rpx;
+			font-size: 28rpx;
 			color: #999999;
 			margin-top: 30rpx;