合并

VUECODE/smart-property-manage/src/views/social/activity/add/index.vue

@@ -223,16 +223,7 @@ export default {
 }
 </script>
 
-<style scoped>
-#root {
-  display: flex;
-}
-.ruleForm {
-  width: 800px;
-  margin-left: auto;
-  margin-right: auto;
-  margin-top: 50px;
-}
+<style>
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
@@ -257,3 +248,15 @@ export default {
   display: block;
 }
 </style>
+
+<style scoped>
+#root {
+  display: flex;
+}
+.ruleForm {
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>

VUECODE/smart-property-manage/src/views/social/activity/edi/index.vue

@@ -227,16 +227,8 @@ export default {
 }
 </script>
 
-<style scoped>
-#root {
-  display: flex;
-}
-.ruleForm {
-  width: 800px;
-  margin-left: auto;
-  margin-right: auto;
-  margin-top: 50px;
-}
+<style>
+
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
@@ -261,3 +253,15 @@ export default {
   display: block;
 }
 </style>
+
+<style scoped>
+#root {
+  display: flex;
+}
+.ruleForm {
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>