Merge branches 'dwhm' and 'dwhm' of http://39.105.160.25:10880/post-project-ui/post-ui into dwhm

src/api/announce/list.js

@@ -5,11 +5,26 @@ import '@/mock/index'
 import request from '@/utils/request'
 
 // 获取公告列表
-export const getNoticeList = (param)=>{
-  return axios.post('/notice/list',param)
+export function getNoticeList() {
+  return request({
+    url: '/system/notice/list',
+    method: 'get',
+  })
+}
+
+// 查询公告
+export function queryNotice(data) {
+  return request({
+    url: '/system/notice/queryNotice',
+    method: 'get',
+    params:data
+  })
 }
 
 // 删除公告
-export const deleteNotice = (param)=>{
-  return axios.post('/notice/delete',param)
+export const deleteNotice = (id)=>{
+  return request({
+    url: '/system/notice/'+id,
+    method: 'delete',
+  })
 }

src/api/user/index.js

@@ -1,7 +1,11 @@
 import axios from "axios"
-import '@/mock/index'
+import request from '@/utils/request'
 
 // 获取用户列表
-export const getUsersList = (param)=>{
-  return axios.post('/user/list',param)
+export function getUsersList(data) {
+  return request({
+    url: '/system/user/list',
+    method: 'get',
+    params:data
+  })
 }

src/views/announcement/list/index.vue

@@ -11,9 +11,9 @@
         </div>
       </div>
       <el-form  :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
-        <el-form-item class="inline" label="公告标题:  " prop="noticeTitle" >
+        <el-form-item class="inline" label="公告标题:  " prop="title" >
           <el-input
-            v-model="queryParams.noticeTitle"
+            v-model="queryParams.title"
             placeholder="筛选公告标题"
             clearable
             @keyup.enter.native="handleQuery"
@@ -21,7 +21,7 @@
         </el-form-item>
         <el-form-item class="inline" label="发布时间:  " prop="dateRange">
           <el-date-picker
-            v-model="queryParams.dateRange"
+            v-model="dateRange"
             type="daterange"
             range-separator="至"
             start-placeholder="开始日期"
@@ -94,7 +94,7 @@
 </template>
 
 <script>
-import { getNoticeList, deleteNotice } from '@/api/announce/list';
+import { getNoticeList, deleteNotice,queryNotice } from '@/api/announce/list';
 
 export default {
   name: "Notice",
@@ -104,10 +104,13 @@ export default {
       loading: true,
       // 公告表格数据
       noticeList: [],
+      // 查询的时间参数
+      dateRange:[],
       // 查询参数
       queryParams: {
-        noticeTitle: undefined,
-        dateRange:[]
+        title: undefined,
+        noticeTimeLeft:undefined,
+        noticeTimeRight:undefined
       },
       // 分页参数
       pagination:{
@@ -124,28 +127,32 @@ export default {
     /** 查询公告列表 */
     getList() {
       this.loading = true;
-      getNoticeList({
-        pageIndex: this.pagination.current,
-        pageSize: this.pagination.pageSize,
-        queryParams:this.queryParams
-      }).then( res =>{
-        // console.log(res)
-        let data = res.data.data;
-        this.noticeList = data.noticeList;
-        this.pagination.total = data.total;
-        this.pagination.current = data.pageIndex;
+      getNoticeList().then( res =>{
+        console.log(res);
+        this.noticeList = res.rows;
+        this.pagination.total = res.total;
+        this.pagination.current = 1;
         this.loading = false;
       })
     },
     /** 搜索按钮操作 */
     handleQuery() {
       this.pagination.current = 1;
-      this.getList();
+      this.queryParams.noticeTimeLeft = this.dateRange ? this.dateRange[0] :undefined;
+      this.queryParams.noticeTimeRight = this.dateRange ? this.dateRange[1] :undefined;
+      this.loading = true;
+      queryNotice({...this.queryParams}).then(res =>{
+        //console.log(res);
+        this.noticeList = res.rows;
+        this.pagination.total = res.total;
+        this.loading = false;
+      });
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange=[]
       this.resetForm("queryForm");
-      this.handleQuery();
+      this.getList();
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -157,13 +164,15 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const noticeIds = row.noticeId;
-      this.$modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？').then(function() {
-        return deleteNotice({id:noticeIds});
+      this.$confirm('是否确认删除公告编号为"' + row.noticeId + '"的数据项？','提示').then(function() {
+        return deleteNotice(row.noticeId);
       }).then(() => {
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        });
         this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(()=>{});
     },
     // 页号发生变化
     onPageChange(number){

src/views/appuserlist/index.vue

@@ -12,27 +12,45 @@
               </div>
             </div>
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" class="search-form">
-              <el-form-item label="编号：" prop="userId">
+              <el-form-item label="编号：" prop="id">
                 <el-input
-                  v-model="queryParams.userId"
+                  v-model="queryParams.id"
                   placeholder="请输入用户编号"
                   clearable
                   style="width: 240px"
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="手机号码：" prop="phoneNumber">
+              <el-form-item label="账号：" prop="username">
                 <el-input
-                  v-model="queryParams.phoneNumber"
+                  v-model="queryParams.username"
+                  placeholder="请输入用户账号"
+                  clearable
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="真实姓名：" prop="realname">
+                <el-input
+                  v-model="queryParams.realname"
+                  placeholder="请输入真实姓名"
+                  clearable
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="手机号码：" prop="mobile">
+                <el-input
+                  v-model="queryParams.mobile"
                   placeholder="请输入手机号码"
                   clearable
                   style="width: 240px"
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="状态：" prop="status">
+              <el-form-item label="状态：" prop="state">
                 <el-select
-                  v-model="queryParams.status"
+                  v-model="queryParams.state"
                   placeholder="用户状态"
                   clearable
                   style="width: 240px"
@@ -47,7 +65,18 @@
               </el-form-item>
               <el-form-item label="注册时间：">
                 <el-date-picker
-                  v-model="dateRange"
+                  v-model="queryParams.registerAt"
+                  style="width: 240px"
+                  value-format="yyyy-MM-dd"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                ></el-date-picker>
+              </el-form-item>
+              <el-form-item label="实名时间：">
+                <el-date-picker
+                  v-model="queryParams.updateAt"
                   style="width: 240px"
                   value-format="yyyy-MM-dd"
                   type="daterange"
@@ -72,24 +101,24 @@
       <el-row>
         <!--用户数据-->
         <el-table v-loading="loading" :data="userList"  border >
-          <el-table-column label="编号" align="center"  prop="userId" />
-          <el-table-column label="账号" align="center"  prop="number"  :show-overflow-tooltip="true" />
-          <el-table-column label="真实姓名" align="center"  prop="name"  :show-overflow-tooltip="true" />
-          <el-table-column label="手机号" align="center"  prop="phoneNumber" width="120" />
+          <el-table-column label="编号" align="center"  prop="id" />
+          <el-table-column label="账号" align="center"  prop="username"  :show-overflow-tooltip="true" />
+          <el-table-column label="真实姓名" align="center"  prop="realname"  :show-overflow-tooltip="true" />
+          <el-table-column label="手机号" align="center"  prop="mobile" width="120" />
           <el-table-column label="详细地址" align="center"  prop="adress"  width="160" :show-overflow-tooltip="true" />
-          <el-table-column label="状态" align="center" prop="status" >
+          <el-table-column label="状态" align="center" prop="state" >
             <template slot-scope="scope">
-              <span>{{ scope.row.status == "0" ? "未认证" : "已认证"  }}</span>
+              <span>{{ getState(scope.row.state)  }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="注册时间" align="center" prop="registerTime"  width="160">
+          <el-table-column label="注册时间" align="center" prop="registerAt"  width="160">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.registerTime) }}</span>
+              <span>{{ parseTime(scope.row.registerAt) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="实名时间" align="center" prop="verifiedTime"  width="160">
+          <el-table-column label="实名时间" align="center" prop="updateAt"  width="160">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.verifiedTime) }}</span>
+              <span>{{ parseTime(scope.row.updateAt) }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -110,6 +139,7 @@
   
   <script>
   import {getUsersList} from '@/api/user'
+import { notDeepEqual } from 'assert';
   
   export default {
     name: "User",
@@ -123,9 +153,13 @@
         dateRange:[],
         // 查询参数
         queryParams: {
-          userId:undefined,
-          phoneNumber:undefined,
-          status:undefined,
+          username:undefined,
+          id:undefined,
+          mobile:undefined,
+          state:undefined,
+          realname:undefined,
+          registerAt:[],
+          updateAt:[],
         },
         // 分页参数
         pagination:{
@@ -149,33 +183,32 @@
     created() {
       this.getList()
     },
+    computed:{
+    },
     methods: {
       /** 查询用户列表 */
       getList() {
         this.loading = true;
         getUsersList({
-          pageIndex: this.pagination.current,
-          pageSize: this.pagination.pageSize,
-          queryParams:this.queryParams,
-          dateRange:this.dateRange
-        }).then(response => {
-          // console.log("数据",response);
-          let data = response.data.data;
-          this.userList = data.userList;
-          this.pagination.total = data.total;
-          this.pagination.current = data.pageIndex;
+          ...this.queryParams
+        }).then(res => {
+          console.log("数据",res);
+          this.userList = res.rows;
+          this.pagination.total = res.total;
+          this.pagination.current = 1;
           this.loading = false;
         });
       },
       /** 搜索按钮操作 */
       handleQuery() {
         this.pagination.current = 1;
-        console.log("时间",this.dateRange);
+        //console.log("时间",this.dateRange);
         this.getList();
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.dateRange = [];
+        this.queryParams.registerAt = [];
+        this.queryParams.updateAt = [];
         this.resetForm("queryForm")
         this.handleQuery();
       },
@@ -183,6 +216,18 @@
       onPageChange(number){
         this.pagination.current=number;
         this.getList();
+      },
+      // 获取用户状态
+      getState(state){
+        if(state=="0"){
+          return "未认证";
+        }
+        else if(state==null){
+          return "未知";
+        }
+        else{
+          return "已认证";
+        }
       }
     }
   };

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://39.105.160.25:10995`,
+        target: `http://39.105.160.25:10995/#/login`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''