From 4120015ddd78a90f83760a2869d73d4214caccce Mon Sep 17 00:00:00 2001
From: caiyuhao <3281194902@qq.com>
Date: Fri, 20 Sep 2024 01:44:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=85=8D=E7=BD=AE=20?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E5=B8=83=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=20=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/modules/mall/index/index.vue | 13 +-
src/pages/Modal/authentication/3.vue | 2 +-
src/pages/service/accompany.vue | 4 +-
src/pages/service/detail.vue | 248 +++++++++++++++++++++++++--
src/pages/space/index.vue | 175 +++++++++++--------
5 files changed, 344 insertions(+), 98 deletions(-)
diff --git a/src/modules/mall/index/index.vue b/src/modules/mall/index/index.vue
index b59f651..2e9dfe9 100644
--- a/src/modules/mall/index/index.vue
+++ b/src/modules/mall/index/index.vue
@@ -14,15 +14,15 @@
:key="index"
:styles="item.property.style"
>
-
+
-
+
diff --git a/src/pages/Modal/authentication/3.vue b/src/pages/Modal/authentication/3.vue
index c8785e3..f58c6cf 100644
--- a/src/pages/Modal/authentication/3.vue
+++ b/src/pages/Modal/authentication/3.vue
@@ -52,7 +52,7 @@
-
+
diff --git a/src/pages/service/accompany.vue b/src/pages/service/accompany.vue
index 318562c..b14a48d 100644
--- a/src/pages/service/accompany.vue
+++ b/src/pages/service/accompany.vue
@@ -50,9 +50,9 @@
-
+
-
+
diff --git a/src/pages/service/detail.vue b/src/pages/service/detail.vue
index 72f28ed..bbc5a4b 100644
--- a/src/pages/service/detail.vue
+++ b/src/pages/service/detail.vue
@@ -23,11 +23,15 @@
-
+
{{ serviceData.userName }}
- 认证{{ serviceData.certificationTime }}
- 服务过 {{ serviceData.serviceNumber }} 次
+
+ 认证{{ serviceData.certificationTime }}
+
+
+ 服务过 {{ serviceData.serviceNumber }} 次
+
@@ -39,22 +43,43 @@
{{ serviceData.serviceName }}服务费
-
-
+
+
+
+
+
@@ -74,6 +99,84 @@
+
@@ -110,15 +213,35 @@
-
- ¥{{ serviceData.price }}/次 起
+
+
+ ¥
+ {{ serviceData.price }}
+ /次 起
+
-
-
+
+
+
+ 消息
+
+
@@ -198,7 +321,6 @@
-
@@ -440,4 +562,94 @@ onLoad(async (options) => {
.border-4 {
border-width: 4px;
}
+
+.information {
+ border-radius: 30px 30px 0 0;
+ /* position: absolute; */
+ /* top: 700rpx; */
+ /* display: flex;
+ align-items: center; */
+}
+
+.information_size {
+ background-color: #ffecec;
+ color: #ff8090;
+ margin: 30px 0;
+ padding: 3px;
+ border-radius: 5px;
+}
+
+.service_costs {
+ display: flex;
+}
+
+.service_img {
+ width: 30px;
+ height: 30px;
+}
+
+.service_accompany {
+ border-radius: 5px;
+}
+
+.appointment {
+ border-radius: 30px;
+ display: grid;
+ place-items: center; /* 水平和垂直居中 */
+ padding: 0 45px;
+ font-size: 14px;
+ height: 120rpx;
+ background-color: #fda2a2;
+ color: #fffcfc;
+}
+
+.filterBox {
+ height: 30px;
+ box-sizing: border-box;
+
+ .scrollBox {
+ width: calc(100vw - 96rpx);
+
+ .viewBox {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ gap: 32rpx;
+ white-space: nowrap;
+ font-size: 28rpx;
+
+ .sceneAddress {
+ position: relative;
+ padding: 8rpx 20rpx;
+ color: #787679;
+ background-color: #f6f6f6;
+ border-radius: 50rpx;
+
+ .filter {
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ image {
+ height: 40rpx;
+ width: 40rpx;
+ }
+ }
+
+ .selected {
+ display: inline-flex;
+ align-items: center;
+ gap: 5rpx;
+
+ image {
+ height: 40rpx;
+ width: 40rpx;
+ vertical-align: middle;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/src/pages/space/index.vue b/src/pages/space/index.vue
index 750342d..c2773fb 100644
--- a/src/pages/space/index.vue
+++ b/src/pages/space/index.vue
@@ -8,78 +8,88 @@
-
-
-
-
-
-
- 您已经互动了
- 10次,
- 还有
- 2次~
-
-
-
-
-
-
-
-
-
- 7月
- 17
- 今日任务
-
-
-
-
-
-
-
- {{ tab }}
-
+
+
+
+
+
+
+
+ 您已经互动了
+ 10次,
+ 还有
+ 2次~
+
-
-
+
+
+
-
-
-
-
-
-
- {{ user.name }}
+
+
+ 7月
+ 17
+ 今日任务
+
+
+
+
+
+
+
+ {{ tab }}
+
-
- 暂无内容...
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ user.name }}
+
+
+
+ 暂无内容...
+
+
+
+
+
+
+
+
-
-
+
@@ -95,6 +105,17 @@ const activeTab = ref(0)
const focusUser = ref([])
const postsList = ref(null)
+onLoad(() => {
+ state.showScroll = true
+})
+
+// 页面状态
+const state = reactive({
+ statusBarHeight: 0, // 状态栏高
+ titleBarHeight: 0, // 导航栏高
+ showScroll: false,
+ refresherTriggered: false, // 下拉刷新状态
+})
// 测试数据
// focusUser = ref([
// { name: '曲三岁', avatar: '/static/my/pet-auatar.jpg' },
@@ -133,11 +154,11 @@ const focus = async () => {
if (res.code == 200) {
focusUser.value = res.data
} else {
- console.error(res);
+ console.error(res)
toast(res.message || '数据获取失败')
}
} catch (error) {
- console.error(error);
+ console.error(error)
toast(error.data.message || '获取关注博主数据失败')
}
}
@@ -149,11 +170,11 @@ const getPosts = async () => {
if (res.code == 200) {
postsList.value = res.data
} else {
- console.error(res);
+ console.error(res)
toast(res.message || '数据获取失败')
}
} catch (error) {
- console.error(error);
+ console.error(error)
toast(error.data.message || '获取关注博主数据失败')
}
}
@@ -187,6 +208,22 @@ onLoad(async () => {
await focus()
await getPosts()
})
+
+// 媒体列表下拉刷新
+function refresherrefresh(e) {
+ state.refresherTriggered = true
+ state.showScroll = false
+ console.log('refresherTriggered', state.refresherTriggered)
+ aaa()
+}
+
+function aaa() {
+ state.refresherTriggered = false
+
+ state.showScroll = true
+ console.log('refresherTriggered', state.refresherTriggered)
+ console.log('showScroll', state.showScroll)
+}