Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/api/member/user.js

@@ -43,6 +43,13 @@ export function getUserPage(params) {
     params: params
   })
 }
+ export function getWaitApprovePage(params){
+  return request({
+    url:'/member/user/waitApprovePage',
+    method:'get',
+    params
+  })
+}
 
 // 导出用户 Excel
 export function exportUserExcel(query) {

src/components/WarehouseAreaDialog/index.vue

@@ -107,7 +107,7 @@ export default {
           const area = r.data
           area.forEach(e => {
             // 仓库
-            e.children.forEach(f => {
+            e.children?.forEach(f => {
               // 区域
               f.selected = false
               if(f.positionList) f.positionList.forEach(g => {

src/views/member/user/underReview.vue

@@ -98,25 +98,20 @@
 
 <script>
 import {
-  createUser,
-  updateUser,
   deleteUser,
-  getUserPage,
   exportUserExcel,
   operationLogApi,
   seTupdateBackletter,
   memberGetAuthIdcardInfo,
   memberGetAuthEnterpriseInfo,
   memberUserAuditIdCard,
-  memberUserUpdateIdCard,
-  memberUserUpdateEnterprise, setUserUpdateStatus, userCreateAuditEnterprise, getWaitApprovePage
+  setUserUpdateStatus, userCreateAuditEnterprise, getWaitApprovePage
 } from "@/api/member/user";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import FileUpload  from "@/components/FileUpload"
 import ImageUpload from "@/components/ImageUpload";
 import uploadImage from "@/components/UploadImage";
 import {CommonStatusEnum} from "@/utils/constants";
-import {changeUserStatus, listServiceUser, listSimpleUsers} from "@/api/system/user";
 
 export default {
   name: "underReview",
@@ -148,8 +143,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeLoginDate: [],
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         page: 1,
@@ -188,7 +181,6 @@ export default {
   },
   methods: {
     deleteFn(row){
-      console.log(row)
       this.$modal.confirm(`${this.$t('是否要删除昵称为')}${row.nickname}${this.$t('的会员')}`).then(function (){
         return deleteUser(row.id)
       }).then( res => {
@@ -226,8 +218,6 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeLoginDate, 'loginDate');
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
       getWaitApprovePage(params).then(response => {
         this.list = response.data.list;
@@ -273,8 +263,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeLoginDate = [];
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.queryParams = {
         page: 1,