From 8941241a0bb4c3b7e3fc3fa33db7cfcc404574f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Tue, 5 Jan 2021 23:19:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E5=8F=8B=E6=83=85=E9=93=BE=E6=8E=A5=E3=80=81Banner=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9B=AE=E5=BD=95=E6=9B=B4=E6=8D=A2=E8=87=B3=E6=A0=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue-element-admin/api/configs.js          |   8 +
 .../vue-element-admin/router/index.js         |   4 +-
 .../store/modules/permission.js               |   1 +
 .../banners/components/detail.vue             |   0
 .../views/{setting => }/banners/index.vue     |   0
 .../views/configs/components/ConfigDetail.vue | 321 ++++++++++++++++++
 .../views/configs/detail.vue                  |  15 +
 .../views/{setting => }/configs/index.vue     |  25 +-
 .../friendlinks/components/detail.vue         |   0
 .../views/{setting => }/friendlinks/index.vue |   0
 .../setting/configs/components/detail.vue     | 124 -------
 11 files changed, 357 insertions(+), 141 deletions(-)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{setting => }/banners/components/detail.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{setting => }/banners/index.vue (100%)
 create mode 100644 app/Modules/Admin/Resources/vue-element-admin/views/configs/components/ConfigDetail.vue
 create mode 100644 app/Modules/Admin/Resources/vue-element-admin/views/configs/detail.vue
 rename app/Modules/Admin/Resources/vue-element-admin/views/{setting => }/configs/index.vue (96%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{setting => }/friendlinks/components/detail.vue (100%)
 rename app/Modules/Admin/Resources/vue-element-admin/views/{setting => }/friendlinks/index.vue (100%)
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/components/detail.vue

diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/configs.js b/app/Modules/Admin/Resources/vue-element-admin/api/configs.js
index 92ea787..13371c1 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/configs.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/configs.js
@@ -8,6 +8,14 @@ export function getList(query) {
     })
 }
 
