前端广告展示

src/views/bst/ad/index.vue

@@ -82,13 +82,13 @@
               v-hasPermi="['bst:ad:edit']">
               {{ scope.row.auditStatus === '1' ? '审核' : '查看详情' }}
             </el-button>
-<!--            <el-button-->
+            <el-button
-<!--              size="mini"-->
+              size="mini"
-<!--              type="text"-->
+              type="text"
-<!--              icon="el-icon-edit"-->
+              icon="el-icon-edit"
-<!--              @click="handleUpdate(scope.row)"-->
+              @click="handleUpdate(scope.row)"
-<!--              v-has-permi="['bst:ad:edit']"-->
+              v-has-permi="['bst:ad:edit']"
-<!--            >修改</el-button>-->
+            >修改</el-button>
             <el-button
               size="mini"
               type="text"

src/views/bst/agreement/index.vue

@@ -34,7 +34,8 @@
           size="mini"
           @click="handleAdd"
           v-has-permi="['bst:agreement:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
@@ -55,12 +56,14 @@
           size="mini"
           @click="handleExport"
           v-has-permi="['bst:agreement:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
+    <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange"
+              :default-sort="defaultSort" @sort-change="onSortChange">
       <el-table-column type="selection" width="55" align="center"/>
       <template v-for="column of showColumns">
         <el-table-column
@@ -80,7 +83,8 @@
             </template>
             <template v-else-if="column.key === 'title'">
               {{ d.row.title | dv }}
-              <dict-tag :options="dict.type.agreement_type" :value="d.row.agreementType" size="mini" style="margin-left: 4px;"/>
+              <dict-tag :options="dict.type.agreement_type" :value="d.row.agreementType" size="mini"
+                        style="margin-left: 4px;"/>
             </template>
             <template v-else-if="column.key === 'userName'">
               <user-link :id="d.row.storeId" :text="d.row.userName"/>
@@ -99,14 +103,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-has-permi="['bst:agreement:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-has-permi="['bst:agreement:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -134,6 +140,23 @@
             style="width: 58%"
           />
         </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <form-col label="内容类型" prop="contentType">
+              <el-select
+                v-model="form.contentType"
+                placeholder="请选择内容类型"
+                style="width: 95%"
+              >
+                <el-option
+                  v-for="dict in dict.type.agreement_content_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </form-col>
+          </el-col>
           <el-col :span="12">
             <form-col label="协议类型" prop="agreementType">
               <el-select
@@ -150,6 +173,8 @@
               </el-select>
             </form-col>
           </el-col>
+        </el-row>
+        <el-row gutter="20">
           <el-col :span="12">
             <form-col label="展示时长" prop="duration">
               <div style="display: flex; align-items: center; gap: 10px">
@@ -165,12 +190,19 @@
               </div>
             </form-col>
           </el-col>
-          <form-col :span="span"  label="简介" prop="brief">
+        </el-row>
+        <el-row gutter="20">
+          <el-col :span="span">
+            <form-col label="简介" prop="brief">
               <el-input v-model="form.brief" placeholder="请输入简介"/>
             </form-col>
-          <form-col :span="span"  label="内容详情">
+          </el-col>
-            <editor  v-model="form.content" :min-height="200"/>
+          <el-col :span="span">
+            <form-col label="内容详情">
+              <editor v-model="form.content" :min-height="150"/>
             </form-col>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -197,16 +229,53 @@ const defaultSort = {
 export default {
   name: "Agreement",
   mixins: [$showColumns],
-  dicts: ['agreement_type'],
+  dicts: ['agreement_type', 'agreement_content_type'],
   components: {FormCol, Editor, AreaRemoteSelect, UserLink},
   data() {
     return {
       span: 24,
       // 字段列表
       columns: [
-        {key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
+        {
-        {key: 'title', visible: true, label: '标题', minWidth: "150", sortable: true, overflow: false, align: 'left', width: null},
+          key: 'id',
-        {key: 'brief', visible: true, label: '简介', minWidth: null, sortable: true, overflow: true, align: 'center', width: null},
+          visible: false,
+          label: 'ID',
+          minWidth: null,
+          sortable: true,
+          overflow: false,
+          align: 'center',
+          width: "80"
+        },
+        {
+          key: 'title',
+          visible: true,
+          label: '标题',
+          minWidth: "150",
+          sortable: true,
+          overflow: false,
+          align: 'left',
+          width: null
+        },
+        {
+          key: 'contentType',
+          visible: true,
+          label: '类型',
+          minWidth: "150",
+          sortable: true,
+          overflow: false,
+          align: 'left',
+          width: null
+        },
+        {
+          key: 'brief',
+          visible: true,
+          label: '简介',
+          minWidth: null,
+          sortable: true,
+          overflow: true,
+          align: 'center',
+          width: null
+        },
         {key: 'userName', visible: true, label: '商户', sortable: true, align: 'center'},
         {key: 'areaName', visible: true, label: '运营区', sortable: true, align: 'center'},
         {key: 'createTime', visible: true, label: '创建时间', sortable: true, align: 'center'},
@@ -244,6 +313,7 @@ export default {
         brief: null,
         content: null,
         agreementType: null,
+        contentType: null,
         duration: null,
       },
       // 表单参数
@@ -254,6 +324,12 @@ export default {
         title: [
           {required: true, message: "标题不能为空", trigger: "blur"}
         ],
+        areaId: [
+          {required: true, message: "运营区不能为空", trigger: "blur"}
+        ],
+        agreementType: [
+          {required: true, message: "协议类型不能为空", trigger: "blur"}
+        ],
       }
     };
   },
@@ -375,7 +451,8 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {