产品库数据分离

src/permission.js

@@ -2,7 +2,7 @@
  * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
  * @Date: 2022-08-02 18:10:30
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-02-28 15:30:43
+ * @LastEditTime: 2024-11-07 10:05:27
  * @FilePath: \admin-manage\src\permission.js
  * @Description: 
  * 

src/router/index.js

@@ -2,7 +2,7 @@
  * @Author: wenjie 1454560336@qq.com
  * @Date: 2024-03-05 11:36:07
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-10-23 11:20:49
+ * @LastEditTime: 2024-11-07 10:01:35
  * @FilePath: \admin-manage\src\router\index.js
  * @Description:
  *
@@ -87,7 +87,7 @@ export let constantRoutes = [{
         },
       },
       {
-        id: 1,
+        id: 2,
         path: '/updatePassword',
         name: '/updatePassword',
         component: () => import('@/views/updatePassword/index.vue'),
@@ -98,6 +98,47 @@ export let constantRoutes = [{
       },
     ]
   },
+  {
+    id: 0,
+    path: '/authorityManage',
+    component: Layout,
+    meta: {
+      title: '权限管理',
+      icon: 'icon-shouyefill'
+    },
+    children: [
+      {
+        id: 1,
+        path: '/authorityManage/menuList',
+        name: '/authorityManage/menuList',
+        component: () => import('@/views/authorityManage/menuList.vue'),
+        meta: {
+          title: '菜单列表',
+          icon: ''
+        },
+      },
+      {
+        id: 2,
+        path: '/authorityManage/roleList',
+        name: '/authorityManage/roleList',
+        component: () => import('@/views/authorityManage/roleList.vue'),
+        meta: {
+          title: '角色列表',
+          icon: ''
+        },
+      },
+      {
+        id: 2,
+        path: '/authorityManage/userList',
+        name: '/authorityManage/userList',
+        component: () => import('@/views/authorityManage/userList.vue'),
+        meta: {
+          title: '用户列表',
+          icon: ''
+        },
+      },
+    ]
+  },
   // {
   //   id: 36,
   //   path: '/adminManage',

src/utils/request.js

@@ -2,7 +2,7 @@
  * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
  * @Date: 2022-08-02 14:50:38
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-10-25 10:44:02
+ * @LastEditTime: 2024-11-01 11:54:14
  * @FilePath: \admin-manage\src\utils\request.js
  * @Description: 
  * 
