From b668cde6fadbb374cde9f6d31dc9c8e1f13a7bda Mon Sep 17 00:00:00 2001
From: zheng_hb <19584434@qq.com>
Date: Wed, 18 Dec 2024 22:09:41 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=9B=B4=E6=96=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a5d829e82e7f61212bf98fd1d93c41ed058a77aa.
---
 pages/index/cart.vue                    | 2 +-
 {mixins => pages/mixins}/globalMixin.js | 0
 pages_order/invoiceIssuance.vue         | 2 +-
 pages_order/invoiceRecords.vue          | 4 ++--
 pages_order/orderDetails.vue            | 2 +-
 pages_order/orderEvaluation.vue         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename {mixins => pages/mixins}/globalMixin.js (100%)

diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index 2766f99..a2e6394 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -23,7 +23,7 @@
 	import tabber from '@/components/base/tabbar.vue'
 	import cardList from '@/components/cart/cardList.vue'
 	import Navbar from '@/pages/components/Navbar.vue'
-    import { globalMixin } from '@/mixins/globalMixin';
+    import { globalMixin } from '../mixins/globalMixin';
 
 	export default {
         mixins: [globalMixin],
diff --git a/mixins/globalMixin.js b/pages/mixins/globalMixin.js
similarity index 100%
rename from mixins/globalMixin.js
rename to pages/mixins/globalMixin.js
diff --git a/pages_order/invoiceIssuance.vue b/pages_order/invoiceIssuance.vue
index 2307a8c..26a4450 100644
--- a/pages_order/invoiceIssuance.vue
+++ b/pages_order/invoiceIssuance.vue
@@ -53,7 +53,7 @@
 
 <script>
     import Navbar from '@/pages/components/Navbar.vue'
-    import { globalMixin } from '@/mixins/globalMixin';
+    import { globalMixin } from '../pages/mixins/globalMixin';
 	export default{
         mixins: [globalMixin],
         components:{
diff --git a/pages_order/invoiceRecords.vue b/pages_order/invoiceRecords.vue
index 25d7e05..2854aab 100644
--- a/pages_order/invoiceRecords.vue
+++ b/pages_order/invoiceRecords.vue
@@ -26,10 +26,10 @@
 
 <script>
 import Navbar from '@/pages/components/Navbar.vue'
-import { globalMixin } from '@/mixins/globalMixin';
+import { globalMixin } from '../pages/mixins/globalMixin';
 
 export default {
-    mixins: [globalMixin],
+     mixins: [globalMixin],
     components:{
         Navbar
     },
diff --git a/pages_order/orderDetails.vue b/pages_order/orderDetails.vue
index b3fe295..77ace6a 100644
--- a/pages_order/orderDetails.vue
+++ b/pages_order/orderDetails.vue
@@ -49,7 +49,7 @@
 
 <script>
 	import Navbar from '@/pages/components/Navbar.vue'
-    import { globalMixin } from '@/mixins/globalMixin';
+    import { globalMixin } from '../pages/mixins/globalMixin';
 
 	export default{
         mixins: [globalMixin],
diff --git a/pages_order/orderEvaluation.vue b/pages_order/orderEvaluation.vue
index ad2c24d..359ed09 100644
--- a/pages_order/orderEvaluation.vue
+++ b/pages_order/orderEvaluation.vue
@@ -43,7 +43,7 @@
 
 <script>
 	import Navbar from '@/pages/components/Navbar.vue'
-    import { globalMixin } from '@/mixins/globalMixin';
+    import { globalMixin } from '../pages/mixins/globalMixin';
 
 	export default{
         mixins: [globalMixin],