hant/wanyu_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 优化

Browse Source
This commit is contained in:
苟川东 2025-04-20 08:46:26 +08:00
parent 2b69628ce7
commit 68b426bc65
7 changed files with 71 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/me-button/me-button.vue
View File

@ -142,8 +142,6 @@ const submit = () => {
font-size: 30rpx;
line-height: 112rpx;
text-align: center;
color: transparent;
transition: background .2s ease;
.text {
height: 96rpx;
line-height: 96rpx;
@ -160,7 +158,6 @@ const submit = () => {
.btn {
border: 1px solid var(--contentBgColor);
box-sizing: border-box;
background-color: transparent;
}
}
}

18
pages/index/index.vue
View File

@ -68,7 +68,12 @@ const acceptOrder = (index, id) => {
content: '接单后请及时和客户联系，确认接单？',
success: function (res) {
if (res.confirm) {
uni.showLoading({
title: '接单中'
});
api.orderConfirm({type: 'accept', order_dispatch_id: id}).then(res => {
uni.hideLoading();
helpers.showToast('已接单')
data.list.splice(index, 1)
}).catch(() => {})
@ -81,10 +86,19 @@ const rejectOrder = (index, id) => {
uni.showModal({
title: '拒接提示',
confirmText: '确认',
content: '确认拒接该单？',
editable: true,
placeholderText: '请输入拒接原因',
success: function (res) {
if (res.confirm) {
api.orderConfirm({type: 'reject', order_dispatch_id: id}).then(res => {
if (!res.content) {
return helpers.showToast('请输入拒接原因')
}
uni.showLoading({
title: '拒接中'
});
api.orderConfirm({type: 'reject', order_dispatch_id: id, reject_reason: res.content}).then(() => {
uni.hideLoading();
helpers.showToast('已拒接')
data.list.splice(index, 1)
}).catch(() => {})

2
pages/order/arrived-on-site.vue
View File

@ -126,7 +126,7 @@ const submit = throttle(() => {
icon: "success"
})
setTimeout(() => {
helpers.jumpToPage('order-info', `id=${id.value}`, 'redirectTo')
uni.navigateBack();
}, 1000)
}).catch(() => {})
}

8
pages/order/complete-service.vue
View File

@ -39,7 +39,7 @@
<!-- 线下收款需选择尾款收款方-->
<view v-if="submitData.final_payment_method === 1" class="item input flex-sb line-after" @click="selectOfflineTotalType()">
<view class="title flex-l">尾款收款方</view>
<view v-if="submitData.offline_total_type === null" class="select-ctr flex-r">请选择尾款收款方</view>
<view v-if="submitData.offline_total_type === 0" class="select-ctr flex-r">请选择尾款收款方</view>
<view v-else class="select-ctr flex-r select">{{submitData.offline_total_type === 1 ? '师傅收' : '公司收'}}</view>
</view>
<view class="item input flex-sb line-after">
@ -185,7 +185,7 @@ const submit = throttle(() => {
icon: "success"
})
setTimeout(() => {
helpers.jumpToPage('order-info', `id=${id.value}`, 'redirectTo')
uni.navigateBack();
}, 1000)
}).catch(() => {})
}
@ -214,7 +214,7 @@ const init = () => {
const submitData = reactive({
complete_images: [],//完成图片
final_payment_method: null,//尾款支付方式：1=线下尾款,2=线上尾款
offline_total_type: null,//尾款收款方：1=师傅收,2=公司收
offline_total_type: 0,//尾款收款方：1=师傅收,2=公司收
amount: '',//收款金额
payment_image: '',//收款图片
})
@ -255,7 +255,7 @@ const validate = () => {
return false
}
if (submitData.final_payment_method === 1 && submitData.offline_total_type === null) {
if (submitData.final_payment_method === 1 && submitData.offline_total_type === 0) {
helpers.showToast('请选择尾款收款方')
return false
}

49
pages/order/order-info.vue
View File

@ -57,7 +57,7 @@
</view>
</view>
<!-- 已上门-->
<!-- 已上门、已完成 显示上门时间-->
<view class="info" v-if="[enums.ORDER_DISPATCH_STATUS.STATUS_CLOCK, enums.ORDER_DISPATCH_STATUS.STATUS_FINISH].includes(data.status)">
<view class="item-row flex-sb line-after">
<view class="title flex-l">上门时间</view>
@ -75,6 +75,44 @@
</view>
</view>
<!-- 已完成 -->
<view class="info" v-if="data.status === enums.ORDER_DISPATCH_STATUS.STATUS_FINISH">
<view class="images line-after">
<view class="title flex-l">完成图片</view>
<view class="imgs-ctr">
<view @click="previewImage(imgUrl)" v-for="(imgUrl, index) in data.images" :key="index" class="img-ctr" :style="{marginRight: (index+1) % 5 === 0 ? '0' : '36rpx'}">
<image class="img" mode="aspectFill" :src="imgUrl"></image>
</view>
</view>
</view>
<view class="item-row flex-sb line-after" v-if="data.order_info.receive_type === 1">
<view class="title flex-l">优惠信息</view>
<view class="value flex-r">
<text>{{data.order_info.online_amount}}元抵扣{{data.order_info.discount_amount}}元</text>
</view>
</view>
<view class="item-row flex-sb line-after">
<view class="title flex-l">尾款收款方</view>
<view class="value flex-r">
<text>{{ data.offline_total_type === 1 ? '师傅收' : '公司收' }}</text>
</view>
</view>
<view class="item-row flex-sb line-after">
<view class="title flex-l">收款金额</view>
<view class="value flex-r">
<text>¥{{ data.total > 0 ? data.total : data.online_total }}</text>
</view>
</view>
<view class="images">
<view class="title flex-l">收款凭证</view>
<view class="imgs-ctr">
<view @click="previewImage(data.image)" :key="index" class="img-ctr">
<image class="img" mode="aspectFill" :src="data.image"></image>
</view>
</view>
</view>
</view>
<me-empty-space height="376"></me-empty-space>
<!-- 待接单-->
@ -165,6 +203,10 @@ const rejectOrder = () => {
placeholderText: '请输入拒接原因',
success: function (res) {
if (res.confirm) {
if (!res.content) {
return helpers.showToast('请输入拒接原因')
}
api.orderConfirm({type: 'reject', order_dispatch_id: id.value, reject_reason: res.content}).then(() => {
helpers.showToast('已拒接')
init()
@ -185,8 +227,12 @@ onShow(() => {
const data = ref(null)
const init = () => {
uni.showLoading({
title: '获取中'
});
api.orderInfo({order_dispatch_id: id.value}).then(res => {
data.value = res
uni.hideLoading();
}).catch(() => {})
}
@ -303,6 +349,7 @@ const previewImage = (url) => {
}
.images {
width: 100%;
position: relative;
.title {
width: 100%;
height: 80rpx;

2
pages/order/select-time.vue
View File

@ -53,7 +53,7 @@ const submit = throttle(() => {
icon: "success"
})
setTimeout(() => {
helpers.jumpToPage('order-info', `id=${id.value}`, 'redirectTo')
uni.navigateBack();
}, 1000)
}).catch(() => {})
}

2
pages/workbench/workbench.vue
View File

@ -106,7 +106,7 @@ const call = (tel) => {
});
}
onLoad(() => {
onShow(() => {
init()
})