From e6ddbfa1688ea796c9f76c3fa6749a1f2cfdfa4f Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Mon, 25 Jul 2022 09:55:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=B9=E7=94=A8HTTPS=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/index.html b/public/index.html
index ac242765..73281f97 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,7 +2,7 @@
  * @Author: Wind
  * @Date: 2022-07-15 17:48:05
  * @LastEditors: Wind
- * @LastEditTime: 2022-07-20 09:56:39
+ * @LastEditTime: 2022-07-25 09:55:19
  * @Description: 
  * @FilePath: \frontend\public\index.html
 -->
@@ -21,7 +21,7 @@
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
   <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-  <script src="http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/goods_new_v3.js?v3"></script>
+  <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/goods_new_v3.js?v3"></script>
   <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

From d82d49fcf558c45eef7b194ff16465593ed48db8 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Mon, 25 Jul 2022 11:57:38 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20key=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/keysFind/index.jsx  |  77 +++++++++++++
 src/components/keysFind/index.less |  17 +++
 src/pages/plan/key/detail/list.js  | 173 ++++++++++++++---------------
 3 files changed, 176 insertions(+), 91 deletions(-)
 create mode 100644 src/components/keysFind/index.jsx
 create mode 100644 src/components/keysFind/index.less

diff --git a/src/components/keysFind/index.jsx b/src/components/keysFind/index.jsx
new file mode 100644
index 00000000..0dcb6f6c
--- /dev/null
+++ b/src/components/keysFind/index.jsx
@@ -0,0 +1,77 @@
+/*
+ * @Author: Wind
+ * @Date: 2022-07-25 10:53:41
+ * @LastEditors: Wind
+ * @LastEditTime: 2022-07-25 11:56:32
+ * @Description:
+ * @FilePath: \frontend\src\components\keysFind\index.jsx
+ */
+import './index.less'
+import {
+  Form,
+  FormDateRangePickerField,
+  FormStrategy,
+  FormSelectField,
+  FormInputField,
+  Button
+} from 'zent'
+export default ({ onQuery }) => {
+  const form = Form.useForm(FormStrategy.View)
+
+  return (
+    <>
+      <Form className='keysFind' ayout='horizontal' form={form}>
+        <FormDateRangePickerField
+          name='date'
+          dateFormat='YYYY-MM-DD'
+          label='请选择日期：'
+          defaultValue={[]}
+          className='zent-datepicker-plan'
+        />
+        <FormSelectField
+          name='distributor'
+          label='分销商：'
+          props={{
+            options: [
+              { key: 1, text: '普通用户' },
+              { key: 2, text: '高级用户' }
+            ]
+          }}
+        />
+        <FormSelectField
+          name='plan'
+          label='计划名称：'
+          props={{
+            options: [
+              { key: 1, text: '普通用户' },
+              { key: 2, text: '高级用户' }
+            ]
+          }}
+        />
+        <FormSelectField
+          name='state'
+          label='状态：'
+          props={{
+            options: [
+              { key: 1, text: '普通用户' },
+              { key: 2, text: '高级用户' }
+            ]
+          }}
+        />
+        <FormInputField
+          name='key'
+          label='KEY：'
+          props={{
+            spellCheck: false
+          }}
+        />
+        <div>
+          <Button type='primary' onClick={() => onQuery(form.getValue())}>
+            查询
+          </Button>
+          <Button onClick={() => form.reset()}>重置</Button>
+        </div>
+      </Form>
+    </>
+  )
+}
diff --git a/src/components/keysFind/index.less b/src/components/keysFind/index.less
new file mode 100644
index 00000000..5416cb7a
--- /dev/null
+++ b/src/components/keysFind/index.less
@@ -0,0 +1,17 @@
+.keysFind {
+    width: 100%;
+    // display: grid;
+    // grid-template-columns: repeat(auto-fill, 500px);
+    display: flex;
+    flex-wrap: wrap;
+
+    .zent-form-control {
+        margin-right: 20px;
+        flex-direction: row !important;
+    }
+
+    .zent-datepicker .zent-datepicker-trigger {
+        background-color: transparent !important;
+        width: 150px !important;
+    }
+}
\ No newline at end of file
diff --git a/src/pages/plan/key/detail/list.js b/src/pages/plan/key/detail/list.js
index b4bcbb74..61bf4e7b 100644
--- a/src/pages/plan/key/detail/list.js
+++ b/src/pages/plan/key/detail/list.js
@@ -1,48 +1,32 @@
 /* key列表 */
-import ReactDOM from 'react-dom'
-import React, { Component } from 'react'
-import { HashRouter as Router, Route, Link } from 'react-router-dom'
+import React from 'react'
 import { Button, Alert } from 'zent'
 import './list.less'
 import {
   Input,
-  openDialog,
-  closeDialog,
   RadioGroup,
   CombinedDateRangePicker,
   Radio,
   Notify,
   Switch,
-  Swiper,
   Dropdown,
   DropdownPosition,
   DropdownClickTrigger,
   Icon,
   MenuItem,
   DropdownContent,
-  Menu,
-  Sweetalert
+  Menu
 } from 'zent'
 import Ipt from '../../../../components/input/main'
 import Grid from '../../../../components/gird/main.js'
 import TabPage from '../../../../components/tabPage/main.js'
