From 9141a87a2f3c9985e4385b5db89a0b86ac3114ee Mon Sep 17 00:00:00 2001
From: "1960116313@qq.com" <1960116313@qq.com>
Date: Thu, 25 Jan 2024 17:14:46 +0800
Subject: [PATCH] =?UTF-8?q?fix;=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=20?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.lsp | 18 ++++++++++++++
package.json | 1 +
src/components/AppRecharge/index.vue | 24 ++++++++++++-------
.../task/components/BasicTask/index.d.ts | 2 ++
src/views/task/components/BasicTask/index.vue | 14 +++++------
src/views/task/components/TaskList/index.d.ts | 2 ++
src/views/task/components/TaskList/index.vue | 3 ++-
7 files changed, 47 insertions(+), 17 deletions(-)
create mode 100644 .env.lsp
diff --git a/.env.lsp b/.env.lsp
new file mode 100644
index 0000000..01024b1
--- /dev/null
+++ b/.env.lsp
@@ -0,0 +1,18 @@
+
+
+# 公共地址
+VITE_GLOB_BASE_URL = "http://192.168.1.134:9872"
+
+# 本地MQTT地址
+VITE_GLOB_MQTT_HOST = "192.168.1.231"
+VITE_GLOB_MQTT_PORT = 8083
+VITE_GLOB_MQTT_PROTOCOL = "ws"
+
+# 本地MQTT用户名
+VITE_GLOB_MQTT_USERNAME = "serverAdmin"
+
+# 本地MQTT密码
+VITE_GLOB_MQTT_PASSWORD = "EnpfgI9yuSwi"
+
+# 接口授权标识
+VITE_GLOB_APP_AUTHORIZATION = "ZmFsY29uOmZhbGNvbl9zZWNyZXQ="
\ No newline at end of file
diff --git a/package.json b/package.json
index c16f472..1854cf3 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
"dev": "vite --host --mode development",
"dev:prod": "vite --host --mode production",
"dev:zxh": "vite --host --mode zxh",
+ "dev:lsp": "vite --host --mode lsp",
"build": "vue-tsc && vite build",
"preview": "vite preview",
"lint": "eslint .",
diff --git a/src/components/AppRecharge/index.vue b/src/components/AppRecharge/index.vue
index cad79c3..a604893 100644
--- a/src/components/AppRecharge/index.vue
+++ b/src/components/AppRecharge/index.vue
@@ -220,9 +220,15 @@ function separator(num: number | string) {
- 152****0062 在 2024/1/23 开通了至尊礼遇卡!
- 178****6455 在 2024/1/12 开通了年套餐!
- 195****2519 在 2024/1/1开通了日套餐!
+ 152****0062 在 2024/1/25开通了至尊礼遇卡!
+ 178****6455 在 2024/1/24开通了年套餐!
+ 151****2519 在 2024/1/23开通了日套餐!
+ 178****0062 在 2024/1/22开通了至尊礼遇卡!
+ 178****6556 在 2024/1/21开通了年套餐!
+ 131****9871 在 2024/1/20开通了日套餐!
+ 198****2091 在 2024/1/19开通了至尊礼遇卡!
+ 138****4848 在 2024/1/18开通了年套餐!
+ 195****2519 在 2024/1/17开通了日套餐!
@@ -408,11 +414,11 @@ function separator(num: number | string) {
margin: 20px auto;
height: 1px;
border: 1px solid #ede0d9;
- .colorLine {
- width: 17%;
- height: 1px;
- background-color: #a46443;
- }
+ // .colorLine {
+ // width: 17%;
+ // height: 1px;
+ // background-color: #a46443;
+ // }
}
.broadcastBox {
width: 95%;
@@ -436,7 +442,7 @@ function separator(num: number | string) {
animation: scrolling 10s linear infinite;
span {
display: inline-block;
- margin-right: 100px;
+ margin-right: 50px;
padding: 0 20px;
background: #fbe6c4;
border-radius: 4px;
diff --git a/src/views/task/components/BasicTask/index.d.ts b/src/views/task/components/BasicTask/index.d.ts
index 7858c07..b928690 100644
--- a/src/views/task/components/BasicTask/index.d.ts
+++ b/src/views/task/components/BasicTask/index.d.ts
@@ -10,5 +10,7 @@ interface TaskType {
points: number
status: number
id: string
+ receiveCount: number
+ finishEnableCount: number
}
export { SignType, TaskType }
diff --git a/src/views/task/components/BasicTask/index.vue b/src/views/task/components/BasicTask/index.vue
index 759bc35..76cdaec 100644
--- a/src/views/task/components/BasicTask/index.vue
+++ b/src/views/task/components/BasicTask/index.vue
@@ -156,8 +156,8 @@ function handleInvite() {
已获得{{ item.points }}点数
-
- {{ item.status === 1 ? 1 : 0 }}/1
+
+ {{ item.receiveCount }}/{{ item.finishEnableCount }}
@@ -170,13 +170,13 @@ function handleInvite() {
-
+
领取
-
+
去邀请
-
@@ -184,10 +184,10 @@ function handleInvite() {
已完成
-
+
领取
-
diff --git a/src/views/task/components/TaskList/index.d.ts b/src/views/task/components/TaskList/index.d.ts
index 65e86b9..2c92383 100644
--- a/src/views/task/components/TaskList/index.d.ts
+++ b/src/views/task/components/TaskList/index.d.ts
@@ -3,4 +3,6 @@ export interface TaskType {
points: number
status: number
id: string
+ receiveCount: number
+ finishEnableCount: number
}
diff --git a/src/views/task/components/TaskList/index.vue b/src/views/task/components/TaskList/index.vue
index 9777f01..f2d3275 100644
--- a/src/views/task/components/TaskList/index.vue
+++ b/src/views/task/components/TaskList/index.vue
@@ -28,6 +28,7 @@ const props = defineProps({
})
const emit = defineEmits(['updateList'])
const reactiveList: ComputedRef
= computed(() => props.list)
+console.log(reactiveList, 'reactiveList')
const userStore = useUserStore()
// 领取积分
@@ -83,7 +84,7 @@ const dynamicStyle = computed(() => {
已获得{{ item.points }}点数
- {{ item.status === 1 ? 1 : 0 }}/1
+ {{ item.receiveCount }}/{{ item.finishEnableCount }}