diff --git a/jsowell-ui/src/views/homeIndex/homeIndex.vue b/jsowell-ui/src/views/homeIndex/homeIndex.vue index 727de2b61..0edfe8916 100644 --- a/jsowell-ui/src/views/homeIndex/homeIndex.vue +++ b/jsowell-ui/src/views/homeIndex/homeIndex.vue @@ -4,68 +4,62 @@
-
总充电电量(度)
-
- {{ generalSituation.totalChargingDegree }} - + /> +
+ {{ generalSituation.totalChargingDegree }} +
总充电电量(度)
+
-
-
总充电费用(元)
-
- {{ generalSituation.totalChargingAmount}} - - -
-
+ +
+ {{ generalSituation.totalChargingAmount}} +
总充电费用(元)
+
+
-
总充电订单数(笔)
-
+ +
{{ generalSituation.totalChargingQuantity}} - -
-
+
总充电订单数(笔)
+
+
-
总充电设备数量(座)
-
+ +
{{ generalSituation.totalPileQuantity }} - +
总充电设备数量(座)
+
-
-
总客户余额(元)
-
- {{ generalSituation.totalMemberAmount }} - - +
+ {{ generalSituation.totalMemberAmount }} +
总客户余额(元)
+
+
-
- + @@ -360,16 +354,26 @@ export default { }; - diff --git a/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue b/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue index 3763edf1a..e5a3eaed0 100644 --- a/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue +++ b/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue @@ -1,57 +1,36 @@ @@ -150,10 +151,18 @@ export default { //图标,可根据自己的需求匹配 icon: "el-icon-caret-bottom", createTimeRange:'', - adapayMember:{} + adapayMember:{}, + dialogVisible: false }; }, methods: { + handleClose(done) { + this.$confirm('确认关闭?') + .then(_ => { + done(); + }) + .catch(_ => {}); + }, handleClick(tab, event) { console.log(tab, event); }, @@ -193,10 +202,25 @@ export default { .center{ text-align: center; } +.text{ + font-size: 12px; + color: red; +} .main { display: flex; justify-content: space-between; - align-items: baseline; + // align-items: baseline; + .main-right{ + width: 310px; + margin-right: 20px; + border: 1px solid #e6ebf5; + border-radius: 10px; + padding: 10px; + transition: all .2s linear; + } +} +.main-right:hover{ + box-shadow: 0 0 5px 3px #999; } .bord { position: relative;