v1.9 优化缴费页面，确认页面缴费时间段错误的问题处理

wuxw
1 parent fdf8fdd7
Showing 2 changed files with 12 additions and 19 deletions
src/components/fee/payFeeOrderConfirm.vue
src/utils/dateUtil.js
@@ -11,7 +11,7 @@
           :label="$t('payFeeOrderConfirm.timeRange')">
           <span>
             {{ dateFormat(formData.endTime) }} 至
-            {{ dateFormat(formData.showEndTime) }}
+            {{ dateFormatSubSec(formData.showEndTime) }}
           </span>
         </el-form-item>
@@ -94,7 +94,7 @@
 <script>
 import { qrCodePayment, checkPayFinish, payFee } from '@/api/fee/payFeeOrderApi'
-import { dateFormat } from '@/utils/dateUtil'
+import { dateFormat, dateFormatSubSec } from '@/utils/dateUtil'
 import PayFeeOrderResult from '@/components/fee/payFeeOrderResult'
 export default {
   name: 'PayFeeOrderConfirm',
@@ -113,6 +113,7 @@ export default {
   },
   methods: {
     dateFormat,
+    dateFormatSubSec,
     open(params) {
       this.formData = { ...params }
       this.dialogVisible = true
@@ -130,14 +131,6 @@ 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'
@@ -163,15 +156,6 @@ 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,6 +76,15 @@ 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();