From e7c25d67ca26110adfc95a8c355ec93e5af799dc Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Fri, 30 Nov 2018 11:38:40 +0800
Subject: [PATCH] 总计

---
 src/assets/img/totalbg.svg | 14 ++++++++++++++
 src/components/total.vue   | 37 +++++++++++++++++++++++++++++++------
 src/styles/reset.css       |  1 -
 3 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 src/assets/img/totalbg.svg

diff --git a/src/assets/img/totalbg.svg b/src/assets/img/totalbg.svg
new file mode 100644
index 0000000..7065038
--- /dev/null
+++ b/src/assets/img/totalbg.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20 29" style="enable-background:new 0 0 20 29;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#XMLID_44_);}
+</style>
+<linearGradient id="XMLID_44_" gradientUnits="userSpaceOnUse" x1="10" y1="1.028133e-05" x2="10" y2="29">
+	<stop  offset="0" style="stop-color:#574DFE"/>
+	<stop  offset="1" style="stop-color:#4BD3FF"/>
+</linearGradient>
+<path id="XMLID_2_" class="st0" d="M18,29H2c-1.1,0-2-0.9-2-2v-9.5L2.5,15h14.9l2.5,2.5V27C20,28.1,19.1,29,18,29z M2.5,14L0,11.5V2
+	c0-1.1,0.9-2,2-2h16c1.1,0,2,0.9,2,2v9.5L17.5,14H2.5z"/>
+</svg>
diff --git a/src/components/total.vue b/src/components/total.vue
index 950a12b..f0c994f 100644
--- a/src/components/total.vue
+++ b/src/components/total.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="totalwrap">
-    总计
-    <span v-for="item in this.$util.formatNumArr(totalNum)" :class="item !== ',' ? 'titlebg' : '' ">{{item}}</span>
+    <p>
+      <span class="totalbgname">总计</span>
+      <span v-for="item in this.$util.formatNumArr(totalNum)" :class="item !== ',' ? 'totalbg' : 'totalnobg' ">{{item}}</span>
+    </p>
+
   </div>
 </template>
 
@@ -23,11 +26,33 @@ export default {
 
 <style scoped>
   .totalwrap {
-    height: 40px;
+    height: 72px;
+    padding: 23px 0  23px 23px;
+    box-sizing: border-box;
     color: #fff;
+    font-size:14px;
+    font-weight:500;
   }
-
-  .titlebg {
-    background: #f00;
+  .totalwrap p{
+    height: 29px;
+    line-height: 29px;
+  }
+  .totalbgname{
+    padding-right: 10px;
+  }
+  .totalbg {
+    width: 20px;
+    height: 29px;
+    margin-right: 3px;
+    display: inline-block;
+    text-align: center;
+    line-height: 29px;
+    font-size: 22px;
+    background: url("../assets/img/totalbg.svg") no-repeat;
+  }
+  .totalnobg{
+    display: inline-block;
+    margin-right: 3px;
+    font-size: 22px;
   }
 </style>
diff --git a/src/styles/reset.css b/src/styles/reset.css
index 24cd767..c758456 100644
--- a/src/styles/reset.css
+++ b/src/styles/reset.css
@@ -45,7 +45,6 @@ html, body {
   background: url("../assets/img/bg.jpg") no-repeat;
   background-size: 100% 100%;
   overflow: hidden;
-  /*box-sizing: border-box;*/
 }
 
 ol, ul {
--
libgit2 0.21.4