diff --git a/api/model/index.js b/api/model/index.js index 6c674c1..bfcb2f8 100644 --- a/api/model/index.js +++ b/api/model/index.js @@ -1,12 +1,6 @@ // 首页相关接口 const api = { - // 批量订阅章节 - batchSubscribeBookCatalog: { - url: '/all_index/batchSubscribeBookCatalog', - method: 'GET', - auth: true, - }, // 获取首页banner getBanner: { url: '/all_index/getBanner', @@ -73,12 +67,6 @@ const api = { method: 'GET', auth: true, }, - // 订阅章节 - subscribeBook: { - url: '/all_index/subscribeBook', - method: 'GET', - auth: true, - }, // 根据书本标识进行投票 vote: { url: '/all_index/vote', diff --git a/api/model/order.js b/api/model/order.js index e4e68fd..59a67d4 100644 --- a/api/model/order.js +++ b/api/model/order.js @@ -25,18 +25,6 @@ const api = { method: 'GET', auth: true, }, - // 支付订单 - payOrder : { - url: '/my_order/payOrder', - method: 'POST', - auth: true, - }, - // 支付成功 - paySuccess : { - url: '/my_order/paySuccess', - method: 'POST', - auth: true, - }, // 创建支付套餐订单 createPayPackageOrder : { url: '/my_order/createPayPackageOrder', diff --git a/config.js b/config.js index 0b239b6..3f50244 100644 --- a/config.js +++ b/config.js @@ -8,7 +8,7 @@ import uvUI from '@/uni_modules/uv-ui-tools' Vue.use(uvUI); // 当前环境 -const type = 'local' +const type = 'prod' // 环境配置 diff --git a/pages.json b/pages.json index b0ad38d..9989007 100644 --- a/pages.json +++ b/pages.json @@ -118,12 +118,15 @@ }, { "path": "mine/recharge" + }, + { + "path": "mine/webview" } ] }], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "小说", + "navigationBarTitleText": "布丁笔录", "navigationBarBackgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8", "navigationStyle": "custom" diff --git a/pages/index/center.vue b/pages/index/center.vue index a908da2..38feeb4 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -110,6 +110,13 @@ + diff --git a/pages_order/author/chapterList.vue b/pages_order/author/chapterList.vue index 4a5e0d2..02ea1a7 100644 --- a/pages_order/author/chapterList.vue +++ b/pages_order/author/chapterList.vue @@ -37,10 +37,12 @@ 章节名 - {{ chapter.title }} - 付费 + + {{ chapter.state == 0 ? '审核中' : chapter.state == 1 ? '已发布' : chapter.state == 2 ? '已驳回' : '' }} @@ -50,10 +52,10 @@ + v-if="list.length == 0" > + + + + + + + + diff --git a/pages_order/novel/ReaderAchievement.vue b/pages_order/novel/ReaderAchievement.vue index 0f90b6c..335f708 100644 --- a/pages_order/novel/ReaderAchievement.vue +++ b/pages_order/novel/ReaderAchievement.vue @@ -4,7 +4,7 @@ 阅读成就设置 - 设置审核中 + {{ statusText }} + placeholder-class="input-placeholder" + :disabled="!canEdit" /> @@ -63,10 +64,10 @@ - @@ -79,45 +80,52 @@ data() { return { mixinsListApi : 'getAchievementList', - isPending: false, keys : ['one', 'two', 'three'], form : {}, } }, + computed: { + // 判断是否可以编辑 + canEdit() { + // status=0(审核中)不能编辑,status=1(已通过)、status=2(不通过)和第一次提交(没有form.id)可以编辑 + return this.form.status != 0 + }, + // 状态文本 + statusText() { + // 第一次提交时不显示状态标签 + if (!this.form.id) return '' + + // 根据状态返回文本 + if (this.form.status == 0) return '审核中' + if (this.form.status == 1) return '已通过' + if (this.form.status == 2) return '不通过' + + return '' + }, + // 状态样式类 + statusClass() { + if (this.form.status == 0) return 'status-pending' + if (this.form.status == 1) return 'status-approved' + if (this.form.status == 2) return 'status-rejected' + return '' + }, + // 提交按钮文本 + submitButtonText() { + if (!this.form.id) return '提交申请' + if (this.form.status == 2) return '重新提交' + return '设置' + } + }, onLoad() { this.getDetail() }, methods: { async getDetail(){ - this.form = await this.$fetch('getAchievement') || {} - this.isPending = this.form.status == 0 + const data = await this.$fetch('getAchievement') || {} + // 使用展开运算符确保响应式更新 + this.form = { ...data } }, async submit() { - // for (var index = 0; index < this.list.length; index++) { - // var element = this.list[index]; - // if (!element.levelName) { - // uni.showToast({ - // title: '请填写所有成就名称', - // icon: 'none' - // }) - // return - // } - // } - - // this.isPending = true - - // let arr = [] - - // for (var index = 0; index < this.list.length; index++) { - // var element = this.list[index]; - - // arr.push(this.$fetch('setAchievementName', { - // name : element.levelName - // })) - // } - - // await Promise.all(arr) - if(this.$utils.verificationAll(this.form, { oneName : '请填写' + this.list[0].title, twoName : '请填写' + this.list[1].title, @@ -179,6 +187,29 @@ margin-bottom: 32rpx; } + .status-tag { + font-size: 24rpx; + border-radius: 10rpx; + padding: 6rpx 24rpx; + margin-left: 20rpx; + margin-bottom: 32rpx; + } + + .status-pending { + background: #ff9500; + color: #fff; + } + + .status-approved { + background: #07c160; + color: #fff; + } + + .status-rejected { + background: #e23d3d; + color: #fff; + } + .achievement-list { display: flex; flex-direction: column; @@ -241,6 +272,11 @@ margin-bottom: 2rpx; } + .input:disabled { + background: #f5f5f5; + color: #999; + } + .input-placeholder { color: #d2d2d2; font-size: 26rpx; @@ -279,14 +315,4 @@ background: #0a226d; color: #fff; } - - .pending-tag { - background: #807a7a; - color: #fff; - font-size: 24rpx; - border-radius: 10rpx; - padding: 6rpx 24rpx; - margin-left: 20rpx; - margin-bottom: 32rpx; - } \ No newline at end of file