-import Filterbar from '../../../../components/filterbar/main.js'
+import KeysFind from '../../../../components/keysFind'
 import {
-  getKeyLog,
-  planIsSend,
   keyCancel,
   keyUsage,
   keyBatchUsage,
   keyBatchCancel,
-  getPlanList,
   handelResponse,
-  startOrStopPlan,
-  getAllEnum,
-  resKeyEmail,
-  planSend,
-  planResend,
-  planReceive,
-  getReseller,
   getkeyDetailList
 } from '../../../../assets/api.js'
 import _ from 'lodash'
@@ -61,11 +45,11 @@ export default class acclist extends React.Component {
       page: 1,
       limit: 10,
       tabList: [
-        { title: "全部", index: 0 },
-        { title: "可使用", index: 1 },
-        { title: "已使用", index: 2 },
-        { title: "已完结", index: 3 },
-        { title: "已作废", index: 4 },
+        { title: '全部', index: 0 },
+        { title: '可使用', index: 1 },
+        { title: '已使用', index: 2 },
+        { title: '已完结', index: 3 },
+        { title: '已作废', index: 4 }
       ],
       distdata: [{ title: '士大夫大师傅' }],
       filterList: [
@@ -112,7 +96,7 @@ export default class acclist extends React.Component {
 
   //分页
   onPageChange(e) {
-    this.setState({ page: e });
+    this.setState({ page: e })
 
     setTimeout(() => {
       this.getpageFn()
@@ -151,14 +135,14 @@ 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;
+      key: this.state.key
     }
-    this.getKeyCodeList(data);
+    console.log(155, this.state.status)
+    let status = this.state.status > 0 ? this.state.status : null
+    if (status) {
+      data.status = status
+    }
+    this.getKeyCodeList(data)
   }
 
   //清空
@@ -214,18 +198,18 @@ export default class acclist extends React.Component {
   }
 
   iptsureFn(e) {
-    let status = this.state.status > 0 ?  this.state.status : null;
-    this.setState({ page: 1 });
-    this.setState({ limit: 10 });
+    let status = this.state.status > 0 ? this.state.status : null
+    this.setState({ page: 1 })
+    this.setState({ limit: 10 })
     let data = {
       page: 1,
       limit: 10,
-      key: this.state.search,
-    };
-    if (status) {
-     data.status=status;
+      key: this.state.search
     }
-    this.getKeyCodeList(data);
+    if (status) {
+      data.status = status
+    }
+    this.getKeyCodeList(data)
   }
 
   onFilterClose(prop) {
@@ -243,11 +227,11 @@ export default class acclist extends React.Component {
   }
 
   tabFn(e) {
-    let status = e > 0 ? e : null;
-      this.setState({ status: e });
-    this.setState({ search: "" });
-    this.setState({ page: 1 });
-    this.setState({ limit: 10 });
+    let status = e > 0 ? e : null
+    this.setState({ status: e })
+    this.setState({ search: '' })
+    this.setState({ page: 1 })
+    this.setState({ limit: 10 })
     let params = {
       page: 1,
       limit: 10,
@@ -274,10 +258,10 @@ export default class acclist extends React.Component {
             Notify.success('标记为使用成功')
           },
           (err) => {
-            Notify.error(err);
+            Notify.error(err)
           }
-        );
-      });
+        )
+      })
     }
     if (key == 2) {
       let formdata = {
@@ -296,15 +280,15 @@ export default class acclist extends React.Component {
             Notify.success('作废成功')
           },
           (err) => {
-            Notify.error(err);
+            Notify.error(err)
           }
-        );
-      });
+        )
+      })
     }
     if (key == 3) {
-      sessionStorage.setItem("keyCode", rowData.key);
+      sessionStorage.setItem('keyCode', rowData.key)
       // this.props.history.push("/home/key-log");
-      window.open('#/home/key-log');
+      window.open('#/home/key-log')
       // sessionStorage.setItem("pathname2", "/home/key-log");
 
       // let cur_nav = sessionStorage.getItem("breakchangenav");
@@ -409,55 +393,55 @@ export default class acclist extends React.Component {
         width: 'auto'
       },
       {
-        title: "发放总数",
-        prop: "total",
-        name: "total",
-        width: "auto",
-        type: "normal",
+        title: '发放总数',
+        prop: 'total',
+        name: 'total',
+        width: 'auto',
+        type: 'normal'
       },
       {
-        title: "剩余总数",
-        prop: "residue",
-        name: "residue",
-        width: "auto",
-        type: "normal",
+        title: '剩余总数',
+        prop: 'residue',
+        name: 'residue',
+        width: 'auto',
+        type: 'normal'
       },
       {
-        title: "使用总数",
-        name: "usage",
-        prop: "usage",
-        type: "normal",
-        width: "auto",
+        title: '使用总数',
+        name: 'usage',
+        prop: 'usage',
+        type: 'normal',
+        width: 'auto'
       },
       {
-        title: "失效总数",
-        name: "overdue",
-        prop: "overdue",
-        type: "normal",
-        width: "auto",
+        title: '失效总数',
+        name: 'overdue',
+        prop: 'overdue',
+        type: 'normal',
+        width: 'auto'
       },
       {
-        title: "作废总数",
-        name: "invalid",
-        prop: "invalid",
-        type: "normal",
-        width: "auto",
+        title: '作废总数',
+        name: 'invalid',
+        prop: 'invalid',
+        type: 'normal',
+        width: 'auto'
       },
       {
-        title: "已完结总数",
-        name: "end",
-        prop: "end",
-        type: "normal",
-        width: "auto",
+        title: '已完结总数',
+        name: 'end',
+        prop: 'end',
+        type: 'normal',
+        width: 'auto'
       },
       {
-        title: "更新时间",
-        name: "update_time",
-        prop: "update_time",
-        type: "normal",
-        width: "auto",
-      },
-    ];
+        title: '更新时间',
+        name: 'update_time',
+        prop: 'update_time',
+        type: 'normal',
+        width: 'auto'
+      }
+    ]
     const date = (
       <CombinedDateRangePicker
         className='zent-datepicker-demo'
@@ -473,6 +457,13 @@ export default class acclist extends React.Component {
     return (
       <div id='dislist'>
         <TabPage tabs={this.state.tabList} tabChange={this.tabFn.bind(this)}>
+          <div className='distable dflexj'>
+            <KeysFind
+              onQuery={(va) => {
+                console.log(va)
+              }}
+            />
+          </div>
           <div className='distable dflexj'>
             <div>
               <Button
@@ -649,7 +640,7 @@ export default class acclist extends React.Component {
                               <MenuItem key='1' disabled>
                                 标记成已使用
                               </MenuItem>
-                              <MenuItem key="2" disabled={rowData.status !=2}>
+                              <MenuItem key='2' disabled={rowData.status != 2}>
                                 作废
                               </MenuItem>
                               <MenuItem key='3'>日志</MenuItem>

From d6cdd5a87ff7255635d83f68ed5cbce223cef6b8 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Mon, 25 Jul 2022 14:05:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9key=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/keysFind/index.jsx  |  3 ++-
 src/components/keysFind/index.less | 33 ++++++++++++++++++++++++++++++
 src/pages/plan/key/detail/list.js  |  2 +-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/components/keysFind/index.jsx b/src/components/keysFind/index.jsx
index 0dcb6f6c..5f5d3ba4 100644
--- a/src/components/keysFind/index.jsx
+++ b/src/components/keysFind/index.jsx
@@ -2,7 +2,7 @@
  * @Author: Wind
  * @Date: 2022-07-25 10:53:41
  * @LastEditors: Wind
- * @LastEditTime: 2022-07-25 11:56:32
+ * @LastEditTime: 2022-07-25 13:49:44
  * @Description:
  * @FilePath: \frontend\src\components\keysFind\index.jsx
  */
@@ -61,6 +61,7 @@ export default ({ onQuery }) => {
         <FormInputField
           name='key'
           label='KEY：'
+          showClear
           props={{
             spellCheck: false
           }}
diff --git a/src/components/keysFind/index.less b/src/components/keysFind/index.less
index 5416cb7a..ae76747c 100644
--- a/src/components/keysFind/index.less
+++ b/src/components/keysFind/index.less
@@ -13,5 +13,38 @@
     .zent-datepicker .zent-datepicker-trigger {
         background-color: transparent !important;
         width: 150px !important;
+        border-radius: 0 !important;
+
+        &:hover {
+            border-color: #296BEF !important;
+            background-color: #F7F9FC !important;
+        }
     }
+
+    .zent-input-wrapper {
+        border-top: 0 !important;
+        border-left: 0 !important;
+        border-right: 0 !important;
+    }
+
+    .zent-input-wrapper:hover {
+        border-color: #296BEF !important;
+
+        .zent-input {
+            background-color: #F7F9FC;
+        }
+    }
+
+    .zent-select-v2 {
+        border-top: 0 !important;
+        border-left: 0 !important;
+        border-right: 0 !important;
+        border-radius: 0 !important;
+
+        &:hover,
+        .zent-select-v2-search:hover {
+            background-color: #F7F9FC;
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/src/pages/plan/key/detail/list.js b/src/pages/plan/key/detail/list.js
index 61bf4e7b..530b78d7 100644
--- a/src/pages/plan/key/detail/list.js
+++ b/src/pages/plan/key/detail/list.js
@@ -457,7 +457,7 @@ export default class acclist extends React.Component {
     return (
       <div id='dislist'>
         <TabPage tabs={this.state.tabList} tabChange={this.tabFn.bind(this)}>
-          <div className='distable dflexj'>
+          <div className='distable dflexj' style={{ paddingBottom: 0 }}>
             <KeysFind
               onQuery={(va) => {
                 console.log(va)