1
This commit is contained in:
parent
695f0bf8e2
commit
b223bede02
@ -1,12 +1,12 @@
|
||||
// 应用全局配置
|
||||
module.exports = {
|
||||
// baseUrl: 'https://www.nuoyunr.com',
|
||||
baseUrl: 'https://www.nuoyunr.com',
|
||||
// baseUrl: 'http://192.168.1.17:48080',
|
||||
// baseUrl: "http://192.168.1.4:48080",
|
||||
baseUrl: "http://localhost:48080",
|
||||
// baseUrl: "http://localhost:48080",
|
||||
imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
|
||||
baseImageUrl: 'https://www.nuoyunr.com/minio/',
|
||||
wsUrl: 'wss://www.nuoyunr.com',
|
||||
wsUrl: 'ws://192.168.1.17:48080',
|
||||
// 应用信息
|
||||
appInfo: {
|
||||
// 应用名称
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -32,7 +32,7 @@
|
||||
v-for="(item,index) in options" :key="index" :style="{height: direction === 'column'?heightArr[index]+'px':'14px'}">
|
||||
<view
|
||||
:class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--before':'uni-steps__row-line--before']"
|
||||
:style="{backgroundColor:index<=active&&index!==0?activeColor:index===0?'transparent':deactiveColor}">
|
||||
>
|
||||
</view>
|
||||
<!-- <view :class="[direction==='column'?'uni-steps__column-check':'uni-steps__row-check']"-->
|
||||
<!-- v-if="index === active">-->
|
||||
@ -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 {
|
||||
@ -278,7 +280,7 @@
|
||||
|
||||
.uni-steps__column-line {
|
||||
width: 1px;
|
||||
background-color: #B7BDC6;
|
||||
//background-color: #B7BDC6;
|
||||
}
|
||||
|
||||
.uni-steps__row-line--after {
|
||||
@ -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 {
|
||||
|
@ -37,19 +37,25 @@ function getOrderStatusText(ticketsStatus,workStatus){
|
||||
let str = "";
|
||||
if("04"==ticketsStatus){
|
||||
//待派工
|
||||
str = "待派工"
|
||||
}else if("05"==ticketsStatus || "07"==ticketsStatus){
|
||||
str = "待维修"
|
||||
}else if("05"==ticketsStatus){
|
||||
//维修中
|
||||
str = "维修中"
|
||||
}else if("01"==ticketsStatus){
|
||||
//待结算
|
||||
str = "待取车结算"
|
||||
//待取车结算
|
||||
str = "已竣工"
|
||||
}else if("06"==ticketsStatus){
|
||||
//挂单/记账
|
||||
str = "挂单/记账"
|
||||
str = "已结算"
|
||||
}else if("07"==ticketsStatus){
|
||||
//待通知客户取车
|
||||
str = "已竣工"
|
||||
}else if("08"==ticketsStatus){
|
||||
//已交车
|
||||
str = "已交车"
|
||||
}else if("02"==ticketsStatus){
|
||||
//已结账
|
||||
str = "已结账"
|
||||
str = "已结算"
|
||||
}else if("03"==ticketsStatus){
|
||||
//已作废
|
||||
str = "已作废"
|
||||
|
Loading…
Reference in New Issue
Block a user