Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4

src/assets/api.js

@@ -866,19 +866,9 @@ export const addFund = (data, id) => {
   return req("post", baseurl + `/codes/voucher/fund/${id}`, data);
 };
 
-// 批量上传查询
+// key列表
-export const bachUploadQuery = (file) => {
+export const getKeysList = (data) => {
-  return upload("post", baseurl + "/key/import?type=1", file);
+  return req("post", baseurl + "/key", data);
-};
-
-// 批量上传作废
-export const bachUploadVoid = (file) => {
-  return upload("post", baseurl + "/key/batchUploadVoid", file);
-};
-
-// 批量上传使用
-export const bachUploadUse = (file) => {
-  return upload("post", baseurl + "/key/batchUploadUsed", file);
 };
 
 export const bachUploadAll = (url, file) => {

src/components/UseUploadExcel/index.jsx

@@ -94,13 +94,9 @@ const UseUploadExcel = (props) => {
             return;
         }
       } else {
-        handelResponse(
+        console.log("res =>", res);
-          res,
+        Notify.error(res.message);
-          (req, msg) => {
+        setFilesTip(0);
-            Notify.error(msg);
-          },
-          (err) => {}
-        );
       }
     });
   };

src/components/keysFind/index.jsx

@@ -2,18 +2,17 @@
  * @Author: Wind
  * @Date: 2022-07-25 10:53:41
  * @LastEditors: Wind
- * @LastEditTime: 2022-07-28 11:26:12
+ * @LastEditTime: 2022-07-28 14:43:42
  * @Description:key列表查询组件
  * @FilePath: \frontend\src\components\keysFind\index.jsx
  */
 import './index.less'
-import { useEffect, useState } from 'react'
+import { useState } from 'react'
-import { Button, Notify, Select, DateRangePicker } from 'zent'
+import { Button, Select, DateRangePicker } from 'zent'
 import Ipt from '@/components/input/main'
 import Form from '@/components/form/main'
 import FormItem from '@/components/form-item/main'
 import _ from 'lodash'
-import { getReSellerOption, handelResponse } from '../../assets/api'
 
 const stateList = [
   { key: 1, text: '全部' },
@@ -33,36 +32,15 @@ function init() {
 }
 
 export default ({ onQuery }) => {
-  const [reseller_option, setReseller_option] = useState([])
   const [models, setModels] = useState(init())
 
-  useEffect(() => {
-    getReSellerOption().then((res) => {
-      handelResponse(
-        res,
-        (req, msg) => {
-          let arr = _.map(req, (o) => {
-            let obj = {}
-            obj.key = o.id
-            obj.text = o.name
-            obj.direct_reseller_id = o.direct_reseller_id
-            return obj
-          })
-          setReseller_option(arr)
-        },
-        (err) => {
-          Notify.error(err)
-        }
-      )
-    })
-  }, [])
-
   function onChange(data) {
     return {
-      date: data.date.length || null,
+      begin_time: data.date[0] || null,
-      reseller: data.reseller?.key,
+      end_time: data.date[1] || null,
-      plan: data.plan?.key,
+      reseller_name: data.reseller?.text,
-      state: data.state?.key,
+      plan_name: data.plan?.text,
+      status: data.state?.key,
       key: data.key || null
     }
   }
@@ -79,30 +57,6 @@ export default ({ onQuery }) => {
             onChange={(va) => setModels({ ...models, date: va })}
           />
         </FormItem>
-        <FormItem labelname='分销商：' required='' labelwidth='70px'>
-          <Select
-            options={reseller_option}
-            value={models.reseller}
-            placeholder='请选择'
-            width={204}
-            clearable
-            onChange={(va) => setModels({ ...models, reseller: va })}
-          />
-        </FormItem>
-
-        <FormItem labelname='计划名称：' required='' labelwidth='90px'>
-          <Select
-            options={[
-              { key: 1, text: '普通用户' },
-              { key: 2, text: '高级用户' }
-            ]}
-            value={models.plan}
-            placeholder='请选择'
-            clearable
-            width={204}
-            onChange={(va) => setModels({ ...models, plan: va })}
-          />
-        </FormItem>
         <FormItem labelname='状态：' required='' labelwidth='50px'>
           <Select
             name='state'
@@ -114,6 +68,27 @@ export default ({ onQuery }) => {
             onChange={(va) => setModels({ ...models, state: va })}
           />
         </FormItem>
+        <FormItem labelname='分销商：' required='' labelwidth='70px'>
+          <Ipt
+            value={models.reseller}
+            countShow={false}
+            labelWidth='0px'
+            placeholder='请输入'
+            width={204}
+            onChange={(va) => setModels({ ...models, key: va })}
+          />
+        </FormItem>
+
+        <FormItem labelname='计划名称：' required='' labelwidth='90px'>
+          <Ipt
+            value={models.plan}
+            countShow={false}
+            labelWidth='0px'
+            placeholder='请输入'
+            width={204}
+            onChange={(va) => setModels({ ...models, key: va })}
+          />
+        </FormItem>
         <FormItem labelname='KEY：' required='' labelwidth='50px'>
           <Ipt
             value={models.key}

src/pages/plan/keyList/index.jsx

@@ -26,6 +26,7 @@ import {
   keyBatchCancel,
   handelResponse,
   getkeyDetailList,
+  getKeysList,
 } from "@/assets/api.js";
 import _ from "lodash";
 import menu from "@/assets/enum.js";
@@ -96,22 +97,22 @@ export default class acclist extends React.Component {
     }, 0);
   }
 
-  componentDidMount(e) {}
+  componentDidMount(e) {
+    this.iptsureFn();
+  }
   componentWillMount() {
     this.setState({ tableHeight: window.innerHeight - 430 });
   }
 
   getKeyCodeList(data) {
     let queryParams = _.omitBy(
-      { ...data, ...this.state.conditionalQuery },
+      { ...data, ...this.state.conditionalQuery, ...this.state.sha1 },
       (value) => {
         return _.isNaN(value) || _.isNil(value);
       }
     );
-    console.log(queryParams);
-    let id = sessionStorage.getItem("key_batch_id");
 
-    getkeyDetailList(id, queryParams).then((res) => {
+    getKeysList(queryParams).then((res) => {
       handelResponse(
         res,
         (req, msg) => {
@@ -132,9 +133,7 @@ export default class acclist extends React.Component {
     let data = {
       page: this.state.page,
       limit: this.state.limit,
-      key: this.state.key,
     };
-    console.log(155, this.state.status);
     let status = this.state.status > 0 ? this.state.status : null;
     if (status) {
       data.status = status;
@@ -198,7 +197,6 @@ export default class acclist extends React.Component {
     let data = {
       page: 1,
       limit: 10,
-      key: this.state.search,
     };
     if (status) {
       data.status = status;
@@ -218,7 +216,6 @@ export default class acclist extends React.Component {
     let params = {
       page: 1,
       limit: 10,
-      key: this.state.search,
     };
     this.getKeyCodeList(params);
   }