From 15e63d4232503362a577b82a58a45f1e311e0e8c Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Mon, 20 Mar 2023 16:18:17 +0800 Subject: [PATCH 1/3] bug --- src/project/fengdu/AppCircle/Add.vue | 2 ++ src/project/fengdu/AppCircle/AppCircle.vue | 3 +++ src/project/fengdu/AppCircle/Detail.vue | 2 ++ src/project/fengdu/AppCircle/MyPostList.vue | 2 ++ src/project/fengdu/AppCircle/Topic.vue | 2 ++ src/project/fengdu/AppCircle/TopicDetail.vue | 2 ++ 6 files changed, 13 insertions(+) diff --git a/src/project/fengdu/AppCircle/Add.vue b/src/project/fengdu/AppCircle/Add.vue index 87d8eb9..77e83ed 100644 --- a/src/project/fengdu/AppCircle/Add.vue +++ b/src/project/fengdu/AppCircle/Add.vue @@ -53,6 +53,8 @@ export default { name: 'Add', appName: '发新贴', + navigationBarBackgroundColor: '#ffffff', + navigationBarTextStyle: 'black', data () { return { diff --git a/src/project/fengdu/AppCircle/AppCircle.vue b/src/project/fengdu/AppCircle/AppCircle.vue index 633b75f..d3d88b4 100644 --- a/src/project/fengdu/AppCircle/AppCircle.vue +++ b/src/project/fengdu/AppCircle/AppCircle.vue @@ -96,6 +96,9 @@ } }, + onReady () { + }, + onLoad () { this.getTopicList() diff --git a/src/project/fengdu/AppCircle/Detail.vue b/src/project/fengdu/AppCircle/Detail.vue index e9f5ddf..72939c8 100644 --- a/src/project/fengdu/AppCircle/Detail.vue +++ b/src/project/fengdu/AppCircle/Detail.vue @@ -99,6 +99,8 @@ export default { name: 'Detail', appName: '详情', + navigationBarBackgroundColor: '#ffffff', + navigationBarTextStyle: 'black', data () { return { diff --git a/src/project/fengdu/AppCircle/MyPostList.vue b/src/project/fengdu/AppCircle/MyPostList.vue index a9ca003..a1fca7b 100644 --- a/src/project/fengdu/AppCircle/MyPostList.vue +++ b/src/project/fengdu/AppCircle/MyPostList.vue @@ -127,6 +127,8 @@ export default { name: 'MyPostList', appName: '我的帖子', + navigationBarBackgroundColor: '#ffffff', + navigationBarTextStyle: 'black', data () { return { diff --git a/src/project/fengdu/AppCircle/Topic.vue b/src/project/fengdu/AppCircle/Topic.vue index c396a18..2aa097f 100644 --- a/src/project/fengdu/AppCircle/Topic.vue +++ b/src/project/fengdu/AppCircle/Topic.vue @@ -17,6 +17,8 @@ export default { name: 'Topic', appName: '更多话题', + navigationBarBackgroundColor: '#ffffff', + navigationBarTextStyle: 'black', data () { return { diff --git a/src/project/fengdu/AppCircle/TopicDetail.vue b/src/project/fengdu/AppCircle/TopicDetail.vue index 55a7163..1a85827 100644 --- a/src/project/fengdu/AppCircle/TopicDetail.vue +++ b/src/project/fengdu/AppCircle/TopicDetail.vue @@ -60,6 +60,8 @@ export default { name: 'TopicDetail', appName: '话题详情', + navigationBarBackgroundColor: '#ffffff', + navigationBarTextStyle: 'black', data () { return { From 80a3286a0589fe535821bd861dd763afbea864a5 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 20 Mar 2023 16:32:30 +0800 Subject: [PATCH 2/3] checktype==4 --- src/components/utils/modules.js | 14 ++++++++ src/project/fengdu/AppHome/AppHome.vue | 49 ++++++++++---------------- src/project/fengdu/AppMine/AppMine.vue | 2 +- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/src/components/utils/modules.js b/src/components/utils/modules.js index 43af3b8..2fea4da 100644 --- a/src/components/utils/modules.js +++ b/src/components/utils/modules.js @@ -69,6 +69,7 @@ export const user = { //checkType 1、登录认证 2、居民认证 3、党员认证 //判断是否需要校验认证信息 let {user: userInfo, token} = rootState + console.log(); if (!checkType) { //如果需要校验认证信息，必定要先验证是否登录 uni.navigateTo({url: modulePath}); @@ -93,6 +94,19 @@ export const user = { return uni.showToast({title: "您还不是党员，暂时无法使用该功能", icon: "none"}); } uni.navigateTo({url: modulePath}); + } else if (checkType == 4) { + if (!token) { + return dispatch('autoLogin').then(() => dispatch('authCheck', { checkType, modulePath })); + } + if (!userInfo.areaId) { + this.$dialog.confirm({ + content: '您只有完成信息认证后，才可进行相关操作。', + confirmText: '去认证' + }).then(() => { + uni.switchTab({ url: '/pages/AppMine/userInfo' }) + }).catch(() => { + }) + } } } } diff --git a/src/project/fengdu/AppHome/AppHome.vue b/src/project/fengdu/AppHome/AppHome.vue index 1706b9b..a0704eb 100644 --- a/src/project/fengdu/AppHome/AppHome.vue +++ b/src/project/fengdu/AppHome/AppHome.vue @@ -118,38 +118,27 @@ export default { }) }, handleClick({type, appId, modulePath, url, checkType, corpId}) { - if(this.user.areaId) { - //先判读是不是系统应用 - if (type != "0") { - if (type == "1") { - uni.navigateToMiniProgram({appId}); - } else if (type == "2") { - uni.navigateTo({url: "/subPages/h5/webview?link=" + url}); - } else if (type == "3") { - this.$linkTo(url); - } else if (type == "4") { - uni.openCustomerServiceChat({ - extInfo: {url: url}, - corpId: corpId, - fail: () => { - this.$u.toast('请使用普通微信打开小程序进行咨询'); - } - }); - } - } else if (type && type == "0") { - uni.showLoading({title: '正在进入应用...'}) - this.authCheck({checkType, modulePath}).finally(() => uni.hideLoading()) + //先判读是不是系统应用 + if (type != "0") { + if (type == "1") { + uni.navigateToMiniProgram({appId}); + } else if (type == "2") { + uni.navigateTo({url: "/subPages/h5/webview?link=" + url}); + } else if (type == "3") { + this.$linkTo(url); + } else if (type == "4") { + uni.openCustomerServiceChat({ + extInfo: {url: url}, + corpId: corpId, + fail: () => { + this.$u.toast('请使用普通微信打开小程序进行咨询'); + } + }); } - } else { - this.$dialog.confirm({ - content: '您只有完成信息认证后，才可进行相关操作。', - confirmText: '去认证' - }).then(() => { - uni.switchTab({ url: '/pages/AppMine/userInfo' }) - }).catch(() => { - }) + } else if (type && type == "0") { + uni.showLoading({title: '正在进入应用...'}) + this.authCheck({checkType, modulePath}).finally(() => uni.hideLoading()) } - }, handleBannerClick(index) { if (!this.swiperList[index].linkUrl) return diff --git a/src/project/fengdu/AppMine/AppMine.vue b/src/project/fengdu/AppMine/AppMine.vue index 20eb269..0c6e9aa 100644 --- a/src/project/fengdu/AppMine/AppMine.vue +++ b/src/project/fengdu/AppMine/AppMine.vue @@ -161,7 +161,7 @@ export default { }, getAuth() { this.$nextTick(() => { - this.token && this.getUserInfo() + this.token && this.getUserInfo('qujing') }) }, onLogout() { From df8ef261a9a31729b827aed39f487cd0da2ade8b Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Mon, 20 Mar 2023 16:55:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/fengdu/AppCircle/Detail.vue | 98 ++++++++++++++++++++++--- 1 file changed, 87 insertions(+), 11 deletions(-) diff --git a/src/project/fengdu/AppCircle/Detail.vue b/src/project/fengdu/AppCircle/Detail.vue index 72939c8..2c392db 100644 --- a/src/project/fengdu/AppCircle/Detail.vue +++ b/src/project/fengdu/AppCircle/Detail.vue @@ -1,4 +1,4 @@ -