From 8f7260df7dd49ac807ce3ef7dd9b1768aadbf346 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 9 Aug 2022 11:11:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                                   | 2 +-
 src/apps/AppOnlineAnswer/AppOnlineAnswer.vue                  | 2 +-
 .../AppPartyHistoryEducation/AppPartyHistoryEducation.vue     | 2 +-
 src/apps/AppPartyHistoryEducation/classroomList.vue           | 2 +-
 src/apps/AppPartyHistoryEducation/detail.vue                  | 2 +-
 src/apps/AppPartyHistoryEducation/knowledgeList.vue           | 2 +-
 src/apps/AppPartyHistoryEducation/list.vue                    | 2 +-
 src/apps/AppPartyHistoryEducation/select.vue                  | 2 +-
 src/apps/AppPartyHistoryEducation/todayDetail.vue             | 2 +-
 src/apps/AppPartyHistoryEducation/todayList.vue               | 2 +-
 src/apps/AppPartyHistoryEducation/videoDetail.vue             | 2 +-
 src/common/common.scss                                        | 3 ---
 src/package.json                                              | 4 ++--
 src/{common => styles}/ckeditor.scss                          | 0
 src/styles/common.scss                                        | 3 +++
 src/{common => styles}/iconfont.css                           | 0
 src/{common => styles}/party.scss                             | 0
 17 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 src/common/common.scss
 rename src/{common => styles}/ckeditor.scss (100%)
 create mode 100644 src/styles/common.scss
 rename src/{common => styles}/iconfont.css (100%)
 rename src/{common => styles}/party.scss (100%)

