From 8c26b4787e3e3acd0816986537ea462ab99e7b75 Mon Sep 17 00:00:00 2001
From: 26947 <12@1>
Date: Mon, 10 Jun 2024 16:12:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B=E6=B4=BB?=
=?UTF-8?q?=E5=8A=A8=E5=8F=82=E4=B8=8E=E4=BA=BA=E5=A4=B4=E5=83=8F=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/activityInfo/info.js | 9 +-
config.js | 2 +-
pages.json | 2 +-
pages/activity/info.vue | 6 +-
pages/mine/myActivity/index.vue | 16 ++--
pages/mine/myActivity/info.vue | 144 ++++++++++++++++++++++----------
6 files changed, 121 insertions(+), 58 deletions(-)
diff --git a/api/activityInfo/info.js b/api/activityInfo/info.js
index cf1e9a2..38af2de 100644
--- a/api/activityInfo/info.js
+++ b/api/activityInfo/info.js
@@ -16,7 +16,14 @@ export function getInfo(id) {
method: 'get'
})
}
-
+getInfoall
+// 查询活动详情详细 所有额外信息
+export function getInfoall(id) {
+ return request({
+ url: '/activityInfo/info/app/all/' + id,
+ method: 'get'
+ })
+}
// 新增活动详情
export function addInfo(data) {
return request({
diff --git a/config.js b/config.js
index 028cde9..8611530 100644
--- a/config.js
+++ b/config.js
@@ -1,6 +1,6 @@
// 应用全局配置
export default {
- qnDomain: 'http://sdcwwvrwz.hn-bkt.clouddn.com/',
+ qnDomain: 'http://seueton5q.hn-bkt.clouddn.com/',
uploadQiNiuDomain: 'https://upload-z2.qiniup.com',
// baseUrl: 'https://vue.ruoyi.vip/prod-api',
// baseUrl: 'http://47.93.242.168:8080',
diff --git a/pages.json b/pages.json
index c46e177..c8309b8 100644
--- a/pages.json
+++ b/pages.json
@@ -298,7 +298,7 @@
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
}
- },
+ }
],
"tabBar": {
"color": "#000000",
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index bcbfd64..c585b7d 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -183,11 +183,12 @@ const goSing = (e) => {
//简单刷新一下数据
checkStatus(actiInfoList.value.id);
}
-const goQrcode = () => {
+const goQrcode = (e) => {
+ console.log("saoma");
uni.scanCode({
onlyFromCamera: true,
success: (res) => {
- console.log('扫描二维码成功,结果:', res);
+ console.log('扫描二维码成功,结果:', res.result);
toqrcode(res);
},
@@ -210,6 +211,7 @@ function confirm() {
}
const toqrcode = (e) => {
qrcodeInfo.value = JSON.parse(e.result);
+ console.log("数据结果：",qrcodeInfo.value);
if (actiInfoList.value.id !== qrcodeInfo.value.id) {
proxy.$modal.msgError('二维码不匹配!')
return;
diff --git a/pages/mine/myActivity/index.vue b/pages/mine/myActivity/index.vue
index e7246ea..f301788 100644
--- a/pages/mine/myActivity/index.vue
+++ b/pages/mine/myActivity/index.vue
@@ -196,17 +196,14 @@ const toInfo = (item) => {
}
//删除分页信息
const removePage = () => {
- queryParams.pageNum = 1
- queryParams.pageNum = 5
+ queryParams.value.pageNum = 1
+ queryParams.value.pageSize = 5
}
const activityState = ref()
onLoad((options) => {
getDicts('activity_state').then(e => {
- activityState.value = e.data
-
- console.log(e);
+ activityState.value = e.data;
})
- console.log("options:", options);
reset()
getListBytype(options.type)
})
@@ -225,12 +222,12 @@ const getListBytype = (type) => {
}
// 下拉刷新
onPullDownRefresh((options) => {
- console.log("下拉刷新,", options);
- removePage()
+
+ removePage();
+ console.log("下拉刷新,", queryParams.value);
getList();
})
const tabsClick = (index) => {
- console.log("index:", index);
removePage()
if (index.state == 9) {
queryParams.value.auditStatus = null;
@@ -245,7 +242,6 @@ const getList = () => {
getmelistInfo(queryParams.value)
.then(res => {
uni.stopPullDownRefresh()
- console.log("res:", res);
total.value = res.total
modelValue.value = res.rows
})
diff --git a/pages/mine/myActivity/info.vue b/pages/mine/myActivity/info.vue
index 940f76a..46d7efc 100644
--- a/pages/mine/myActivity/info.vue
+++ b/pages/mine/myActivity/info.vue
@@ -25,37 +25,64 @@
-
+
签到二维码
-
-
-
-
- {{ actiInfoList.nickName }}
- {{ actiInfoList.infoSchool }}
+
+
+
+
+
已报名：{{ actiInfoList.elroll }}人
-
-
+
+
+
+
+
+
+ 已报名：{{ actiInfoList.elroll }}人
+
+
+
+
+
+ 已签到：{{ actiInfoList.qrcodeElroll }}人
+
+
+
+
+
+
+
+
+
+
+
+
+