@@ -33,7 +33,7 @@ service.interceptors.request.use(
       // ['X-Token'] is a custom headers key
       // please modify it according to the actual situation
       config.headers['Accesstoken'] = getToken()
-      config.headers['code'] = 3
+      config.headers['code'] = 1
       config.headers['epid'] = localStorage.getItem('epid')
       // config.headers['Content-Type'] = 'application/x-www-form-urlencoded'
     // }

src/views/authorityManage/menuList.vue

@@ -0,0 +1,207 @@
+
+<template>
+  <div class="menuList app-container">
+    <div class="search">
+      <el-button class="add-btn" type="primary" size="small" @click="handleAdd"
+        >添加</el-button
+      >
+    </div>
+
+    <el-table
+    :data="tableData"
+    style="width: 100%;margin-bottom: 20px;"
+    row-key="id"
+    border
+    default-expand-all
+    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+    <el-table-column
+      prop="date"
+      label="菜单名称"
+      align="center"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="name"
+      label="排序"
+      align="center"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="address"
+      label="请求地址"
+      align="center"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="address"
+      label="类型"
+      align="center"
+      >
+    </el-table-column>
+      <el-table-column prop="address" align="center" label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button type="text" size="small" @click="handleDel(scope.row.id)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog :title="title" width="550px" :visible.sync="dialogFormVisible">
+        <el-form label-width="130px" :model="setQuery"
+        ref="setQuery"
+        :rules="rules">
+            <el-form-item label="菜单名称:"  prop="paperName">
+                <el-input
+                v-model="setQuery.paperName"
+                class="item-width-300"
+                ></el-input>
+            </el-form-item>
+             <el-form-item label="上级菜单:"  prop="paperName">
+                <el-select v-model="setQuery.type" class="item-width-300" placeholder="请选择">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="菜单类型:"  prop="questionsNum">
+               <el-radio-group v-model="setQuery.type">
+                    <el-radio :label="1">目录</el-radio>
+                    <el-radio :label="2">菜单</el-radio>
+                    <el-radio :label="3">按钮</el-radio>
+                </el-radio-group>
+            </el-form-item>
+             <el-form-item label="请求地址:"  prop="questionsNum">
+                <el-input
+                type="number"
+                v-model.number="setQuery.questionsNum"
+                class="item-width-300"
+                ></el-input>
+            </el-form-item>
+             <el-form-item label="显示排序:"  prop="questionsNum">
+                <el-input
+                type="number"
+                v-model.number="setQuery.questionsNum"
+                class="item-width-300"
+                ></el-input>
+            </el-form-item>
+        </el-form>
+    <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" :loading="btnLoading" @click="save">确 定</el-button>
+    </div>
+    </el-dialog>
+
+  </div>
+</template>
+  
+  <script>
+export default {
+  name: "menuList",
+  data() {
+    return {
+      title:"",
+      dialogFormVisible:false,
+      tableData: [{
+          id: 1,
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          id: 2,
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        }, {
+          id: 3,
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄',
+          children: [{
+              id: 31,
+              date: '2016-05-01',
+              name: '王小虎',
+              address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+              id: 32,
+              date: '2016-05-01',
+              name: '王小虎',
+              address: '上海市普陀区金沙江路 1519 弄'
+          }]
+        }, {
+          id: 4,
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        }],
+      loading: false,
+      options:[
+        {
+          value: '选项1',
+          label: '黄金糕'
+        }, {
+          value: '选项2',
+          label: '双皮奶'
+        }, {
+          value: '选项3',
+          label: '蚵仔煎'
+        }
+      ],
+      setQuery: {
+       type:1
+      },
+      rules:{}
+    };
+  },
+
+  methods: {
+
+    handleEdit(row){
+        this.title = "编辑"
+        this.dialogFormVisible = true
+     
+    },
+    handleAdd(){
+        this.title = "添加"
+        this.dialogFormVisible = true
+    },
+    // 点击删除
+    handleDel(id) {
+       this.$confirm(`此操作将删除该数据, 是否继续?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          del({menuId:id}).then(res=>{
+            if(res.state == 'Success'){
+               this.$notify({
+                title: '成功',
+                message: '操作成功',
+                type: 'success'
+              });
+              this.getMenu()
+            }
+          })
+        })
+    },
+
+  },
+  created() {
+  },
+};
+</script>
+  
+<style lang="scss" scoped>
+.menuList {
+  .search{
+    justify-content: space-between;
+  }
+  .icon{
+    width: 80px;
+    height: 80px;
+  }
+}
+</style>
+  

src/views/authorityManage/roleList.vue

@@ -0,0 +1,336 @@
+
+<template>
+  <div class="roleList app-container">
+    <div class="search">
+        <div>
+            <el-input
+            v-model="query.name"
+            size="small"
+            clearable
+            placeholder="请输入名称"
+            class="item-width-200 "
+            ></el-input>
+             <el-input
+            v-model="query.name"
+            size="small"
+            clearable
+            placeholder="请输入登录账号"
+            class="item-width-200 ml10"
+            ></el-input>
+            <el-select
+          v-model="query.activityType"
+          size="small"
+          class="item-width-200 ml10"
+          placeholder="请选择角色"
+          clearable
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+
+        <el-date-picker
+          v-model="date"
+          size="small"
+          value-format="timestamp"
+          class="item-width-350 ml10"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+       
+            <el-button
+            class="ml10"
+            type="primary"
+            size="small"
+            icon="el-icon-search"
+            @click="handleSearch"
+        >
+            搜索
+        </el-button>
+        </div>
+        <el-button
+            type="primary"
+            size="small"
+            @click="handleAdd"
+        >
+            添加
+        </el-button>
+    </div>
+
+    <el-table
+      :data="tableData"
+      tooltip-effect="dark"
+      border
+      v-loading="loading"
+      style="width: 100%"
+    >
+      <el-table-column
+        align="center"
+        label="角色名称"
+        prop="activityName"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+      
+      <el-table-column
+        align="center"
+        label="备注"
+        prop="status"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+       <el-table-column
+        align="center"
+        label="状态"
+        prop="status"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+       <el-table-column
+        align="center"
+        label="创建时间"
+        prop="status"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+
+       <el-table-column prop="address" align="center" label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button type="text" size="small" @click="handleEdit(scope.row)">权限分配</el-button>
+          <el-button type="text" size="small" @click="handleDel(scope.row.id)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-box">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        background
+        :current-page="query.currentPage"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="query.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+
+     <el-dialog :title="title" width="550px" :visible.sync="dialogFormVisible">
+        <el-form label-width="130px" :model="setQuery"
+        ref="setQuery"
+        :rules="rules">
+            <el-form-item label="角色名称:"  prop="paperName">
+                <el-input
+                v-model="setQuery.paperName"
+                class="item-width-300"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="备注:"  prop="paperName">
+                <el-input
+                v-model="setQuery.paperName"
+                class="item-width-300"
+                ></el-input>
+            </el-form-item>
+             
+            <el-form-item label="权限分配:"  prop="questionsNum">
+              <el-tree
+                style="margin-top: 10px;"
+                :data="data"
+                show-checkbox
+                default-expand-all
+                node-key="id"
+                ref="tree"
+                highlight-current
+                :props="defaultProps">
+              </el-tree>
+            </el-form-item>
+           
+        </el-form>
+    <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" :loading="btnLoading" @click="save">确 定</el-button>
+    </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+  <script>
+  import {activityList,activityDel,activityStop} from '@/api/activity'
+export default {
+  name: "roleList",
+  data() {
+    return {
+        date:'',
+        data: [{
+          id: 1,
+          label: '一级 1',
+          children: [{
+            id: 4,
+            label: '二级 1-1',
+            children: [{
+              id: 9,
+              label: '三级 1-1-1'
+            }, {
+              id: 10,
+              label: '三级 1-1-2'
+            }]
+          }]
+        }, {
+          id: 2,
+          label: '一级 2',
+          children: [{
+            id: 5,
+            label: '二级 2-1'
+          }, {
+            id: 6,
+            label: '二级 2-2'
+          }]
+        }, {
+          id: 3,
+          label: '一级 3',
+          children: [{
+            id: 7,
+            label: '二级 3-1'
+          }, {
+            id: 8,
+            label: '二级 3-2'
+          }]
+        }],
+        defaultProps: {
+          children: 'children',
+          label: 'label'
+        },
+      options:[
+        {
+          value:1,
+          label:'海报'
+        },
+        {
+          value:2,
+          label:'报名'
+        },
+      ],
+ 
+      tableData: [],
+      loading: false,
+      btnLoading: false,
+      dialogFormVisible: false,
+      query: {
+        "activityType":null,
+        "state":'',
+        "currentPage": 1,
+        "pageSize": 10,
+        shopId: 0,
+      },
+      setQuery: {
+       type:1
+      },
+      rules:{},
+      title: "",
+      total: 0,
+    };
+  },
+  watch: {
+    date(val){
+      if(val){
+        this.query.startTime = val[0]
+        this.query.endTime = val[1]
+      }else{
+        this.query.startTime = ''
+        this.query.endTime = ''
+      }
+    }
+  },
+  methods: {
+    handleEdit(row){
+        this.title = "编辑"
+        this.dialogFormVisible = true
+     
+    },
+    handleAdd(){
+        this.title = "添加"
+        this.dialogFormVisible = true
+    },
+    handleSearch(){
+      this.query.currentPage = 1
+      this.activityList();
+    },
+    handleDel(id){
+         this.$confirm(`此操作将删除该活动, 是否继续?`, "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+        }).then(() => {
+          activityDel({id}).then(res=>{
+            if(res.state == 'Success'){
+               this.$notify({
+                title: "成功",
+                message: "操作成功",
+                type: "success",
+              });
+              this.handleSearch()
+            }
+          })
+        })
+    },
+    handleSizeChange(val) {
+      this.query.currentPage = 1;
+      this.query.pageSize = val;
+      this.activityList()
+    },
+    handleCurrentChange(val) {
+      this.query.currentPage = val;
+      this.activityList()
+    },
+    activityList(){
+    //   this.loading = true
+    //   activityList(this.query).then(res=>{
+    //     this.loading = false
+    //     if(res.state == 'Success'){
+    //       this.tableData = res.content.records
+    //       this.total = res.content.total
+    //     }
+    //   })
+    },
+    save(){
+        console.log(1111);
+        this.$refs.setQuery.validate((v) => {
+        if (v) {
+        //   this.btnLoading = true
+        //   addOrUpdatePaper(this.setQuery).then(res=>{
+        //     this.btnLoading = false
+        //     if(res.state == 'Success'){
+                this.dialogFormVisible = false
+        //       this.$notify({
+        //           title: '成功',
+        //           message: '操作成功',
+        //           type: 'success'
+        //         });
+        //         this.query.currentPage = 1
+        //         this.paperList();
+        //     }
+        //   })
+        }
+      });
+    }
+  },
+  created() {
+    this.activityList()
+  },
+};
+</script>
+
+<style lang="scss" >
+.roleList {
+
+}
+
+</style>

src/views/authorityManage/userList.vue

@@ -0,0 +1,361 @@
+
+<template>
+  <div class="userList app-container">
+    <div class="search">
+        <div>
+            <el-input
+            v-model="query.name"
+            size="small"
+            clearable
+            placeholder="请输入名称"
+            class="item-width-200 "
+            ></el-input>
+             <el-input
+            v-model="query.name"
+            size="small"
+            clearable
+            placeholder="请输入登录账号"
+            class="item-width-200 ml10"
+            ></el-input>
+            <el-select
+          v-model="query.activityType"
+          size="small"
+          class="item-width-200 ml10"
+          placeholder="请选择角色"
+          clearable
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+
+        <el-date-picker
+          v-model="date"
+          size="small"
+          value-format="timestamp"
+          class="item-width-350 ml10"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+       
+            <el-button
+            class="ml10"
+            type="primary"
+            size="small"
+            icon="el-icon-search"
+            @click="handleSearch"
+        >
+            搜索
+        </el-button>
+        </div>
+        <el-button
+            type="primary"
+            size="small"
+            @click="handleAdd"
+        >
+            添加
+        </el-button>
+    </div>
+
+    <el-table
+      :data="tableData"
+      tooltip-effect="dark"
+      border
+      v-loading="loading"
+      style="width: 100%"
+    >
+      <el-table-column
+        align="center"
+        label="角色名称"
+        prop="activityName"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+      
+      <el-table-column
+        align="center"
+        label="备注"
+        prop="status"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+       <el-table-column
+        align="center"
+        label="状态"
+        prop="status"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+       <el-table-column
+        align="center"
+        label="创建时间"
+        prop="status"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+
+       <el-table-column prop="address" align="center" label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button type="text" size="small" @click="handleEdit(scope.row)">权限分配</el-button>
+          <el-button type="text" size="small" @click="handleDel(scope.row.id)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-box">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        background
+        :current-page="query.currentPage"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="query.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+
+     <el-dialog :title="title" width="550px" :visible.sync="dialogFormVisible">
+        <el-form label-width="130px" :model="setQuery"
+        ref="setQuery"
+        :rules="rules">
+            <el-form-item label="姓名:"  prop="paperName">
+                <el-input
+                v-model="setQuery.paperName"
+                class="item-width-300"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="登录账号:"  prop="paperName">
+                <el-input
+                v-model="setQuery.paperName"
+                class="item-width-300"
+                ></el-input>
+            </el-form-item>
+             
+            <el-form-item label="角色:"  prop="questionsNum">
+              <el-select
+                v-model="query.activityType"
+                size="small"
+                class="item-width-200 ml10"
+                placeholder="请选择角色"
+                clearable
+                >
+                    <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="状态:"  prop="paperName">
+               <el-radio-group v-model="setQuery.type">
+                    <el-radio :label="1">启用</el-radio>
+                    <el-radio :label="2">禁用</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+              <el-form-item label="原始密码" prop="old">
+                <el-input type="text" :maxlength="16" class="item-width-300" v-model="setQuery.old" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="新的密码" prop="pwd">
+                <el-input type="text" :maxlength="16" class="item-width-300" v-model="setQuery.pwd" 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" :loading="btnLoading" @click="save">确 定</el-button>
+    </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+  <script>
+  import {activityList,activityDel,activityStop} from '@/api/activity'
+export default {
+  name: "userList",
+  data() {
+    return {
+        date:'',
+        data: [{
+          id: 1,
+          label: '一级 1',
+          children: [{
+            id: 4,
+            label: '二级 1-1',
+            children: [{
+              id: 9,
+              label: '三级 1-1-1'
+            }, {
+              id: 10,
+              label: '三级 1-1-2'
+            }]
+          }]
+        }, {
+          id: 2,
+          label: '一级 2',
+          children: [{
+            id: 5,
+            label: '二级 2-1'
+          }, {
+            id: 6,
+            label: '二级 2-2'
+          }]
+        }, {
+          id: 3,
+          label: '一级 3',
+          children: [{
+            id: 7,
+            label: '二级 3-1'
+          }, {
+            id: 8,
+            label: '二级 3-2'
+          }]
+        }],
+        defaultProps: {
+          children: 'children',
+          label: 'label'
+        },
+      options:[
+        {
+          value:1,
+          label:'海报'
+        },
+        {
+          value:2,
+          label:'报名'
+        },
+      ],
+ 
+      tableData: [],
+      loading: false,
+      btnLoading: false,
+      dialogFormVisible: false,
+      query: {
+        "activityType":null,
+        "state":'',
+        "currentPage": 1,
+        "pageSize": 10,
+        shopId: 0,
+      },
+      setQuery: {
+       type:1
+      },
+      rules:{
+         old:[
+            { required:true,message:'请填写旧密码', trigger: 'blur' }
+        ],
+        pwd: [
+            { required:true,message:'请填写新密码', trigger: 'blur' }
+
+        ],
+      },
+      title: "",
+      total: 0,
+    };
+  },
+  watch: {
+    date(val){
+      if(val){
+        this.query.startTime = val[0]
+        this.query.endTime = val[1]
+      }else{
+        this.query.startTime = ''
+        this.query.endTime = ''
+      }
+    }
+  },
+  methods: {
+    handleEdit(row){
+        this.title = "编辑"
+        this.dialogFormVisible = true
+     
+    },
+    handleAdd(){
+        this.title = "添加"
+        this.dialogFormVisible = true
+    },
+    handleSearch(){
+      this.query.currentPage = 1
+      this.activityList();
+    },
+    handleDel(id){
+         this.$confirm(`此操作将删除该活动, 是否继续?`, "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+        }).then(() => {
+          activityDel({id}).then(res=>{
+            if(res.state == 'Success'){
+               this.$notify({
+                title: "成功",
+                message: "操作成功",
+                type: "success",
+              });
+              this.handleSearch()
+            }
+          })
+        })
+    },
+    handleSizeChange(val) {
+      this.query.currentPage = 1;
+      this.query.pageSize = val;
+      this.activityList()
+    },
+    handleCurrentChange(val) {
+      this.query.currentPage = val;
+      this.activityList()
+    },
+    activityList(){
+    //   this.loading = true
+    //   activityList(this.query).then(res=>{
+    //     this.loading = false
+    //     if(res.state == 'Success'){
+    //       this.tableData = res.content.records
+    //       this.total = res.content.total
+    //     }
+    //   })
+    },
+    save(){
+        this.$refs.setQuery.validate((v) => {
+        if (v) {
+        //   this.btnLoading = true
+        //   addOrUpdatePaper(this.setQuery).then(res=>{
+        //     this.btnLoading = false
+        //     if(res.state == 'Success'){
+                this.dialogFormVisible = false
+        //       this.$notify({
+        //           title: '成功',
+        //           message: '操作成功',
+        //           type: 'success'
+        //         });
+        //         this.query.currentPage = 1
+        //         this.paperList();
+        //     }
+        //   })
+        }
+      });
+    }
+  },
+  created() {
+    this.activityList()
+  },
+};
+</script>
+
+<style lang="scss" >
+.userList {
+
+}
+
+</style>

src/views/home/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-07-08 12:10:55
- * @LastEditTime: 2024-09-11 16:14:27
+ * @LastEditTime: 2024-11-01 16:31:42
  * @LastEditors: wenjie 1454560336@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \admin-manage\src\views\home\index.vue
@@ -31,6 +31,21 @@
       </el-row>
     </div> -->
 
+     <el-select
+          v-model="platformType"
+          size="small"
+          class="item-width-200 mb10"
+          placeholder="请选择所属平台"
+        >
+          <el-option
+            v-for="item in masterShopOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+
     <div class="bottom">
       <div class="title">订单数据 <span>更新于{{ updateTime }}</span></div>
       <el-row>
@@ -165,6 +180,10 @@ export default {
   components: {},
   data() {
     return {
+      platformType:1,
+      query:{
+        platformType:1,
+      },
       userData: {
         dayRegister: 0,
         dayVip: 0,
@@ -193,42 +212,49 @@ export default {
       updateTime: '',
     };
   },
+  watch: {
+    platformType(val) {
+        this.init()
+      }
+  },
   computed: {
 
   },
   methods: {
 
-
+    init(){
+        this.updateTime = new Date().toLocaleString();
+        const thisDayStartTime = new Date(new Date().toLocaleDateString()).getTime();
+        const thisDayEndTime = new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1;
+        const yesterdayStartTime = thisDayStartTime - 24 * 60 * 60 * 1000;
+        const yesterdayEndTime = thisDayEndTime - 24 * 60 * 60 * 1000;
+
+        orderCount({
+          startTime: thisDayStartTime,
+          endTime: thisDayEndTime
+        }).then(res => {
+          if (res.state == 'Success') {
+            this.today = res.content;
+          }
+        });
+        orderCount({
+          startTime: yesterdayStartTime,
+          endTime: yesterdayEndTime
+        }).then(res => {
+          if (res.state == 'Success') {
+            this.yesterday = res.content;
+          }
+        });
+        userStatistics({code:this.query.platformType}).then(res => {
+          if (res.state == 'Success') {
+            this.userData = res.content;
+          }
+        })
+    }
   },
   created() { },
   mounted() {
-    this.updateTime = new Date().toLocaleString();
-    const thisDayStartTime = new Date(new Date().toLocaleDateString()).getTime();
-    const thisDayEndTime = new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1;
-    const yesterdayStartTime = thisDayStartTime - 24 * 60 * 60 * 1000;
-    const yesterdayEndTime = thisDayEndTime - 24 * 60 * 60 * 1000;
-
-    orderCount({
-      startTime: thisDayStartTime,
-      endTime: thisDayEndTime
-    }).then(res => {
-      if (res.state == 'Success') {
-        this.today = res.content;
-      }
-    });
-    orderCount({
-      startTime: yesterdayStartTime,
-      endTime: yesterdayEndTime
-    }).then(res => {
-      if (res.state == 'Success') {
-        this.yesterday = res.content;
-      }
-    });
-    userStatistics().then(res => {
-      if (res.state == 'Success') {
-        this.userData = res.content;
-      }
-    })
+    this.init();
 
   },
 };

src/views/operationManage/equitiesManage/addEquities.vue

@@ -82,11 +82,11 @@
           <el-button class="ml10" @click="handleChoose(2)">{{setQuery.bindContent?'切换':'选择抽奖活动'}}</el-button>
           </el-form-item>
 
-           <el-form-item label="抽奖次数：" prop="givenNum">
+           <el-form-item label="抽奖次数：" prop="claimNum">
               <el-input
                   size="small"
                   type="number"
-                  v-model.number="setQuery.givenNum"
+                  v-model.number="setQuery.claimNum"
                   :maxlength="10"
                   class="item-width-300"
               >
@@ -456,7 +456,6 @@ export default {
         "equityImg": "",
         "equityName": "",
         "equityType": 0,
-        "givenNum": 1,
         "showType": 1,
         "status": 1
       },

src/views/operationManage/goodsManage/productLibrary.vue

@@ -10,6 +10,14 @@
           clearable
           class="item-width-200 "
         ></el-input>
+         <el-select v-model="platformType" size="small" filterable clearable class="item-width-200 ml10" placeholder="请选择平台">
+              <el-option
+                v-for="item in platformTypeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           <el-select v-model="query.regionCode" size="small" filterable clearable class="item-width-200 ml10" placeholder="请选择区域">
               <el-option
                 v-for="item in cityOptions"
@@ -253,6 +261,8 @@ export default {
   },
   data() {
     return {
+      platformType:'',
+      platformTypeOptions:[],
       title:'',
       tableData: [],
       loading: false,
@@ -501,9 +511,9 @@ export default {
     },
     getCityList() {
       this.loading = true
-      getCityList({name:'',
-        page: 0,
-        size: 999,}).then((res) => {
+      getCityList({
+      type:'Park',
+        }).then((res) => {
         this.loading = false
         if (res.state == "Success") {
           this.cityOptions = res.content.content.map(item => {