From b4f5e888ba1dddc198970f6d65faba6afdd4d90e Mon Sep 17 00:00:00 2001
From: Apple <>
Date: Fri, 17 Jun 2022 11:23:08 +0800
Subject: [PATCH] =?UTF-8?q?key=E6=89=B9=E6=AC=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E3=80=90=E4=BD=BF=E7=94=A8key=E6=80=BB=E6=95=B0=E3=80=91?=
 =?UTF-8?q?=E6=94=B9=E3=80=90=E6=B6=88=E8=80=97key=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E3=80=91=20key=E6=89=B9=E6=AC=A1=E5=88=97=E8=A1=A8=20=E6=82=AC?=
 =?UTF-8?q?=E5=81=9C=E6=88=96=E7=82=B9=E5=87=BB=E3=80=90=E6=B6=88=E8=80=97?=
 =?UTF-8?q?key=E6=80=BB=E6=95=B0=E3=80=91=E5=AD=97=E6=AE=B5=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC=EF=BC=88=E8=93=9D=E8=89=B2=EF=BC=89=EF=BC=8C=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=20=E7=BB=9F=E8=AE=A1=E7=9A=84=E5=85=91=E6=8D=A2?=
 =?UTF-8?q?=E7=A0=81=20=E3=80=90=E4=BD=9C=E5=BA=9F=E6=95=B0=E3=80=91?=
 =?UTF-8?q?=E3=80=90=E5=B7=B2=E4=BD=BF=E7=94=A8=E6=95=B0=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E7=BB=93=E6=95=B0=E3=80=91=E3=80=90=E5=B7=B2?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E6=95=B0=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/comm.css        |  3 +++
 src/pages/plan/key/list.js | 38 +++++++++++++++++++++++++++++++++-----
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/assets/comm.css b/src/assets/comm.css
index 33f3ccc5..8a9b1485 100644
--- a/src/assets/comm.css
+++ b/src/assets/comm.css
@@ -130,3 +130,6 @@ html,body,h1,h2,h3,h4,h5,h6,p,ul,li,dl,dd,dt,ol,input{
 .fz16{
   font-size: 16px;
 }
+.fz12{
+  font-size: 12px!important;
+}
diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js
index 75a2e40e..9251cd66 100644
--- a/src/pages/plan/key/list.js
+++ b/src/pages/plan/key/list.js
@@ -22,7 +22,7 @@ import {
   DropdownContent
 } from 'zent'
 import './list.less'
-import { Switch } from 'zent'
+import { Switch,Pop } from 'zent'
 import '../../../assets/comm.css'
 import Ipt from '../../../components/input/main'
 import Grid from '../../../components/gird/main.js'
@@ -110,9 +110,9 @@ const Column = [
     width: '120px'
   },
   {
-    title: "使用key码总数",
+    title: "已消耗key总数",
     name: "usage",
-    type: "normal",
+    type: "slot",
     prop: "usage",
     width: "120px",
   },
@@ -710,7 +710,31 @@ export default class acclist extends React.Component {
         onChange={this.onChangeCombinedDate.bind(this)}
       />
     )
-
+  const popDom=(row)=>{
+    return (
+      <div>
+        <b>兑换码统计</b>
+        <ul className='dflexaj mt5 fz12'>
+          <li className='dflexajc mr15'>
+            <span>已作废数</span>
+            <span>{row.invalid_total}</span>
+          </li>
+          <li className='dflexajc mr15'>
+            <span>已使用数</span>
+            <span>{row.usage_total}</span>
+          </li>
+          <li className='dflexajc mr15'>
+            <span>已完结数</span>
+            <span>{row.end_total}</span>
+          </li>
+          <li className='dflexajc'>
+            <span>已失效数</span>
+            <span>{row.overdue_total}</span>
+          </li>
+        </ul>
+      </div>
+    )
+  }
     const { current, pageSize } = this.state
     return (
       <div id='exchangecodelist'>
@@ -777,7 +801,11 @@ export default class acclist extends React.Component {
                   }
                   return str
                 }
-
+                if(com=='usage'){
+                  return  <Pop trigger="hover" content={popDom(rowData)}>
+                             <span className='grid-link'>{rowData.usage}</span>
+                          </Pop>
+                }
                 if (com == 'switch') {
                   return (
                     <Switch