diff --git a/components/reservationOrder/reservationOrder.vue b/components/reservationOrder/reservationOrder.vue
index 895fbc2..50ea481 100644
--- a/components/reservationOrder/reservationOrder.vue
+++ b/components/reservationOrder/reservationOrder.vue
@@ -18,7 +18,7 @@
- {{orderInfo.busiTypeStr}}
+ {{orderInfo.repairTypeText}}
服务顾问:{{orderInfo.adviser.nickname}} 电话:{{orderInfo.adviser.mobile}}
diff --git a/pages-shop/shopDetail/shopDetail.vue b/pages-shop/shopDetail/shopDetail.vue
index 0bb1880..f485101 100644
--- a/pages-shop/shopDetail/shopDetail.vue
+++ b/pages-shop/shopDetail/shopDetail.vue
@@ -68,20 +68,6 @@
-
-
-
-
-
-
-
-
-
@@ -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()){
diff --git a/pages/myReservation/addReservation.vue b/pages/myReservation/addReservation.vue
index e4ea0db..3a5074e 100644
--- a/pages/myReservation/addReservation.vue
+++ b/pages/myReservation/addReservation.vue
@@ -26,13 +26,13 @@
年检时间:{{car.nextInspectionDate || '未获取到'}}
-
-
+
+
保险时间:{{car.insuranceExpiryDate || '未获取到'}}
-
-
+
+
@@ -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;
diff --git a/pages/myReservation/myReservation.vue b/pages/myReservation/myReservation.vue
index beb0580..9314f36 100644
--- a/pages/myReservation/myReservation.vue
+++ b/pages/myReservation/myReservation.vue
@@ -19,14 +19,12 @@