diff --git a/pages/index/index-skeleton.vue b/pages/index/index-skeleton.vue
index e2f6357..61ad3f7 100644
--- a/pages/index/index-skeleton.vue
+++ b/pages/index/index-skeleton.vue
@@ -31,7 +31,7 @@
7.54公里
- 已支付订金：123.00元抵扣200元
+ 已支付定金：123.00元抵扣200元
@@ -82,7 +82,7 @@
7.54公里
- 已支付订金：123.00元抵扣200元
+ 已支付定金：123.00元抵扣200元
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1c61ccd..9151fcc 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -27,7 +27,7 @@
{{formatDistance(item.order_info.lat, item.order_info.lng)}}
- 已支付订金：{{item.order_info.coupon.threshold}}元抵扣{{item.order_info.coupon.discount_value}}元
+ 已支付定金：{{item.order_info.coupon.threshold}}元抵扣{{item.order_info.coupon.discount_value}}元
diff --git a/pages/order/complete-service.vue b/pages/order/complete-service.vue
index 4388eb2..eae76b7 100644
--- a/pages/order/complete-service.vue
+++ b/pages/order/complete-service.vue
@@ -20,7 +20,7 @@
-
点击上传
@@ -94,13 +94,13 @@
-
+
收款信息
请上传收款成功图片（最多 1 张）
-
点击上传
@@ -113,7 +113,28 @@
+
+
+
+
+ 定金核销凭证
+ 请上传凭证图片（最多 4 张）
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
@@ -187,16 +208,10 @@ const upload = (type) => {
let fullUrl = res.cdnurl + '/' + res.key
- if (type === 'complete') {
- submitData.complete_images.push(fullUrl)
- }
-
- if (type === 'material_images') {
- submitData.material_images.push(fullUrl)
- }
-
- if (type === 'collectPayment') {
+ if (type === 'payment_image') {
submitData.payment_image = fullUrl
+ } else {
+ submitData[type].push(fullUrl)
}
helpers.showToast('上传成功')
@@ -289,8 +304,9 @@ const submitData = reactive({
payment_image: '',//收款图片
receive_type: null,//收款类型：1=定金,2=全款
is_material_used: 0,//是否使用材料：0=未使用,1=已使用
- material_cost: null,//材料成本
+ material_cost: 0,//材料成本
material_images: [],//材料凭证
+ off_images: [],//定金核销二维码
})
const selectFinalPaymentMethod = () => {
@@ -330,7 +346,7 @@ const validate = () => {
// 使用材料
if (submitData.is_material_used === 1) {
- if (submitData.material_cost === null) {
+ if (submitData.material_cost === 0) {
helpers.showToast('请输入材料成本')
return false
}
diff --git a/pages/order/order-info.vue b/pages/order/order-info.vue
index 4be3701..82a53a9 100644
--- a/pages/order/order-info.vue
+++ b/pages/order/order-info.vue
@@ -72,10 +72,6 @@
客户地址
{{helpers.removeCommas(data.order_info.area.merge_name)}}{{ data.order_info.address }}
-
- 订单详情
- {{data.order_info.detail ? data.order_info.detail : '暂无详情'}}
-
图片
@@ -85,7 +81,7 @@
- 平台备注
+ 订单备注
{{data.order_info.remark ? data.order_info.remark : '无备注信息'}}
@@ -179,6 +175,14 @@
¥{{ data.total > 0 ? data.total : data.online_total }}
+
+ 定金核销凭证
+
+
+
+
+
+
收款凭证
@@ -379,10 +383,10 @@ const getPriceDescText = () => {
if (orderInfo.status === 60) {
let tailText = orderInfo.total > 0 ? '线下收款¥' + orderInfo.total : '线上收款¥' + orderInfo.online_total
- return `服务价格(订金¥${orderInfo.order_info.online_amount}+${tailText})`
+ return `服务价格(定金¥${orderInfo.order_info.online_amount}+${tailText})`
}
- return `服务价格(已收订金¥${orderInfo.order_info.online_amount})`
+ return `服务价格(已收定金¥${orderInfo.order_info.online_amount})`
}
//获取订单状态文本
diff --git a/static/css/form.scss b/static/css/form.scss
index 71f73db..937fd64 100644
--- a/static/css/form.scss
+++ b/static/css/form.scss
@@ -69,6 +69,7 @@
}
}
.upload {
+ position: relative;
.info {
width: 100%;
height: 80rpx;