diff --git a/api/api.js b/api/api.js index d05691f..458d6d8 100644 --- a/api/api.js +++ b/api/api.js @@ -472,7 +472,7 @@ export function api(key, data, callback, loadingTitle) { if (req.auth) { if (!uni.getStorageSync('token')) { utils.toLogin() - console.error('需要登录') + console.error('需要登录', req) return } } diff --git a/api/model/browseRecord.js b/api/model/browseRecord.js index 98799d5..37e131b 100644 --- a/api/model/browseRecord.js +++ b/api/model/browseRecord.js @@ -5,8 +5,6 @@ const api = { addBrowseRecord: { url: '/city/browseRecord/addBrowseRecord', method: 'POST', - auth : true, - showLoading : true, }, //获取记录列表type-0帖子-1租房-2工作-3景点-4美食-5活动-6人找车-7车找人-8文章 getBrowseRecordPage: { diff --git a/mixins/rewardedVideoAd.js b/mixins/rewardedVideoAd.js index 728418b..00e2275 100644 --- a/mixins/rewardedVideoAd.js +++ b/mixins/rewardedVideoAd.js @@ -112,6 +112,14 @@ export default { * @param {String} options.fallbackContent 广告加载失败时的弹窗内容 */ showRewardedVideoAd(options = {}) { + // 检查用户是否已登录 + if (!this.userInfo || !this.userInfo.id) { + console.log('用户未登录，跳转到登录页面') + // 使用utils中的toLogin方法跳转到登录页面 + this.$utils.toLogin() + return + } + // 如果正在观看广告，直接返回 if (this.isWatchingAd) { return diff --git a/pages/index/index.vue b/pages/index/index.vue index cb6f9cf..447512f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -13,10 +13,13 @@ - + 江华瑶族自治县 + + @@ -26,6 +29,7 @@ {{ headInfo.name }} + + {{headInfo.activityNum}}活动 江华便民生活好帮手 + --> + + + + + 当前已有{{headInfo.userNum}}位江华人入驻 + + + + 江华便民生活好帮手 + @@ -404,6 +421,7 @@ top: 0; left: 0; padding-top: 80rpx; + background-color: #00000052; // background: linear-gradient(to bottom, rgb(85, 94, 123), rgb(45, 51, 73)); .Toggle { @@ -451,6 +469,10 @@ text { margin: 0 10rpx; } + + &.intro-text { + font-weight: bold; + } } } diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue index da01fdf..ac22c5a 100644 --- a/pages_order/auth/wxLogin.vue +++ b/pages_order/auth/wxLogin.vue @@ -18,7 +18,7 @@ - 取消登录 + 匿名体验 @@ -27,20 +27,20 @@ - - - + + - 阅读并同意我们的“服务协议与隐私条款” + + 阅读并同意我们的"服务协议与隐私条款" + - - 以及个人信息保护指引 + + 以及个人信息保护指引 @@ -70,6 +70,14 @@ } this.$store.commit('login') }, + //切换勾选状态 + toggleCheckbox(){ + if(this.checkboxValue.includes(1)){ + this.checkboxValue = [] + } else { + this.checkboxValue = [1] + } + }, //打开应用配置 openConfigDetail(key){ this.$refs.popup.open(key) @@ -126,8 +134,8 @@ display: flex; justify-content: center; align-items: center; - margin: 20rpx 0; border-radius: 20rpx; + margin: 20rpx 0; .icon{ margin-right: 10rpx; image{ @@ -147,11 +155,38 @@ .config{ position: absolute; bottom: 0; - font-size: 22rpx; + font-size: 28rpx; text-align: center; - line-height: 40rpx; + line-height: 50rpx; + padding: 20rpx; + + .content { + cursor: pointer; + padding: 15rpx; + border-radius: 10rpx; + transition: background-color 0.2s; + } + + .checkbox-row { + display: flex; + align-items: center; + justify-content: center; + margin-bottom: 10rpx; + } + + .text-content { + margin-left: 15rpx; + flex: 1; + } + + .text-line { + text-align: center; + margin-top: 5rpx; + } + text{ color: $uni-color; + font-weight: 500; } } } diff --git a/pages_order/components/list/comment/commentItem.vue b/pages_order/components/list/comment/commentItem.vue index faf3344..26bda5a 100644 --- a/pages_order/components/list/comment/commentItem.vue +++ b/pages_order/components/list/comment/commentItem.vue @@ -112,6 +112,13 @@ // 处理回复 handleReply() { + // 检查用户是否已登录 + if (!this.userInfo || !this.userInfo.id) { + console.log('用户未登录，跳转到登录页面') + // 使用utils中的toLogin方法跳转到登录页面 + this.$utils.toLogin() + return + } this.$emit('reply', { item : this.item, level : 0, @@ -120,6 +127,13 @@ // 处理子评论回复 handleSubReply(subComment) { + // 检查用户是否已登录 + if (!this.userInfo || !this.userInfo.id) { + console.log('用户未登录，跳转到登录页面') + // 使用utils中的toLogin方法跳转到登录页面 + this.$utils.toLogin() + return + } this.$emit('reply', { item : subComment, level : 1, diff --git a/pages_order/components/list/comment/commentList.vue b/pages_order/components/list/comment/commentList.vue index 393439f..2a6385e 100644 --- a/pages_order/components/list/comment/commentList.vue +++ b/pages_order/components/list/comment/commentList.vue @@ -46,6 +46,13 @@ export default { // 打开评论发布弹窗 openCommentPublish() { + // 检查用户是否已登录 + if (!this.userInfo || !this.userInfo.id) { + console.log('用户未登录，跳转到登录页面') + // 使用utils中的toLogin方法跳转到登录页面 + this.$utils.toLogin() + return + } this.currentReplyComment = null this.$refs.commentPublish.open() }, diff --git a/pages_order/components/list/comment/commentPublish.vue b/pages_order/components/list/comment/commentPublish.vue index 388a59e..bcec0ec 100644 --- a/pages_order/components/list/comment/commentPublish.vue +++ b/pages_order/components/list/comment/commentPublish.vue @@ -81,6 +81,7 @@ export default { // 检查邮箱并提交 async submit() { + // 检查用户是否填写了邮箱 if (!this.userInfo.mail) { this.$refs.emailPopup.show() diff --git a/pages_order/mine/promotion.vue b/pages_order/mine/promotion.vue index 089c82e..012515b 100644 --- a/pages_order/mine/promotion.vue +++ b/pages_order/mine/promotion.vue @@ -43,7 +43,7 @@ return { url: '', title: '123123', - baseUrl: 'https://dianpin-img.xzaiyp.top/', + baseUrl: '', canvas: {}, imagePath: '', } diff --git a/pages_order/post/postDetail.vue b/pages_order/post/postDetail.vue index 4f3f136..8b69e5c 100644 --- a/pages_order/post/postDetail.vue +++ b/pages_order/post/postDetail.vue @@ -28,7 +28,7 @@ - + diff --git a/pages_order/scenicSpot/scenicSpotDetail.vue b/pages_order/scenicSpot/scenicSpotDetail.vue index 75b7cdb..77b5749 100644 --- a/pages_order/scenicSpot/scenicSpotDetail.vue +++ b/pages_order/scenicSpot/scenicSpotDetail.vue @@ -8,7 +8,7 @@ - + -
- - + - + - + +