diff --git a/src/App.vue b/src/App.vue
index e0167ca2..c0f42b34 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -69,7 +69,7 @@ export default {
 
 <style lang="scss">
 @import '~uview-ui/index.scss';
-@import './common/common';
+@import 'styles/common';
 
 body {
   font-family: 'Microsoft YaHei', serif;
diff --git a/src/apps/AppOnlineAnswer/AppOnlineAnswer.vue b/src/apps/AppOnlineAnswer/AppOnlineAnswer.vue
index 6fb44a82..fee495f3 100644
--- a/src/apps/AppOnlineAnswer/AppOnlineAnswer.vue
+++ b/src/apps/AppOnlineAnswer/AppOnlineAnswer.vue
@@ -217,7 +217,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../common/party";
+@import "../../styles/party";
 
 .AppOnlineAnswer {
   width: 100%;
diff --git a/src/apps/AppPartyHistoryEducation/AppPartyHistoryEducation.vue b/src/apps/AppPartyHistoryEducation/AppPartyHistoryEducation.vue
index b62b6b96..e3dcae1a 100644
--- a/src/apps/AppPartyHistoryEducation/AppPartyHistoryEducation.vue
+++ b/src/apps/AppPartyHistoryEducation/AppPartyHistoryEducation.vue
@@ -144,7 +144,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../common/party";
+@import "../../styles/party";
 
 .AppPartyHistoryEducation {
   width: 100%;
diff --git a/src/apps/AppPartyHistoryEducation/classroomList.vue b/src/apps/AppPartyHistoryEducation/classroomList.vue
index 8f372673..5a0c08f2 100644
--- a/src/apps/AppPartyHistoryEducation/classroomList.vue
+++ b/src/apps/AppPartyHistoryEducation/classroomList.vue
@@ -60,7 +60,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../common/party";
+@import "../../styles/party";
 .home {
   width: 100%;
   height: 100%;
diff --git a/src/apps/AppPartyHistoryEducation/detail.vue b/src/apps/AppPartyHistoryEducation/detail.vue
index cd0df5f6..60d1fa85 100644
--- a/src/apps/AppPartyHistoryEducation/detail.vue
+++ b/src/apps/AppPartyHistoryEducation/detail.vue
@@ -50,7 +50,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../common/party";
+@import "../../styles/party";
 .home {
   width: 100%;
   height: 100%;
diff --git a/src/apps/AppPartyHistoryEducation/knowledgeList.vue b/src/apps/AppPartyHistoryEducation/knowledgeList.vue
index 4a6d3e45..30744bbb 100644
--- a/src/apps/AppPartyHistoryEducation/knowledgeList.vue
+++ b/src/apps/AppPartyHistoryEducation/knowledgeList.vue
@@ -184,7 +184,7 @@ export default {
 };
 </script>
 <style lang="scss" scope>
-@import "../../common/party";
+@import "../../styles/party";
 .page {
   .search-box {
     width: 100%;
diff --git a/src/apps/AppPartyHistoryEducation/list.vue b/src/apps/AppPartyHistoryEducation/list.vue
index 9b87a62d..92ddbb50 100644
--- a/src/apps/AppPartyHistoryEducation/list.vue
+++ b/src/apps/AppPartyHistoryEducation/list.vue
@@ -201,7 +201,7 @@ export default {
 };
 </script>
 <style lang="scss" scope>
-@import "../../common/party";
+@import "../../styles/party";
 
 .page {
   .search-box {
diff --git a/src/apps/AppPartyHistoryEducation/select.vue b/src/apps/AppPartyHistoryEducation/select.vue
index 94dcf8a0..0098069c 100644
--- a/src/apps/AppPartyHistoryEducation/select.vue
+++ b/src/apps/AppPartyHistoryEducation/select.vue
@@ -31,7 +31,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../common/party";
+@import "../../styles/party";
 .home {
   width: 100%;
   height: 100%;
diff --git a/src/apps/AppPartyHistoryEducation/todayDetail.vue b/src/apps/AppPartyHistoryEducation/todayDetail.vue
index d713b8a8..e2dc272c 100644
--- a/src/apps/AppPartyHistoryEducation/todayDetail.vue
+++ b/src/apps/AppPartyHistoryEducation/todayDetail.vue
@@ -50,7 +50,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../common/party";
+@import "../../styles/party";
 .home {
   width: 100%;
   height: 100%;
diff --git a/src/apps/AppPartyHistoryEducation/todayList.vue b/src/apps/AppPartyHistoryEducation/todayList.vue
index 058fa79c..0e2d9c78 100644
--- a/src/apps/AppPartyHistoryEducation/todayList.vue
+++ b/src/apps/AppPartyHistoryEducation/todayList.vue
@@ -90,7 +90,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../common/party";
+@import "../../styles/party";
 .home {
   width: 100%;
   height: 100%;
diff --git a/src/apps/AppPartyHistoryEducation/videoDetail.vue b/src/apps/AppPartyHistoryEducation/videoDetail.vue
index ac1049dd..4f9bc56a 100644
--- a/src/apps/AppPartyHistoryEducation/videoDetail.vue
+++ b/src/apps/AppPartyHistoryEducation/videoDetail.vue
@@ -83,7 +83,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../common/party";
+@import "../../styles/party";
 .home {
   width: 100%;
   height: 100%;
diff --git a/src/common/common.scss b/src/common/common.scss
deleted file mode 100644
index 04f7a5bf..00000000
--- a/src/common/common.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import "ckeditor";
-@import "party";
-@import "iconfont.css";
diff --git a/src/package.json b/src/package.json
index e48921cf..1b6e38d7 100644
--- a/src/package.json
+++ b/src/package.json
@@ -5,14 +5,14 @@
   "files": [
     "apps",
     "project",
+    "styles",
     "components",
     "common/util.js",
     "common/dict.js",
     "common/monent.js",
     "common/modules.js",
     "common/http.js",
-    "common/crypto-js.js",
-    "common/ckeditor.scss"
+    "common/crypto-js.js"
   ],
   "dependencies": {
   }
diff --git a/src/common/ckeditor.scss b/src/styles/ckeditor.scss
similarity index 100%
rename from src/common/ckeditor.scss
rename to src/styles/ckeditor.scss
diff --git a/src/styles/common.scss b/src/styles/common.scss
new file mode 100644
index 00000000..bf1d5a31
--- /dev/null
+++ b/src/styles/common.scss
@@ -0,0 +1,3 @@
+@import "styles/ckeditor";
+@import "styles/party";
+@import "styles/iconfont.css";
diff --git a/src/common/iconfont.css b/src/styles/iconfont.css
similarity index 100%
rename from src/common/iconfont.css
rename to src/styles/iconfont.css
diff --git a/src/common/party.scss b/src/styles/party.scss
similarity index 100%
rename from src/common/party.scss
rename to src/styles/party.scss