From 1f66b163ca0463afe3360e358324485cb98ea752 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 28 八月 2023 14:40:27 +0800
Subject: [PATCH] 小程序

---
 minipro_standard/main.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/minipro_standard/main.js b/minipro_standard/main.js
index ff8e5d7..db947f8 100644
--- a/minipro_standard/main.js
+++ b/minipro_standard/main.js
@@ -1,13 +1,13 @@
 import Vue from 'vue'
 import App from './App'
 import mixin from './common/mixin'
-import 'vant/lib/index.css'
+<<<<<<< HEAD
+=======
 
+>>>>>>> 572591bc99c61e648d60b9bf148b2ab2e0ee4e2e
 // 寮曞叆鍏ㄥ眬uView
 import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)
-import Vant from 'vant';
-Vue.use(Vant);
 // vuex
 import store from './store'
 Vue.prototype.$store = store

--
Gitblit v1.9.3