From 471f740979e2c9a0ab49ace461787a1b028684d6 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Wed, 23 Aug 2023 09:56:01 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B5=E9=9D=A2=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/api/uniapp/TempController.java    |  2 +-
 .../src/views/order/order/orderDetail.vue     | 28 -------------------
 jsowell-ui/src/views/pile/firmware/index.vue  |  2 +-
 jsowell-ui/src/views/pile/merchant/index.vue  |  1 +
 jsowell-ui/src/views/pile/model/index.vue     |  1 +
 5 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
index 6d749debc..61941ea62 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
@@ -212,7 +212,7 @@ public class TempController extends BaseController {
 
     /**
      * 临时 余额支付分账
-     * http://localhost:8080/temp/doBalancePaymentTemp
+     * https://api.jsowellcloud.com/temp/doBalancePaymentTemp
      * @param dto
      * @return
      */
diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index 8b5433523..8d365bcd6 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -94,34 +94,6 @@
       <div class="marginTop"></div>
     </el-card>
 
-    <!--  收费明细  -->
-    <!--    <el-card class="cardStyle">
-          <h3>收费明细</h3>
-          <el-table style="width: 100%" :data="orderDetail" border>
-            <el-table-column prop="totalUsedElectricity" label="总用电量" align="center"/>
-            <el-table-column prop="totalOrderAmount" label="订单总金额" align="center"/>
-            <el-table-column prop="totalElectricityAmount" label="电费总金额" align="center"/>
-            <el-table-column prop="totalServiceAmount" label="服务费总金额" align="center"/>
-
-            <el-table-column prop="sharpUsedElectricity" label="尖时段用电量" align="center"/>
-            <el-table-column prop="sharpElectricityPrice" label="尖时段电费单价" align="center"/>
-            <el-table-column prop="sharpServicePrice" label="尖时段服务费单价" align="center"/>
-
-            <el-table-column prop="peakUsedElectricity" label="峰时段用电量" align="center"/>
-            <el-table-column prop="peakElectricityPrice" label="峰时段电费单价" align="center"/>
-            <el-table-column prop="peakServicePrice" label="峰时段服务费单价" align="center"/>
-
-            <el-table-column prop="flatUsedElectricity" label="平时段用电量" align="center"/>
-            <el-table-column prop="flatElectricityPrice" label="平时段电费单价" align="center"/>
-            <el-table-column prop="flatServicePrice" label="平时段服务费单价" align="center"/>
-
-            <el-table-column prop="valleyUsedElectricity" label="谷时段用电量" align="center"/>
-            <el-table-column prop="valleyElectricityPrice" label="谷时段电费单价" align="center"/>
-            <el-table-column prop="valleyServicePrice" label="谷时段服务费单价" align="center"/>
-          </el-table>
-          <div class="marginTop"></div>
-        </el-card>-->
-
     <el-card class="cardStyle">
       <h3>收费明细</h3>
       <el-table :data="tableData" border show-summary :summary-method="getSummaries">
diff --git a/jsowell-ui/src/views/pile/firmware/index.vue b/jsowell-ui/src/views/pile/firmware/index.vue
index 9d70033df..e910380bf 100644
--- a/jsowell-ui/src/views/pile/firmware/index.vue
+++ b/jsowell-ui/src/views/pile/firmware/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
             <el-form-item label="固件名称" prop="name">
                 <el-input
                     v-model="queryParams.name"
diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue
index 9c186dd59..335b54a08 100644
--- a/jsowell-ui/src/views/pile/merchant/index.vue
+++ b/jsowell-ui/src/views/pile/merchant/index.vue
@@ -7,6 +7,7 @@
             :inline="true"
             v-show="showSearch"
             label-width="110px"
+            @submit.native.prevent
         >
             <el-form-item label="运营商名称" prop="merchantName">
                 <el-input
diff --git a/jsowell-ui/src/views/pile/model/index.vue b/jsowell-ui/src/views/pile/model/index.vue
index 678405c92..d1c47dc70 100644
--- a/jsowell-ui/src/views/pile/model/index.vue
+++ b/jsowell-ui/src/views/pile/model/index.vue
@@ -7,6 +7,7 @@
       size="small"
       :inline="true"
       label-width="68px"
+      @submit.native.prevent
     >
       <el-form-item label="型号名称" prop="modelName">
         <el-input