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

src/assets/api.js

@@ -868,7 +868,7 @@ export const addFund = (data, id) => {
 
 // key列表
 export const getKeysList = (data) => {
-  return req("post", baseurl + "/key", data);
+  return req("get", baseurl + "/key", data);
 };
 
 export const bachUploadAll = (url, file) => {

src/components/keysFind/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Wind
  * @Date: 2022-07-25 10:53:41
  * @LastEditors: Wind
- * @LastEditTime: 2022-07-28 14:43:42
+ * @LastEditTime: 2022-07-28 15:29:24
  * @Description:key列表查询组件
  * @FilePath: \frontend\src\components\keysFind\index.jsx
  */
@@ -15,11 +15,11 @@ import FormItem from '@/components/form-item/main'
 import _ from 'lodash'
 
 const stateList = [
-  { key: 1, text: '全部' },
+  { key: 0, text: '全部' },
-  { key: 2, text: '待使用' },
+  { key: 1, text: '待使用' },
-  { key: 3, text: '已使用' },
+  { key: 2, text: '已使用' },
-  { key: 4, text: '已完结' },
+  { key: 3, text: '已完结' },
-  { key: 5, text: '已作废' }
+  { key: 4, text: '已作废' }
 ]
 function init() {
   return {
@@ -38,9 +38,9 @@ export default ({ onQuery }) => {
     return {
       begin_time: data.date[0] || null,
       end_time: data.date[1] || null,
-      reseller_name: data.reseller?.text,
+      reseller_name: data.reseller || null,
-      plan_name: data.plan?.text,
+      plan_name: data.plan || null,
-      status: data.state?.key,
+      status: data.state?.key || null,
       key: data.key || null
     }
   }
@@ -75,7 +75,8 @@ export default ({ onQuery }) => {
             labelWidth='0px'
             placeholder='请输入'
             width={204}
-            onChange={(va) => setModels({ ...models, key: va })}
+            onClearItem={() => setModels({ ...models, reseller: '' })}
+            onChange={(va) => setModels({ ...models, reseller: va })}
           />
         </FormItem>
 
@@ -86,7 +87,8 @@ export default ({ onQuery }) => {
             labelWidth='0px'
             placeholder='请输入'
             width={204}
-            onChange={(va) => setModels({ ...models, key: va })}
+            onChange={(va) => setModels({ ...models, plan: va })}
+            onClearItem={() => setModels({ ...models, plan: '' })}
           />
         </FormItem>
         <FormItem labelname='KEY：' required='' labelwidth='50px'>
@@ -97,6 +99,7 @@ export default ({ onQuery }) => {
             placeholder='请输入'
             width={204}
             onChange={(va) => setModels({ ...models, key: va })}
+            onClearItem={() => setModels({ ...models, key: '' })}
           />
         </FormItem>
 

src/pages/plan/keyList/index.jsx

@@ -395,15 +395,15 @@ export default class acclist extends React.Component {
         title: "归属营销计划",
         width: "auto",
         type: "normal",
-        prop: "plan_title",
+        prop: "title",
-        name: "plan_title",
+        name: "title",
       },
       {
         title: "归属KEY批次",
-        prop: "status",
+        prop: "batch_name",
-        name: "status",
+        name: "batch_name",
         width: "auto",
-        type: "slot",
+        type: "normal",
       },
       {
         title: "状态",
@@ -466,7 +466,7 @@ export default class acclist extends React.Component {
         name: "update_time",
         prop: "update_time",
         type: "normal",
-        width: "auto",
+        width: "220px",
       },
     ];
     const date = (