mirror of
https://gitee.com/java110/MicroCommunityWeb.git
synced 2026-02-23 21:36:37 +08:00
Compare commits
No commits in common. "d2655d32e5c4dcf37999a082f7e9bf7925980e95" and "68220d50cc423de357d2fa075b5eb403014d394a" have entirely different histories.
d2655d32e5
...
68220d50cc
@ -11,7 +11,7 @@
|
||||
:label="$t('payFeeOrderConfirm.timeRange')">
|
||||
<span>
|
||||
{{ dateFormat(formData.endTime) }} 至
|
||||
{{ dateFormatSubSec(formData.showEndTime) }}
|
||||
{{ dateFormat(formData.showEndTime) }}
|
||||
</span>
|
||||
</el-form-item>
|
||||
|
||||
@ -94,7 +94,7 @@
|
||||
|
||||
<script>
|
||||
import { qrCodePayment, checkPayFinish, payFee } from '@/api/fee/payFeeOrderApi'
|
||||
import { dateFormat, dateFormatSubSec } from '@/utils/dateUtil'
|
||||
import { dateFormat } from '@/utils/dateUtil'
|
||||
import PayFeeOrderResult from '@/components/fee/payFeeOrderResult'
|
||||
export default {
|
||||
name: 'PayFeeOrderConfirm',
|
||||
@ -113,7 +113,6 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
dateFormat,
|
||||
dateFormatSubSec,
|
||||
open(params) {
|
||||
this.formData = { ...params }
|
||||
this.dialogVisible = true
|
||||
@ -131,6 +130,14 @@ export default {
|
||||
},
|
||||
async qrCodePayFee() {
|
||||
try {
|
||||
// const printFees = [{
|
||||
// feeId: this.formData.feeId,
|
||||
// squarePrice: this.formData.squarePrice,
|
||||
// additionalAmount: this.formData.additionalAmount,
|
||||
// feeName: this.formData.feeName,
|
||||
// amount: this.formData.receivedAmount,
|
||||
// authCode: this.formData.authCode
|
||||
// }]
|
||||
|
||||
this.formData.subServiceCode = 'fee.payFee'
|
||||
|
||||
@ -156,6 +163,15 @@ export default {
|
||||
},
|
||||
async qrCodeCheckPayFinish() {
|
||||
try {
|
||||
// const printFees = [{
|
||||
// feeId: this.formData.feeId,
|
||||
// squarePrice: this.formData.squarePrice,
|
||||
// additionalAmount: this.formData.additionalAmount,
|
||||
// feeName: this.formData.feeName,
|
||||
// amount: this.formData.receivedAmount,
|
||||
// authCode: this.formData.authCode,
|
||||
// orderId: this.formData.orderId
|
||||
// }]
|
||||
|
||||
this.formData.subServiceCode = 'fee.payFee'
|
||||
|
||||
|
||||
@ -76,15 +76,6 @@ export function dateFormat (_time) {
|
||||
return y + '-' + add0(m) + '-' + add0(d);
|
||||
}
|
||||
|
||||
export function dateFormatSubSec (_time) {
|
||||
if (!_time) {
|
||||
return ''
|
||||
}
|
||||
let _date = new Date(_time);
|
||||
_date.setSeconds(_date.getSeconds() - 1);
|
||||
return dateFormat(_date);
|
||||
}
|
||||
|
||||
export function timeFormat (_time) {
|
||||
let _date = new Date(_time);
|
||||
let h = _date.getHours();
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
</el-form>
|
||||
<!-- Add a white line and copyright info below the form -->
|
||||
<div class="divider"></div>
|
||||
<div class="copyright">©2020-2026 <span v-html="companyName"></span></div>
|
||||
<div class="copyright">©2020-2025 <span v-html="companyName"></span></div>
|
||||
</div>
|
||||
<select-login-user ref="selectLoginUserRef" @select="handleSelect"></select-login-user>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user