Merge branch 'master' of https://git.nuttyreading.com/wangjinlei/tougao_web into Editorial-Board

This commit is contained in:
2025-11-28 16:54:15 +08:00
12 changed files with 1329 additions and 964 deletions

View File

@@ -721,10 +721,10 @@ export default {
console.log('res at line 191:', res);
if (res.code == 0) {
this.article_pay_info = {
fee: res.data.article.fee,
is_buy: res.data.article.is_buy,
original_price: res.data.journal.fee,
fee_remark: res.data.article.fee_remark,
fee: res.data.article ? res.data.article.fee : 0,
is_buy: res.data.article ? res.data.article.is_buy : 0,
original_price: res.data.journal ? res.data.journal.fee : 0,
fee_remark: res.data.article ? res.data.article.fee_remark : '',
order: res.data.order,
paystation_fee: res.data.order && res.data.order.paystation ? res.data.order.paystation.amount : '',
paystation_time: res.data.order && res.data.order.paystation ? res.data.order.paystation.request_time : '',
@@ -732,7 +732,7 @@ export default {
};
if (this.article_pay_info.is_buy == 1) {
if (this.article_pay_info.fee == 0) {
if (Number(this.article_pay_info.fee) == 0) {
this.feeStatus = 2;
} else {
this.feeStatus = 1;
@@ -864,7 +864,10 @@ export default {
}
this.$nextTick(() => {
// 更新引用列表
this.$refs.editPublicRefRdit.init(this.chanFerForm);
if(this.$refs.editPublicRefRdit){
this.$refs.editPublicRefRdit.init(this.chanFerForm);
}
});
})
.catch((err) => {
@@ -2153,7 +2156,7 @@ export default {
width: 260px !important;
}
.scroll-item {
margin: 10px 20px 20px 276px;
margin: 10px 20px 20px 280px;
}
.payment_info_box {
margin-bottom: 10px;