From 171d9fffda68bfadd6776731b80baa852e5d0b35 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 11:47:10 +0800
Subject: [PATCH] logon
---
src/pages.json | 8 +
src/pages/booking/booking-success.vue | 72 +++++++++
src/pages/booking/booking.vue | 29 ++--
src/pages/booking/components/addressPopup.vue | 15 +-
src/pages/booking/components/timePopup.vue | 9 +-
src/pages/index/components/CategoryPanel.vue | 13 +-
src/pages/index/components/CustomNavbar.vue | 8 +-
src/pages/index/index.vue | 152 +-----------------
src/pages/index/styles/neighborhoodSite.scss | 1 +
src/pages/login/login.vue | 8 +-
src/pages/my/my.vue | 6 +-
src/pages/serviceSite/serviceSite.vue | 5 +-
src/types/member.d.ts | 5 +-
src/utils/http.ts | 4 +-
14 files changed, 128 insertions(+), 207 deletions(-)
create mode 100644 src/pages/booking/booking-success.vue
diff --git a/src/pages.json b/src/pages.json
index d4fdccf..df53b6e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -18,6 +18,14 @@
"navigationBarTitleText": "一键预约",
}
},
+ {
+ "path": "pages/booking/booking-success",
+ "style": {
+ "navigationBarTitleText": "预约成功",
+ }
+ },
+
+
//pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/index",
diff --git a/src/pages/booking/booking-success.vue b/src/pages/booking/booking-success.vue
new file mode 100644
index 0000000..5c323dd
--- /dev/null
+++ b/src/pages/booking/booking-success.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+ 预约成功
+ 预约上门时间:今天上午 10:30
+
+
+ 回到首页
+ 查看订单
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/booking/booking.vue b/src/pages/booking/booking.vue
index 42b0766..207c444 100644
--- a/src/pages/booking/booking.vue
+++ b/src/pages/booking/booking.vue
@@ -45,20 +45,16 @@ const leiList = [
const weightMenuList = [
{
id: 1,
- name: '5-10kg',
+ name: '10kg以下',
},
{
id: 2,
- name: '10-15kg',
+ name: '10-20kg',
},
{
id: 3,
- name: '15-20kg',
- },
- {
- id: 4,
- name: '20-50kg',
- },
+ name: '20kg以上',
+ }
]
const handleMenuChange = (val) => {
@@ -68,11 +64,7 @@ const handleWeightChange = (val) => {
activeWeightKey.value = val
}
const handleToto = () => {
- uni.showToast({
- title: 'todo...',
- icon: 'none',
- duration: 1000,
- })
+ uni.navigateTo({ url: '/pages/booking/booking-success' })
}
// 微信 - 获取当前经纬度
@@ -152,10 +144,10 @@ const openAdressPop = () => {
}
const handleTimePopChange = (val) => {
- timdeLabel.value ='取件时间: ' + val
+ timdeLabel.value ='收货时间: ' + val
}
-const handleAddressPopChange = (e) => {
- debugger
+const handleAddressPopChange = (val) => {
+ addressLabel.value ='收货地址: ' + val
}
@@ -324,17 +316,18 @@ page {
}
.weight-menu {
display: flex;
- flex-direction: row;
+ flex-direction: column;
.item {
flex: 1;
text-align: center;
- margin: 0 10rpx;
+ margin: 10rpx;
font-size: 28rpx;
border-radius: 8rpx;
padding: 30rpx 10rpx;
background: #f2f2fa;
&.active {
background: #fff7e8;
+ border: 2rpx solid #FF7D00;
}
}
}
diff --git a/src/pages/booking/components/addressPopup.vue b/src/pages/booking/components/addressPopup.vue
index d327999..5219fb3 100644
--- a/src/pages/booking/components/addressPopup.vue
+++ b/src/pages/booking/components/addressPopup.vue
@@ -5,6 +5,11 @@ const addressPopup2 = ref()
// 获取收货地址列表数据
const addressList = ref([])
+// 定义返回给父组件的方法
+const emit = defineEmits(['change'])
+
+
+
const getMemberAddressData = async () => {
const res = await new Promise((resolve, reject) => {
@@ -36,15 +41,9 @@ const show = ()=> {
}
const hide = ()=> {
addressPopup2.value?.close?.()
-}
+ const str = addressList.value[0].fullLocation
+ emit('change', str)
-const handleDayChange = (e) => {
- const idx = e.target.dataset.val
- activeDayIndex.value = idx
-}
-const handleTimeChange = (e) => {
- const idx = e.target.dataset.val
- activeTimeIndex.value = idx
}
// 暴露方法给父组件
defineExpose({
diff --git a/src/pages/booking/components/timePopup.vue b/src/pages/booking/components/timePopup.vue
index 0ebd97d..a16b9c8 100644
--- a/src/pages/booking/components/timePopup.vue
+++ b/src/pages/booking/components/timePopup.vue
@@ -81,7 +81,7 @@ defineExpose({
-
diff --git a/src/pages/index/components/CustomNavbar.vue b/src/pages/index/components/CustomNavbar.vue
index 63ec508..ab47575 100644
--- a/src/pages/index/components/CustomNavbar.vue
+++ b/src/pages/index/components/CustomNavbar.vue
@@ -6,10 +6,10 @@ const { safeAreaInsets } = uni.getSystemInfoSync()
-
-
-
-
+
-
+
@@ -111,9 +111,9 @@ const handleNewsList = () => {
-
+
diff --git a/src/pages/serviceSite/serviceSite.vue b/src/pages/serviceSite/serviceSite.vue
index 5ae5ee8..17fa340 100644
--- a/src/pages/serviceSite/serviceSite.vue
+++ b/src/pages/serviceSite/serviceSite.vue
@@ -29,6 +29,7 @@ const isLoading = ref(false)
const isFinish = ref(false)
const getDataList = async () => {
+ debugger
// 如果数据出于加载中,退出函数
if (isLoading.value) return
// 退出分页判断
@@ -66,9 +67,7 @@ const onRefresherrefresh = async () => {
// 关闭动画
isTriggered.value = false
}
-onMounted(() => {
- getDataList()
-})
+getDataList()
diff --git a/src/types/member.d.ts b/src/types/member.d.ts
index c21a1c8..e70f88b 100644
--- a/src/types/member.d.ts
+++ b/src/types/member.d.ts
@@ -12,12 +12,13 @@ type BaseProfile = {
}
/** 小程序登录 登录用户信息 */
-export type LoginResult = BaseProfile & {
+export type LoginResult = {
id: string
+ openid: string
phone: string
/** 登录凭证 */
token: string
- userType: number
+ userType: Object
username: string
}
diff --git a/src/utils/http.ts b/src/utils/http.ts
index 85b9fd2..e4c02d2 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -10,7 +10,6 @@
* 3. 添加小程序端请求头标识
* 4. 添加 token 请求头标识
*/
-
import { useMemberStore } from '@/stores'
const baseURL = 'http://192.168.0.166:8808/api'
@@ -27,12 +26,11 @@ const httpInterceptor = {
// 3. 添加小程序端请求头标识
options.header = {
...options.header,
- 'source-client': 'miniapp',
- 'jnpf-origin': 'app',
}
// 4. 添加 token 请求头标识
const memberStore = useMemberStore()
const token = memberStore.profile?.token
+ debugger
if (token) {
options.header.authorization = token
}