diff --git a/config.js b/config.js
index f0c99bc..d5532e7 100644
--- a/config.js
+++ b/config.js
@@ -8,13 +8,13 @@ import uvUI from '@/uni_modules/uv-ui-tools'
Vue.use(uvUI);
// 当前环境
-const type = 'local'
+const type = 'prod'
// 环境配置
const config = {
local : {
- baseUrl : 'http://127.0.0.1:8002/novel-admin',
+ baseUrl : 'http://127.0.0.1:8003/novel-admin',
},
dev : {
baseUrl : 'http://h5.xzaiyp.top/novel-admin',
@@ -23,22 +23,28 @@ const config = {
baseUrl : 'https://prod-api.budingxiaoshuo.com/novel-admin',
}
}
+// oss:
+// accessKey: LTAI5tG9VnnPpjvcrQ3dtaYG
+// secretKey: h0nzWxMbH9RIeVVcFbtjTpocCj9GHc
+// endpoint: oss-cn-shenzhen.aliyuncs.com
+// bucketName: buding-oss
+// staticDomain: https://oss.budingxiaoshuo.com/
// 默认配置
const defaultConfig = {
mapKey : 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU',
aliOss: {
- url: 'https://image.hhlm1688.com/',
+ url: 'https://oss.budingxiaoshuo.com/',
config: {
//桶的地址
- region: 'oss-cn-guangzhou',
+ region: 'oss-cn-shenzhen',
//id
- accessKeyId: 'LTAI5tQSs47izVy8DLVdwUU9',
+ accessKeyId: 'LTAI5tG9VnnPpjvcrQ3dtaYG',
//密钥
- accessKeySecret: 'qHI7C3PaXYZySr84HTToviC71AYlFq',
+ accessKeySecret: 'h0nzWxMbH9RIeVVcFbtjTpocCj9GHc',
//桶的名字
- bucket: 'hanhaiimage',
+ bucket: 'buding-oss',
endpoint: 'oss-cn-shenzhen.aliyuncs.com',
}
},
diff --git a/pages_order/comment/myComment.vue b/pages_order/comment/myComment.vue
index 4a4f5d5..2e773ac 100644
--- a/pages_order/comment/myComment.vue
+++ b/pages_order/comment/myComment.vue
@@ -90,14 +90,7 @@
}).then(res => {
this.unreadComments = res.records
- this.unreadComments.forEach(n => {
- this.updateCommentRead(n.id)
- })
- })
- },
- updateCommentRead(commentId){
- this.$fetch('updateCommentRead', {
- commentId
+ this.$fetch('updateCommentRead')
})
},
}
diff --git a/pages_order/mine/runningWater.vue b/pages_order/mine/runningWater.vue
index a14a621..d3889cf 100644
--- a/pages_order/mine/runningWater.vue
+++ b/pages_order/mine/runningWater.vue
@@ -56,6 +56,10 @@
onLoad(e) {
this.status = e.status
},
+ onShow() {
+ // 更新用户信息
+ this.$store.commit('getUserInfo')
+ },
methods: {
leftClick() { //返回钱包
uni.navigateBack(-1)
diff --git a/pages_order/novel/Translation.vue b/pages_order/novel/Translation.vue
index 1ccbd4a..9c91e75 100644
--- a/pages_order/novel/Translation.vue
+++ b/pages_order/novel/Translation.vue
@@ -26,9 +26,9 @@
+ {{ day.num }}
-
@@ -36,14 +36,16 @@
+ :class="{ 'no-border': idx == list.length - 1 }">
{{ task.title }}
推荐票 +{{ task.num }}
-
@@ -67,19 +69,6 @@
data() {
return {
checkedDays: 3, // 已签到天数
- tasks: [{
- title: '观看视频广告',
- received: false
- },
- {
- title: '每日首阅三个章节',
- received: false
- },
- {
- title: '每日首条评论',
- received: false
- },
- ],
clockList: [],
isChecked: false, // 新增：签到按钮状态
maxVote: 0,
@@ -88,10 +77,6 @@
}
},
computed: {
- isSign() {
- // 如果今日不可签到，则表示已签到
- return !this.canSignToday;
- },
},
onShow() {
this.getMyRecommendTicketNum()
@@ -162,9 +147,44 @@
this.getSignTaskList()
this.getMyRecommendTicketNum()
},
- async clickMoreTask(taskId) {
+ playTask(task){
+ if ("key_comment" == task.keyName){
+ //每日首条评论
+ uni.showModal({
+ title: '发布一条评论即可领取',
+ showCancel: false,
+ success: (res) => {
+ }
+ })
+ }else if ("key_chapter" == task.keyName){
+ //每日首阅三个章节
+ uni.showModal({
+ title: '阅读3个新的章节小说即可领取',
+ showCancel: false,
+ success: (res) => {
+ }
+ })
+
+ return chapterCount >= 3;
+ }else if ("key_advertisement" == task.keyName){
+ // TODO 观看视频广告
+ uni.showModal({
+ title: '暂未开放',
+ showCancel: false,
+ success: (res) => {
+ }
+ })
+ }
+ },
+ async clickMoreTask(task) {
+
+ if (!task.isTask) {
+ this.playTask(task)
+ return
+ }
+
await this.$fetch('clickMoreTask', {
- taskId,
+ taskId : task.id,
})
uni.showToast({
title: '领取成功',
@@ -173,34 +193,10 @@
this.getMoreTaskList()
this.getMyRecommendTicketNum()
},
- handleCheckin() {
- if (this.checkedDays < 8) {
- this.checkedDays++;
- this.isChecked = true;
- uni.showToast({
- title: '签到成功',
- icon: 'none'
- });
- } else {
- this.isChecked = true;
- uni.showToast({
- title: '已全部签到',
- icon: 'none'
- });
- }
- },
- handleReceive(idx) {
- this.tasks[idx].received = true;
- uni.showToast({
- title: '领取成功',
- icon: 'success'
- });
- },
checkTodaySignStatus() {
this.$fetch('getSignTaskToday')
.then(res => {
- // res.result == 0 表示可以签到，否则表示已签到
- this.canSignToday = res.result;
+ this.canSignToday = res;
})
.catch(err => {
console.error('获取今日签到状态失败:', err);
diff --git a/pages_order/novel/readnovels.vue b/pages_order/novel/readnovels.vue
index 2d59a5f..02e5593 100644
--- a/pages_order/novel/readnovels.vue
+++ b/pages_order/novel/readnovels.vue
@@ -22,8 +22,8 @@
-
+
{{ currentChapter }}
@@ -100,7 +100,6 @@
cid: 0,
novelData: {},
chapterList: [],
- scrollTop: 0, // 滚动位置
// 是否需要购买
isPay : false,
@@ -177,7 +176,10 @@
// 滚动到顶部
this.$nextTick(() => {
- this.scrollTop = 0; // 设置scroll-view滚动到顶部
+ uni.pageScrollTo({
+ scrollTop: 0,
+ duration: 0
+ });
})
})
},
@@ -195,15 +197,8 @@
this.toggleFullScreen();
},
handleScroll(e) {
- // 获取滚动位置
- const scrollTop = e.detail.scrollTop;
- this.scrollTop = scrollTop; // 更新当前滚动位置
-
- // 滚动时触发订阅弹窗
- if (scrollTop > 50 && !this.popupShown) {
- this.$refs.subscriptionPopup.open();
- this.popupShown = true;
- }
+ // scroll-view的滚动事件（如果需要处理scroll-view内部的滚动逻辑）
+ // 目前主要的滚动逻辑已移至onPageScroll处理
},
toggleFullScreen() {
this.isFullScreen = !this.isFullScreen