wesmiler 2 месяцев назад
Родитель
Сommit
420fafa2d2

+ 278 - 0
addons/admin/src/views/system/article/about.vue

@@ -0,0 +1,278 @@
+<template>
+  <div class="ele-body">
+    <el-card shadow="never">
+      <!-- 搜索表单 -->
+      <el-form :model="table.where" label-width="90px" class="ele-form-search"
+               @keyup.enter.native="$refs.table.reload()" @submit.native.prevent>
+        <el-row :gutter="15">
+          <el-col :md="8" :sm="12">
+            <el-form-item label="关键词:">
+              <el-input v-model="table.where.keyword" placeholder="请输入标题关键词" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :md="6" :sm="12">
+            <el-form-item label="类型:">
+              <el-select v-model="table.where.type" placeholder="请选择类型" class="ele-fluid">
+                <el-option label="全部" :value="0"/>
+                <el-option v-for="(item,k) in typeArr" :key="k" :label="item.name" :value="item.id"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :md="6" :sm="12">
+            <el-form-item label="状态:">
+              <el-select v-model="table.where.status" placeholder="请选择" class="ele-fluid">
+                <el-option label="全部" :value="0"/>
+                <el-option label="发布" :value="1"/>
+                <el-option label="未发布" :value="2"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :md="6" :sm="12">
+            <div class="ele-form-actions">
+              <el-button type="primary" @click="$refs.table.reload()" icon="el-icon-search" class="ele-btn-icon">查询
+              </el-button>
+              <el-button @click="(table.where={status:0,type:0,show_type:1})&&$refs.table.reload()">重置</el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+      <!-- 操作按钮 -->
+      <div class="ele-table-tool ele-table-tool-default">
+        <el-button @click="add()" type="primary" icon="el-icon-plus" class="ele-btn-icon" size="small" v-if="permission.includes('sys:article:add')">添加协议
+        </el-button>
+      </div>
+      <!-- 数据表格 -->
+      <ele-data-table ref="table" :config="table" :choose.sync="choose" height="calc(100vh - 315px)"  highlight-current-row>
+        <template >
+          <el-table-column type="selection" width="45" align="center" fixed="left"/>
+          <el-table-column prop="id" label="ID" width="60" align="center" fixed="left" show-overflow-tooltip/>
+          <el-table-column prop="title" label="标题" show-overflow-tooltip min-width="200"/>
+          <el-table-column prop="type_name" label="类型" show-overflow-tooltip min-width="100">
+            <template slot-scope="{row}">
+              <span class="ele-text-primary">{{row.type_name}}</span>
+            </template>
+          </el-table-column>
+<!--          <el-table-column prop="view_num" label="浏览量" sortable="custom" show-overflow-tooltip min-width="100" align="center"/>-->
+          <el-table-column prop="status" label="发布" :resizable="false" min-width="120">
+            <template slot-scope="{row}">
+              <el-switch v-model="row.status" @change="editStatus(row)" :active-value="1" :inactive-value="2"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="180px" align="center" :resizable="false"  fixed="right">
+            <template slot-scope="{row}">
+              <el-link @click="edit(row)" icon="el-icon-edit" type="primary" :underline="false" v-if="permission.includes('sys:article:edit')">修改</el-link>
+              <el-popconfirm title="确定要删除此协议吗?删除后不可恢复!" @confirm="remove(row)" class="ele-action">
+                <el-link slot="reference" icon="el-icon-delete" type="danger" :underline="false" v-if="permission.includes('sys:article:delete')">删除</el-link>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
+        </template>
+      </ele-data-table>
+    </el-card>
+    <!-- 编辑弹窗 -->
+    <el-dialog :title="editForm.id?'修改协议':'添加协议'" :visible.sync="showEdit" width="1000px"
+               @closed="resetEditForm()" :destroy-on-close="true" custom-class="ele-dialog-form" :lock-scroll="false">
+      <el-form :model="editForm" ref="editForm" :rules="editRules" label-width="100px">
+        <el-row :gutter="15">
+          <el-col :sm="15">
+            <el-form-item label="类型:" prop="type">
+              <el-select v-model="editForm.type" placeholder="请选择类型" class="ele-fluid">
+                <el-option v-for="(item,k) in typeArr" :key="k" :label="item.name" :value="item.id"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="标题:" prop="title">
+              <el-input v-model="editForm.title" placeholder="请输入标题" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :sm="20">
+            <el-form-item label="协议内容:" prop="content">
+              <tinymce-editor v-model="editForm.content" :init="editContent"/>
+            </el-form-item>
+            <el-form-item label="状态:">
+              <el-radio-group v-model="editForm.status">
+                <el-radio :label="1">发布</el-radio>
+                <el-radio :label="2">不发布</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="showEdit=false">取消</el-button>
+        <el-button type="primary" @click="save">保存</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// import uploadImage from '@/components/uploadImage'
+import TinymceEditor from '@/components/TinymceEditor'
+import { mapGetters } from "vuex";
+export default {
+  name: "Sysarticle",
+  components: {TinymceEditor},
+  data() {
+    return {
+      table: {url: '/article/index', where: {status:0,type:0,show_type: 1}},  // 表格配置
+      choose: [],  // 表格选中数据
+      showEdit: false,  // 是否显示表单弹窗
+      editForm: {status:1,type:1},  // 表单数据
+      typeArr: [
+        {id:3,name:'用户注册协议'},
+        {id:4,name:'提现协议'},
+        {id:5,name:'隐私协议'},
+        {id:6,name:'关于我们'},
+      ],
+      editRules: {  // 表单验证规则
+        title: [
+          {required: true, message: '请输入名称', trigger: 'blur'}
+        ],
+        type: [
+          {required: true, message: '请选择分类', trigger: 'blur'}
+        ],
+      },
+      // 分类
+      cates:[],
+      loading: false,
+      // 自定义文件上传(这里使用把选择的文件转成blob演示)
+      file_picker_callback: (callback, value, meta) => {
+        let input = document.createElement('input');
+        input.setAttribute('type', 'file');
+        // 设定文件可选类型
+        if (meta.filetype === 'image') {
+          input.setAttribute('accept', 'image/*');
+        } else if (meta.filetype === 'media') {
+          input.setAttribute('accept', 'video/*');
+        }
+        input.onchange = () => {
+          let file = input.files[0];
+          let reader = new FileReader();
+          reader.onload = (e) => {
+            let blob = new Blob([e.target.result], {type: file.type});
+            callback(URL.createObjectURL(blob));
+          };
+          reader.readAsArrayBuffer(file);
+        }
+        input.click();
+      }
+    }
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    editContent() {
+      return {
+        menubar: false,
+        file_picker_callback: this.file_picker_callback,
+        skin_url: this.$store.state.theme.theme === 'dark' ? '/tinymce/skins/ui/oxide-dark' : '/tinymce/skins/ui/oxide',
+        content_css: this.$store.state.theme.theme === 'dark' ? '/tinymce/skins/content/dark/content.css' : '/tinymce/skins/content/default/content.css'
+      };
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    /* 添加 */
+    add() {
+      this.resetEditForm();
+      this.showEdit = true;
+    },
+    /* 显示编辑 */
+    edit(row) {
+      this.editForm = Object.assign({}, row);
+      this.showEdit = true;
+    },
+    /* 重置表单 */
+    resetEditForm() {
+      this.editForm = {status: 1, type: 1, title: '', content: ''};
+      if (this.$refs.editForm) {
+        this.$refs.editForm.clearValidate();
+      }
+    },
+    /* 保存编辑 */
+    save() {
+      this.$refs['editForm'].validate((valid) => {
+        if (valid) {
+          const loading = this.$loading({lock: true});
+          this.$http.post('/article/edit', this.editForm).then(res => {
+            loading.close();
+            if (res.data.code === 0) {
+              this.showEdit = false;
+              this.$message({type: 'success', message: res.data.msg});
+              this.$refs.table.reload();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          }).catch(e => {
+            loading.close();
+            this.$message.error(e.message);
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+    /* 删除 */
+    remove(row) {
+      if (!row) {  // 批量删除
+        if (this.choose.length === 0) return this.$message.error('请至少选择一条数据');
+        let ids = this.choose.map(d => d.id);
+        this.$confirm('确定要删除选中的吗?', '提示', {type: 'warning'}).then(() => {
+          const loading = this.$loading({lock: true});
+          this.$http.post('/article/delete', {id: ids}).then(res => {
+            loading.close();
+            if (res.data.code === 0) {
+              this.$message({type: 'success', message: res.data.msg});
+              this.$refs.table.reload();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          }).catch(e => {
+            loading.close();
+            this.$message.error(e.message);
+          });
+        }).catch(() => 0);
+      } else {  // 单个删除
+        const loading = this.$loading({lock: true});
+        this.$http.post('/article/delete', {id:row.id}).then(res => {
+          loading.close();
+          if (res.data.code === 0) {
+            this.$message({type: 'success', message: res.data.msg});
+            this.$refs.table.reload();
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        }).catch(e => {
+          loading.close();
+          this.$message.error(e.message);
+        });
+      }
+    },
+    /* 更改状态 */
+    editStatus(row) {
+      this.$message.closeAll()
+      const loading = this.$loading({lock: true});
+      let params = Object.assign({}, row);
+      this.$http.post('/article/status', params).then(res => {
+        loading.close();
+        if (res.data.code === 0) {
+          this.$message({type: 'success', message: res.data.msg});
+        } else {
+          row.status = !row.status ? 2 : 1;
+          this.$message.error(res.data.msg);
+        }
+      }).catch(e => {
+        loading.close();
+        this.$message.error(e.message);
+      });
+    },
+  }
+}
+</script>
+
+<style scoped>
+.ele-block >>> .el-upload, .ele-block >>> .el-upload-dragger {
+  width: 100%;
+}
+</style>

+ 11 - 0
app/Models/ArticleModel.php

@@ -22,4 +22,15 @@ class ArticleModel extends BaseModel
     // 设置数据表
     protected $table = 'article';
 
+    /**
+     * 分类
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function category()
+    {
+        return $this->hasOne(ArticleCateModel::class, 'cate_id', 'cate_id')
+            ->select(['cate_id', 'name', 'type']);
+    }
+
+
 }

+ 13 - 25
app/Services/Common/ArticleService.php

@@ -57,29 +57,18 @@ class ArticleService extends BaseService
         $where = ['a.mark' => 1];
         $status = isset($params['status']) ? $params['status'] : 0;
         $type = isset($params['type']) ? $params['type'] : 0;
-        $showType = isset($params['show_type']) ? $params['show_type'] : 1; // 1:协议 2:公告
 
         if ($status > 0) {
             $where['a.status'] = $status;
         }
 
-        $list = $this->model->from('article as a')
+        $list = $this->model->with(['category'])->from('article as a')
             ->where($where)
-            ->where(function ($query) use ($type, $showType) {
-                // 根据show_type区分协议和公告
-                if ($showType == 1) {
-                    // 协议类型:1-5
-                    $query->whereIn('a.type', [1, 2, 3, 4, 5]);
-                } else if ($showType == 2) {
-                    // 公告类型:固定为6
-                    $query->where('a.type', 6);
-                }
-
-                // 如果指定了具体类型,则进一步筛选(仅用于协议)
-                if ($showType == 1 && $type && is_array($type)) {
-                    $query->whereIn('a.type', $type);
-                } else if ($showType == 1 && $type) {
+            ->where(function ($query) use ($type) {
+                if ($type>0) {
                     $query->where('a.type', $type);
+                } else {
+                    $query->where('a.type','>=',3)->where('a.type','<=',9);
                 }
             })
             ->where(function ($query) use ($params) {
@@ -94,13 +83,12 @@ class ArticleService extends BaseService
         $list = $list ? $list->toArray() : [];
         if ($list) {
             $typrArr = [
-                '',
-                '商家入驻协议',
-                '代理申请协议',
-                '提现协议',
-                '提现说明',
-                '充值说明',
-                '公告'
+                1=>'行业资讯中心',
+                2=>'行业政策专栏',
+                3=>'用户注册协议',
+                4=>'提现协议',
+                5=>'隐私协议',
+                9=>'关于我们'
             ];
             foreach ($list['data'] as &$item) {
                 $item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H.i.s') : '';
@@ -136,7 +124,7 @@ class ArticleService extends BaseService
         }
 
         // 设置日志标题
-        ActionLogModel::setTitle("发布文章或客服咨询信息");
+        ActionLogModel::setTitle("编辑文章信息");
         ActionLogModel::record();
         return parent::edit($data); // TODO: Change the autogenerated stub
     }
@@ -161,7 +149,7 @@ class ArticleService extends BaseService
 
         if ($result) {
             // 设置日志标题
-            ActionLogModel::setTitle("删除协议内容");
+            ActionLogModel::setTitle("删除文章内容");
             ActionLogModel::record();
             return ['code' => 0, 'msg' => '删除成功'];
         }