diff --git a/config.js b/config.js
index ecb360c..87813a0 100644
--- a/config.js
+++ b/config.js
@@ -1,9 +1,9 @@
// 应用全局配置
module.exports = {
- // baseUrl: 'https://www.nuoyunr.com',
+ baseUrl: 'https://www.nuoyunr.com',
// baseUrl: 'http://124.222.105.7:48080',
// baseUrl: 'http://192.168.1.4:48080',
- baseUrl: "http://localhost:48080",
+ // baseUrl: "http://localhost:48080",
// baseUrl: "http://rzqhb7.natappfree.cc",
imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
baseImageUrl: 'https://www.nuoyunr.com/minio/',
@@ -15,7 +15,7 @@ module.exports = {
// 应用名称
name: "智修小助手",
// 应用版本
- version: "1.7",
+ version: "1.8",
// 应用logo
logo: "/static/logo.png'",
// 官方网站
diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index f6bebc2..74c5193 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -57,7 +57,7 @@
-
+
车主
{{ ticketInfo.userName }}
@@ -1107,6 +1107,10 @@ export default {
}else{
resultObj.maintenanceDate = '未知'
}
+ //最近保养公里数
+ if (!resultObj.maintenanceMileage){
+ resultObj.maintenanceMileage = '未知'
+ }
//预计竣工日期
if (null != resultObj.outTime){
resultObj.outTime = formatDate(resultObj.outTime)
@@ -1498,7 +1502,9 @@ export default {
//gap: 20rpx;
.tushi-box{
- font-size: 16px;
+ font-weight: 500;
+ font-size: 32rpx;
+ line-height: 40rpx;
display: flex;
align-items: center;
justify-content: center;
@@ -1536,7 +1542,7 @@ export default {
.projDate {
font-weight: 500;
- font-size: 28rpx;
+ font-size: 30rpx;
color: #636C8C;
display: flex;
@@ -1824,6 +1830,7 @@ export default {
padding: 40rpx 0;
font-weight: 500;
font-size: 32rpx;
+ line-height: 40rpx;
color: #333333;
border-bottom: 1rpx solid #EEEEEE;
display: flex;
@@ -1833,7 +1840,7 @@ export default {
width: 40rpx;
height: 40rpx;
background: #0174F6;
- border-radius: 18rpx 18rpx 18rpx 18rpx;
+ border-radius: 50%;
display: inline-block;
text-align: center;
line-height: 40rpx;
@@ -1871,6 +1878,7 @@ export default {
}
.infoItem {
+ padding: 20rpx 0;
display: flex;
justify-content: space-between;
font-weight: 500;
@@ -1944,18 +1952,20 @@ export default {
line-height: 1;
display: flex;
flex-direction: column;
- row-gap: 20rpx;
.orderTypeInfo {
+ padding: 10rpx 0;
font-weight: bold;
font-size: 40rpx;
color: #333333;
}
.orderStateInfo {
+ padding: 10rpx 0;
font-weight: 500;
font-size: 32rpx;
color: #666666;
}
.orderDateInfo {
+ padding: 10rpx 0;
font-weight: 500;
font-size: 32rpx;
color: #0174F6;
@@ -1970,7 +1980,8 @@ export default {
justify-content: center;
padding-bottom: 30rpx;
font-weight: 500;
- font-size: 28rpx;
+ font-size: 32rpx;
+ line-height: 40rpx;
}
.processList {
padding: 0 20rpx;
diff --git a/uni_modules/uni-steps/components/uni-steps/uni-steps.vue b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
index 1a84b71..4631bd0 100644
--- a/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
+++ b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
@@ -200,7 +200,7 @@
}
.uni-steps__column-text {
- padding: 6px 0px;
+ padding: 10px 0 2px 0;
border-bottom-style: solid;
border-bottom-width: 1px;
border-bottom-color: $uni-border-color;
@@ -217,9 +217,9 @@
}
.uni-steps__column-title {
- font-size: 28rpx;
- text-align: left;
- line-height: 32rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ line-height: 40rpx;
}
.uni-steps__row-desc {
@@ -229,9 +229,11 @@
}
.uni-steps__column-desc {
- font-size: 25rpx;
+ font-size: 30rpx;
text-align: left;
line-height: 32rpx;
+ padding: 10rpx 0;
+
}
.uni-steps__row-container {
@@ -300,20 +302,29 @@
}
.uni-steps__row-circle {
- width: 20px;
- height: 20px;
+ width: 40rpx;
+ height: 40rpx;
+ text-align: center;
border-radius: 50%;
background-color: #B7BDC6;
margin: 0px 3px;
+ display: inline-block;
+ line-height: 40rpx;
+ font-weight: 500;
+ font-size: 16px;
}
.uni-steps__column-circle {
- width: 20px;
- height: 20px;
+ width: 40rpx;
+ height: 40rpx;
text-align: center;
border-radius: 50%;
background-color: #B7BDC6;
margin: 4px 0px 5px 0px;
+ display: inline-block;
+ line-height: 40rpx;
+ font-weight: 500;
+ font-size: 16px;
}
.uni-steps__row-check {