From fe684bd7dfa8371a9e9981470f7d5d232fbb0d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E6=9D=B0?= <> Date: Tue, 5 Mar 2024 18:02:08 +0800 Subject: [PATCH] fix --- src/pages.json | 86 ++++++----- src/pages/booking/booking.vue | 15 +- src/pages/index/components/CustomNavbar.vue | 11 +- src/pages/index/index.vue | 4 +- src/pages/login/login.vue | 1 - src/pages/my/my.vue | 137 +++++++++++++----- src/pages/serviceSite/serviceSite.vue | 1 - src/services/booking.ts | 21 +++ src/static/images/cart_selected.png | Bin 1679 -> 1543 bytes src/static/images/site_selected.png | Bin 0 -> 1620 bytes src/static/tabs/booking_default.png | Bin 0 -> 2335 bytes src/static/tabs/booking_selected.png | Bin 0 -> 2360 bytes src/static/tabs/category_selected.png | Bin 6063 -> 0 bytes src/static/tabs/home_selected.png | Bin 4378 -> 878 bytes ...{category_default.png => site_default.png} | Bin src/static/tabs/site_selected.png | Bin 0 -> 1620 bytes src/utils/http.ts | 1 - 17 files changed, 186 insertions(+), 91 deletions(-) create mode 100644 src/services/booking.ts create mode 100644 src/static/images/site_selected.png create mode 100644 src/static/tabs/booking_default.png create mode 100644 src/static/tabs/booking_selected.png delete mode 100644 src/static/tabs/category_selected.png rename src/static/tabs/{category_default.png => site_default.png} (100%) create mode 100644 src/static/tabs/site_selected.png diff --git a/src/pages.json b/src/pages.json index df53b6e..992ffcd 100644 --- a/src/pages.json +++ b/src/pages.json @@ -11,7 +11,14 @@ "^Xtx(.*)": "@/components/Xtx$1.vue" } }, - "pages": [ + "pages": [{ + "path": "pages/my/my", + "style": { + "navigationStyle": "custom", + "navigationBarTextStyle": "white", + "navigationBarTitleText": "我的" + } + }, { "path": "pages/booking/booking", "style": { @@ -25,7 +32,7 @@ } }, - + //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages { "path": "pages/index/index", @@ -35,12 +42,6 @@ "navigationBarTitleText": "首页" } }, - { - "path": "pages/serviceSite/serviceSite", - "style": { - "navigationBarTitleText": "服务站列表" - } - }, { "path": "pages/siteDetail/siteDetail", "style": { @@ -54,20 +55,7 @@ "navigationBarTitleText": "商品分类" } }, - { - "path": "pages/orerdList/orerdList", - "style": { - "navigationBarTitleText": "订单列表" - } - }, - { - "path": "pages/my/my", - "style": { - "navigationStyle": "custom", - "navigationBarTextStyle": "white", - "navigationBarTitleText": "我的" - } - }, + { "path": "pages/login/login", "style": { @@ -91,7 +79,19 @@ "style": { "navigationBarTitleText": "商品详情" } - } + }, + { + "path": "pages/serviceSite/serviceSite", + "style": { + "navigationBarTitleText": "服务站" + } + }, + { + "path": "pages/orerdList/orerdList", + "style": { + "navigationBarTitleText": "订单" + } + }, ], "globalStyle": { "navigationBarTextStyle": "black", @@ -105,31 +105,30 @@ "selectedColor": "#3775F6", "backgroundColor": "#fff", "borderStyle": "white", - "list": [ - { + "list": [{ "text": "首页", "pagePath": "pages/index/index", "iconPath": "static/tabs/home_default.png", "selectedIconPath": "static/tabs/home_selected.png" }, - { - "text": "服务站", - "pagePath": "pages/serviceSite/serviceSite", - "iconPath": "static/tabs/category_default.png", - "selectedIconPath": "static/tabs/category_selected.png" - }, + // { + // "text": "服务站", + // "pagePath": "pages/serviceSite/serviceSite", + // "iconPath": "static/tabs/site_default.png", + // "selectedIconPath": "static/tabs/site_selected.png" + // }, { "text": "一键预约", "pagePath": "pages/booking/booking", - "iconPath": "static/tabs/cart_default.png", - "selectedIconPath": "static/tabs/cart_selected.png" - }, - { - "text": "订单", - "pagePath": "pages/orerdList/orerdList", - "iconPath": "static/tabs/cart_default.png", - "selectedIconPath": "static/tabs/cart_selected.png" + "iconPath": "static/tabs/booking_default.png", + "selectedIconPath": "static/tabs/booking_selected.png" }, + // { + // "text": "订单", + // "pagePath": "pages/orerdList/orerdList", + // "iconPath": "static/tabs/cart_default.png", + // "selectedIconPath": "static/tabs/cart_selected.png" + // }, { "text": "我的", "pagePath": "pages/my/my", @@ -139,13 +138,11 @@ ] }, // 分包加载规则 - "subPackages": [ - { + "subPackages": [{ // 子包的根目录 "root": "pagesMember", // 页面路径和窗口表现 - "pages": [ - { + "pages": [{ "path": "settings/settings", "style": { "navigationBarTitleText": "设置" @@ -175,8 +172,7 @@ }, { "root": "pagesOrder", - "pages": [ - { + "pages": [{ "path": "create/create", "style": { "navigationBarTitleText": "填写订单" diff --git a/src/pages/booking/booking.vue b/src/pages/booking/booking.vue index 207c444..3d0e9ed 100644 --- a/src/pages/booking/booking.vue +++ b/src/pages/booking/booking.vue @@ -3,6 +3,8 @@ import { computed, ref } from 'vue' import { onLoad, onReady } from '@dcloudio/uni-app' import TimePopup from './components/timePopup.vue' import AddressPopup from './components/addressPopup.vue' +import { postBookingAPI } from '@/services/booking' + const activeMenuKey = ref(0) const activeWeightKey = ref(0) @@ -10,12 +12,10 @@ const activeWeightKey = ref(0) // 地图 const longitude = ref(0) const latitude = ref(0) - // 弹出层组件 const timeChildPopup = ref() const addressChildPopup = ref() - const addressLabel = ref('取件地址') const timdeLabel = ref('取件时间') @@ -63,10 +63,13 @@ const handleMenuChange = (val) => { const handleWeightChange = (val) => { activeWeightKey.value = val } -const handleToto = () => { - uni.navigateTo({ url: '/pages/booking/booking-success' }) +const handleBooking = async () => { + const params = {} + const res = await postBookingAPI(params) + if (res.code) { + uni.navigateTo({ url: '/pages/booking/booking-success' }) + } } - // 微信 - 获取当前经纬度 const getLocationInfo = () => { uni.getLocation({ @@ -205,7 +208,7 @@ const handleAddressPopChange = (val) => { - 立即预约回收 + 立即预约回收 diff --git a/src/pages/index/components/CustomNavbar.vue b/src/pages/index/components/CustomNavbar.vue index ab47575..5ab8332 100644 --- a/src/pages/index/components/CustomNavbar.vue +++ b/src/pages/index/components/CustomNavbar.vue @@ -1,3 +1,11 @@ + @@ -344,9 +397,27 @@ page { } } -/* 猜你喜欢 */ -.guess { - background-color: #f7f7f8; - margin-top: 20rpx; +.module { + margin: 40rpx 0; + .module-title { + font-size: 30rpx; + margin: 20rpx; + } + .module-list { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + .item { + width: 160rpx; + height: 160rpx; + margin: 0 10rpx; + background: #F2F2FA; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + } + } } diff --git a/src/pages/serviceSite/serviceSite.vue b/src/pages/serviceSite/serviceSite.vue index 17fa340..193001b 100644 --- a/src/pages/serviceSite/serviceSite.vue +++ b/src/pages/serviceSite/serviceSite.vue @@ -29,7 +29,6 @@ const isLoading = ref(false) const isFinish = ref(false) const getDataList = async () => { - debugger // 如果数据出于加载中，退出函数 if (isLoading.value) return // 退出分页判断 diff --git a/src/services/booking.ts b/src/services/booking.ts new file mode 100644 index 0000000..b503c7f --- /dev/null +++ b/src/services/booking.ts @@ -0,0 +1,21 @@ +/* + * @Author: 王文杰 + * @Date: 2024-03-05 17:18:02 + * @LastEditors: 王文杰 + * @LastEditTime: 2024-03-05 17:44:43 + * @FilePath: /app-nx-personal/src/services/booking.ts + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ +import type { PageResult } from '@/types/global' +import { http } from '@/utils/http' +/** + * 一键预约 + * @param data orderState 订单状 + */ +export const postBookingAPI = (data: any) => { + return http({ + method: 'POST', + url: `/order/create`, + data, + }) +} diff --git a/src/static/images/cart_selected.png b/src/static/images/cart_selected.png index 130bd911c33c17a92bf29ffeb0d19ab9e96b5f56..d16efb17fde69f4fdd960850dcf7bc95b87a31c4 100644 GIT binary patch delta 1532 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 literal 4378 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 S*}IAW0000