Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.env.test

.env.test

@@ -11,13 +11,13 @@ NODE_ENV= 'production'
 VUE_APP_BASE_API = 'https://med.imchong.cn:8091'
 
 # 图片显示
-VUE_APP_TEST_API = 'https://www.cw.imchong.cn/minio'
+VUE_APP_TEST_API = 'https://med.imchong.cn/minio'
 
 # A端前端地址
-VUE_APP_WEB = 'http://47.92.55.88:80'
+VUE_APP_WEB = 'https://med.imchong.cn'
 
 # business微服务地址
-VUE_APP_MICRO_BUSINESS = 'http://47.92.55.88:1099'
+VUE_APP_MICRO_BUSINESS = 'https://med.imchong.cn:1099'
 
 # finance微服务地址
-VUE_APP_MICRO_FINANCE = 'http://47.92.55.88:1098'
+VUE_APP_MICRO_FINANCE = 'https://med.imchong.cn:1098'

package.json

@@ -72,7 +72,7 @@
     "husky": "^8.0.0",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",
-    "sass": "1.32.13",
+    "sass": "1.39.0",
     "sass-loader": "10.1.1",
     "script-ext-html-webpack-plugin": "2.1.5",
     "svg-sprite-loader": "5.1.1",

src/components/ImageUpload/imgUploadForBanner.vue

@@ -115,7 +115,7 @@ export default {
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 3
+      default: 4
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
@@ -329,6 +329,10 @@ export default {
     // 上传失败
     handleUploadError() {
       this.$modal.msgError('上传图片失败，请重试')
+      this.cropperVisible = false
+      this.fileList = []
+      this.uploadList = []
+      this.number = 0
       // this.$modal.closeLoading()
     },
     // 上传结束处理

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

@@ -53,7 +53,13 @@
               <el-form-item>
                 <div>
                   <el-button class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
-                  <el-button class="resetBtn" icon="el-icon-back" @click="goBack">返回</el-button>
+                  <BackBtn
+                    :button-class="'resetBtn'"
+                    :button-icon="'el-icon-back'"
+                    :click-action="goBack"
+                    button-text="返回"
+                    is-show-confirm="true"
+                  />
                 </div>
               </el-form-item>
             </el-form>
@@ -71,12 +77,13 @@ import { checkRole } from '@/utils/permission'
 import { selectDictLabel } from '@/utils/ruoyi'
 import { getArticle, updateArticle } from '@/api/business/article'
 import userAvatar from '@/views/system/user/profile/userAvatar.vue'
+import BackBtn from '@/components/BackBtn/index.vue'
 import { html2Text } from '@/utils'
 
 export default {
   name: 'ArticleEdit',
   // eslint-disable-next-line vue/no-unused-components
-  components: { userAvatar },
+  components: { userAvatar, BackBtn },
   // 数据字典
   dicts: ['article_status'],
 

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

@@ -61,7 +61,13 @@
               <el-form-item>
                 <div>
                   <el-button :loading="submitLoading" class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
-                  <el-button class="resetBtn" icon="el-icon-back" @click="goBack">返回</el-button>
+                  <BackBtn
+                    :button-class="'resetBtn'"
+                    :button-icon="'el-icon-back'"
+                    :click-action="goBack"
+                    button-text="返回"
+                    is-show-confirm="true"
+                  />
                 </div>
               </el-form-item>
             </el-form>
@@ -78,12 +84,13 @@
 import { selectDictLabel } from '@/utils/ruoyi'
 import { addArticle, listArticle } from '@/api/business/article'
 import { html2Text } from '@/utils'
+import BackBtn from '@/components/BackBtn/index.vue'
 
 export default {
   name: 'ArticleInsert',
   // 数据字典
   dicts: ['article_status'],
-
+  components: { BackBtn },
   props: {
     id: {
       // 防止接受状态类型不兼容

src/views/banner_management/banner_add.vue

@@ -56,7 +56,13 @@
           </el-form-item>
           <el-form-item>
             <el-button :loading="submitLoading" class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
-            <el-button class="resetBtn" icon="el-icon-back" @click="goBack">返回</el-button>
+            <BackBtn
+              :button-class="'resetBtn'"
+              :button-icon="'el-icon-back'"
+              :click-action="goBack"
+              button-text="返回"
+              is-show-confirm="true"
+            />
           </el-form-item>
         </el-form>
       </div>
@@ -68,10 +74,11 @@
 import { parseTime } from '@/utils/ruoyi'
 import { addBanner, listBanner } from '@/api/business/banner'
 import ImgUploadForBanner from '@/components/ImageUpload/imgUploadForBanner.vue'
+import BackBtn from '@/components/BackBtn/index.vue'
 
 export default {
   name: 'BannerAdd',
-  components: { ImgUploadForBanner },
+  components: { ImgUploadForBanner, BackBtn },
   data() {
     const checkSort = (rule, value, callback) => {
       if (value === 0) {

src/views/banner_management/banner_edit.vue

@@ -62,7 +62,13 @@
           </el-form-item>
           <el-form-item>
             <el-button :loading="submitLoading" class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
-            <el-button class="resetBtn" icon="el-icon-back" @click="goBack">返回</el-button>
+            <BackBtn
+              :button-class="'resetBtn'"
+              :button-icon="'el-icon-back'"
+              :click-action="goBack"
+              button-text="返回"
+              is-show-confirm="true"
+            />
           </el-form-item>
         </el-form>
       </div>
@@ -73,9 +79,10 @@
 <script>
 import { getBanner, listBanner, updateBanner } from '@/api/business/banner'
 import ImgUploadForBanner from '@/components/ImageUpload/imgUploadForBanner.vue'
+import BackBtn from '@/components/BackBtn/index.vue'
 export default {
   name: 'BannerEdit',
-  components: { ImgUploadForBanner },
+  components: { ImgUploadForBanner, BackBtn },
   data() {
     const checkSort = (rule, value, callback) => {
       if (value === undefined || value === null) {

vue.config.js

@@ -28,6 +28,11 @@ module.exports = {
         plugins: [
           postcss
         ]
+      },
+      sass: {
+        sassOptions: {
+          outputStyle: 'expanded'
+        }
       }
     }
   }
@@ -53,6 +58,11 @@ module.exports = {
         plugins: [
           postcss
         ]
+      },
+      sass: {
+        sassOptions: {
+          outputStyle: 'expanded'
+        }
       }
     }
   },
@@ -79,13 +89,6 @@ module.exports = {
     },
     disableHostCheck: true
   },
-  // css: {
-  //   loaderOptions: {
-  //     sass: {
-  //       sassOptions: { outputStyle: "expanded" }
-  //     }
-  //   }
-  // },
   configureWebpack: {
     name: name,
     output: {