完善下单逻辑及其ui展示,修复支付倒计时显示错误bug
This commit is contained in:
@@ -53,6 +53,8 @@ import ServicePageScaffold from '@/components/homeService/ServicePageScaffold.uv
|
||||
import ServicePanel from '@/components/homeService/ServicePanel.uvue'
|
||||
import { fetchConsumerAcceptanceDetail, submitConsumerAcceptance } from '@/services/homeServiceService.uts'
|
||||
import { HomeServiceAcceptanceType } from '@/types/home-service.uts'
|
||||
import { getCurrentUser, getCurrentUserId } from '@/utils/store.uts'
|
||||
import { goToLogin } from '@/utils/utils.uts'
|
||||
|
||||
const caseId = ref('')
|
||||
const detail = ref<HomeServiceAcceptanceType | null>(null)
|
||||
@@ -62,17 +64,31 @@ const selectedTags = ref<Array<string>>([])
|
||||
const scores = [1, 2, 3, 4, 5]
|
||||
const allTags = ['准时上门', '沟通清楚', '动作规范', '记录完整', '需进一步整改']
|
||||
|
||||
async function ensureLogin(): Promise<boolean> {
|
||||
const user = await getCurrentUser()
|
||||
if (user == null || getCurrentUserId() == '') {
|
||||
goToLogin('/pages/mall/consumer/home-service/feedback?id=' + caseId.value)
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
onLoad((options) => {
|
||||
const id = options['id']
|
||||
if (id != null) {
|
||||
caseId.value = id as string
|
||||
fetchConsumerAcceptanceDetail(caseId.value).then((res) => {
|
||||
if (res != null) {
|
||||
detail.value = res
|
||||
rating.value = res.rating
|
||||
feedback.value = res.feedback
|
||||
selectedTags.value = res.tags.slice(0)
|
||||
ensureLogin().then((ok) => {
|
||||
if (!ok) {
|
||||
return
|
||||
}
|
||||
fetchConsumerAcceptanceDetail(caseId.value).then((res) => {
|
||||
if (res != null) {
|
||||
detail.value = res
|
||||
rating.value = res.rating
|
||||
feedback.value = res.feedback
|
||||
selectedTags.value = res.tags.slice(0)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
@@ -87,6 +103,9 @@ function toggleTag(tag: string) {
|
||||
}
|
||||
|
||||
async function submitResult(approved: boolean) {
|
||||
if (!(await ensureLogin())) {
|
||||
return
|
||||
}
|
||||
if (caseId.value == '' || feedback.value == '') {
|
||||
uni.showToast({ title: '请填写反馈说明', icon: 'none' })
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user