From 0d2024eabd0f07bc4ab3341dddc10464d31938f8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 21 十二月 2024 18:47:12 +0800
Subject: [PATCH] #新增订单筛选物料界面
---
main.js | 82 +++++++++++++++++++++++++++++------------
1 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/main.js b/main.js
index e83ee95..de7e8cc 100644
--- a/main.js
+++ b/main.js
@@ -1,25 +1,59 @@
-import App from './App'
-
-// #ifndef VUE3
-import Vue from 'vue'
-// Vue.prototype.baseUrl = "http://localhost:8081/acs"
-Vue.prototype.baseIP = '192.168.4.138:8082'
-const baseIP = Vue.prototype.baseIP
-Vue.prototype.baseUrl = 'http://' + baseIP + '/xgmwms'
-Vue.config.productionTip = false
-App.mpType = 'app'
-const app = new Vue({
- ...App
-})
-app.$mount()
-// #endif
-
-// #ifdef VUE3
-import { createSSRApp } from 'vue'
-export function createApp() {
- const app = createSSRApp(App)
- return {
- app
- }
-}
+import App from './App'
+
+// #ifndef VUE3
+import Vue from 'vue'
+Vue.config.productionTip = false
+
+import '@/common/bluetooth.js';
+//鍏ㄥ眬鏁版嵁鐘舵�佺鐞� vuex
+import store from '@/store/index.js';
+Vue.prototype.$store = store;
+//鍏ㄥ眬鍏敤闈欐�佹暟鎹�
+import Mock from '@/common/mock/index.js';
+Vue.prototype.$Mock = Mock;
+
+App.mpType = 'app'
+
+try {
+ function isPromise(obj) {
+ return (
+ !!obj &&
+ (typeof obj === "object" || typeof obj === "function") &&
+ typeof obj.then === "function"
+ );
+ }
+
+ // 缁熶竴 vue2 API Promise 鍖栬繑鍥炴牸寮忎笌 vue3 淇濇寔涓�鑷�
+ uni.addInterceptor({
+ returnValue(res) {
+ if (!isPromise(res)) {
+ return res;
+ }
+ return new Promise((resolve, reject) => {
+ res.then((res) => {
+ if (res[0]) {
+ reject(res[0]);
+ } else {
+ resolve(res[1]);
+ }
+ });
+ });
+ },
+ });
+} catch (error) { }
+
+const app = new Vue({
+ ...App
+})
+app.$mount()
+// #endif
+
+// #ifdef VUE3
+import { createSSRApp } from 'vue'
+export function createApp() {
+ const app = createSSRApp(App)
+ return {
+ app
+ }
+}
// #endif
\ No newline at end of file
--
Gitblit v1.9.1