From 436b9e15d7f9de8dcc761fd1af8c9a9d2d48621b 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 09:23:01 +0800 Subject: [PATCH] login --- src/pages.json | 9 +- src/pages/booking/booking.vue | 4 +- src/pages/my/my.vue | 2 +- src/pages/orderDetail/orderDetail.vue | 284 ++-------------- .../components/OrderList.vue | 25 +- src/pages/orderList/list.vue | 106 ++++++ src/pages/orerdList/components/OrderItem.vue | 318 ------------------ src/pages/orerdList/orerdList.vue | 66 ---- src/pagesOrder/list/components/OrderList.vue | 22 +- src/pagesOrder/list/list.vue | 13 +- src/services/order.ts | 2 +- src/utils/http.ts | 2 +- 12 files changed, 187 insertions(+), 666 deletions(-) rename src/pages/{orerdList => orderList}/components/OrderList.vue (96%) create mode 100644 src/pages/orderList/list.vue delete mode 100644 src/pages/orerdList/components/OrderItem.vue delete mode 100644 src/pages/orerdList/orerdList.vue diff --git a/src/pages.json b/src/pages.json index 8015d84..c9c1574 100644 --- a/src/pages.json +++ b/src/pages.json @@ -18,6 +18,12 @@ "navigationBarTitleText": "登录" } }, + { + "path": "pages/orderDetail/orderDetail", + "style": { + "navigationBarTitleText": "订单详情" + } + }, { "path": "pages/my/my", "style": { @@ -87,11 +93,12 @@ } }, { - "path": "pages/orerdList/orerdList", + "path": "pages/orderList/list", "style": { "navigationBarTitleText": "订单" } }, + ], "globalStyle": { "navigationBarTextStyle": "white", diff --git a/src/pages/booking/booking.vue b/src/pages/booking/booking.vue index 4ec7139..cfd09cc 100644 --- a/src/pages/booking/booking.vue +++ b/src/pages/booking/booking.vue @@ -224,7 +224,7 @@ const handleBooking = async () => { - + diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue index d561ca0..ec15504 100644 --- a/src/pages/my/my.vue +++ b/src/pages/my/my.vue @@ -164,7 +164,7 @@ const handleNewsList = () => { diff --git a/src/pages/orderDetail/orderDetail.vue b/src/pages/orderDetail/orderDetail.vue index 917aec4..6a30f53 100644 --- a/src/pages/orderDetail/orderDetail.vue +++ b/src/pages/orderDetail/orderDetail.vue @@ -37,122 +37,10 @@ const props = withDefaults(defineProps(), { targetLongitude: '121.197665', targetLatitude: '31.128418', }) -const tMap = new QQMapWX({ - key: 'EAQBZ-BZZCZ-DGUX2-TZI4D-PZRWH-NNFNJ', -}) -// 微信 - 获取当前经纬度 -const getLocationInfo = () => { - uni.getLocation({ - type: 'gcj02', - // isHighAccuracy: true, - // highAccuracyExpireTime: 5000, - success(res) { - console.log(res) - tMap.direction({ - mode: 'driving', - from: { - // longitude: res.longitude, - // latitude: res.latitude, - longitude: '121.197635', - latitude: '31.128684', - }, - to: { - longitude: props.targetLongitude, - latitude: props.targetLatitude, - }, - success(res2: any) { - console.log('res2', res2) - const ret = res2 - const coors = ret.result.routes[0].polyline, - pl = [] - //坐标解压（返回的点串坐标，通过前向差分进行压缩） - const kr = 1000000 - for (let i = 2; i < coors.length; i++) { - coors[i] = Number(coors[i - 2]) + Number(coors[i]) / kr - } - //将解压后的坐标放入点串数组pl中 - for (let i = 0; i < coors.length; i += 2) { - pl.push({ latitude: coors[i], longitude: coors[i + 1] }) - } - console.log(pl) - //设置polyline属性，将路线显示出来,将解压坐标第一个数据作为起点 - - latitude.value = pl[0].latitude - longitude.value = pl[0].longitude - polyline.value = [ - { - points: pl, - color: '#409eff', - width: 4, - }, - ] - orderDetailPopup?.value?.open() - }, - }) - }, - fail(err) { - console.log(err) - uni.showModal({ - content: '检测到您没打开获取定位功能权限，是否去设置打开？', - confirmText: '确认', - cancelText: '取消', - success: function (res) { - if (res.confirm) { - uni.openSetting({ - success() { - getLocationInfo() - }, - }) - } - }, - }) - }, - }) -} -const getAuthorizeInfo = () => { - uni.authorize({ - scope: 'scope.userLocation', - success(res) { - getLocationInfo() - }, - fail(err) { - uni.showModal({ - content: '检测到您没打开获取定位功能权限，是否去设置打开？', - confirmText: '确认', - cancelText: '取消', - success: function (res) { - if (res.confirm) { - uni.openSetting({ - success() { - getLocationInfo() - }, - }) - } - }, - }) - }, - }) -} -// 微信 - 获取设置信息 -const getSettingInfo = () => { - uni.getSetting({ - success(res) { - if (res.authSetting['scope.userLocation']) { - getLocationInfo() - } else { - getAuthorizeInfo() - } - }, - }) -} // 页面渲染完毕，绑定动画效果 onReady(() => { - getSettingInfo() console.log(props) }) -const { ctx }: any = getCurrentInstance() -const mapContext = ref(null as unknown as UniApp.MapContext) - // 获取订单详情 // const order = ref() // const getMemberOrderByIdData = async () => { @@ -209,47 +97,6 @@ const phone = async () => { // }, // }) // } - - -const handleAction = () => { - if (props.state == '1') { - tMap.direction({ - mode: 'walking', - from: { - // longitude: res.longitude, - // latitude: res.latitude, - longitude: '121.197635', - latitude: '31.128684', - }, - to: { - longitude: props.targetLongitude, - latitude: props.targetLatitude, - }, - success(res: any) { - const ret = res - const distance = ret.result.routes[0].distance - if (distance < 100) { - uni.navigateTo({ url: '/payment/detail/detail' }) - } else { - uni.showToast({ - icon: 'none', - title: '请先到达订单所在的位置', - }) - } - }, - }) - - } else { - orderConfirmPopup.value?.open?.() - } -} -const handleDetailShow = () => { - orderDetailPopup.value?.open?.() -} -const handleDetailPopupClose = () => { - orderDetailPopup.value?.close?.() -} - const handleAcceptConfirm = () => { uni.navigateTo({ url: '/payment/detail/detail' }) } @@ -257,104 +104,20 @@ const handleAcceptConfirm = () => { diff --git a/src/pages/orerdList/components/OrderItem.vue b/src/pages/orerdList/components/OrderItem.vue deleted file mode 100644 index 16b1997..0000000 --- a/src/pages/orerdList/components/OrderItem.vue +++ /dev/null @@ -1,318 +0,0 @@ - - - - - diff --git a/src/pages/orerdList/orerdList.vue b/src/pages/orerdList/orerdList.vue deleted file mode 100644 index c867273..0000000 --- a/src/pages/orerdList/orerdList.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - - diff --git a/src/pagesOrder/list/components/OrderList.vue b/src/pagesOrder/list/components/OrderList.vue index 17a3943..b4847d1 100644 --- a/src/pagesOrder/list/components/OrderList.vue +++ b/src/pagesOrder/list/components/OrderList.vue @@ -8,20 +8,26 @@ import { getPayMockAPI, getPayWxPayMiniPayAPI } from '@/services/pay' import type { OrderItem } from '@/types/order' import type { OrderListParams } from '@/types/order' import { onMounted, ref } from 'vue' +import { useMemberStore } from '@/stores' // 获取屏幕边界到安全区域距离 const { safeAreaInsets } = uni.getSystemInfoSync() - +const memberStore = useMemberStore() // 定义 porps const props = defineProps<{ - orderState: number + orderState: string }>() // 请求参数 const queryParams: Required = { - page: 1, + pageNo: 1, pageSize: 5, - orderState: props.orderState, + status: props.orderState, + location: { + latitude: 31.163973, + longitude: 121.404032 + }, + id: memberStore.profile?.id, } // 获取订单列表 @@ -42,11 +48,11 @@ const getMemberOrderData = async () => { // 发送请求后，重置标记 isLoading.value = false // 数组追加 - orderList.value.push(...res.result.items) + orderList.value.push(...res.data.list) // 分页条件 - if (queryParams.page < res.result.pages) { + if (queryParams.pageNo < res.data.pages) { // 页码累加 - queryParams.page++ + queryParams.pageNo++ } else { // 分页已结束 isFinish.value = true @@ -131,7 +137,7 @@ const onRefresherrefresh = async () => { // 开始动画 isTriggered.value = true // 重置数据 - queryParams.page = 1 + queryParams.pageNo = 1 orderList.value = [] isFinish.value = false // 加载数据 diff --git a/src/pagesOrder/list/list.vue b/src/pagesOrder/list/list.vue index 09e3004..57b956c 100644 --- a/src/pagesOrder/list/list.vue +++ b/src/pagesOrder/list/list.vue @@ -9,15 +9,16 @@ const query = defineProps<{ // tabs 数据 const orderTabs = ref([ - { orderState: 0, title: '全部', isRender: false }, - { orderState: 1, title: '待付款', isRender: false }, - { orderState: 2, title: '待发货', isRender: false }, - { orderState: 3, title: '待收货', isRender: false }, - { orderState: 4, title: '待评价', isRender: false }, + // { orderState: 0, title: '全部', isRender: false }, + { orderState: 'PENDING', title: '待接单', isRender: false }, + { orderState: 'UNPROCESSED', title: '待上门/待服务', isRender: false }, + { orderState: 'RECYCLING', title: '回收中', isRender: false }, + { orderState: 'FINISHED', title: '已完成', isRender: false }, + { orderState: 'CANCELED', title: '已取消,可用', isRender: false }, ]) // 高亮下标 -const activeIndex = ref(orderTabs.value.findIndex((v) => v.orderState === Number(query.type))) +const activeIndex = ref(orderTabs.value.findIndex((v) => v.orderState === 'PENDING')) // 默认渲染容器 orderTabs.value[activeIndex.value].isRender = true diff --git a/src/services/order.ts b/src/services/order.ts index c513e34..726d9b1 100644 --- a/src/services/order.ts +++ b/src/services/order.ts @@ -132,7 +132,7 @@ export const getMemberOrderCancelByIdAPI = (id: string, data: { cancelReason: st export const getMemberOrderAPI = (data: OrderListParams) => { return http({ method: 'POST', - url: `/scm/RecycleOrder/getList`, + url: `/recycle-order/page`, data, }) } diff --git a/src/utils/http.ts b/src/utils/http.ts index 630b0ab..8ae184d 100644 --- a/src/utils/http.ts +++ b/src/utils/http.ts @@ -11,7 +11,7 @@ * 4. 添加 token 请求头标识 */ import { useMemberStore } from '@/stores' -const baseURL = 'http://192.168.0.166:8808/api' +const baseURL = 'http://222.71.165.188:8808/api' // 添加拦截器 const httpInterceptor = {