From 76d57cea3728acd0922269d2f5af261f7ebab400 Mon Sep 17 00:00:00 2001
From: YuanHuakk <1751826683@qq.com>
Date: Wed, 1 Nov 2023 14:54:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=BE=E5=88=B0=E6=B4=BB?=
=?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components.d.ts | 1 +
src/api/user.ts | 11 ++++
src/app.config.ts | 4 ++
src/components/Popup.vue | 68 ++++++++++++++++++---
src/pages/index/index.vue | 5 +-
src/pages/marketing/sign/index.config.ts | 3 +
src/pages/marketing/sign/index.vue | 20 +++---
src/pages/users/account/index.vue | 74 ++++++++++++++++++++---
src/static/index/close.png | Bin 0 -> 1473 bytes
src/static/index/poppBg.png | Bin 0 -> 70050 bytes
10 files changed, 155 insertions(+), 31 deletions(-)
create mode 100644 src/static/index/close.png
create mode 100644 src/static/index/poppBg.png
diff --git a/components.d.ts b/components.d.ts
index 2c19488..3ada26f 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -41,6 +41,7 @@ declare module '@vue/runtime-core' {
NutTextarea: typeof import('@nutui/nutui-taro')['Textarea']
NutUploader: typeof import('@nutui/nutui-taro')['Uploader']
Pay: typeof import('./src/components/Pay.vue')['default']
+ Popup: typeof import('./src/components/Popup.vue')['default']
RichEditor: typeof import('./src/components/RichEditor.vue')['default']
Ucharts: typeof import('./src/components/Ucharts.vue')['default']
Upload: typeof import('./src/components/Upload.vue')['default']
diff --git a/src/api/user.ts b/src/api/user.ts
index ee2a208..4236b35 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -63,3 +63,14 @@ export const getRefereeCode = () => request("/user/promotion", {}, "POST");
// 取消订单返回积分
export const qxOrder = (data: object) =>
request("/user/point/off", data, "POST");
+
+// 用户签到
+export const userSign = () =>
+ request("/sign/user", {}, "POST");
+
+// 获取签到记录
+export const getSignRecord = () =>
+ request("/sign/pulse/count", {}, "POST");
+// 获取赠送总记录
+export const getGiftRecord = (data: object) =>
+ request("/user/giftPulseRecord", data, "POST");
diff --git a/src/app.config.ts b/src/app.config.ts
index 68c8e75..5bba15c 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -57,6 +57,10 @@ export default defineAppConfig({
{
root: 'pages/mer',
pages: ['mer_detail/index']
+ },
+ {
+ root: 'pages/marketing',
+ pages: ['sign/index']
}
],
window: {
diff --git a/src/components/Popup.vue b/src/components/Popup.vue
index 23c3bb1..e908835 100644
--- a/src/components/Popup.vue
+++ b/src/components/Popup.vue
@@ -1,11 +1,59 @@
-
-
-
- $END$
-
-
-
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 45bbe4f..f594391 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -32,7 +32,7 @@
@@ -53,6 +53,8 @@
+
+
@@ -62,6 +64,7 @@ import Taro from '@tarojs/taro'
import {bindParent, getBanner} from '@/api/user'
import {getMerList} from '@/api/goods'
import {calculateDistance} from '@/utils'
+import Popup from "@/components/Popup.vue";
const searchValue = ref('')
diff --git a/src/pages/marketing/sign/index.config.ts b/src/pages/marketing/sign/index.config.ts
index e69de29..e84943a 100644
--- a/src/pages/marketing/sign/index.config.ts
+++ b/src/pages/marketing/sign/index.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+ navigationBarTitleText: "每日签到",
+});
diff --git a/src/pages/marketing/sign/index.vue b/src/pages/marketing/sign/index.vue
index 23c3bb1..829087f 100644
--- a/src/pages/marketing/sign/index.vue
+++ b/src/pages/marketing/sign/index.vue
@@ -1,11 +1,11 @@
-
-
-
- $END$
-
-
-
\ No newline at end of file
diff --git a/src/pages/users/account/index.vue b/src/pages/users/account/index.vue
index be47547..6d24840 100644
--- a/src/pages/users/account/index.vue
+++ b/src/pages/users/account/index.vue
@@ -1,7 +1,7 @@