From 862bb8e84e13e128090583a0820b49abe355d8a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com> Date: Wed, 26 Nov 2025 17:48:27 +0800 Subject: [PATCH 1/2] tijiao --- src/api/index.js | 4 +- .../components/pendingPayment/success.vue | 105 +++++++++++------- 2 files changed, 65 insertions(+), 44 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 525753d..487fb66 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -19,8 +19,8 @@ const service = axios.create({ // baseURL: 'https://submission.tmrjournals.com/', //正式 记得切换 // baseURL: 'http://www.tougao.com/', //测试本地 记得切换 // baseURL: 'http://192.168.110.110/tougao/public/index.php/', - // baseURL: '/api', //本地 - baseURL: '/', //正式 + baseURL: '/api', //本地 + // baseURL: '/', //正式 }); diff --git a/src/components/page/components/pendingPayment/success.vue b/src/components/page/components/pendingPayment/success.vue index 9ba5e07..e15aa3b 100644 --- a/src/components/page/components/pendingPayment/success.vue +++ b/src/components/page/components/pendingPayment/success.vue @@ -1,28 +1,42 @@ @@ -33,7 +47,7 @@ export default { return { alertShow: true, urlList: { - detail: 'api/Preaccept/getPreacceptPayment', + detail: 'api/Order/PaystationLookup', createdOrder: 'api/Order/creatArticleOrder' }, articleInfo: {}, @@ -41,26 +55,25 @@ export default { total: '', articleId: this.$route.query.id, dingshi: null, - hideSec: 5 + hideSec: 10 }; }, created() { this.getDetail(); }, mounted() { - this.hideAlert(); + }, methods: { hideAlert() { - this.dingshi = setInterval(() => { + this.dingshi = setInterval(() => { this.hideSec -= 1; if (this.hideSec == 1) { this.goBack(); - return false + return false; } - + // console.log(this.hideSec) - }, 1000); }, formatAmount(amount) { @@ -80,15 +93,24 @@ export default { .then((res) => { console.log('res at line 191:', res); if (res.code == 0) { + this.hideAlert(); setTimeout(() => { + if (res.data.result == 'success') { + this.articleInfo = res.data.paystation; + this.articleInfo.state = 1; + this.total = Number(this.articleInfo.amount / 100); + } else if (res.data.result == 'fail') { + this.articleInfo.state = 0; + this.$forceUpdate(); + } loading.close(); - this.articleInfo = res.data.order; - - this.total = Number(res.data.order.paystation.amount / 100); }, 1000); - + } else { + loading.close(); + this.$message.error(res.msg); } - }).catch(() => { + }) + .catch(() => { loading.close(); }); }, @@ -112,9 +134,9 @@ export default { this.$router.replace({ name: 'success' }); this.$router.push({ path: '/PreIngested', - query:{ - id: id - } + query: { + id: id + } }); // } // @@ -144,7 +166,7 @@ export default { background-color: #fff; border: 1px solid #fcc3c3; border-radius: 16px; - color: #F56C6C; + color: #f56c6c; box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); /* 添加阴影效果 */ width: 600px; } @@ -159,7 +181,7 @@ p { button { padding: 10px 20px; - + color: #fff; border: none; border-radius: 5px; @@ -167,20 +189,19 @@ button { margin-top: 20px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); /* 按钮添加阴影效果 */ } -.btn-success{ -background-color: #00c286; -} -.btn-danger{ -background-color: #F56C6C; -} -.btn-success:hover{ -background-color: #00c286; -} -.btn-danger:hover{ -background-color: #F56C6C; -} +.btn-success { + background-color: #00c286; +} +.btn-danger { + background-color: #f56c6c; +} +.btn-success:hover { + background-color: #00c286; +} +.btn-danger:hover { + background-color: #f56c6c; +} button:hover { - box-shadow: 0 4px 6px rgba(0, 0, 0, 0.3); /* 按钮悬停时的阴影效果 */ } .success-box { From 1ce769f591b3d4021eac1db4e375535c6f5520ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com> Date: Wed, 26 Nov 2025 18:30:22 +0800 Subject: [PATCH 2/2] tijiao --- src/api/index.js | 4 ++-- src/components/page/articleDetailEditor.vue | 3 ++- src/components/page/articleListEditor_A.vue | 15 +++------------ 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 487fb66..525753d 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -19,8 +19,8 @@ const service = axios.create({ // baseURL: 'https://submission.tmrjournals.com/', //正式 记得切换 // baseURL: 'http://www.tougao.com/', //测试本地 记得切换 // baseURL: 'http://192.168.110.110/tougao/public/index.php/', - baseURL: '/api', //本地 - // baseURL: '/', //正式 + // baseURL: '/api', //本地 + baseURL: '/', //正式 }); diff --git a/src/components/page/articleDetailEditor.vue b/src/components/page/articleDetailEditor.vue index c403072..faec552 100644 --- a/src/components/page/articleDetailEditor.vue +++ b/src/components/page/articleDetailEditor.vue @@ -1846,12 +1846,13 @@ export default { }, // 算平均分 avegeCount(arry) { + var ratedLength = arry.map(item => item.rated).filter(rated => rated&&rated>0).length; let str = 0; let all = 0; for (let i = 0; i < arry.length; i++) { all += Number(arry[i].rated); } - str = (all / arry.length).toFixed(1); + str = (all / ratedLength).toFixed(1); return str; }, diff --git a/src/components/page/articleListEditor_A.vue b/src/components/page/articleListEditor_A.vue index 17b881b..882c213 100644 --- a/src/components/page/articleListEditor_A.vue +++ b/src/components/page/articleListEditor_A.vue @@ -1458,12 +1458,13 @@ export default { }, // 算平均分 avegeCount(arry) { + var ratedLength = arry.map(item => item.rated).filter(rated => rated&&rated>0).length; let str = 0; let all = 0; for (let i = 0; i < arry.length; i++) { all += Number(arry[i].rated); } - str = (all / arry.length).toFixed(1); + str = (all / ratedLength).toFixed(1); return str; }, toggleShowAll(item, i) { @@ -2643,17 +2644,7 @@ export default { //文章类型 - // 算平均分 - avegeCount(arry) { - let str = 0; - let all = 0; - for (let i = 0; i < arry.length; i++) { - all += arry[i].rated; - } - str = (all / arry.length).toFixed(1); - return str; - }, - + // 算终审分 finalCount(arry) { let str = 0;