From 6cdfc87b5d8ee4cdb12bc71a22332910c6b4f3fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E6=9D=B0?= <> Date: Thu, 7 Mar 2024 10:23:36 +0800 Subject: [PATCH] login --- src/pages/index/components/DataList.vue | 36 ++++++---- src/pages/index/components/uni-dialog.vue | 0 src/pages/orerdList/components/OrderItem.vue | 65 +++++-------------- src/pages/orerdList/orerdList.vue | 14 +++- src/services/order.ts | 2 +- src/static/images/logo.png | Bin 14810 -> 13382 bytes src/utils/http.ts | 8 +-- 7 files changed, 53 insertions(+), 72 deletions(-) delete mode 100644 src/pages/index/components/uni-dialog.vue mode change 100755 => 100644 src/static/images/logo.png diff --git a/src/pages/index/components/DataList.vue b/src/pages/index/components/DataList.vue index 909abbd..98ceaf9 100644 --- a/src/pages/index/components/DataList.vue +++ b/src/pages/index/components/DataList.vue @@ -14,24 +14,25 @@ import { formatDate } from '@/utils/index' // 获取屏幕边界到安全区域距离 const { safeAreaInsets } = uni.getSystemInfoSync() -const latitude = ref('0') -const longitude = ref('0') +let latitude = ref('') +let longitude = ref('') // 定义 porps const props = defineProps<{ statusId: String }>() const memberStore = useMemberStore() -const userInfo = memberStore.profile - +const staffId = memberStore.profile?.id // 请求参数 -const queryParams: Required = { +let queryParams = { + id: staffId, pageNo: 1, pageSize: 10, - id: userInfo?.id, - status: 'PENDING', - latitude: latitude.value, - longitude: longitude.value, + location: { + latitude: '31.163973', + longitude: '121.404032' + }, + status: props.orderState, } @@ -60,6 +61,18 @@ const getMemberOrderData = async (longitude, latitude) => { // 发送请求前,标记为加载中 isLoading.value = true // 发送请求 + if (longitude) { + // longitude.value = longitude + // latitude.value = latitude + // const location = { + // longitude, + // latitude, + // } + // queryParams = { + // ...queryParams, + // location, + // } + } const res = await getListOrderAPI(queryParams) // 发送请求后,重置标记 isLoading.value = false @@ -80,7 +93,6 @@ const getMemberOrderData = async (longitude, latitude) => { onMounted(() => { getSettingInfo() - // getMemberOrderData() }) const handleTimeup = async (item: Object) => { @@ -120,8 +132,6 @@ const onRefresherrefresh = async () => { const emit = defineEmits('orderAccept') - - // 微信 - 获取设置信息 const getSettingInfo = () => { uni.getSetting({ @@ -142,8 +152,6 @@ const getLocationInfo = () => { // highAccuracyExpireTime: 5000, success(res) { console.log(res) - // longitude?.value = res.longitude - // latitude?.value = res.atitude getMemberOrderData(res.longitude, res.latitude) }, fail(err) { diff --git a/src/pages/index/components/uni-dialog.vue b/src/pages/index/components/uni-dialog.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages/orerdList/components/OrderItem.vue b/src/pages/orerdList/components/OrderItem.vue index 16b1997..163e1f9 100644 --- a/src/pages/orerdList/components/OrderItem.vue +++ b/src/pages/orerdList/components/OrderItem.vue @@ -8,60 +8,32 @@ import { getPayMockAPI, getPayWxPayMiniPayAPI } from '@/services/pay' import type { OrderItem } from '@/types/order' import type { OrderListParams } from '@/types/order' import { onMounted, ref, defineEmits } from 'vue' +import { useMemberStore } from '@/stores' // 获取屏幕边界到安全区域距离 const { safeAreaInsets } = uni.getSystemInfoSync() // 定义 porps const props = defineProps<{ - orderState: number + orderState: string }>() +const memberStore = useMemberStore() +const staffId = memberStore.profile?.id // 请求参数 -const queryParams: Required = { - page: 1, - pageSize: 5, - orderState: props.orderState, +const queryParams = { + id: staffId, + pageNo: 1, + pageSize: 10, + location: { + latitude: 31.163973, + longitude: 121.404032 + }, + status: props.orderState, } // 获取订单列表 -// const orderList = ref([]) -const orderList = [ - { - id: '1747900788929204226', - createTime: '剩余接单时间', - locationNum: '0.4km', - loction: '上海市松江区新松江路92弄开元地中海园区', - people: '曾先生 18526235487', - payType: 1, - orderState: 2, - time: '2024-01-18 17:06:37', - time2: '17:01:01', - postFee: 8.0, - payMoney: 982.0, - totalMoney: 974.0, - totalNum: 13, - payChannel: 2, - countdown: 1579, - }, - { - locationNum: '0.4km', - loction: '上海市松江区新松江路92弄开元地中海园区', - id: '1747899379064246273', - people: '曾先生 18526235487', - createTime: '剩余接单时间', - payType: 1, - orderState: 1, - time: '2024-01-18 17:01:01', - time2: '17:01:01', - postFee: 1.0, - payMoney: 70.0, - totalMoney: 69.0, - totalNum: 1, - payChannel: 2, - countdown: 1243, - }, -] +const orderList = ref([]) // 是否加载中标记,用于防止滚动触底触发多次请求 const isLoading = ref(false) @@ -93,14 +65,7 @@ const getMemberOrderData = async () => { } onMounted(() => { - // getMemberOrderData() - // const arr: object[] = [ - // { - // id: 1, - // name: '233' - // } - // ] - // orderList.value.push(...arr) + getMemberOrderData() }) // 订单支付 diff --git a/src/pages/orerdList/orerdList.vue b/src/pages/orerdList/orerdList.vue index c867273..05c3970 100644 --- a/src/pages/orerdList/orerdList.vue +++ b/src/pages/orerdList/orerdList.vue @@ -1,3 +1,11 @@ +