Commit d2e14893 authored by 李超鹏's avatar 李超鹏

Merge remote-tracking branch 'origin/master'

parents ed3a0cea be2d69fa
......@@ -29,18 +29,25 @@
},
computed: {
type() {
let ty = this.item.fieldsType.toLocaleLowerCase()
if (this.item.fieldsId == 200) {
this.maxlength = 9
return 'digit'
} else {
if (this.item && ty == 'password') {
return this.item.fieldsType
}else if (this.item && ty == 'text') {
return 'textarea'
} else {
return 'text'
if (this.item) {
let ty = this.item.fieldsType.toLocaleLowerCase()
switch (ty) {
case 'text':
return 'textarea'
case 'password':
return this.item.fieldsType
case 'decimal':
case 'number':
case 'double':
case 'integer':
this.maxlength = 9
return 'digit'
case 'textarea':
default:
return 'text'
}
} else {
return 'text'
}
},
......
......@@ -26,8 +26,9 @@
</view>
<view class="line-view"></view>
<view class="reason-view" v-if="showReason"><text class="reason-text">未通过原因:</text>
<text v-for="(item, index) in orderData.auditResults" :key="index">{{item}}</text>
<view class="reason-view" v-if="showReason">
<view><text class="reason-title">未通过原因:</text></view>
<view class="reason-text"><text v-for="(item, index) in orderData.auditResults" :key="index">{{item}}</text></view>
</view>
<view class="bottom-view">
<view>
......@@ -187,8 +188,8 @@
return this.timeout ? '超' : '剩'
},
timeText() {
let time = this.orderType == 4 ? this.orderData.orderFinishDatetime : this.orderData.auditDatetime
return this.$u.timeFormat(time, 'yyyy.mm.dd hh:MM:ss')
let time = this.orderType == 4 ? this.orderData.orderFinishDatetime : this.orderData.auditDatetime
return time ? this.$u.timeFormat(time, 'yyyy.mm.dd hh:MM:ss') : ''
},
timeTitle() {
return this.orderType == 4 ? '提交时间:' : '审核时间:'
......@@ -230,11 +231,11 @@
this.orderType = 0
} else if (this.orderData.orderStatus == 31) {
if (this.orderData.appointmentDatetime) {
return this.orderType = 2
this.orderType = 2
} else {
this.orderType = 1
}
} else if (this.orderData.orderStatus > 31 || this.orderData.orderStatus < 80) {
} else if (this.orderData.orderStatus > 31 && this.orderData.orderStatus < 80) {
this.orderType = 3
} else if (this.orderData.orderStatus == 85 || this.orderData.orderStatus == 87) {
this.orderType = 4
......@@ -380,7 +381,8 @@
display: flex;
align-items: center;
align-items: flex-start;
text-align: left;
text-align: left;
margin-right: 30rpx;
.address-image {
width: 26rpx;
height: 28rpx;
......@@ -407,10 +409,15 @@
font-size: 26rpx;
color: #FA5A49;
display: flex;
align-items: flex-start;
.reason-text {
align-items: flex-start;
display: flex;
.reason-title {
flex-shrink: 0;
color: #666666;
}
.reason-text {
display: flex;
flex-direction: column;
}
}
......
......@@ -11,7 +11,7 @@
></u-navbar>
<view class="content-cody">
<u-cell-group :border="false">
<u-cell-item v-for="item in list" :title="item.name" :value="item.isUploadName" :arrow="true"
<u-cell-item v-for="(item, index) in list" :title="item.name" :value="item.isUploadName" :arrow="true" :key="index"
:value-style="{'color': item.color}" @click="toDetail(item.keyName)" :title-style="{'padding-left':'20rpx'}">
<u-icon slot="icon" size="32" name="checkmark-circle" :color="item.iconColor"></u-icon>
</u-cell-item>
......@@ -112,7 +112,7 @@
},
toDetail(key) {
let data = this.list[key].data;
if(data.status != 1){
if(!data.isUpload){
return;
}
wx.navigateTo({
......
......@@ -253,7 +253,7 @@
}
},
show200() {
return this.form.paymentMethodsType != '03'
return this.form.paymentMethodsType && this.form.paymentMethodsType != '03'
}
},
methods: {
......
......@@ -30,7 +30,7 @@
<text>{{ order.contactPhone }}</text>
</view>
<view class="between-cell address-cell">
<view class="left">
<view class="left-address">
<u-icon name="map" size="28"></u-icon>
<text class="address-txt">{{ formatAddress }}</text>
</view>
......@@ -323,13 +323,13 @@
}
})
} else {
uni.setClipboardData({
data: address,
success: function () {
console.log('success');
}
});
} else if (res.errMsg) {
// uni.setClipboardData({
// data: address,
// success: function () {
// console.log('success');
// }
// });
}
}
});
......@@ -857,9 +857,13 @@
display: flex;
justify-content: space-between;
align-items: center;
.left {
.left-address {
display: flex;
align-items: flex-start;
.address-txt {
line-height: 30rpx;
margin-left: 8rpx;
margin-right: 30rpx;
}
}
}
......@@ -949,19 +953,19 @@
z-index: 1;
}
.address-cell {
height: 24rpx;
font-size: 24rpx;
font-weight: 400;
color: #333333;
line-height: 24rpx;
// .address-cell {
// height: 24rpx;
// font-size: 24rpx;
// font-weight: 400;
// color: #333333;
// line-height: 24rpx;
.left {
.address-txt {
margin-left: 8rpx;
}
}
}
// .left {
// .address-txt {
// margin-left: 8rpx;
// }
// }
// }
}
.record-item {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment