Merge branch 'master' of http://124.222.105.7:3000/dianliang/dl_site_system

dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCategoryServiceImpl.java

@@ -44,7 +44,7 @@ public class BusiCategoryServiceImpl extends ServiceImpl<BusiCategoryMapper, Bus
         lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag,0)
                 .eq(BusiCategory::getTenantId,category.getTenantId())
                 .orderByAsc(DlBaseEntity::getCreateTime);
-        if (StringUtils.isEmpty(category.getCatgName())) {
+        if (!StringUtils.isEmpty(category.getCatgName())) {
             lambdaQueryWrapper.like(BusiCategory::getCatgName,category.getCatgName());
         }
         List<BusiCategory> list = list(lambdaQueryWrapper);

dl_vue/src/views/busi/category/form/categoryForm.vue

@@ -1,19 +1,15 @@
 <template>
   <!-- 添加或修改网站栏目对话框 -->
   <div class="app-container">
-    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="150px">
       <el-row :gutter="20">
-        <el-col :span="6">
+
-          <el-form-item label="栏目编号" prop="code">
+        <el-col :span="8">
-            <el-input v-model="form.code" placeholder="请输入栏目编号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="栏目名称" prop="catgName">
             <el-input v-model="form.catgName" placeholder="请输入栏目名称" />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="栏目类型" prop="catgType">
             <el-select v-model="form.catgType" placeholder="请选择通告栏目类型" >
               <el-option
@@ -25,13 +21,53 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="排序" prop="sort">
             <el-input v-model="form.sort" placeholder="请输入排序" />
           </el-form-item>
         </el-col>
       </el-row>
 
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="产品上方内容html" prop="prodUp">
+            <el-input type="textarea" v-model="form.prodUp" placeholder="请输入产品上方内容html" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="产品下方内容html" prop="prodDown">
+            <el-input type="textarea" v-model="form.prodDown" placeholder="请输入产品下方内容html" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="页面title" prop="title">
+            <el-input type="textarea" v-model="form.title" placeholder="请输入页面title" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="页面keyword" prop="keyword">
+            <el-input type="textarea" v-model="form.keyword" placeholder="请输入页面keyword" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="页面description" prop="description">
+              <el-input type="textarea" v-model="form.description" placeholder="请输入页面description" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+      <el-row>
+        <el-col>
+          <el-form-item label="内容html" prop="content">
+          <editor v-model="form.content" :min-height="192"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
 
 
     </el-form>
@@ -53,9 +89,15 @@ export default {
       title:"",
       //表单参数
       form:{
-        code:"",
         catgName:"",
         catgType:"",
+        sort:"",
+        title:"",
+        keyword:"",
+        description:"",
+        prodUp:"",
+        prodDown:"",
+        content:""
       },
       //列表页入参
       query:{},