Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-ui/src/views/homeIndex/homeIndex.vue

@@ -8,9 +8,8 @@
             :src="require('@/assets/images/lightning.png')"
            />
         <div class="flex1">
-          <b class="box-h1">{{ generalSituation.totalChargingDegree }}</b>
+          <b class="box-h1">{{ generalSituation.totalChargingDegree}}</b>
           <div>总充电电量(度)</div>
-          <div class="progress" />
         </div>
       </div>
       <div class="box">
@@ -19,7 +18,6 @@
           <div class="flex1">
             <b class="box-h1">{{ generalSituation.totalChargingAmount}}</b>
             <div>总充电费用(元)</div>
-            <div class="progress" />
           </div>
       </div>
       <div class="box">
@@ -29,7 +27,6 @@
         <div class="flex1">
           <b class="box-h1">{{ generalSituation.totalChargingQuantity}}</b>
           <div>总充电订单数(笔)</div>
-          <div class="progress" />
         </div>    
       </div>
       <div class="box">
@@ -39,7 +36,6 @@
         <div class="flex1">
           <b class="box-h1">{{ generalSituation.totalPileQuantity }}</b>
           <div>总充电设备数量(座)</div>
-          <div class="progress" />
         </div>
       </div>
       <div class="box"  v-hasRole="['admin', 'common']">
@@ -50,7 +46,6 @@
         <div class="flex1">
           <b class="box-h1">{{ generalSituation.totalMemberAmount }}</b>
           <div>总客户余额(元)</div>
-          <div class="progress" />
         </div>  
         </div>
 <!--      <div class="box">-->
@@ -366,9 +361,15 @@ export default {
   box-shadow: 0 15px 10px -11px #1ab394;
   margin-right: 24px;
   margin-bottom: 20px;
+  position: relative;
   .box-image{
     width: 60px;
      height: 60px;
+    // background-size: 100% 100%;
+    // position: absolute;
+    // right: 0;
+    // bottom: 0;
+    // filter: drop-shadow(40px 0px gray);
   }
   .flex1{
     flex: 1;

jsowell-ui/src/views/pile/merchant/components/adapayMember.vue

@@ -18,18 +18,18 @@
         </el-card>
         <template  v-else>
               <el-card class="box-card" shadow="hover" style="margin-bottom: 10px">
-            <h2>汇付会员</h2>
+            <h2>会员信息</h2>
             <hr>
-            <el-descriptions :column="2" >
-                <el-descriptions-item label="会员昵称">{{
+            <el-descriptions>
+                <!-- <el-descriptions-item label="会员昵称">{{
                     dialogForm.nickname
-                }}</el-descriptions-item>
+                }}</el-descriptions-item> -->
                 <el-descriptions-item label="会员邮箱">{{
                     dialogForm.email
                 }}</el-descriptions-item>
-                <el-descriptions-item label="会员性别">{{
+                <!-- <el-descriptions-item label="会员性别">{{
                     dialogForm.gender === "FEMALE" ? "女" : "男"
-                }}</el-descriptions-item>
+                }}</el-descriptions-item> -->
                 <el-descriptions-item label="公司地址">{{
                     dialogForm.location
                 }}</el-descriptions-item>
@@ -37,7 +37,7 @@
         </el-card>
         <el-card class="box-card" shadow="hover" style="margin:20px 0">
             <!-- <div style="margin: 12px 0">汇付结算账户</div> -->
-            <h2>汇付结算账户</h2>
+            <h2>结算账户</h2>
             <hr>
               <el-descriptions :column="2" v-for="(item,index) in settleAccountList" :key="index">
                 <el-descriptions-item label="银行账户类型">{{ item.bankAcctType === '1'? '对公':'对私'}}</el-descriptions-item>

jsowell-ui/src/views/pile/merchant/components/revenue.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="app-container">
          <h2>营收总报</h2>
-     <el-card shadow="hover" style="margin-bottom:10px;padding:10px">
-        <el-descriptions >
+     <el-card shadow="hover" style="margin-bottom:10px;padding:10px" >
+        <el-descriptions v-if="merchantOrderReport !== null">
     <el-descriptions-item label="用电度数">{{merchantOrderReport.useElectricity}}度</el-descriptions-item>
     <el-descriptions-item label="充电次数">{{merchantOrderReport.chargeNum}}次</el-descriptions-item>
     <el-descriptions-item label="充电时长">{{merchantOrderReport.chargeTime}}分钟</el-descriptions-item>
@@ -13,6 +13,7 @@
     <el-descriptions-item label="交易手续费">{{merchantOrderReport.tradeFee}}元</el-descriptions-item>
     <el-descriptions-item label="虚拟金额">{{merchantOrderReport.virtualAmount}}元</el-descriptions-item>
 </el-descriptions>
+        <h3 v-else>暂无数据</h3>
      </el-card>
         <h2>营收日报</h2>
         <el-form
@@ -141,6 +142,7 @@ export default {
                     this.total = response.data.pageResponse.total
                    } else{
                     this.reportList =[]
+                    this.merchantOrderReport= null
                    }
                 }
             );

jsowell-ui/src/views/pile/merchant/detail.vue

@@ -2,10 +2,10 @@
 
     <div class="app-container">
   <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
-    <el-tab-pane label="汇付支付配置" name="first">
+    <el-tab-pane label="支付设置" name="first">
       <adapay-member :merchantId="merchantId"></adapay-member>
     </el-tab-pane>
-    <el-tab-pane label="配置管理" name="second">配置管理</el-tab-pane>
+    <!-- <el-tab-pane label="配置管理" name="second">配置管理</el-tab-pane> -->
 <!--    <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>-->
     <el-tab-pane label="钱包汇总" name="wallet">
       <wallet-summary :merchantId="merchantId"></wallet-summary>