From 2eb21bfe2f40630a46e675211f23b5f240e395a4 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 12 九月 2025 15:01:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into send_coupon
---
main.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/main.js b/main.js
index 30b77ff..9007db8 100644
--- a/main.js
+++ b/main.js
@@ -1,10 +1,10 @@
import Vue from "vue";
import App from "./App";
import * as filters from "./utils/filters.js"; // global filter
-import uView from '@/uview-components/uview-ui'
+import uView from '@/components/uview-components/uview-ui'
import store from "./store";
import config from '@/config/config';
-import airBtn from "@/components/m-airbtn/index.vue";
+import airBtn from "./pages/subComponents/m-airbtn";
import socketIO from './pages/mine/im/socket';
// 鑷畾涔塼abbar
@@ -24,7 +24,7 @@
// #endif
// 寮曞叆uView瀵瑰皬绋嬪簭鍒嗕韩鐨刴ixin灏佽
-let mpShare = require('./uview-components/uview-ui/libs/mixin/mpShare.js');
+let mpShare = require('./components/uview-components/uview-ui/libs/mixin/mpShare.js');
Vue.mixin(mpShare)
/**
--
Gitblit v1.8.0