Merge remote-tracking branch 'origin/master'

src/components/ImageUpload/imgUploadForBanner.vue

@@ -419,5 +419,10 @@ export default {
     height: 22px;
   }
 }
+::v-deep .el-upload__tip {
+  padding-top: 10px !important;
+  line-height: 0 !important;
+  font-weight: bold;
+}
 </style>
 

src/views/article-management/article-insert.vue

@@ -196,6 +196,7 @@ export default {
           listArticle(search).then(res => {
             if (res.total > 0) {
               this.$message.error('权重已存在')
+              this.submitLoading = false
             } else {
               addArticle(this.form).then(response => {
                 this.$message({

src/views/article-management/article-management.vue

@@ -560,8 +560,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .app-container {
-  padding: 1.5rem;
-  margin-bottom: 0.5em;
+  padding: 20px;
 }
 
 /*表格超出行宽省略号显示并悬浮状态显示全文*/
@@ -594,4 +593,9 @@ export default {
 .el-tab-pane {
   padding-bottom: 15px;
 }
+::v-deep .pagination-container {
+  padding: 0 !important;
+  margin-top: 24px !important;
+  margin-bottom: 30px !important;
+}
 </style>

src/views/banner_management/banner_add.vue

@@ -105,7 +105,7 @@ export default {
       if (!value || value.length === 0) {
         console.log('触发必填', value.length)
         this.showImgTips = false
-        callback(new Error('请上传jpg/jpeg/png文件请，且不超过20Mb'))
+        callback(new Error('请上传jpg/jpeg/png文件，且不超过20Mb'))
       } else {
         this.showImgTips = false
         callback()

src/views/banner_management/banner_management.vue

@@ -354,10 +354,7 @@ export default {
 
 <style lang="scss" scoped>
 .app-container {
-  padding-left: 1.5rem;
-  padding-right: 1.5rem;
-  padding-top: 1.5rem;
-  margin-bottom: 0.5em;
+  padding: 20px;
 }
 
 //所有表格内容选中后的样式-all
@@ -388,4 +385,9 @@ export default {
 ::v-deep .status-offshelf {
   color: #f5aa6c;
 }
+::v-deep .pagination-container {
+  padding: 0 !important;
+  margin-top: 24px !important;
+  margin-bottom: 30px !important;
+}
 </style>

src/views/service-management/medical-record-management/medical-record-management.vue

@@ -918,7 +918,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 .custom-select .el-select__tags-text {
   max-width: 60px; /* 设置最大宽度 */
   overflow: hidden;
@@ -963,7 +963,6 @@ export default {
 
 .app-container {
   background-color: #FFFFFF;
-  padding-bottom: 3.4em !important;
 }
 
 ::v-deep .el-dialog:not(.is-fullscreen) {
@@ -973,4 +972,5 @@ export default {
   height: 500px;
   overflow-y: auto;
 }
+
 </style>