From abe3a86c15105f215992d78bcaaf9b51efa1d565 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:22:41 +0800
Subject: [PATCH] 解决冲突
---
src/main.ts | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main.ts b/src/main.ts
index 9359c6e..f7af582 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,13 +8,14 @@
import numeral from 'numeral';
import preview from "vue-photo-preview";
import "vue-photo-preview/dist/skin.css";
-import * as VueWindow from "@hscmap/vue-window";
+// import * as VueWindow from "@hscmap/vue-window";
import VueAwesomeSwiper from "vue-awesome-swiper";
import ToggleButton from 'vue-js-toggle-button';
-import ImageShow from './scripts/component.js'
+import {ImageShow,PwInput} from './scripts/component.js'
import "swiper/dist/css/swiper.css";
+import './assets/css/element-variables.scss'
@@ -23,10 +24,11 @@
Vue.config.productionTip = false;
Vue.mixin(Mixin);
Vue.use(preview);
-Vue.use(VueWindow);
+// Vue.use(VueWindow);
Vue.use(VueAwesomeSwiper as any);
Vue.use(ToggleButton)
Vue.use(ImageShow)
+Vue.use(PwInput)
--
Gitblit v1.8.0