feat: #10000 暂存

resources/frontend/src/App.vue

@@ -12,4 +12,5 @@
 };
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+</style>

resources/frontend/src/router/index1.js

@@ -19,7 +19,7 @@ const list = [
       {
         path: "GOODS_TYPE",
         name: "商品种类",
-        component: () => import("../views/home/home.vue"),
+        component: () => import("../views/goodsType/goodsType.vue"),
       },
       {
         path: "GOODS_BRAND",

resources/frontend/src/views/brand/brand.vue

@@ -1,14 +1,12 @@
 <template>
     <div class="conent">
         <!-- 新增按钮 -->
-    <div class="btn">
         <el-button type="primary" @click="handAdd">新增</el-button>
-    </div>
+
         <!-- 列表 -->
         <div class="table">
             <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
                 @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55"> </el-table-column>
                 <el-table-column prop="name" label="商品品牌"> </el-table-column>
                 <el-table-column prop="" label="操作">
                     <template slot-scope="scope">
@@ -19,6 +17,14 @@
             </el-table>
         </div>
 
+        <!-- 分页功能 -->
+        <div class="block">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="current_page" :page-sizes="[15, 50, 100]" :page-size="per_page"
+                layout="total, sizes, prev, pager, next, jumper" :total="Paginationdata.total">
+            </el-pagination>
+        </div>
+
         <!-- 新增品牌对话框 -->
         <el-dialog title="新增品牌" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
             <el-form :model="form">
@@ -44,14 +50,6 @@
                 <el-button type="primary" @click="EditSubmit">确 定</el-button>
             </div>
         </el-dialog>
-
-    <!-- 分页功能 -->
-    <div class="block">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="current_page"
-        :page-sizes="[15, 50, 100]" :page-size="per_page" layout="total, sizes, prev, pager, next, jumper"
-        :total="Paginationdata.total">
-      </el-pagination>
-    </div>
     </div>
 </template>
 
@@ -181,30 +179,6 @@
 </script>
 
 <style lang="scss" scoped>
-  .conent {
-    width: 100%;
-    min-height: calc(100vh - 200px);
-    position: relative;
-  }
-
-  .btn {
-    height: 104px;
-    border-radius: 5px;
-    display: flex;
-    align-items: center;
-
-  }
-
-  .el-button {
-    width: 114px;
-    height: 44px;
-    border-radius: 3px;
-  }
-
-  .table {
-    margin-top: 20px;
-  }
-
 .block {
     margin-top: 30px;
 }

resources/frontend/src/views/goods/addgoods/addgoods.vue

@@ -11,8 +11,8 @@
                         </el-select>
                     </div>
                     <span style="font-size: 14px">商品图片：
-            <el-upload class="avatar-uploader" action="#" :limit="1" :auto-upload="false" :show-file-list="true"
-              list-type="picture-card" :on-change="handleAvatarSuccess">
+                        <el-upload class="avatar-uploader" action="#" :limit="1" :auto-upload="false"
+                            :show-file-list="true" list-type="picture-card" :on-change="handleAvatarSuccess">
                             <img v-if="imageUrl" :src="imageUrl" class="avatar" />
                             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                         </el-upload>
@@ -82,7 +82,8 @@
                             <el-input placeholder="商品名称" v-model="form.title" v-else></el-input>
                         </el-form-item>
                         <el-form-item label="商品编码：">
-              <el-input placeholder="商品编码" v-model="form.goods_code" :disabled="true" v-if="isShow"></el-input>
+                            <el-input placeholder="商品编码" v-model="form.goods_code" :disabled="true" v-if="isShow">
+                            </el-input>
                             <el-input placeholder="商品编码" v-model="form.goods_code" v-else></el-input>
                         </el-form-item>
                         <el-form-item label="商品种类：">

resources/frontend/src/views/goods/goods.vue

@@ -360,11 +360,7 @@
 <script>
 import axios from "axios";
 import { goods_types, Brand_goods_types } from "../../api/rankingData.js";
-import {
-    goods,
-    update,
-    singleUpdate,
-} from "../../api/goods";
+import { goods, update, singleUpdate } from "../../api/goods";
 export default {
     data() {
         return {

resources/frontend/src/views/goodsType/goodsType.vue

@@ -0,0 +1,186 @@
+<template>
+    <div class="conent">
+        <!-- 新增按钮 -->
+        <el-button type="primary" @click="handAdd">新增</el-button>
+
+        <!-- 列表 -->
+        <div class="table">
+            <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
+                @selection-change="handleSelectionChange">
+                <el-table-column prop="name" label="商品种类"> </el-table-column>
+                <el-table-column prop="" label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="primary" @click="handEdit(scope.row.id, scope.row)">编辑</el-button>
+                        <el-button type="danger" @click="handdel(scope.row.id)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+
+        <!-- 分页功能 -->
+        <div class="block">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="current_page" :page-sizes="[15, 50, 100]" :page-size="per_page"
+                layout="total, sizes, prev, pager, next, jumper" :total="Paginationdata.total">
+            </el-pagination>
+        </div>
+
+        <!-- 新增种类对话框 -->
+        <el-dialog title="新增" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
+            <el-form :model="form">
+                <el-form-item label="商品种类" :label-width="formLabelWidth">
+                    <el-input v-model="form.kindName" autocomplete="off"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="dialogFormVisible = false">取 消</el-button>
+                <el-button type="primary" @click="addSubmit">确 定</el-button>
+            </div>
+        </el-dialog>
+
+        <!-- 编辑 -->
+        <el-dialog title="编辑" :visible.sync="dialogFormVisible1" :close-on-click-modal="false">
+            <el-form :model="form1">
+                <el-form-item label="编辑种类" :label-width="formLabelWidth1">
+                    <el-input v-model="form1.kindName1" autocomplete="off"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="dialogFormVisible1 = false">取 消</el-button>
+                <el-button type="primary" @click="EditSubmit">确 定</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    goods_types,
+    Delgoods_types,
+    Addgoods_types,
+    editGoods_types,
+} from "../../api/rankingData";
+export default {
+    data() {
+        return {
+            id: "", //每一项的id
+            tableData: [],
+            multipleSelection: [],
+            dialogFormVisible: false,
+            dialogFormVisible1: false,
+            form: {
+                kindName: "", //种类名
+            },
+            form1: {
+                kindName1: "", //种类名
+            },
+            formLabelWidth: "120px",
+            formLabelWidth1: "120px",
+            newKind: [],
+            Paginationdata: {}, //分页相关数据
+            current_page: 1, //当前页
+            per_page: 15, //每页显示数量
+        };
+    },
+    mounted() {
+        this.getGoods_types();
+    },
+    methods: {
+        // 复选框按钮
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        },
+
+        //分页功能
+        handleSizeChange(val) {
+            //当前条数
+            this.per_page = val;
+            this.getGoods_types();
+        },
+        handleCurrentChange(val) {
+            //当前页
+            this.current_page = val;
+            this.getGoods_types();
+        },
+        // 新增
+        handAdd() {
+            this.form.kindName = "";
+            this.dialogFormVisible = true;
+        },
+        // 确认新增
+        addSubmit() {
+            var string;
+            string = this.form.kindName.replace(/\s/g, ",").split(",");
+            Addgoods_types({
+                names: string,
+            }).then((res) => {
+                this.$message({
+                    type: "success",
+                    message: "添加成功",
+                });
+                this.getGoods_types();
+            });
+            this.dialogFormVisible = false;
+        },
+        // 编辑
+        handEdit(id, item) {
+            this.id = id;
+            this.form1.kindName1 = item.name;
+            this.dialogFormVisible1 = true;
+        },
+        // 编辑确定按钮
+        EditSubmit() {
+            editGoods_types(this.id, {
+                name: this.form1.kindName1,
+            }).then((res) => {
+                this.$message({
+                    type: "success",
+                    message: "编辑成功",
+                });
+                this.getGoods_types();
+            });
+            this.dialogFormVisible1 = false;
+        },
+        // 删除
+        handdel(id) {
+            this.$confirm("确定删除此条商品种类吗?", "确认删除", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    Delgoods_types(id).then((res) => {
+                        this.getGoods_types();
+                    });
+                    this.$message({
+                        type: "success",
+                        message: "删除成功!",
+                    });
+                })
+                .catch(() => {
+                    this.$message({
+                        type: "info",
+                        message: "已取消删除",
+                    });
+                });
+        },
+        // 获取列表
+        getGoods_types() {
+            let page = {
+                page: this.current_page,
+                per_page: this.per_page,
+            };
+            goods_types(page).then((res) => {
+                this.tableData = res.data.data;
+                this.Paginationdata = res.data.meta;
+            });
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.block {
+    margin-top: 30px;
+}
+</style>

resources/frontend/src/views/home/home.vue

@@ -1,212 +0,0 @@
-<template>
-  <div class="conent">
-    <!-- 新增按钮 -->
-    <div class="btn">
-      <el-button type="primary" @click="handAdd">新增</el-button>
-    </div>
-
-    <!-- 列表 -->
-    <div class="table">
-      <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
-        @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column prop="name" label="商品种类"> </el-table-column>
-        <el-table-column prop="" label="操作">
-          <template slot-scope="scope">
-            <el-button type="primary" @click="handEdit(scope.row.id, scope.row)">编辑</el-button>
-            <el-button type="danger" @click="handdel(scope.row.id)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <!-- 新增种类对话框 -->
-    <el-dialog title="新增" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
-      <el-form :model="form">
-        <el-form-item label="商品种类" :label-width="formLabelWidth">
-          <el-input v-model="form.kindName" autocomplete="off"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click="addSubmit">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 编辑 -->
-    <el-dialog title="编辑" :visible.sync="dialogFormVisible1" :close-on-click-modal="false">
-      <el-form :model="form1">
-        <el-form-item label="编辑种类" :label-width="formLabelWidth1">
-          <el-input v-model="form1.kindName1" autocomplete="off"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible1 = false">取 消</el-button>
-        <el-button type="primary" @click="EditSubmit">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 分页功能 -->
-    <div class="block">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="current_page"
-        :page-sizes="[15, 50, 100]" :page-size="per_page" layout="total, sizes, prev, pager, next, jumper"
-        :total="Paginationdata.total">
-      </el-pagination>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {
-    goods_types,
-    Delgoods_types,
-    Addgoods_types,
-    editGoods_types,
-  } from "../../api/rankingData";
-  export default {
-    data() {
-      return {
-        id: "", //每一项的id
-        tableData: [],
-        multipleSelection: [],
-        dialogFormVisible: false,
-        dialogFormVisible1: false,
-        form: {
-          kindName: "", //种类名
-        },
-        form1: {
-          kindName1: "", //种类名
-        },
-        formLabelWidth: "120px",
-        formLabelWidth1: "120px",
-        newKind: [],
-        Paginationdata: {}, //分页相关数据
-        current_page: 1, //当前页
-        per_page: 15, //每页显示数量
-      };
-    },
-    mounted() {
-      this.getGoods_types();
-    },
-    methods: {
-      // 复选框按钮
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-
-      //分页功能
-      handleSizeChange(val) {
-        //当前条数
-        this.per_page = val;
-        this.getGoods_types();
-      },
-      handleCurrentChange(val) {
-        //当前页
-        this.current_page = val;
-        this.getGoods_types();
-      },
-      // 新增
-      handAdd() {
-        this.form.kindName = "";
-        this.dialogFormVisible = true;
-      },
-      // 确认新增
-      addSubmit() {
-        var string;
-        string = this.form.kindName.replace(/\s/g, ",").split(",");
-        Addgoods_types({
-          names: string,
-        }).then((res) => {
-          this.$message({
-            type: "success",
-            message: "添加成功",
-          });
-          this.getGoods_types();
-        });
-        this.dialogFormVisible = false;
-      },
-      // 编辑
-      handEdit(id, item) {
-        this.id = id;
-        this.form1.kindName1 = item.name;
-        this.dialogFormVisible1 = true;
-      },
-      // 编辑确定按钮
-      EditSubmit() {
-        editGoods_types(this.id, {
-          name: this.form1.kindName1,
-        }).then((res) => {
-          this.$message({
-            type: "success",
-            message: "编辑成功",
-          });
-          this.getGoods_types();
-        });
-        this.dialogFormVisible1 = false;
-      },
-      // 删除
-      handdel(id) {
-        this.$confirm("确定删除此条商品种类吗?", "确认删除", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            Delgoods_types(id).then((res) => {
-              this.getGoods_types();
-            });
-            this.$message({
-              type: "success",
-              message: "删除成功!",
-            });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消删除",
-            });
-          });
-      },
-      // 获取列表
-      getGoods_types() {
-        let page = {
-          page: this.current_page,
-          per_page: this.per_page,
-        };
-        goods_types(page).then((res) => {
-          this.tableData = res.data.data;
-          this.Paginationdata = res.data.meta;
-        });
-      },
-    },
-  };
-</script>
-<style lang="scss" scoped>
-  .conent {
-    width: 100%;
-    min-height: calc(100vh - 200px);
-    position: relative;
-  }
-
-  .btn {
-    height: 104px;
-    border-radius: 5px;
-    display: flex;
-    align-items: center;
-
-  }
-
-  .el-button {
-    width: 114px;
-    height: 44px;
-    border-radius: 3px;
-  }
-
-  .table {
-    margin-top: 20px;
-  }
-
-  .block {
-    margin-top: 30px;
-  }
-</style>

resources/frontend/src/views/index.vue

@@ -13,7 +13,9 @@
                                 <template slot="title">
                                     <span>{{ item.name }}</span>
                                 </template>
-                <el-menu-item :index="items.code" :key="items.id" v-for="items in item.children">{{ items.name }}
+                                <el-menu-item :index="items.code" :key="items.id" v-for="items in item.children">{{
+                                        items.name
+                                }}
                                 </el-menu-item>
                             </el-submenu>
                         </div>
@@ -30,7 +32,8 @@
                                 </div>
                                 <div class="right">
                                     <el-breadcrumb separator-class="el-icon-arrow-right">
-                    <el-breadcrumb-item v-for="(item, index) in titie" :key="index">{{ item.name }}</el-breadcrumb-item>
+                                        <el-breadcrumb-item v-for="(item, index) in titie" :key="index">{{ item.name }}
+                                        </el-breadcrumb-item>
                                     </el-breadcrumb>
                                 </div>
                             </li>
@@ -299,11 +302,17 @@
 
 .box-card {
     background-color: #fff;
-    min-height: calc(100vh - 200px);
+    min-height: calc(100vh - 120px);
     margin: 10px;
     padding: 20px;
 }
 
+.conent {
+    width: 100%;
+    min-height: calc(100vh - 200px);
+    position: relative;
+}
+
 .add {
     cursor: pointer;
     font-size: 25px;
@@ -362,4 +371,18 @@
 .el-menu-item-group__title {
     padding: 0 0 !important;
 }
+
+.table {
+    margin-top: 20px;
+}
+
+.block {
+    margin-top: 30px;
+}
+
+.from-btn {
+    display: flex;
+    justify-content: space-around;
+    align-content: center;
+}
 </style>

resources/frontend/src/views/logs/logs.vue

@@ -1,30 +1,33 @@
 <template>
     <div>
         <!-- 筛选框 -->
-    <el-card class="box-card">
-      <div class="goods" style="margin: 20px">
+        <el-card class="box-card" :body-style="{ padding: '20px 20px 0 20px' }">
             <el-form ref="form" :inline="true" :model="form">
                 <el-form-item label="模块:" style="margin-right: 40px">
                     <el-select v-model="form.module" clearable>
-              <el-option v-for="item in mouduleOptions" :key="item.value" :label="item.label" :value="item.value">
+                        <el-option v-for="item in mouduleOptions" :key="item.value" :label="item.label"
+                            :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="操作:" style="margin-right: 40px">
                     <el-select v-model="form.action" clearable>
-              <el-option v-for="item in actionOptions" :key="item.value" :label="item.label" :value="item.value">
+                        <el-option v-for="item in actionOptions" :key="item.value" :label="item.label"
+                            :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="目标类型:" style="margin-right: 40px">
                     <el-select v-model="form.target_type" clearable>
-              <el-option v-for="item in target_ypeOptions" :key="item.value" :label="item.label" :value="item.value">
+                        <el-option v-for="item in target_ypeOptions" :key="item.value" :label="item.label"
+                            :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="类别:" style="margin-right: 40px">
                     <el-select v-model="form.targetField" clearable>
-              <el-option v-for="item in target_fieldOptions" :key="item.value" :label="item.label" :value="item.value">
+                        <el-option v-for="item in target_fieldOptions" :key="item.value" :label="item.label"
+                            :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -43,7 +46,6 @@
                     <el-button type="primary" @click="query()">查询</el-button>
                 </el-form-item>
             </el-form>
-      </div>
         </el-card>
 
         <!-- 表格 -->
@@ -87,9 +89,9 @@
 
         <!-- 分页功能 -->
         <div class="block">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="current_page"
-        :page-sizes="[15, 50, 100]" :page-size="per_page" layout="total, sizes, prev, pager, next, jumper"
-        :total="Paginationdata.total">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="current_page" :page-sizes="[15, 50, 100]" :page-size="per_page"
+                layout="total, sizes, prev, pager, next, jumper" :total="Paginationdata.total">
             </el-pagination>
         </div>
     </div>
@@ -357,10 +359,11 @@
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .block {
     margin-top: 30px;
 }
+
 ::v-deep .el-card__body {
     padding: 0;
 }

resources/frontend/src/views/logs/record.vue

@@ -1,8 +1,7 @@
 <template>
     <div>
         <!-- 筛选框 -->
-    <el-card class="box-card">
-      <div class="goods" style="margin: 20px">
+        <el-card :body-style="{ padding: '20px 20px 0 20px' }">
             <el-form ref="form" :inline="true" :model="form">
                 <el-form-item label="查询类别：">
                     <el-select v-model="form.targetField" placeholder="全部">
@@ -25,11 +24,10 @@
                     <el-button type="primary" @click="query()">查询</el-button>
                 </el-form-item>
             </el-form>
-      </div>
         </el-card>
 
         <!-- 表格 -->
-    <el-card style="margin-top: 30px" class="box-card">
+        <el-card style="margin-top: 30px">
             <el-table :data="tableData" style="width: 100%" border>
                 <el-table-column prop="id" label="序号" width="70"> </el-table-column>
                 <el-table-column prop="created_at" label="时间" width="200">
@@ -47,9 +45,9 @@
 
         <!-- 分页功能 -->
         <div class="block">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="current_page"
-        :page-sizes="[15, 50, 100]" :page-size="per_page" layout="total, sizes, prev, pager, next, jumper"
-        :total="Paginationdata.total">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="current_page" :page-sizes="[15, 50, 100]" :page-size="per_page"
+                layout="total, sizes, prev, pager, next, jumper" :total="Paginationdata.total">
             </el-pagination>
         </div>
     </div>
@@ -177,9 +175,3 @@
     },
 };
 </script>
-
-<style>
-  .block {
-    margin-top: 30px;
-  }
-</style>

resources/frontend/src/views/store/store.vue

@@ -1,9 +1,7 @@
 <template>
     <div class="conent">
         <!-- 新增按钮 -->
-    <div class="btn">
         <el-button type="primary" @click="handAdd">新增</el-button>
-    </div>
 
         <div class="table">
             <el-table :data="tableData" style="width: 100%">
@@ -13,8 +11,10 @@
                 <el-table-column prop="plat_id" label="所属平台"></el-table-column>
                 <el-table-column label="操作">
                     <template slot-scope="scope">
-            <el-button type="danger" v-if="scope.row.status === '未授权'"><a :href="scope.row.authUrl" target="_blank"
-                rel="noopener noreferrer">&nbsp;&nbsp;授&nbsp;&nbsp;&nbsp;权&nbsp;&nbsp;</a></el-button>
+                        <el-button type="danger" v-if="scope.row.status === '未授权'"><a :href="scope.row.authUrl"
+                                target="_blank"
+                                rel="noopener noreferrer">&nbsp;&nbsp;授&nbsp;&nbsp;&nbsp;权&nbsp;&nbsp;</a>
+                        </el-button>
                         <div v-if="scope.row.status === '已授权'">
                             <el-button type="success" :disabled="true">{{
                                     scope.row.status
@@ -22,7 +22,8 @@
                             <el-button @click="download(scope.row)">下载商品</el-button>
                         </div>
                         <div v-if="scope.row.status === '重新授权'">
-              <el-button type="danger" target="_blank"><a :href="scope.row.authUrl" rel="noopener noreferrer">重新授权</a>
+                            <el-button type="danger" target="_blank"><a :href="scope.row.authUrl"
+                                    rel="noopener noreferrer">重新授权</a>
                             </el-button>
                             <el-button @click="download(scope.row)">下载商品</el-button>
                         </div>
@@ -38,6 +39,14 @@
             </el-table>
         </div>
 
+        <!-- 分页功能 -->
+        <div class="block">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="current_page" :page-sizes="[15, 50, 100]" :page-size="per_page"
+                layout="total, sizes, prev, pager, next, jumper" :total="Paginationdata.total">
+            </el-pagination>
+        </div>
+
         <!-- 新增店铺 -->
         <el-dialog title="新增店铺" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
             <el-form :model="form">
@@ -56,14 +65,6 @@
                 <el-button type="primary" @click="addSubmit">确 定</el-button>
             </div>
         </el-dialog>
-
-    <!-- 分页功能 -->
-    <div class="block">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="current_page"
-        :page-sizes="[15, 50, 100]" :page-size="per_page" layout="total, sizes, prev, pager, next, jumper"
-        :total="Paginationdata.total">
-      </el-pagination>
-    </div>
     </div>
 </template>
 
@@ -157,31 +158,6 @@
     text-decoration: none;
     color: white;
 }
-
-  .conent {
-    width: 100%;
-    min-height: calc(100vh - 200px);
-    position: relative;
-  }
-
-  .btn {
-    height: 104px;
-    border-radius: 5px;
-    display: flex;
-    align-items: center;
-
-  }
-
-  .el-button {
-    width: 114px;
-    height: 44px;
-    border-radius: 3px;
-  }
-
-  .table {
-    margin-top: 20px;
-  }
-
 .block {
     margin-top: 30px;
 }

resources/frontend/src/views/system/role.vue

@@ -1,10 +1,5 @@
 <template>
     <div class="conent">
-    <!-- 新增按钮 -->
-    <div class="btn">
-      <el-button type="primary" @click="dialogVisible2 = true">新增</el-button>
-    </div>
-
         <!-- 点击新增弹出表单 -->
         <div class="from">
             <el-dialog title="新增角色" :visible.sync="dialogVisible2" width="30%" :close-on-click-modal="false">
@@ -22,7 +17,10 @@
             </el-dialog>
         </div>
 
-    <!-- 角色表单 -->
+        <!-- 新增按钮 -->
+        <el-button type="primary" @click="dialogVisible2 = true">新增</el-button>
+
+        <!-- 角色列表 -->
         <div class="table">
             <el-table :data="tableList" style="width: 100%">
                 <el-table-column prop="id" label="ID"> </el-table-column>
@@ -43,7 +41,8 @@
         <!-- 点击编辑弹出权限框 -->
         <el-dialog title="编辑权限" :visible.sync="dialogVisible" width="30%" :close-on-click-modal="false">
             <el-tree v-if="isShowtree" :data="Role_Permission" show-checkbox :default-expand-all="false" node-key="id"
-        ref="tree" highlight-current :props="defaultProps" :default-checked-keys="chekedKeys" v-model="permissionIds">
+                ref="tree" highlight-current :props="defaultProps" :default-checked-keys="chekedKeys"
+                v-model="permissionIds">
             </el-tree>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="cancel()">取 消</el-button>
@@ -157,33 +156,4 @@
 </script>
 
 <style lang="scss" scoped>
-  .conent {
-    width: 100%;
-    min-height: calc(100vh - 200px);
-  }
-
-  .btn {
-    height: 104px;
-    border-radius: 5px;
-    display: flex;
-    align-items: center;
-
-
-  }
-
-  .el-button {
-    width: 114px;
-    height: 44px;
-    border-radius: 3px;
-  }
-
-  .table {
-    margin-top: 20px;
-  }
-
-  .from-btn {
-    display: flex;
-    justify-content: space-around;
-    align-content: center;
-  }
 </style>

resources/frontend/src/views/users/users.vue

@@ -1,9 +1,5 @@
 <template>
     <div class="conent">
-    <!-- 新增按钮 -->
-    <div class="btn">
-      <el-button type="primary" @click="dialogVisible = true">新增</el-button>
-    </div>
 
         <!-- 点击新增弹出表单 -->
         <div class="from">
@@ -22,7 +18,8 @@
                         <el-form-item label="角色">
                             <template>
                                 <el-select v-model="value" placeholder="请选择">
-                  <el-option v-for="item in roleOptions" :key="item.value" :label="item.name" :value="item.name">
+                                    <el-option v-for="item in roleOptions" :key="item.value" :label="item.name"
+                                        :value="item.name">
                                     </el-option>
                                 </el-select>
                             </template>
@@ -53,7 +50,8 @@
                         <el-form-item label="角色">
                             <template>
                                 <el-select v-model="edit_from.role_name" placeholder="请选择">
-                  <el-option v-for="item in roleOptions" :key="item.value" :label="item.name" :value="item.name">
+                                    <el-option v-for="item in roleOptions" :key="item.value" :label="item.name"
+                                        :value="item.name">
                                     </el-option>
                                 </el-select>
                             </template>
@@ -73,6 +71,9 @@
             </el-dialog>
         </div>
 
+        <!-- 新增按钮 -->
+        <el-button type="primary" @click="dialogVisible = true">新增</el-button>
+
         <!-- 用户列表 -->
         <div class="table">
             <template>
@@ -96,9 +97,9 @@
 
         <!-- 分页功能 -->
         <div class="block">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="current_page"
-        :page-sizes="[15, 50, 100]" :page-size="per_page" layout="total, sizes, prev, pager, next, jumper"
-        :total="Paginationdata.total">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="current_page" :page-sizes="[15, 50, 100]" :page-size="per_page"
+                layout="total, sizes, prev, pager, next, jumper" :total="Paginationdata.total">
             </el-pagination>
         </div>
     </div>
@@ -226,36 +227,6 @@
 </script>
 
 <style lang="scss" scoped>
-  .conent {
-    width: 100%;
-    min-height: calc(100vh - 200px);
-    position: relative;
-  }
-
-  .btn {
-    height: 104px;
-    border-radius: 5px;
-    display: flex;
-    align-items: center;
-
-  }
-
-  .el-button {
-    width: 114px;
-    height: 44px;
-    border-radius: 3px;
-  }
-
-  .table {
-    margin-top: 20px;
-  }
-
-  .from-btn {
-    display: flex;
-    justify-content: space-around;
-    align-content: center;
-  }
-
 .block {
     margin-top: 30px;
 }