取消订单修复

study/pay/orderPay.vue

@@ -239,7 +239,7 @@
 
     <template>
       <view class="content refund-box"
-        v-if="info.goodsList[0].goodsState == 'APPLY_REFUND'  || info.goodsList[0].goodsState == 'APPLY_REFUNDING' || (info.goodsList[0].refundLog && info.goodsList[0].refundLog.remark)">
+        v-if="info.goodsList[0].goodsState == 'APPLY_REFUND' || info.goodsList[0].goodsState == 'APPLY_REFUNDING' || (info.goodsList[0].refundLog && info.goodsList[0].refundLog.remark)">
         <view class="title">
           退款原因
         </view>
@@ -248,8 +248,9 @@
           {{ info.goodsList[0].refundLog.remark }}
         </view>
       </view>
-      <button type="default" :loading="btnLoading" v-if="info.goodsList[0].goodsState == 'APPLY_REFUND' || info.goodsList[0].goodsState == 'APPLY_REFUNDING'" class="pay-btn"
-        @click="cancelReply">取消退款</button>
+      <button type="default" :loading="btnLoading"
+        v-if="info.goodsList[0].goodsState == 'APPLY_REFUND' || info.goodsList[0].goodsState == 'APPLY_REFUNDING'"
+        class="pay-btn" @click="cancelReply">取消退款</button>
     </template>
 
 
@@ -272,8 +273,8 @@
 
 <script>
 import { qrCode, getReserve } from '@/api/order.js'
-import { payDetails, queryPayOrder, unRefund, refundIntervene } from '@/api/payment.js';
-import { cancelOrder } from '@/api/refuel.js'
+import { payDetails, queryPayOrder, unRefund, refundIntervene, close } from '@/api/payment.js';
+// import { cancelOrder } from '@/api/refuel.js'
 export default {
   data() {
     return {
@@ -431,14 +432,15 @@ export default {
       })
 
 
-      let obj = {}
-      try {
-        obj = JSON.parse(this.info.goodsList[0].extend)
-      } catch (error) {
-        obj = {}
-      }
+      // let obj = {}
+      // try {
+      //   obj = JSON.parse(this.info.goodsList[0].extend)
+      // } catch (error) {
+      //   obj = {}
+      // }
 
-      cancelOrder(obj).then(res => {
+      close(this.info.orderNo
+      ).then(res => {
         if (res.state == 'Success') {
           uni.showToast({
             title: '取消成功',