From 2128c685701f296c600e1ad127b7f60107adf955 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Mon, 16 Jun 2025 15:12:54 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/navigation/navigationBar.vue | 4 +++-
pages/components/notice-item.vue | 19 +++++++++++--------
pages/login.vue | 21 ++++++++++++++++++---
pages/notice/detail.vue | 7 ++++---
pages/notice/public-notice.vue | 7 ++++---
store/modules/user.js | 5 +++--
6 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/components/navigation/navigationBar.vue b/components/navigation/navigationBar.vue
index 088fd04..fe9a4d0 100644
--- a/components/navigation/navigationBar.vue
+++ b/components/navigation/navigationBar.vue
@@ -68,13 +68,15 @@
.navigationBar {
position: absolute;
top: var(--status-bar-height);
- height: 90rpx;
+ height: 110rpx;
width: 100%;
display: flex;
align-items: center;
font-size: 30rpx;
justify-content: center;
z-index: 9;
+ box-sizing: border-box;
+ padding-top: 20rpx;
.navigationBarBack {
padding-left: 20rpx;
diff --git a/pages/components/notice-item.vue b/pages/components/notice-item.vue
index aee691b..257138f 100644
--- a/pages/components/notice-item.vue
+++ b/pages/components/notice-item.vue
@@ -22,21 +22,22 @@
- 类型：{{item.bloggerTypesText||'无限制'}}
+ 类型：{{item.bloggerTypes||'无限制'}}
- {{item.userNickName}}
+ {{item.userNickName}}
+
-
+
-
+
diff --git a/pages/login.vue b/pages/login.vue
index 8f7dfcf..b4e17a8 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -1,5 +1,8 @@
+
+
+
@@ -87,6 +90,10 @@
},
methods: {
+ back() {
+ uni.navigateBack()
+
+ },
/**
* 同意
* @param {Object} e
@@ -139,6 +146,10 @@
toast("请先阅读并同意《隐私协议》《用户服务协议》")
return
}
+ if (uni.getStorageSync("inviteId")) {
+ this.wxLoginForm.inviteId = uni.getStorageSync("inviteId")
+ }
+ console.log(this.wxLoginForm, 145);
let ok = await this.wxLogin()
console.log("微信小程序发起授权登录")
this.$modal.loading("登录中...")
@@ -159,9 +170,7 @@
},
//向后端发起登录请求
sendWxLoginFormToLocalService() {
- if (uni.getStorageSync("inviteId")) {
- this.wxLoginForm.inviteId = uni.getStorageSync("inviteId")
- }
+
this.$store.dispatch('WxLogin', this.wxLoginForm).then(() => {
this.$modal.closeLoading()
this.loginSuccess()
@@ -220,6 +229,12 @@
background-color: #ffffff;
}
+ .navigationBarBack {
+ position: fixed;
+ left: 30rpx;
+ top: 98rpx;
+ }
+
.checklist-box {
margin-right: 0rpx !important;
}
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index deb6f7b..43adcf7 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -4,7 +4,7 @@
title-color="#000000">
-
+
已报名：{{allImgNum||0}}人
@@ -129,7 +129,7 @@
{{calculateTimeDifference(noticeDetail.updateTime)||''}}更新
- {{noticeDetail.viewNum||''}} 阅读
+
@@ -390,8 +390,9 @@
onShow() {
if (null != getJSONData(constant.userInfo)) {
this.userInfo = getJSONData(constant.userInfo)
+ this.getRole()
}
- this.getRole()
+
this.getDetail()
this.viewNotice()
},
diff --git a/pages/notice/public-notice.vue b/pages/notice/public-notice.vue
index 6d4bdbb..4287f44 100644
--- a/pages/notice/public-notice.vue
+++ b/pages/notice/public-notice.vue
@@ -48,8 +48,8 @@
截止时间
-
+
@@ -292,6 +292,7 @@
},
data() {
return {
+ nowDate: new Date(),
//城市树结构
dataTree: [],
//一行显示几个
@@ -1138,4 +1139,4 @@
.checklist-box {
margin-right: 0 !important;
}
-
+
\ No newline at end of file
diff --git a/store/modules/user.js b/store/modules/user.js
index 42ae65f..cb10b2f 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -62,8 +62,9 @@ const user = {
const code = wxUserInfo.code
const encryptedIv = wxUserInfo.encryptedIv
const encryptedData = wxUserInfo.encryptedData
+ const inviteId = wxUserInfo.inviteId
return new Promise((resolve, reject) => {
- wxLogin(code, encryptedIv, encryptedData).then(res => {
+ wxLogin(code, encryptedIv, encryptedData, inviteId).then(res => {
setToken(res.token)
commit('SET_TOKEN', res.token)
resolve()
@@ -161,4 +162,4 @@ const user = {
}
}
-export default user
+export default user
\ No newline at end of file