修改bug

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

@@ -192,37 +192,36 @@
       <div class="marginTop"></div>
     </el-card>
     <!-- 实时订单数据 -->
+
     <el-card class="cardStyle">
       <h3>实时订单数据</h3>
-      <el-table style="width: 100%" :data="orderRealTimeInfo" border>
+      <el-descriptions
-        <el-table-column prop="time" label="时间" align="center" />
+        direction="vertical"
-        <el-table-column
+        :column="5"
-          prop="orderAmount"
+        border
-          label="消费金额"
+        :contentStyle="CS"
-          align="center"
+        :label-style="LS"
-          width="280"
+      >
-        >
+        <el-descriptions-item label="时间">{{
-          <template slot-scope="scope">
+          orderRealTimeInfo.time
-            <span
+        }}</el-descriptions-item>
-              >￥{{
+        <el-descriptions-item label="消费金额">{{
-                scope.row.orderAmount === "0.0000" ? "0" : scope.row.orderAmount
+          orderRealTimeInfo.orderAmount === "0.0000"
-              }}
+            ? "0"
-            </span>
+            : orderRealTimeInfo.orderAmount
-          </template>
+        }}</el-descriptions-item>
-        </el-table-column>
+        <el-descriptions-item label="充电度数">{{
-
+          orderRealTimeInfo.chargedDegree === "0.0000"
-        <el-table-column prop="chargedDegree" label="充电度数" align="center">
+            ? "0"
-          <template slot-scope="scope">
+            : orderRealTimeInfo.chargedDegree
-            <span>{{
+        }}</el-descriptions-item>
-              scope.row.chargedDegree === "0.0000"
+        <el-descriptions-item label="充电时长">{{
-                ? "0"
+          orderRealTimeInfo.chargingTime
-                : scope.row.chargedDegree
+        }}</el-descriptions-item>
-            }}</span>
+        <el-descriptions-item label="当前soc">{{
-          </template>
+          orderRealTimeInfo.soc
-        </el-table-column>
+        }}</el-descriptions-item>
-        <el-table-column prop="chargingTime" label="充电时长" align="center" />
+      </el-descriptions>
-        <el-table-column prop="soc" label="当前soc" align="center" />
-      </el-table>
       <div class="marginTop"></div>
     </el-card>
     <!-- 支付信息 -->
@@ -480,21 +479,20 @@ export default {
     },
     async getOrderDetail() {
       const { data } = await getOrder(this.orderCode);
-
+      console.log("getOrder", data);
-      // console.log("getOrder", data);
       this.obj = data;
       this.orderInfo = data.orderInfo;
-      this.payDetail = data.payRecordList;
+      this.payDetail = data.payRecordList; // 数组
-      this.orderRefundInfoList = data.orderRefundInfoList;
+      this.orderRefundInfoList = data.orderRefundInfoList; // 数组
       this.userInfo = [data.memberInfo];
       // console.log("this.userInfo", this.userInfo);
       this.pileIn = [data.pileInfo];
       // console.log("this.pileIn", this.pileIn);
       this.orderRealTimeInfo = data.orderRealTimeInfo;
       this.orderDetail = [data.billingDetails];
-      this.tableData = data.chargeDetails;
+      this.tableData = data.chargeDetails; // array
       this.lastMonitorData = data.lastMonitorData;
-
+      console.log("orderInfo.orderStatus", this.orderInfo.orderStatus);
       // 是否显示重试退款按钮
       // if (data.orderInfo.orderStatus === '6' && data.payRecordList[0].payMode === '4' && data.orderRefundInfoList.length === 0) {
       //   this.retryRefundFlag = true;
@@ -510,7 +508,7 @@ export default {
       if (this.orderInfo == null || this.orderInfo.orderStatus !== "6") {
         return false;
       }
-      if (this.payDetail[0] == null || this.payDetail.payMode[0] !== "4") {
+      if (this.payDetail[0] == null || this.payDetail[0].payMode !== "4") {
         return false;
       }
       if (