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

# Conflicts:
#	jsowell-ui/src/views/order/order/orderDetail.vue

jsowell-ui/src/views/order/order/orderDetail.vue

@@ -194,33 +194,35 @@
     <!-- 实时订单数据 -->
     <el-card class="cardStyle">
       <h3>实时订单数据</h3>
-      <el-descriptions
-        direction="vertical"
-        :column="5"
-        border
-        :contentStyle="CS"
-        :label-style="LS"
-      >
-        <el-descriptions-item label="时间">{{
-          orderRealTimeInfo.time
-        }}</el-descriptions-item>
-        <el-descriptions-item label="消费金额">{{
-          orderRealTimeInfo.orderAmount === "0.0000"
-            ? "0"
-            : orderRealTimeInfo.orderAmount
-        }}</el-descriptions-item>
-        <el-descriptions-item label="充电度数">{{
-          orderRealTimeInfo.chargedDegree === "0.0000"
-            ? "0"
-            : orderRealTimeInfo.chargedDegree
-        }}</el-descriptions-item>
-        <el-descriptions-item label="充电时长">{{
-          orderRealTimeInfo.chargingTime
-        }}</el-descriptions-item>
-        <el-descriptions-item label="当前soc">{{
-          orderRealTimeInfo.soc
-        }}</el-descriptions-item>
-      </el-descriptions>
+      <el-table style="width: 100%" :data="orderRealTimeInfo" border>
+        <el-table-column prop="time" label="时间" align="center" />
+        <el-table-column
+          prop="orderAmount"
+          label="消费金额"
+          align="center"
+          width="280"
+        >
+          <template slot-scope="scope">
+            <span
+              >￥{{
+                scope.row.orderAmount === "0.0000" ? "0" : scope.row.orderAmount
+              }}
+            </span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="chargedDegree" label="充电度数" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.chargedDegree === "0.0000"
+                ? "0"
+                : scope.row.chargedDegree
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="chargingTime" label="充电时长" align="center" />
+        <el-table-column prop="soc" label="当前soc" align="center" />
+      </el-table>
       <div class="marginTop"></div>
     </el-card>
     <!-- 支付信息 -->