diff --git a/src/assets/api.js b/src/assets/api.js
index 76275374..e3d104b1 100644
--- a/src/assets/api.js
+++ b/src/assets/api.js
@@ -866,19 +866,9 @@ export const addFund = (data, id) => {
return req("post", baseurl + `/codes/voucher/fund/${id}`, data);
};
-// 批量上传查询
-export const bachUploadQuery = (file) => {
- return upload("post", baseurl + "/key/import?type=1", file);
-};
-
-// 批量上传作废
-export const bachUploadVoid = (file) => {
- return upload("post", baseurl + "/key/batchUploadVoid", file);
-};
-
-// 批量上传使用
-export const bachUploadUse = (file) => {
- return upload("post", baseurl + "/key/batchUploadUsed", file);
+// key列表
+export const getKeysList = (data) => {
+ return req("post", baseurl + "/key", data);
};
export const bachUploadAll = (url, file) => {
diff --git a/src/components/UseUploadExcel/index.jsx b/src/components/UseUploadExcel/index.jsx
index e582a18d..233a289f 100644
--- a/src/components/UseUploadExcel/index.jsx
+++ b/src/components/UseUploadExcel/index.jsx
@@ -94,13 +94,9 @@ const UseUploadExcel = (props) => {
return;
}
} else {
- handelResponse(
- res,
- (req, msg) => {
- Notify.error(msg);
- },
- (err) => {}
- );
+ console.log("res =>", res);
+ Notify.error(res.message);
+ setFilesTip(0);
}
});
};
diff --git a/src/components/keysFind/index.jsx b/src/components/keysFind/index.jsx
index 9ab95165..de6cc9cc 100644
--- a/src/components/keysFind/index.jsx
+++ b/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 { Button, Notify, Select, DateRangePicker } from 'zent'
+import { useState } from 'react'
+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,
- reseller: data.reseller?.key,
- plan: data.plan?.key,
- state: data.state?.key,
+ begin_time: data.date[0] || null,
+ end_time: data.date[1] || null,
+ reseller_name: data.reseller?.text,
+ 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 })}
/>
-
-
-
-
-
+
+ setModels({ ...models, key: va })}
+ />
+
+
+
+ setModels({ ...models, key: va })}
+ />
+
{
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);
}