Explorar o código

Merge branch 'pre' of http://git.bjzxtw.org.cn:3000/zxt/admin_home into pre

LiuJ hai 1 semana
pai
achega
abe751848c

+ 35 - 0
src/api/blackWord.js

@@ -0,0 +1,35 @@
+// 违禁词-黑名单
+import request from '@/utils/request'
+
+//违禁词-列表
+export const getBlackWordList = (params) => {
+    return request({
+        url: '/public/getBlackWordList',
+        method: 'get',
+        params
+    })
+}
+
+// 创建违禁词
+export const addBlackWord = (data) => {
+    return request({
+        url: '/public/addBlackWord',
+        method: 'post',
+        data
+    })
+}
+// 删除违禁词
+export const delBlackWord = (data) => {
+    return request({
+        url: '/public/delBlackWord',
+        method: 'post',
+        data
+    })
+}
+export const upBlackWord = (data) => {
+    return request({
+        url: '/public/upBlackWord',
+        method: 'post',
+        data
+    })
+}

+ 16 - 0
src/router/index.js

@@ -763,6 +763,22 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/blackWordList',
+    component: Layout,
+    children: [
+      {
+        name: '',
+        path: '',
+        component: () => import('@/views/website/blackWordList.vue'),
+        meta: {
+          title: '违禁词',
+          hidden: true,
+          breadcrumb: true
+        }
+      }
+    ]
+  },
   {
     path: '/tabbar',
     component: Layout,

+ 1 - 1
src/utils/baseUrl.js

@@ -7,7 +7,7 @@ const URL = {
   //baseUrl: 'http://adminpre.bjzxtw.org.cn:9501',//pre环境域名
   webUrl:'adminpre.bjzxtw.org.cn',//管理系统地址,如果用户因为某种原因以外退出,需要一个userurl用于请求接口
   baseUrl: 'http://apipre1.bjzxtw.org.cn:29501',//pre环境域名2
-  //baseUrl: 'http://192.168.1.201:9501',//刘佳伟本地环境
+  // baseUrl: 'http://192.168.1.201:9501',//刘佳伟本地环境
   //baseUrl:'http://192.168.1.115:9501',//冯蕊的本地环境
   //baseUrl: 'http://192.168.1.125:9501',//刘剑的本地环境
   //WebsocketUrl: 'ws://192.168.1.201:9506',//刘佳伟 -- websocket地址

+ 9 - 4
src/views/news/GoodListApply.vue

@@ -220,13 +220,18 @@ export default {
       this.$confirm('将此商品通过审核吗?', '提示', {
         confirmButtonText: '通过',
         cancelButtonText: '拒绝',
+        distinguishCancelAndClose: true,  // 关键配置项
         type: 'warning'
       }).then(() => {
         this.upRow(id, 2)
-      }).catch(() => {
-        //输入驳回理由
-        console.log("驳回")
-        this.examineWindow = true;
+      }).catch((the_reback) => {
+
+         if(the_reback=="cancel"){
+                  //输入驳回理由
+                  // console.log("驳回" )
+                  this.examineWindow = true;
+         }    
+		 
       })
     },
     //1.列表和分页相关 start ------------------------------------------------------------>

+ 471 - 0
src/views/website/blackWordList.vue

@@ -0,0 +1,471 @@
+<template>
+    <!-- 友情链接列表 -->
+    <div>
+        <div class="title">
+            <el-row>
+                <el-col :span="6" class="left">
+                    <div class="searchBox">
+                        <div class="searchTitle">违禁词名称</div>
+                        <el-input v-model="name" placeholder="请输入违禁词名称"></el-input>
+                    </div>
+                </el-col>
+
+                <el-col :span="10" class="right">
+                    <div class="btnList">
+                        <button class="search" @click="goSearch">搜索</button>
+                        <button class="reset" @click="reset">重置</button>
+                    </div>
+                </el-col>
+            </el-row>
+        </div>
+        <!--表格内容 start------------------------------------------------------------>
+        <div class="layerBox">
+            <tableTitle :name="tableDivTitle" />
+            <button class="btn" @click="addBlackWord">添加违禁词</button>
+            <el-row>
+                <template>
+                    <el-table class="my-table" :data="tableData" style="width: 100%">
+                        <el-table-column fixed prop="id" label="编号" width="70">
+                        </el-table-column>
+                        <el-table-column prop="name" label="违禁词名称" width="400">
+                        </el-table-column>
+                        <el-table-column prop="created_at" label="创建时间">
+                        </el-table-column>
+                    
+                        <el-table-column fixed="right" header-align="center" label="操作" width="220">
+                            <template slot-scope="scope">
+                                <div class="listBtnBox">
+                                    <div class="listDeleteBtn" @click="deleteRow(scope.row.name, scope.row)">
+                                        <i class="el-icon-delete"></i>删除
+                                    </div>
+                                    <div class="listEditBtn" @click="goEdit(scope.row.id, scope.row)">
+                                        <i class="el-icon-edit-outline"></i>编辑
+                                    </div>
+                                </div>
+                                
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </template>
+            </el-row>
+        </div>
+        <!--分页 start------------------------------------------------------------>
+        <div class="alignBox">
+            <el-row>
+                <el-col :span="24">
+                    <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                        :current-page="page" :page-size="pageSize" layout="total, prev, pager, next, jumper"
+                        :total="total">
+                    </el-pagination>
+                </el-col>
+            </el-row>
+        </div>
+        <!--分页 end------------------------------------------------------------>
+        <!--表格内容 end------------------------------------------------------------>
+        <!-- 弹出框 start------------------------------------------------------------>
+        <el-dialog :title="dialogName" :visible.sync="dialogTableVisible" width="50%" :close-on-click-modal="false">
+            <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+                <div class="dialogText">
+
+                    <el-form-item label="违禁词名称:" prop="name">
+                        <el-input v-model="ruleForm.name" placeholder="请输入违禁词名称"></el-input>
+                    </el-form-item>
+                
+                </div>
+                <div class="dialogBtn">
+                    <el-button type="info" @click="cancelForm">取消</el-button>
+                    <el-button type="primary" @click="submitForm">提交</el-button>
+                </div>
+            </el-form>
+        </el-dialog>
+        <!-- 弹出框 end------------------------------------------------------------>
+    </div>
+
+</template>
+
+<script>
+//表格标题
+import tableTitle from './components/blogroll/tableTitle.vue';
+//引入公用样式
+import '@/styles/global.less';
+// 引入api
+import { getBlackWordList, addBlackWord, delBlackWord, upBlackWord } from '@/api/blackWord.js'
+
+export default {
+    components: {
+        tableTitle,//表格标题
+    },
+    data() {
+        const validateEmpty = (rule, value, callback) => {
+            if (value.length == 0) {
+                callback(new Error('该项不能为空!'))
+            } else {
+                callback()
+            }
+        }
+        return {
+            tableDivTitle: "违禁词列表",  //表格标题
+            name: '', // 违禁词名称
+            // 分页器相关
+            total: 0,
+            page: 1,
+            pageSize: 10,
+            //表格相关
+            tableData: [],
+            //弹出框相关
+            dialogTableVisible: false,  //是否显示
+            dialogName: '',     //弹框标题名
+
+            value: [],
+            list: [],
+            // 图片相关
+            formLabelWidth: '120px',//表单的长度
+
+            id:'',
+            //表单相关
+            ruleForm: {
+                name: '', //违禁词名称
+            },
+            rules: {   //规则
+                name: [{ required: true, trigger: 'blur', validator: validateEmpty }], //违禁词名称          
+            },
+
+        }
+    },
+    methods: {
+        getData() {
+            getBlackWordList({
+                    page: this.page,
+                    pageSize: this.pageSize,
+                    name: this.name
+                }).then(data => {
+                    console.log(data);
+                    this.tableData = data.data.rows
+                    this.total = data.data.count 
+                })
+            
+
+        },
+        //1.2 删除内容
+        deleteRow(name, val) {
+            this.$confirm('注意:您是否确定删除该违禁词?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+            }).then(() => {
+                delBlackWord({
+                    name: name,
+                }).then(data => {
+                    console.log(data);
+                    if (data.code == 200) {
+                        this.$message({
+                            type: 'success',
+                            message: '删除成功!'
+                        });
+                        this.getData()
+                    } else if (data.code == 0) {
+                        this.$message({
+                            type: 'error',
+                            message: data.message
+                        });
+                    }
+                })
+            }).catch(() => {
+                this.$message({
+                    type: 'warning',
+                    message: '已取消'
+                });
+            });
+        },
+
+        //1.3 列表内容分页
+        //直接跳转
+        handleSizeChange(val) {
+            this.page = val;
+            this.getData();
+        },
+        //1.4 点击分页
+        handleCurrentChange(val) {
+            this.page = val;
+            this.getData();
+        },
+
+        // 1.5 搜索按钮
+        goSearch() {
+            this.page = 1
+            this.getData()
+        },
+        //1.6 重置按钮
+        reset() {
+            this.name = ''
+            this.getData()
+        },
+        //列表和分页相关 end ------------------------------------------------------------>
+
+        //1.7 添加
+        addBlackWord() {
+            this.dialogTableVisible = true //弹窗是否显示
+            this.dialogName = "添加"  //弹窗名称
+            this.ruleForm.name = ''
+        },
+
+        // 弹出层相关方法
+        // 提交表单
+        submitForm() {
+            // 添加
+            if (this.dialogName == "添加") {
+                addBlackWord({
+                    name: this.ruleForm.name,
+                }).then(data => {
+                    console.log(data);
+                    if (data.code == 200) {
+                            this.$message({
+                                message: "添加成功",
+                                type: 'success'
+                            });
+                            this.dialogTableVisible = false
+                            this.getData()
+                        } else {
+                            this.$message.error(data.message)
+                        }
+                    })
+                }  
+                if (this.dialogName == "编辑") {
+                upBlackWord({
+                    id: this.id,
+                    name: this.ruleForm.name,
+                }).then(data => {
+                    console.log(data);
+                    if (data.code == 200) {
+                            this.$message({
+                                message: "修改成功",
+                                type: 'success'
+                            });
+                            this.dialogTableVisible = false
+                            this.getData()
+                        } else {
+                            this.$message.error(data.message)
+                        }
+                    })
+                }
+        },
+        //取消添加或编辑
+        cancelForm() {
+            this.dialogTableVisible = false
+        },
+        goEdit(id, val) {
+            this.dialogTableVisible = true //弹框显示
+            this.dialogName = "编辑"    //弹框名字
+            this.id = id //活动id
+            this.ruleForm.name = val.name //违规词名称
+        },
+    },
+
+    mounted() {
+        //获取网站列表数据
+        this.getData()
+
+    }
+}
+</script>
+
+<style scoped lang="less">
+.title {
+    margin: 30px 30px 20px 30px;
+    padding: 30px 30px 40px 30px;
+    background-color: #fff;
+    border-radius: 20px 20px 20px 20px;
+    border: 1px solid #E9EDF7;
+
+    .left {
+        float: left;
+    }
+
+    .right {
+        float: right;
+    }
+
+    .searchBox {
+        .searchTitle {
+            padding-bottom: 10px;
+            font-family: Microsoft YaHei, Microsoft YaHei;
+            font-weight: 400;
+            font-size: 14px;
+            color: #999999;
+            line-height: 16px;
+        }
+
+        .el-select {
+            width: 85%;
+            display: inline-block;
+            position: relative;
+        }
+    }
+
+    .btnList {
+        float: right;
+        padding-top: 28px;
+
+        button {
+            width: 120px;
+            height: 38px;
+            border: none;
+            border-radius: 8px;
+            // padding: 0 30px;
+        }
+
+        .search {
+            background-color: #5570f1;
+            color: #fff;
+            margin-right: 20px;
+        }
+
+        .reset {
+            font-family: Microsoft YaHei, Microsoft YaHei;
+            font-weight: 400;
+            font-size: 16px;
+            color: #333333;
+            background: #F5F7FB;
+            border-radius: 8px 8px 8px 8px;
+            border: 1px solid rgba(85, 112, 241, 0.11);
+        }
+    }
+}
+
+.layerBox {
+    padding: 30px 20px;
+    position: relative;
+
+    .btn {
+        position: absolute;
+        top: 30px;
+        right: 20px;
+        height: 38px;
+        color: #fff;
+        background-color: #5570f1;
+        border: none;
+        border-radius: 8px;
+        padding: 8px 28px 9px;
+        box-sizing: border-box;
+    }
+
+    .listBtnBox {
+        justify-content: left;
+    }
+
+
+    .listDeleteBtn,
+    .listEditBtn,
+    .listLookBtn {
+        margin-left: 0px;
+        padding-left: 0px;
+        margin-right: 20px;
+        width: 76px;
+        height: 36px;
+        line-height: 36px;
+    }
+
+
+    .listLookBtn {
+        text-align: center;
+        border-radius: 8px;
+        cursor: pointer;
+        color: #55b5f1;
+        background-color: rgba(85, 181, 241, 0.16);
+
+        >i {
+            padding-right: 8px;
+        }
+    }
+
+    .uploadImage {
+        width: 130px;
+    }
+
+    // from表单中每条数据的下外边距
+    ::v-deep .el-form-item {
+        margin-bottom: 50px;
+    }
+
+    //下拉框宽度
+    ::v-deep .el-select {
+        width: 100%;
+    }
+
+    ::v-deep .el-input--medium,
+    ::v-deep .el-form-item__label {
+        line-height: 36px;
+        font-size: 16px;
+    }
+}
+
+// 弹出层内容
+.dialogText {
+    margin: 0 7px 0 3px;
+    padding-top: 20px;
+    padding-bottom: 1px;
+    padding: 20px 60px 1px 20px;
+    background-color: #f5f7fb;
+
+    // from表单中每条数据的下外边距
+    ::v-deep .el-form-item {
+        margin-bottom: 50px;
+    }
+
+    //下拉框宽度
+    ::v-deep .el-select {
+        width: 100%;
+    }
+
+    //图片的宽高
+    ::v-deep .avatar {
+        width: 140px;
+        height: auto;
+    }
+
+    .keywords {
+        position: relative;
+
+        i {
+            position: absolute;
+            top: 0;
+            left: -15px;
+        }
+    }
+}
+
+// 弹出层按钮
+.dialogBtn {
+    text-align: center;
+    margin: 50px auto 20px;
+
+    ::v-deep .avatar {
+        width: 140px;
+        height: 50px;
+        display: block;
+    }
+
+    button {
+        width: 184px;
+        padding: 16px;
+        font-family: Microsoft YaHei, Microsoft YaHei;
+        font-weight: 400;
+        font-size: 20px;
+        border: none;
+        border-radius: 12px 12px 12px 12px;
+    }
+
+    // 取消
+    .cancel {
+        color: #333333;
+        background-color: #f5f7fb;
+        border: 2px solid rgba(85, 112, 241, 0.11);
+    }
+
+    // 提交
+    .submit {
+        color: #fff;
+        background-color: #5570F1;
+        margin-left: 40px;
+    }
+}
+</style>