From f19de6005874be051e7b837219998d683bc94e51 Mon Sep 17 00:00:00 2001
From: Connor <1813766834@qq.com>
Date: Sat, 8 Jun 2024 20:01:35 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=83=AD=E9=97=A8?=
=?UTF-8?q?=E5=BC=B9=E7=AA=97=E9=80=89=E9=A1=B9=E5=88=97=E8=A1=A8=E3=80=81?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=9D=A2=20icon=20=E8=B7=AF?=
=?UTF-8?q?=E5=BE=84=E7=AD=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index.vue | 18 +++++++++---------
pages/search/index.vue | 8 ++++----
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index f4e29ef..b0f4718 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -108,19 +108,18 @@
-
+
+
-
@@ -148,7 +147,7 @@ import PostView from "@/pages/common/postview/index.vue";
// const postTypeList = ['发布话题', '发布活动'];
const postTypeList = [{lable:'发布话题',id:1}, {lable:'发布活动',id:2}];
const searchPrerequisiteList = [
- '热门', '最新', '筛选3', '筛选4', '筛选5', '筛选6', '筛选7', '筛选8', '筛选9'
+ '热门', '最新', '筛选3', '筛选4', '筛选5', '筛选6', '筛选7', '筛选8'
];
const list1 = reactive([
@@ -499,12 +498,13 @@ import PostView from "@/pages/common/postview/index.vue";
margin-top: 42rpx;
display: flex;
flex-wrap: wrap;
- justify-content: space-between;
+ // justify-content: space-between;
}
.box-b {
- width: calc(33.33% - 16rpx); /* 每行三个元素，减去外边距的总宽度 */
+ width: calc(33.33% - 48rpx); /* 每行三个元素，减去外边距的总宽度 */
margin-bottom: 24rpx;
+ margin-left: 24rpx;
}
.box-c {
@@ -524,7 +524,7 @@ import PostView from "@/pages/common/postview/index.vue";
text-align: center;
font-family: "Microsoft YaHei";
// line-height: 82rpx;
- display: block;
+ // display: block;
cursor: pointer;
transition: all 0.3s ease;
padding: 12rpx 0;
diff --git a/pages/search/index.vue b/pages/search/index.vue
index 26688dd..7b72c41 100644
--- a/pages/search/index.vue
+++ b/pages/search/index.vue
@@ -7,11 +7,11 @@
-
+
-
+
搜索
@@ -22,7 +22,7 @@
搜索历史
-
+
@@ -33,7 +33,7 @@
-
+
没有找到相关内容奥,换个词试试吧!
From 4348db789851d6212a8272a556b62c6705fb7599 Mon Sep 17 00:00:00 2001
From: Connor <1813766834@qq.com>
Date: Sat, 8 Jun 2024 20:06:30 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=83=AD=E9=97=A8?=
=?UTF-8?q?=E5=BC=B9=E7=AA=97=E9=80=89=E9=A1=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index bb063c5..f0eebd5 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -502,9 +502,10 @@ import PostView from "@/pages/common/postview/index.vue";
}
.box-b {
- width: calc(33.33% - 48rpx); /* 每行三个元素，减去外边距的总宽度 */
+ width: calc(33.33% - 26rpx); /* 每行三个元素，减去外边距的总宽度 */
margin-bottom: 24rpx;
- margin-left: 24rpx;
+ // margin-left: 12rpx;
+ margin-right: 24rpx;
}
.box-c {
From 5609f6d94623962f2eabd512e4ea8d2e87432c4a Mon Sep 17 00:00:00 2001
From: 26947 <12@1>
Date: Sat, 8 Jun 2024 21:22:20 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B4=BB=E5=8A=A8?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=83=8C=E6=99=AF=E5=B1=95=E7=A4=BA=E5=87=BA?=
=?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/activity/index.vue | 31 +++++----
pages/activity/info.vue | 4 +-
pages/activity/publish.vue | 130 +++++++++++++++++++++++++------------
3 files changed, 104 insertions(+), 61 deletions(-)
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index fb9d55f..6591528 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -1,8 +1,6 @@
-
@@ -148,30 +149,7 @@ const uploadFilePromise = async (fileInfo1, name) => {
const uploadQN = (file) => {
return uploadQN1(file.url);
};
-//废弃
-const uploadQN2 = (file) => {
- return new Promise((resolve, reject) => {
- const observable = qiniu.upload(file, dataToken.key, dataToken.token, putExtra, config);
- const subscription = observable.subscribe({
- next(res) {
- console.log("next:", res);
- },
- error(err) {
- console.log("error:", err);
- reject(err);
- },
- async complete(res) {
- console.log("complete:", res);
- form.url = res.key;
- form.name = res.key;
- form.type = res.mimeType;
- form.size = res.fsize;
- await addFileList(form);
- resolve(res.key);
- }
- });
- });
-};
+
//调用uni上传方法
const uploadQN1 = (file) => {
return new Promise((resolve, reject) => {
diff --git a/pages/common/talkState/audit.vue b/pages/common/talkState/audit.vue
index b064025..f9d1c5b 100644
--- a/pages/common/talkState/audit.vue
+++ b/pages/common/talkState/audit.vue
@@ -35,15 +35,20 @@ const { proxy } = getCurrentInstance();
const iconConfig = proxy.iconConfig;
const sh2x1 = iconConfig.sh2x1;
const sh2x = iconConfig.sh2x;
-const bgColor = ref('');
-bgColor.value = 'rgba(170, 0, 0, 0)'
+const bgColor = ref('rgba(170, 0, 0, 0)');
+
const leftClick = () => {
proxy.$tab.navigateBack(1)
}
-
diff --git a/pages/register.vue b/pages/register.vue
index 293264e..a981a2f 100644
--- a/pages/register.vue
+++ b/pages/register.vue
@@ -111,6 +111,7 @@
registerSuccess(result) {
// 设置用户信息
this.$store.dispatch('GetInfo').then(res => {
+ this.$store.dispatch('GetUserInfo');
this.$tab.reLaunch('/pages/index')
})
}
diff --git a/pages/takeaway/index.vue b/pages/takeaway/index.vue
index 987f156..19f6415 100644
--- a/pages/takeaway/index.vue
+++ b/pages/takeaway/index.vue
@@ -1,19 +1,159 @@
-
-
-
@@ -132,20 +132,23 @@ import {onReachBottom,onLoad,onPageScroll} from "@dcloudio/uni-app";
import PostView from "@/pages/common/postview/index.vue";
const bgColor = ref('rgba(170, 0, 0, 0)');
-
+ onMounted(() => {
+ onPageScroll((e) => {
+ // console.log("滚动距离为：" + e.scrollTop);
+ if (e.scrollTop >= 70) {
+ bgColor.value = 'rgba(255, 255, 255, 1)'
+ } else {
+ bgColor.value = 'rgba(170, 0, 0, 0)'
+ }
+ });
+ onReachBottom(() => {
+ console.log('触底了')
+ })
+ })
- onPageScroll((e) => {
- // console.log("滚动距离为：" + e.scrollTop);
- if (e.scrollTop >= 70) {
- bgColor.value = 'rgba(255, 255, 255, 1)'
- } else {
- bgColor.value = 'rgba(170, 0, 0, 0)'
- }
- })
+
const { proxy } = getCurrentInstance();
- onReachBottom(() => {
- console.log('触底了')
- })
+
const viewIndex = ref(1);
const searchOpen = ref(false);
@@ -311,13 +314,7 @@ import PostView from "@/pages/common/postview/index.vue";
const handerShowHand = () => {
searchOpen.value = !searchOpen.value;
};
-
- onMounted(() => {
- console.log(proxy.$store.state.user.QNDomain);
- });
-
-
-
+
function GotoUNISignid(){
proxy.$tab.navigateTo("/pages/signln/signid");
}
diff --git a/pages/post/postInfo/postInfo.vue b/pages/post/postInfo/postInfo.vue
index b4963a9..6ecfa88 100644
--- a/pages/post/postInfo/postInfo.vue
+++ b/pages/post/postInfo/postInfo.vue
@@ -34,17 +34,20 @@
- ---展开回复
-
- ---收起
+
@@ -79,7 +96,7 @@
@@ -93,11 +110,11 @@
-
+
-
+
@@ -112,12 +129,13 @@
diff --git a/static/images/icon/deployment-1.png b/static/images/icon/deployment-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ece320aff8baa19e8558b6445101c5326d01c38f
GIT binary patch
literal 611
zcmV-p0-XJcP)Px%9Z5t%R5(wqlTV0FVHC!H=lwo1_rC8Xp%ht6iqb4BC}l9pY{--%8w+A(gN@mU
z4K^kl3q?vS6iGygNv34OVq!7bNGT(kZ|)ycX5ORw-8-6LX1;Hjv%7Vk=XcKYo-4yi
zc3sd;HPRIY!7JvlYFW0?c)bVuT;e4C3M>I?-bm-dAb33&tXh_BFkT-6i-2zu$3NN;
z{|E?x??%`jhT+@)fu(7>-YZXm#lVQ5J0&-a<9Hil9*n~T-D0in{}))2ByEbkC^yL=
zyREfP>Y%)mB-x?JePBK?i24ra+`HMp;y7N1m}kH;;HMF~!Z3W8d;A9FAH!+7OO!jn
zJm8D^N_!M77-$9-$MIUkoCSt71Im4rdXJx&V`p|
zddG&KdW=cZEy&r@=nYT>+KRK4W7Y;28(n5opfbi&C}$>LlAN$M=xGEg2AV}BNp?=r
xlSNwE9a($6S^2C$WsE(dGVEM-ox_X{Z~$ar&+zLEd{002ovPDHLkV1iil4-)_Y
literal 0
HcmV?d00001
diff --git a/static/images/icon/ring-1.png b/static/images/icon/ring-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..27cc2a37bbccc788b27652582cb93485af925314
GIT binary patch
literal 242
zcmVPx#tVu*cR5(w))WHqHFboCIZ%+cFv^&5CIb@@F1ek#}C^tC65Ei6D6;;z3<$OEAB`FmqSK
zYcS(#+BI0k-{6Q#HCte@W-DBz?SV7wg;UKfFyqr-;rKn?h*LLt;H(9$aMAP@*wk{X
s6Y}%1Y8vFG)nQ*&DWwAu?Y-;q2_f;S^(y+E`2YX_07*qoM6N<$f{V0ejQ{`u
literal 0
HcmV?d00001
From 9a9d1019ecb333c3796a1c27b206e568dc3209df Mon Sep 17 00:00:00 2001
From: 26947 <12@1>
Date: Sun, 9 Jun 2024 20:22:43 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 2 +-
api/activityInfo/activityTakeInfo.js | 9 +
api/activityInfo/info.js | 9 +
pages.json | 9 +
pages/activity/index.vue | 8 +-
pages/common/activityList/index.vue | 36 ++-
pages/mine/index.vue | 1 +
pages/mine/myActivity/index.vue | 400 +++++++++++++++++++++++++++
pages/mine/setting/index.vue | 2 +-
9 files changed, 465 insertions(+), 11 deletions(-)
create mode 100644 pages/mine/myActivity/index.vue
diff --git a/App.vue b/App.vue
index 5ca38e8..e336421 100644
--- a/App.vue
+++ b/App.vue
@@ -23,7 +23,7 @@
},
checkLogin() {
if (!getToken()) {
- this.$tab.reLaunch('pages/loginInfo/login')
+ this.$tab.reLaunch('pages/login')
}
}
}
diff --git a/api/activityInfo/activityTakeInfo.js b/api/activityInfo/activityTakeInfo.js
index 2798ad7..2fd20cf 100644
--- a/api/activityInfo/activityTakeInfo.js
+++ b/api/activityInfo/activityTakeInfo.js
@@ -72,3 +72,12 @@ export function gotoQrcode(data) {
data: data
})
}
+
+//查询用户所有活动参与的详细信息
+// 报名
+export function getUserAcInfo() {
+ return request({
+ url: '/activityInfo/activityTakeInfo/getUserAcInfo',
+ method: 'get'
+ })
+}
\ No newline at end of file
diff --git a/api/activityInfo/info.js b/api/activityInfo/info.js
index d85494c..cf1e9a2 100644
--- a/api/activityInfo/info.js
+++ b/api/activityInfo/info.js
@@ -42,3 +42,12 @@ export function delInfo(id) {
method: 'delete'
})
}
+
+// 查询自己的活动详情列表
+export function getmelistInfo(query) {
+ return request({
+ url: '/activityInfo/info/app/getmelistInfo',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/pages.json b/pages.json
index 1a58432..015babe 100644
--- a/pages.json
+++ b/pages.json
@@ -282,6 +282,15 @@
"navigationBarTitleText": "兼职"
}
}
+ ,
+ {
+ "path": "pages/mine/myActivity/index",
+ "style": {
+ "navigationBarTitleText": "我的活动",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 100
+ }
+ }
],
"tabBar": {
"color": "#000000",
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 4dbf2df..78c2fac 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -49,6 +49,7 @@
+
+
\ No newline at end of file
diff --git a/pages/mine/setting/index.vue b/pages/mine/setting/index.vue
index 9321d01..ada64c0 100644
--- a/pages/mine/setting/index.vue
+++ b/pages/mine/setting/index.vue
@@ -50,7 +50,7 @@
handleLogout() {
this.$modal.confirm('确定注销并退出系统吗？').then(() => {
this.$store.dispatch('LogOut').then(() => {
- this.$tab.reLaunch('/pages/loginInfo/login')
+ this.$tab.reLaunch('/pages/login')
})
})
}
From ad6dfb39048d60fb003b8e0783fa02e908eb13bd Mon Sep 17 00:00:00 2001
From: 26947 <12@1>
Date: Sun, 9 Jun 2024 23:10:23 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 8 +
pages/activity/index.vue | 32 ++-
pages/common/activityList/index.vue | 13 +-
pages/mine/myActivity/index.vue | 4 +
pages/mine/myActivity/info.vue | 337 ++++++++++++++++++++++++++++
5 files changed, 385 insertions(+), 9 deletions(-)
create mode 100644 pages/mine/myActivity/info.vue
diff --git a/pages.json b/pages.json
index 015babe..c46e177 100644
--- a/pages.json
+++ b/pages.json
@@ -291,6 +291,14 @@
"onReachBottomDistance": 100
}
}
+ ,{
+ "path": "pages/mine/myActivity/info",
+ "style": {
+ "navigationBarTitleText": "活动详情",
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
+ },
],
"tabBar": {
"color": "#000000",
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 78c2fac..3901f28 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -2,7 +2,7 @@
-
+
时间
-
+
+
+
@@ -55,14 +64,16 @@ import { onShow, onLoad ,onPullDownRefresh} from '@dcloudio/uni-app'
import { getDicts } from "@/api/system/dict/data"
import { ref, reactive, getCurrentInstance, toRefs } from 'vue'
import { useStore } from 'vuex';
-import { func } from "uview-plus/libs/function/test";
+const timeFormat = uni.$u.timeFormat;
const { proxy } = getCurrentInstance();
+const newData = ref(new Date().getTime());
const iconConfig = proxy.iconConfig;
const tu21 = iconConfig.tu21;
const tu22 = iconConfig.tu22;
const tu51 = iconConfig.tu51;
const tu52 = iconConfig.tu52;
const tu53 = iconConfig.tu53;
+const show = ref(false)
const total = ref()
const imgInfo = ref("")
const search = ref("电音节节日活动")
@@ -87,6 +98,7 @@ const data = reactive({
acTitle: null,
acContent: null,
startTime: null,
+ startTime1: null,
endTime: null,
state: null,
addres: null,
@@ -127,6 +139,7 @@ function reset() {
acTitle: null,
acContent: null,
startTime: null,
+ startTime1: null,
endTime: null,
state: null,
addres: null,
@@ -159,6 +172,19 @@ function reset() {
console.log("下拉刷新,",options);
getList();
})
+const queryTime = () => {
+ show.value = true
+}
+//日期选择
+const confirm = (e) => {
+ queryParams.value.startTime1 = timeFormat(e.value, 'yyyy-mm-dd');
+ show.value = false
+ getList()
+}
+const close = () =>{
+ queryParams.value.startTime1=null
+ show.value = false
+}
//tabs
const tabsClick =(e) =>{
if(e.state == 9){
diff --git a/pages/common/activityList/index.vue b/pages/common/activityList/index.vue
index 56d81b2..2ceb6e9 100644
--- a/pages/common/activityList/index.vue
+++ b/pages/common/activityList/index.vue
@@ -19,10 +19,10 @@
活动地点：{{ item.addres }}
-
+
-
- {{ getDictLabelByValue2(item.attendState).dictLabel }}
+
+ {{ getDictLabelByValue2(item.attendState) }}
@@ -70,15 +70,16 @@ const getDictLabelByValue = (state) => {
return dict ? dict : '未知状态';
};
const getDictLabelByValue2 = (state) => {
+ if(state == null)return null;
const dict = activityState2.value.find((dict) => dict.dictValue === state);
- if(dict.dictValue == 0){
+ if( dict== undefined | dict.dictValue == 0){
return null;
}
if(dict.dictValue == 1 | dict.dictValue == 2){
dict.dictLabel = "已报名"
- return dict ? dict : '未知状态';
+ return dict ? dict.dictLabel : '未知状态';
}
- return dict ? dict : '未知状态';
+ return dict ? dict.dictLabel : '未知状态';
};
onLoad((options) => {
getDicts('activity_state').then(e => {
diff --git a/pages/mine/myActivity/index.vue b/pages/mine/myActivity/index.vue
index e86867e..e7246ea 100644
--- a/pages/mine/myActivity/index.vue
+++ b/pages/mine/myActivity/index.vue
@@ -191,6 +191,10 @@ const scrolltolower = async () => {
console.log("没有更多数据了");
}
};
+const toInfo = (item) => {
+ proxy.$tab.navigateTo(`/pages/mine/myActivity/info?id=${item.id}`);
+}
+//删除分页信息
const removePage = () => {
queryParams.pageNum = 1
queryParams.pageNum = 5
diff --git a/pages/mine/myActivity/info.vue b/pages/mine/myActivity/info.vue
new file mode 100644
index 0000000..940f76a
--- /dev/null
+++ b/pages/mine/myActivity/info.vue
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+ {{ actiInfoList.acTitle }}
+ 活动时间：{{ actiInfoList.startTime }} - {{ actiInfoList.endTime }}
+ 活动地点：{{ actiInfoList.addres }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 签到二维码
+
+
+
+
+
+
+
+
+
+ {{ actiInfoList.nickName }}
+ {{ actiInfoList.infoSchool }}
+
+
+ 已报名：{{ actiInfoList.elroll }}人
+
+
+
+
+
+
+
+
\ No newline at end of file
From 8c26b4787e3e3acd0816986537ea462ab99e7b75 Mon Sep 17 00:00:00 2001
From: 26947 <12@1>
Date: Mon, 10 Jun 2024 16:12:11 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B?=
=?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=8F=82=E4=B8=8E=E4=BA=BA=E5=A4=B4=E5=83=8F?=
=?UTF-8?q?=E6=9F=A5=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 }}人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/activity/publish.vue b/pages/activity/publish.vue
index 1743c52..7e18eec 100644
--- a/pages/activity/publish.vue
+++ b/pages/activity/publish.vue
@@ -77,7 +77,7 @@
border="none">
添加活动具体位置
-
+
@@ -198,7 +198,9 @@ const inputtextInfo = (e) => {
console.log("测试输入1：", e);
}
-
+const gotomap = () => {
+ proxy.$tab.navigateTo('/pages/activity/map')
+}
const submitForm = (type) => {
if (uFormRef.value) {
diff --git a/pages/mine/myActivity/index.vue b/pages/mine/myActivity/index.vue
index f301788..15da2ff 100644
--- a/pages/mine/myActivity/index.vue
+++ b/pages/mine/myActivity/index.vue
@@ -227,6 +227,7 @@ onPullDownRefresh((options) => {
console.log("下拉刷新,", queryParams.value);
getList();
})
+//按照条件查询
const tabsClick = (index) => {
removePage()
if (index.state == 9) {
diff --git a/pages/mine/myActivity/info.vue b/pages/mine/myActivity/info.vue
index 46d7efc..f14aa21 100644
--- a/pages/mine/myActivity/info.vue
+++ b/pages/mine/myActivity/info.vue
@@ -7,7 +7,7 @@
-
+
@@ -26,50 +26,69 @@
+ @click="showqr = true">
+
签到二维码
-
+
-
+
+
+
+ 发布审核时间：{{ actiInfoList.startTime }}
+ 审核状态：审核中
+
+
+
+
+
+ 发布审核时间：{{ actiInfoList.startTime }}
+ 审核状态：未通过
+ 未通过原因：{{actiInfoList.auditAdvice}}
+
+
+
+
-
-
-
-
-
- 已报名：{{ actiInfoList.elroll }}人
-
-
-
-
-
-
+
+
+
+
已报名：{{ actiInfoList.elroll }}人
-
-
-
-
- 已签到：{{ actiInfoList.qrcodeElroll }}人
-
+
+
+
+
+
+ 已报名：{{ actiInfoList.elroll }}人
+
+
+
+
+
+ 已签到：{{ actiInfoList.qrcodeElroll }}人
+
+
+
-
-
+
+
+ style="width: 600rpx; height: 600rpx">
+
@@ -77,7 +96,7 @@
diff --git a/pages/mine/myActivity/info.vue b/pages/mine/myActivity/info.vue
index f14aa21..d825613 100644
--- a/pages/mine/myActivity/info.vue
+++ b/pages/mine/myActivity/info.vue
@@ -24,7 +24,7 @@
-
+