diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue
index 175c7f2..58b2161 100644
--- a/subPackages/order/detail.vue
+++ b/subPackages/order/detail.vue
@@ -19,14 +19,14 @@
- 还剩{{remainNum}}张未核销
+ 还剩{{remainNum}}张未核销
{{item.specifications_name}}
-
+
核销码:{{item.child_id}}
@@ -247,7 +247,7 @@
{{info.order_child[0].goods_data.address}}
- 距您约{{info.order_child[0].goods_data.distance > 1000 ? info.order_child[0].goods_data.distance / 1000 + 'km' : info.order_child[0].goods_data.distance + 'm'}}
+ 距您约{{info.order_child[0].goods_data.distance > 1000 ? (info.order_child[0].goods_data.distance / 1000).toFixed(2) + 'km' : info.order_child[0].goods_data.distance + 'm'}}
@@ -256,7 +256,7 @@
+ @click="openLocation(info.order_child[0].goods_data.lat,info.order_child[0].goods_data.lon)">
@@ -461,7 +461,7 @@
}
// 景点、美食二维码
- if (['ticket', 'food'].includes(this.info.order_child[0].goods_genre)) {
+ if (['ticket', 'food'].includes(this.info.order_child[0].goods_genre) || (this.info.order_child[0].contact_id && this.info.order_child[0].extract_id)) {
if (['PAYMENT_SUCCESSFULLY', 'WAIT_REFUND', 'REFUND_SUCCESS', 'WAIT_COMMENT', 'COMPLETED']
.includes(this.info.status)) {
this.isQrcode = true
@@ -490,7 +490,6 @@
},
// 生成二维码
getCodeImg(code, index) {
- console.log(code)
new QRCode('qrcodeT' + index, {
text: code,
width: 150,
@@ -498,9 +497,8 @@
padding: 2,
colorDark: 'rgb(0,0,0)',
colorLight: 'rgb(255,255,255)',
- correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
+ correctLevel: QRCode.CorrectLevel.M, // 二维码可辨识度
callback: res => {
- console.log(res)
this.$set(this.info.order_child[index], 'qrcodeimg', res.path);
this.$forceUpdate();
}
@@ -762,7 +760,6 @@
image {
width: 300rpx;
height: 300rpx;
- border-radius: 10rpx;
}
.qrcode-title {