From eee82fc63bf8b0b48bda5d6c89a491974a20bc97 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 09:52:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 minipro_standard/main.js |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/minipro_standard/main.js b/minipro_standard/main.js
index b601077..06bb2a0 100644
--- a/minipro_standard/main.js
+++ b/minipro_standard/main.js
@@ -1,20 +1,23 @@
 import Vue from 'vue'
 import App from './App'
 
-// vuex
-import store from './store'
+
 import mixin from './common/mixin'
 
 // 寮曞叆鍏ㄥ眬uView
 import uView from '@/uni_modules/uview-ui'
+Vue.use(uView)
 
+// vuex
+import store from './store'
 Vue.prototype.$store = store
 store.dispatch('getHeight')
+
 Vue.config.productionTip = false
 
 App.mpType = 'app'
-Vue.use(uView)
 
+console.log(uni.$u);
 // #ifdef MP
 // 寮曞叆uView瀵瑰皬绋嬪簭鍒嗕韩鐨刴ixin灏佽
 const mpShare = require('@/uni_modules/uview-ui/libs/mixin/mpShare.js')
@@ -22,13 +25,14 @@
 // #endif
 
 Vue.mixin(mixin)
+// 寮曞叆璇锋眰灏佽
 
 const app = new Vue({
 	store,
   ...App
 })
-
-// 寮曞叆璇锋眰灏佽
 require('./util/request/index')(app)
+// 鑾峰彇寰呭姙鏁伴噺
+store.dispatch('getUpcomingNum')
 
 app.$mount()
\ No newline at end of file

--
Gitblit v1.9.3