master
jevononlie 7 months ago
parent 6020dbb5f4
commit 88d5c3c5d2

@ -3,7 +3,7 @@ import { OrderState } from '@/services/constants'
import { orderStateList } from '@/services/constants' import { orderStateList } from '@/services/constants'
import { getListOrderAPI, postOrderAcceptAPI, postOrderReachAPI } from '@/services/order' import { getListOrderAPI, postOrderAcceptAPI, postOrderReachAPI } from '@/services/order'
import { ref, reactive, watch } from 'vue' import { ref, reactive, watch } from 'vue'
import { onLoad, onReady } from '@dcloudio/uni-app' import { onLoad, onReady, onShow } from '@dcloudio/uni-app'
import { useMemberStore } from '@/stores' import { useMemberStore } from '@/stores'
import QQMapWX from '@/libs/qqmap-wx-jssdk1.2/qqmap-wx-jssdk.min.js' import QQMapWX from '@/libs/qqmap-wx-jssdk1.2/qqmap-wx-jssdk.min.js'
import { getDistance } from '@/utils/index' import { getDistance } from '@/utils/index'
@ -67,6 +67,12 @@ const getMemberOrderData = async () => {
isFinish.value = true isFinish.value = true
} }
} }
onShow(() => {
isFinish.value = false
isLoading.value = false
orderList.value = []
getMemberOrderData()
})
onReady(() => { onReady(() => {
getSettingInfo() getSettingInfo()
}) })
@ -244,7 +250,6 @@ const getAuthorizeInfo = () => {
}, },
}) })
} }
getSettingInfo()
</script> </script>
<template> <template>

@ -2,7 +2,7 @@
import { ref, computed } from 'vue' import { ref, computed } from 'vue'
import { useMemberStore } from '@/stores' import { useMemberStore } from '@/stores'
import DataList from './components/DataList.vue' import DataList from './components/DataList.vue'
import { onReady, onLoad } from '@dcloudio/uni-app' import { onReady, onShow } from '@dcloudio/uni-app'
// //
const orderAcceptPopup = ref<UniHelper.UniPopupInstance>() const orderAcceptPopup = ref<UniHelper.UniPopupInstance>()
@ -21,24 +21,13 @@ const orderTabs = ref([
// //
const activeIndex = ref(orderTabs.value.findIndex((v) => v.orderState === 'PENDING')) const activeIndex = ref(orderTabs.value.findIndex((v) => v.orderState === 'PENDING'))
orderTabs.value[activeIndex.value].isRender = true orderTabs.value[activeIndex.value].isRender = true
// //
const datetimesingle = ref('') const datetimesingle = ref('')
const activeId = ref('') const activeId = ref('')
// const handleOrderAccept = (item: any) => {
// activeId.value = item.id
// datetimesingle.value = item.time
// orderAcceptPopup?.value?.open()
// }
const changeTime = (e) => { const changeTime = (e) => {
console.log('change事件:', e) console.log('change事件:', e)
} }
// const handleAccept = () => {
// const url = `/pages/orderDetail/orderDetail?state=${props.state}&id=${activeId.value}`
// uni.navigateTo({ url })
// }
// const handleOrderPay = (item: any) => {
// //
// }
const handleLogin = () => { const handleLogin = () => {
const url = `/pages/login/login` const url = `/pages/login/login`
uni.navigateTo({ url }) uni.navigateTo({ url })

Loading…
Cancel
Save