From a7a251c1f3ac203608d37139c73989bb226f6408 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Mon, 19 Aug 2024 17:15:39 +0800
Subject: [PATCH] update

---
 api/order.js         | 11 ++++++++++-
 pages/user/index.vue |  5 ++++-
 pages/user/user.vue  |  3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/api/order.js b/api/order.js
index 151fe80..a76724c 100755
--- a/api/order.js
+++ b/api/order.js
@@ -9,7 +9,8 @@ const api = {
   cancel: 'order/cancel',
   extractQrcode: 'order/extractQrcode',
   receipt: '/open/equipment/receipt',
-  pay: 'order/pay'
+  pay: 'order/pay',
+  updateOrderNo: '/shop/order-pay/change-order-no',
 }
 
 // 当前用户待处理的订单数量
@@ -46,3 +47,11 @@ export function receipt(data) {
 export function extractQrcode(orderId, param) {
   return request.get(api.extractQrcode, { orderId, ...param })
 }
+
+
+// 核销二维码
+export function updateOrderNo() {
+  return request.get(api.updateOrderNo)
+}
+
+
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 7f0d5ba..76aac38 100755
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -156,6 +156,7 @@
   import * as UserApi from '@/api/user'
   import * as OrderApi from '@/api/order'
   import { checkLogin } from '@/core/app'
+  import {updateOrderNo} from "../../websoft/api/order";
 
   // 订单操作
   const orderNavbar = [
@@ -217,7 +218,8 @@
     /**
      * 生命周期函数--监听页面显示
      */
-    onLoad(options) {},
+    onLoad(options) {
+    },
 
     /**
      * 生命周期函数--监听页面显示
@@ -249,6 +251,7 @@
             app.initService()
             // 初始化订单操作数据
             app.initOrderTabbar()
+              OrderApi.updateOrderNo()
             // 执行回调函数
             callback && callback()
           })
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 8771222..fd91e72 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -143,6 +143,7 @@
 	import storage from '@/utils/storage'
 	import { getMobile } from '@/utils/util.js'
 	import http from '@/websoft/api'
+    import * as OrderApi from '@/api/order'
 
 	// 订单操作
 	const orderNavbar = [
@@ -246,6 +247,8 @@
 						app.userInfo = res.data
 						store.dispatch('setUserInfo',res.data)
 						app.isLogin = true
+                        OrderApi.updateOrderNo()
+                        console.log(OrderApi)
 					}else{
 						app.isLogin = false
 						app.handleLogout()