From 725325a5bdfac73de8e8cbec2ba71a4923883529 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 17 十月 2024 16:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://39.96.92.240:10000/r/~fyy/unattended-app
---
main.js | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/main.js b/main.js
index 6d629e2..45985a1 100644
--- a/main.js
+++ b/main.js
@@ -1,12 +1,16 @@
import App from './App'
import Vue from 'vue'
-import tabbar from '@/components/tab-bar/tab-bar.vue'
-
+import '../unattended-app/static/fonts/commontfont.css'
+// import tabbar from '@/components/tab-bar/tab-bar.vue'
Vue.config.productionTip = false
App.mpType = 'app'
uni.$u.config.unit = 'rpx'
-Vue.use('tab-bar', tabbar);
+// #ifdef MP-WEIXIN
+import tabbar from '@/components/tab-bar/tab-bar.vue'
+Vue.use('tab-bar', tabbar)
+// #endif
+
// 寮曞叆鍏ㄥ眬 uView 妗嗘灦
import uView from '@/uni_modules/uview-ui'
@@ -20,12 +24,16 @@
import {
reqAll,
reqGet,
- reqPost
-} from '@/api/index.js';
-Vue.prototype.$reqAll = reqAll;
-Vue.prototype.$reqGet = reqGet;
-Vue.prototype.$reqPost = reqPost;
-Vue.prototype.$store = store;
+ reqPost,
+ reqAllJson,
+ reqDelete
+} from '@/api/index.js'
+Vue.prototype.$reqAll = reqAll
+Vue.prototype.$reqAllJson = reqAllJson
+Vue.prototype.$reqGet = reqGet
+Vue.prototype.$reqPost = reqPost
+Vue.prototype.$reqDelete = reqDelete
+Vue.prototype.$store = store
// 鐢变簬寰俊灏忕▼搴忕殑杩愯鏈哄埗闂锛岄渶澹版槑濡備笅涓�琛岋紝H5鍜孉PP闈炲繀濉�
const app = new Vue({
store,
--
Gitblit v1.9.1