Merge branch 'master' of ssh://101.201.226.163:50022/binbin0314/datang-admin

src/components/News/addOrEdit.vue

@@ -86,7 +86,9 @@
                     </el-radio-group>
                 </el-form-item>
             </div>
-            <el-form-item label="正文：" prop="content">
+            <el-form-item label="正文：" prop="content" :rules="[
+                        { required: formLabelAlign.jumpUrl ? false : true, message: '请输入正文' },
+                    ]">
                 <editor ref="editor" :content="formLabelAlign.content" />
             </el-form-item>
             <el-form-item label="相关新闻：" prop="relationContentIds">
@@ -150,9 +152,6 @@
                     title: [
                         { type: 'string', required: true, message: '请输入标题', trigger: 'blur' }
                     ],
-                    content: [
-                        { type: 'string', required: true, message: '请输入正文' }
-                    ],
                 }
             }
         },

vue.config.js

@@ -10,7 +10,7 @@ const proxyUrl = '/datang/v1.0'
 const port = 8080
 
 module.exports = {
-    publicPath: '/v1.0/manage',
+    publicPath: '/manage',
     devServer: {
         open: true,
         overlay: {