+export function detail(id) {
+    return request({
+        url: '/configs/detail',
+        method: 'get',
+        params: { config_id:id }
+    })
+}
+
 export function create(data) {
     return request({
         url: '/configs/create',
diff --git a/app/Modules/Admin/Resources/vue-element-admin/router/index.js b/app/Modules/Admin/Resources/vue-element-admin/router/index.js
index cb1ae71..235ab8d 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/router/index.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/router/index.js
@@ -111,8 +111,7 @@ export const constantRoutes = [
     componentsRouter,
     chartsRouter
 ];
-console.log('---componentsRouter---');
-console.log(componentsRouter);
+
 
 /**
  * asyncRoutes
@@ -123,7 +122,6 @@ export const asyncRoutes = [
     // componentsRouter,
     // chartsRouter,
 
-
     // {
     //     path: 'external-link',
     //     component: Layout,
diff --git a/app/Modules/Admin/Resources/vue-element-admin/store/modules/permission.js b/app/Modules/Admin/Resources/vue-element-admin/store/modules/permission.js
index 67657b4..8f3d504 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/store/modules/permission.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/store/modules/permission.js
@@ -57,6 +57,7 @@ export function generaMenu(routes, data) {
             path: item.vue_path,
             component: (item.vue_component === 'Layout') ? Layout : (resolve) => require([`@/views/${item.vue_component}`], resolve),
             children: [],
+            // name: item.vue_name,
         };
 
         // console.log(item);
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/setting/banners/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/setting/banners/components/detail.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/setting/banners/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/setting/banners/index.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/configs/components/ConfigDetail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/configs/components/ConfigDetail.vue
new file mode 100644
index 0000000..29d740b
--- /dev/null
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/configs/components/ConfigDetail.vue
@@ -0,0 +1,321 @@
+<template>
+    <div class="createPost-container">
+        <el-form ref="postForm" :model="postForm" :rules="rules" class="form-container">
+            <sticky :z-index="10" :class-name="'sub-navbar publish'">
+                <el-button v-loading="loading" style="margin-left: 10px;" type="success" @click="submitForm">
+                    Publish
+                </el-button>
+            </sticky>
+
+            <div class="createPost-main-container">
+                <el-form-item prop="article_title" label-width="70px" label="文章标题:">
+                    <MDinput v-model="postForm.article_title" :maxlength="100" name="name" required>
+                        Title
+                    </MDinput>
+                </el-form-item>
+
+                <el-form-item label="父级菜单">
+                    <el-select v-model="postForm.category_id" placeholder="请选择文章分类" autocomplete="off" class="article-textarea">
+                        <el-option
+                            v-for="item in category"
+                            :key="item.category_id"
+                            :checked="item.category_id == postForm.category_id"
+                            :label="item.category_name"
+                            :value="item.category_id"
+                        />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item prop="article_cover" label="文章封面">
+                    <pan-thumb :image="image_url" @click="show=true"/>
+
+                    <el-button
+                        id="img-btn"
+                        type="primary"
+                        icon="el-icon-upload"
+                        @click="show=true"
+                    >
+                        文章封面
+                    </el-button>
+
+                    <my-upload
+                        v-model="show"
+                        img-format="png"
+                        :size="size"
+                        :width="50"
+                        :height="50"
+                        lang-type="zh"
+                        :no-rotate="false"
+                        field="file"
+                        :url="upload_url"
+                        @crop-success="cropSuccess"
+                        @crop-upload-success="cropUploadSuccess"
+                        @crop-upload-fail="cropUploadFail"
+                    />
+                </el-form-item>
+
+                <el-form-item label-width="70px" label="关键字:">
+                    <el-input v-model="postForm.article_keywords" :rows="1" type="textarea" class="article-textarea"
+                              autosize placeholder="Please enter the 关键字搜索"/>
+                </el-form-item>
+
+                <el-form-item label-width="70px" label="描述:">
+                    <el-input v-model="postForm.article_description" :rows="1" type="textarea" class="article-textarea"
+                              autosize placeholder="Please enter the 文章描述"/>
+                    <span v-show="contentShortLength" class="word-counter">{{ contentShortLength }}words</span>
+                </el-form-item>
+
+                <el-form-item prop="article_content">
+                    <el-tag class="tag-title">
+                        文章内容:
+                    </el-tag>
+                    <markdown-editor v-model="postForm.article_content" height="400px" />
+                </el-form-item>
+
+                <el-form-item label="排序" prop="article_sort">
+                    <el-input v-model.trim="postForm.article_sort" autocomplete="off"/>
+                </el-form-item>
+            </div>
+        </el-form>
+    </div>
+</template>
+
+<script>
+    import MarkdownEditor from '@/components/MarkdownEditor'
+    import myUpload from '@/components/Uploads/image/index';
+    import PanThumb from '@/components/PanThumb';
+    import MDinput from '@/components/MDinput'
+    import Sticky from '@/components/Sticky' // 粘性header组件
+    import {validURL} from '@/utils/validate'
+    import {getUploadUrl} from '@/api/common';
+    import {detail, create, update} from '@/api/configs';
+
+    const defaultForm = {
+        article_id: 0,
+        article_title: '', // 文章题目
+        category_id: 0, // 分类
+        article_content: '', // 文章内容
+        article_keywords: '', // 关键字
+        article_description: '', // 文章摘要
+        article_cover: '', // 封面图
+        article_link: '', // 文章外链
+        article_sort: 99, // 排序
+    };
+
+    export default {
+        name: 'ArticleDetail',
+        components: {MDinput, Sticky,
+            'my-upload': myUpload,
+            PanThumb,
+            MarkdownEditor
+        },
+        props: {
+            isEdit: {
+                type: Boolean,
+                default: false
+            }
+        },
+        data() {
+            const validateRequire = (rule, value, callback) => {
+                if (value === '') {
+                    this.$message({
+                        message: rule.field + '为必传项',
+                        type: 'error'
+                    })
+                    callback(new Error(rule.field + '为必传项'))
+                } else {
+                    callback();
+                }
+                return;
+            }
+            const validateSourceUri = (rule, value, callback) => {
+                if (value) {
+                    if (validURL(value)) {
+                        callback()
+                    } else {
+                        this.$message({
+                            message: '外链url填写不正确',
+                            type: 'error'
+                        })
+                        callback(new Error('外链url填写不正确'))
+                    }
+                } else {
+                    callback()
+                }
+            }
+            return {
+                postForm: Object.assign({}, defaultForm),
+                loading: false,
+                userListOptions: [],
+                rules: {
+                    article_title: [{validator: validateRequire}],
+                    category_id: [{validator: validateRequire}],
+                    article_cover: [{validator: validateRequire}],
+                    article_content: [{validator: validateRequire}],
+                    article_link: [{validator: validateSourceUri, trigger: 'blur'}]
+                },
+                tempRoute: {},
+                // 图片上传
+                show: false,
+                size: 2.1,
+
+                // 图片上传
+                upload_url: '',
+                image_url: '',
+
+                category:[], // 分类
+            }
+        },
+        computed: {
+            contentShortLength() {
+                return this.postForm.article_description.length;
+            },
+            lang() {
+                return this.$store.getters.language;
+            },
+        },
+        created() {
+            console.log('Article-detail');
+            console.log(this.$route);
+            if (this.isEdit) {
+                const article_id = this.$route.query && this.$route.query.article_id;
+                if (article_id > 0) this.getDetail(article_id);
+            }
+
+            // Why need to make a copy of this.$route here?
+            // Because if you enter this page and quickly switch tag, may be in the execution of the setTagsViewTitle function, this.$route is no longer pointing to the current page
+            // https://github.com/PanJiaChen/vue-element-admin/issues/1221
+            this.tempRoute = Object.assign({}, this.$route);
+
+            // 图片上传路径
+            this.upload_url = getUploadUrl();
+            // 文章分类列表
+            this.getCategorySelect();
+        },
+        methods: {
+            // 获取菜单列表
+            async getCategorySelect() {
+                const res = await getCategorySelect();
+                this.category = res.data;
+            },
+            // 获取文章详情
+            getDetail(article_id) {
+                detail(article_id).then(response => {
+                    console.log(response);
+
+                    this.postForm = response.data;
+                    // 默认展示的封面图
+                    this.image_url = this.postForm.article_cover;
+
+                    // set page title
+                    this.setPageTitle();
+                }).catch(err => {
+                    console.log(err);
+                })
+            },
+            setTagsViewTitle() {
+                const title = this.lang === 'zh' ? '编辑文章' : 'Edit Article';
+                const route = Object.assign({}, this.tempRoute, {title: `${title}-${this.postForm.article_id}`});
+                this.$store.dispatch('tagsView/updateVisitedView', route);
+            },
+            setPageTitle() {
+                const title = 'Edit Article';
+                document.title = `${title} - ${this.postForm.article_id}`;
+            },
+            submitForm() {
+                // console.log(this.postForm);
+                this.$refs.postForm.validate(async valid => {
+                    if (valid) {
+                        this.loading = true;
+
+                        const {msg, status} = this.postForm.article_id > 0 ? await update(this.postForm) : await create(this.postForm);
+                        if (status == 1){
+                            this.$notify({
+                                title: '成功',
+                                message: this.postForm.article_id > 0 ? '编辑文章成功' : '发布文章成功',
+                                type: 'success',
+                                duration: 2000,
+                            });
+
+                            // 返回文章列表
+                            this.$router.push(`/articles`);
+                        }else{
+                            this.$message({
+                                message: msg,
+                                type: 'error',
+                            });
+                        }
+
+                        this.loading = false;
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                })
+            },
+            cropSuccess(imgDataUrl, field) {
+                console.log('-------- crop success --------', imgDataUrl, field);
+            },
+            // 上传成功回调
+            cropUploadSuccess(result, field) {
+                this.image_url = result.path_url;
+                this.postForm.article_cover = result.data;
+            },
+            // 上传失败回调
+            cropUploadFail(status, field) {
+                console.log('上传失败状态' + status);
+                console.log('field: ' + field);
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "~@/styles/mixin.scss";
+
+    .createPost-container {
+        position: relative;
+
+        .el-form {
+            .el-form-item{
+                margin-bottom: 40px;
+            }
+        }
+
+        .createPost-main-container {
+            padding: 40px 45px 20px 50px;
+
+            .postInfo-container {
+                position: relative;
+                @include clearfix;
+                margin-bottom: 10px;
+
+                .postInfo-container-item {
+                    float: left;
+                }
+            }
+        }
+
+        .word-counter {
+            width: 40px;
+            position: absolute;
+            right: 10px;
+            top: 0px;
+        }
+    }
+
+    .article-textarea ::v-deep {
+        textarea {
+            padding-right: 40px;
+            resize: none;
+            border: none;
+            border-radius: 0px;
+            border-bottom: 1px solid #bfcbd9;
+        }
+    }
+
+    // 封面图
+    .pan-item, .pan-info, .pan-thumb{
+        border-radius: 0;
+    }
+</style>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/configs/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/configs/detail.vue
new file mode 100644
index 0000000..24513cb
--- /dev/null
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/configs/detail.vue
@@ -0,0 +1,15 @@
+<template>
+  <config-detail :is-edit="true" />
+</template>
+
+<script>
+import ConfigDetail from './components/ConfigDetail';
+
+export default {
+  name: 'EditForm',
+  components: { ConfigDetail },
+    created() {
+        console.log('config-detail');
+    },
+}
+</script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
similarity index 96%
rename from app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/index.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
index 595960e..7c1bb00 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
@@ -28,7 +28,7 @@
                 style="margin-left: 10px;"
                 type="primary"
                 icon="el-icon-plus"
-                @click="handleCreate"
+                @click="handleEdit"
             >
                 {{ $t('table.add') }}
             </el-button>
@@ -151,15 +151,13 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
         />
-        <edit ref="edit" @fetchData="getList"/>
     </div>
 </template>
 
 <script>
     import {getList, setDel, changeFiledStatus} from '@/api/configs'
     import waves from '@/directive/waves' // waves directive
-    import Edit from './components/detail'
-    import {parseTime} from '@/utils/index'
+    import {parseTime} from '@/utils/index';
 
     const calendarCheckOptions = [
         {key: '-1', display_name: '全部'},
@@ -174,7 +172,7 @@
 
     export default {
         name: 'UserManagement',
-        components: {Edit},
+        components: {},
         directives: {waves},
         filters: {
             parseTime: parseTime,
@@ -225,10 +223,6 @@
                 },
                 dialogFormVisible: false,
                 dialogStatus: '',
-                textMap: {
-                    update: 'Edit',
-                    create: 'Create'
-                },
                 rules: {
                     type: [{required: true, message: 'type is required', trigger: 'change'}],
                     timestamp: [{type: 'date', required: true, message: 'timestamp is required', trigger: 'change'}],
@@ -290,12 +284,15 @@
                 this.selectRows = val;
                 this.is_batch = 1;
             },
+            // 新增与编辑
             handleEdit(row) {
-                if (row) {
-                    this.$refs['edit'].showEdit(row)
-                } else {
-                    this.$refs['edit'].showEdit()
-                }
+                var query = {};
+                if (row.config_id) query.config_id = row.config_id;
+                console.log(query);
+                this.$router.push({
+                    'path':`/configs/detail`,
+                    'query': query,
+                });
             },
             handleDelete(row) {
                 var ids = '';
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/setting/friendlinks/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/setting/friendlinks/components/detail.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/setting/friendlinks/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/setting/friendlinks/index.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/components/detail.vue
deleted file mode 100644
index f5132be..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/components/detail.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="dialogFormVisible"
-    width="500px"
-    @close="close"
-  >
-    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-      <el-form-item label="管理员" prop="admin_name">
-        <el-input v-model.trim="form.admin_name" autocomplete="off" />
-      </el-form-item>
-      <el-form-item label="密码" prop="password">
-        <el-input type="password" autocomplete="off" />
-      </el-form-item>
-      <el-form-item label="邮箱" prop="admin_email">
-        <el-input v-model.trim="form.admin_email" autocomplete="off" />
-      </el-form-item>
-      <el-form-item label="权限">
-        <!--prop="permissions"-->
-        <!--v-model="form.permissions"-->
-        <el-checkbox-group>
-          <el-checkbox label="admin" />
-          <el-checkbox label="editor" />
-        </el-checkbox-group>
-      </el-form-item>
-      <el-form-item label="启用状态" prop="resource">
-        <el-radio-group v-model="form.is_check">
-          <el-radio :label="0" :checked="form.is_check == 0 ? 'checked' : ''">禁用</el-radio>
-          <el-radio :label="1" :checked="form.is_check == 1 ? 'checked' : ''">启用</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="close">取 消</el-button>
-      <el-button type="primary" @click="save">确 定</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { create, update } from '@/api/configs'
-import { isEmail } from '@/utils/validate'
-
-// 定义一个全局的变量，谁用谁知道
-var validEmail = (rule, value, callback) => {
-  if (!isEmail(value)) {
-    callback(new Error('请输入正确的邮箱'))
-  } else {
-    callback()
-  }
-}
-
-export default {
-  name: 'UserManagementEdit',
-  data() {
-    return {
-      form: {
-        admin_name: '',
-        password: '',
-        admin_email: '',
-        permissions: [],
-        is_check: 0
-      },
-      rules: {
-        admin_name: [
-          { required: true, trigger: 'blur', message: '请输入用户名' },
-          {
-            min: 3,
-            max: 20,
-            message: '长度在 3 到 20 个字符',
-            trigger: 'blur'
-          }
-        ],
-        // password: [
-        //     {required: true, trigger: "blur", message: "请输入密码"},
-        // ],
-        admin_email: [
-          { required: true, trigger: 'blur', message: '请输入邮箱' },
-          { required: true, trigger: 'blur', validator: isEmail }// 这里需要用到全局变量
-        ],
-        permissions: [
-          { required: true, trigger: 'blur', message: '请选择权限' }
-        ]
-      },
-      title: '',
-      dialogFormVisible: false
-    }
-  },
-  created() {
-  },
-  methods: {
-    showEdit(row) {
-      const admin = Object.assign({}, row)
-      if (!admin) {
-        this.title = '添加'
-      } else {
-        this.title = '编辑'
-        this.form = admin
-        this.form.password = this.form.login_token = this.form.use_role = ''
-      }
-      this.dialogFormVisible = true
-    },
-    close() {
-      this.$refs['form'].resetFields()
-      this.form = this.$options.data().form
-      this.dialogFormVisible = false
-    },
-    save() {
-      this.$refs['form'].validate(async(valid) => {
-        console.log(valid)
-        console.log(this.form.admin_id)
-        if (valid) {
-          const { msg } = this.form.admin_id ? await update(this.form) : await create(this.form)
-          this.$baseMessage(msg, 'success')
-          this.$emit('fetchData')
-          this.close()
-        } else {
-          return false
-        }
-      })
-    }
-  }
-}
-</script>
-- 
Gitee


From a7015cca21b1b00f90d1da40375eaef1dce6db6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 6 Jan 2021 00:03:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=EF=BC=9B=202.=E6=96=87=E7=AB=A0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=9A=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=9B=203.=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84border-radius=E5=8F=AF=E9=9A=8F?=
 =?UTF-8?q?=E6=84=8F=E4=BC=A0=E5=8F=82=E8=AE=BE=E7=BD=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PanThumb/index.vue             |  8 +-
 .../views/admin_roles/index.vue               |  2 +-
 .../vue-element-admin/views/admins/index.vue  | 15 +--
 .../articles/components/ArticleDetail.vue     | 47 +++++++--
 .../views/articles/index.vue                  | 95 ++++++++++++++++---
 .../vue-element-admin/views/configs/index.vue |  1 -
 6 files changed, 137 insertions(+), 31 deletions(-)

diff --git a/app/Modules/Admin/Resources/vue-element-admin/components/PanThumb/index.vue b/app/Modules/Admin/Resources/vue-element-admin/components/PanThumb/index.vue
index 1bcf417..eca3910 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/components/PanThumb/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/components/PanThumb/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div :style="{zIndex:zIndex,height:height,width:width}" class="pan-item">
-    <div class="pan-info">
+  <div :style="{zIndex:zIndex,height:height,width:width,borderRadius:borderRadius}" class="pan-item">
+    <div class="pan-info" :style="{borderRadius:borderRadius}">
       <div class="pan-info-roles-container">
         <slot />
       </div>
@@ -29,6 +29,10 @@ export default {
     height: {
       type: String,
       default: '150px'
+    },
+    borderRadius: {
+      type: String,
+      default: '50%'
     }
   }
 }
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
index 29a8e62..29610c9 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
@@ -98,7 +98,7 @@
                             禁用
                         </el-tag>
                     </el-button>
-
+                    <!-- 编辑与删除 -->
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
                     <el-button type="text" icon="el-icon-delete" v-if="scope.row.role_id > 1" @click="handleDelete(scope.row)">删除</el-button>
                 </template>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
index f366894..9fdc2d9 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
@@ -82,9 +82,10 @@
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="is_check" label="启用状态">
-                <template slot-scope="scope">
-                    <el-tag :type="scope.row.is_check | statusFilter">
-                        {{ scope.row.is_check | checkFilter }}
+                <template slot-scope="{row}">
+                    <el-tag :type="row.is_check | statusFilter">
+                        <i :class="row.is_check == 1 ? 'el-icon-unlock' : 'el-icon-lock'" />
+                        {{ row.is_check | checkFilter }}
                     </el-tag>
                 </template>
             </el-table-column>
@@ -97,19 +98,21 @@
             >
                 <template v-slot="scope">
                     <!-- 状态变更 -->
-                    <el-button v-if="scope.row.admin_id > 1 && scope.row.is_check == 0" type="text" icon="el-icon-unlock"
+                    <el-button v-if="scope.row.admin_id > 1 && scope.row.is_check == 0" type="text"
                                @click="changeStatus(scope.row, 1)">
                         <el-tag :type="1 | statusFilter">
+                            <i class="el-icon-unlock" />
                             启用
                         </el-tag>
                     </el-button>
-                    <el-button v-else-if="scope.row.admin_id > 1 && scope.row.is_check == 1" type="text" icon="el-icon-lock"
+                    <el-button v-else-if="scope.row.admin_id > 1 && scope.row.is_check == 1" type="text"
                                @click="changeStatus(scope.row, 0)">
                         <el-tag :type="0 | statusFilter">
+                            <i class="el-icon-lock" />
                             禁用
                         </el-tag>
                     </el-button>
-
+                    <!-- 编辑与删除 -->
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
                     <el-button type="text" icon="el-icon-delete" v-if="scope.row.admin_id != 1"
                                @click="handleDelete(scope.row)">删除
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
index 397e102..fe96d3f 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
@@ -28,7 +28,7 @@
                 </el-form-item>
 
                 <el-form-item prop="article_cover" label="文章封面">
-                    <pan-thumb :image="image_url" @click="show=true"/>
+                    <pan-thumb :image="image_url" :borderRadius="borderRadius" @click="show=true"/>
 
                     <el-button
                         id="img-btn"
@@ -74,8 +74,38 @@
                 </el-form-item>
 
                 <el-form-item label="排序" prop="article_sort">
-                    <el-input v-model.trim="postForm.article_sort" autocomplete="off"/>
+                    <el-input v-model.trim="postForm.article_sort" type="number" autocomplete="off"/>
                 </el-form-item>
+
+                <el-form-item label="是否置顶" prop="set_top">
+                    <el-radio-group v-model="postForm.set_top">
+                        <el-radio :label="0" :checked="postForm.set_top == 0 ? 'checked' : ''">否</el-radio>
+                        <el-radio :label="1" :checked="postForm.set_top == 1 ? 'checked' : ''">是</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item label="是否推荐" prop="is_recommend">
+                    <el-radio-group v-model="postForm.is_recommend">
+                        <el-radio :label="0" :checked="postForm.is_recommend == 0 ? 'checked' : ''">否</el-radio>
+                        <el-radio :label="1" :checked="postForm.is_recommend == 1 ? 'checked' : ''">是</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item label="是否公开" prop="is_public">
+                    <el-radio-group v-model="postForm.is_public">
+                        <el-radio :label="0" :checked="postForm.is_public == 0 ? 'checked' : ''">否</el-radio>
+                        <el-radio :label="1" :checked="postForm.is_public == 1 ? 'checked' : ''">是</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item label="文章来源" prop="article_origin">
+                    <el-input v-model.trim="postForm.article_origin" type="url" autocomplete="off"/>
+                </el-form-item>
+
+                <el-form-item label="文章作者" prop="article_author">
+                    <el-input v-model.trim="postForm.article_author" autocomplete="off"/>
+                </el-form-item>
+
             </div>
         </el-form>
     </div>
@@ -104,6 +134,11 @@
         article_cover: '', // 封面图
         article_link: '', // 文章外链
         article_sort: 99, // 排序
+        set_top:0, // 是否置顶
+        is_recommend:0, // 是否推荐
+        is_public:0, // 是否公开
+        article_origin:'', // 文章来源
+        article_author:'', // 文章作者
     };
 
     export default {
@@ -166,13 +201,14 @@
                 // 图片上传
                 upload_url: '',
                 image_url: '',
+                borderRadius:'initial',
 
                 category:[], // 分类
             }
         },
         computed: {
             contentShortLength() {
-                return this.postForm.article_description.length;
+                return this.postForm.article_description?.length;
             },
             lang() {
                 return this.$store.getters.language;
@@ -317,9 +353,4 @@
             border-bottom: 1px solid #bfcbd9;
         }
     }
-
-    // 封面图
-    .pan-item, .pan-info, .pan-thumb{
-        border-radius: 0;
-    }
 </style>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
index 6e230e3..7d45fd0 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
@@ -83,30 +83,82 @@
                 </template>
             </el-table-column>
 
-            <el-table-column width="120px" align="center" label="是否置顶">
+            <el-table-column align="center" label="是否置顶">
                 <template slot-scope="{row}">
-                    <span>{{ row.set_top }}</span>
+                    <el-tag :type="row.set_top | statusFilter">
+                        <i :class="row.set_top == 1 ? 'el-icon-top' : 'el-icon-bottom'" />
+                        {{ row.set_top == 1 ? '是' : '否' }}
+                    </el-tag>
                 </template>
             </el-table-column>
 
-            <el-table-column width="120px" align="center" label="是否推荐">
+            <el-table-column align="center" label="是否推荐">
                 <template slot-scope="{row}">
-                    <span>{{ row.is_recommend }}</span>
+                    <el-tag :type="row.is_recommend | statusFilter">
+                        <i :class="row.is_recommend == 1 ? 'el-icon-info' : 'el-icon-remove'" />
+                        {{ row.is_recommend == 1 ? '是' : '否' }}
+                    </el-tag>
                 </template>
             </el-table-column>
 
-            <el-table-column class-name="status-col" label="Status" width="110">
+            <el-table-column align="center" label="是否公开">
                 <template slot-scope="{row}">
-                    <el-tag :type="row.is_check | statusFilter">
-                        {{ row.is_check }}
+                    <el-tag :type="row.is_public | statusFilter">
+                        <i :class="row.is_public == 1 ? 'el-icon-unlock' : 'el-icon-lock'" />
+                        {{ row.is_public == 1 ? '是' : '否' }}
                     </el-tag>
                 </template>
             </el-table-column>
 
             <el-table-column align="center"
-                             label="操作"
-                             width="230">
+                             label="操作">
                 <template slot-scope="scope">
+                    <!-- 是否置顶 -->
+                    <el-button v-if="scope.row.set_top == 0" type="text"
+                               @click="changeStatus(scope.row, 1, 'set_top')">
+                        <el-tag :type="1 | statusFilter">
+                            <i class="el-icon-top" />
+                            置顶
+                        </el-tag>
+                    </el-button>
+                    <el-button v-else-if="scope.row.set_top == 1" type="text"
+                               @click="changeStatus(scope.row, 0, 'set_top')">
+                        <el-tag :type="0 | statusFilter">
+                            <i class="el-icon-bottom" />
+                            取消’置顶‘
+                        </el-tag>
+                    </el-button>
+                    <!-- 是否推荐 -->
+                    <el-button v-if="scope.row.is_recommend == 0" type="text"
+                               @click="changeStatus(scope.row, 1, 'is_recommend')">
+                        <el-tag :type="1 | statusFilter">
+                            <i class="el-icon-info" />
+                            推荐
+                        </el-tag>
+                    </el-button>
+                    <el-button v-else-if="scope.row.is_recommend == 1" type="text"
+                               @click="changeStatus(scope.row, 0, 'is_recommend')">
+                        <el-tag :type="0 | statusFilter">
+                            <i class="el-icon-remove" />
+                            取消’推荐‘
+                        </el-tag>
+                    </el-button>
+                    <!-- 状态变更 -->
+                    <el-button v-if="scope.row.is_public == 0" type="text"
+                               @click="changeStatus(scope.row, 1, 'is_public')">
+                        <el-tag :type="1 | statusFilter">
+                            <i class="el-icon-unlock" />
+                            公开
+                        </el-tag>
+                    </el-button>
+                    <el-button v-else-if="scope.row.is_public == 1" type="text"
+                               @click="changeStatus(scope.row, 0, 'is_public')">
+                        <el-tag :type="0 | statusFilter">
+                            <i class="el-icon-lock" />
+                            私密
+                        </el-tag>
+                    </el-button>
+                    <!-- 编辑与删除 -->
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)"> 编辑 </el-button>
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"> 删除 </el-button>
                 </template>
@@ -124,7 +176,7 @@
 </template>
 
 <script>
-    import {getList, setDel} from '@/api/articles';
+    import {getList, setDel, changeFiledStatus} from '@/api/articles';
     import Pagination from '@/components/Pagination'; // Secondary package based on el-pagination
     import waves from '@/directive/waves';
     import {getFormatDate, parseTime} from "@/utils"; // waves directive
@@ -147,9 +199,9 @@
         filters: {
             statusFilter(status) {
                 const statusMap = {
-                    published: 'success',
-                    draft: 'info',
-                    deleted: 'danger',
+                    1: 'success',
+                    2: 'info',
+                    0: 'danger',
                 };
                 return statusMap[status];
             },
@@ -275,6 +327,23 @@
                     })
                 )
             },
+            // 状态变更
+            async changeStatus(row, value, filed) {
+                const {data, msg, status} = await changeFiledStatus({
+                    'article_id': row.article_id,
+                    'change_field': filed,
+                    'change_value': value
+                });
+
+                // 设置成功之后，同步到当前列表数据
+                if (status == 1){
+                    row[filed] = value;
+                }
+                this.$message({
+                    message: msg,
+                    type: status == 1 ? 'success' : 'error',
+                });
+            },
         }
     }
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
index 7c1bb00..7b60e84 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
@@ -135,7 +135,6 @@
                             禁用
                         </el-tag>
                     </el-button>
-
                     <!-- 编辑与删除 -->
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
-- 
Gitee