From 240532388fdc1a46b5d7f0b107bff68c7e6f36e4 Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Fri, 26 Nov 2021 20:47:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/subnav/main.less               |  8 +++++---
 src/pages/exchangecode/commodity/commodity.js | 14 +++++++++++---
 src/pages/home/home.js                        |  2 +-
 src/pages/home/home.less                      |  7 +++++++
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/components/subnav/main.less b/src/components/subnav/main.less
index cc778a03..d7a3f86d 100644
--- a/src/components/subnav/main.less
+++ b/src/components/subnav/main.less
@@ -3,21 +3,23 @@
   height: 60px;
   min-width: 300px;
   display: flex;
+  line-height: 60px;
   box-sizing: border-box;
 }
 .nava a{
   display: flex;
   color: #333;
+  padding: 0 18px;
   text-decoration: none;
-  margin-right: 10px;
+  // margin-right: 10px;
   font-size: 16px;
   align-items: center;
   justify-content: center;
-  width: 110px;
+  // width: 110px;
   text-align: center;
   box-sizing: border-box;
   &:hover{
-    width: 110px;
+    // width: 110px;
     background: #f2f4f7;
     color: #296bef;
   }
diff --git a/src/pages/exchangecode/commodity/commodity.js b/src/pages/exchangecode/commodity/commodity.js
index aa1bab74..f67506b0 100644
--- a/src/pages/exchangecode/commodity/commodity.js
+++ b/src/pages/exchangecode/commodity/commodity.js
@@ -75,7 +75,9 @@ export default class commoditylist extends React.Component{
       filterList:[{id:0,label:"商品类型",menuList:[{id:2,name:"卡密"},{id:1,name:"直充"}]},
 			],
       menuList:[{id:0,name:"商品类型",check:false}],
-	  drawerVisible:false
+    drawerVisible:false,
+    contractprice:0,
+    totalprice:0,
     }
   }
   //分页
@@ -133,7 +135,13 @@ export default class commoditylist extends React.Component{
   }
   selection(selection){
     this.setState({selectiondata:selection});
-
+    let contractprice=0;
+    let totalprice=0;
+    selection.forEach(item=>{
+      contractprice+=Number(item.official_price);
+      totalprice+=Number(item.contract_price);
+    });
+    this.setState({contractprice,totalprice});
     }
     batchdelFn(){
       if(this.state.selectiondata<1){
@@ -253,7 +261,7 @@ export default class commoditylist extends React.Component{
       type="info"
       extraContent={<Button type="primary">清空</Button>}
     >
-      已选择<font color="#296bef" style={{fontWeight:'bold'}}>{this.state.selectiondata.length}</font>项，库存金额30.00万，库存数总计：36.4万
+      已选择<font color="#296bef" style={{fontWeight:'bold'}}>{this.state.selectiondata.length}</font>项，官方价格总计:{this.state.contractprice.toFixed(4)}，合同价总计：{this.state.totalprice.toFixed(4)}
         </Alert>):null
         }
         <div className="code-table">
diff --git a/src/pages/home/home.js b/src/pages/home/home.js
index 68e9b4fe..2f954ecc 100644
--- a/src/pages/home/home.js
+++ b/src/pages/home/home.js
@@ -275,7 +275,7 @@ export default class App extends Component {
                    </div>
                  </div>}>
                  {/*  */}
-                 {this.state.userInfo.user_name}！&nbsp;<Icon type="down" className="exitIcon" />
+                <div className="nameItem">{this.state.userInfo.user_name}&nbsp;<Icon type="down" className="exitIcon" /></div>
                 </Pop>
               </div>   
               <aside className="mainbody" >
diff --git a/src/pages/home/home.less b/src/pages/home/home.less
index 4a58d299..ba083f17 100644
--- a/src/pages/home/home.less
+++ b/src/pages/home/home.less
@@ -82,6 +82,7 @@
 .exit-userInfo{
   line-height: 1.5rem;
   color: #333;
+
   font-size: 14px;
   margin-left: 15px;
 }
@@ -108,4 +109,10 @@
   border-radius: 12px!important;
 
   background: transparent!important;
+}
+.nameItem{
+  height: 100%;
+  display: flex;
+  align-items: center;
+  font-weight: bold;
 }
\ No newline at end of file