From 4e517dc54e1e3e5e5b543383c321161de351272e Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 11 十一月 2024 16:05:06 +0800
Subject: [PATCH] Merge branch 'feature/jlhg/first' of http://39.96.92.240:10000/r/~fyy/unattended-app into feature/jlhg/first
---
main.js | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/main.js b/main.js
index 5e8f4b3..e41f9aa 100644
--- a/main.js
+++ b/main.js
@@ -1,12 +1,15 @@
import App from './App'
import Vue from 'vue'
-import tabbar from '@/components/tab-bar/tab-bar.vue'
+import '../unattended-app/static/fonts/commontfont.css'
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,11 +23,22 @@
import {
reqAll,
reqGet,
- reqPost
-} from '@/api/index.js';
-Vue.prototype.$reqAll = reqAll;
-Vue.prototype.$reqGet = reqGet;
-Vue.prototype.$reqPost = reqPost;
+ reqGet2,
+ reqGetId,
+ reqPost,
+ reqPut,
+ reqAllJson,
+ reqDelete
+} from '@/api/index.js'
+Vue.prototype.$reqAll = reqAll
+Vue.prototype.$reqAllJson = reqAllJson
+Vue.prototype.$reqGet = reqGet
+Vue.prototype.$reqGet2 = reqGet2
+Vue.prototype.$reqGetId = reqGetId
+Vue.prototype.$reqPost = reqPost
+Vue.prototype.$reqPut = reqPut
+Vue.prototype.$reqDelete = reqDelete
+Vue.prototype.$store = store
// 鐢变簬寰俊灏忕▼搴忕殑杩愯鏈哄埗闂锛岄渶澹版槑濡備笅涓�琛岋紝H5鍜孉PP闈炲繀濉�
const app = new Vue({
store,
--
Gitblit v1.9.1