From c0d643db47c0281b30e83a41456109c0f1ba9bcc Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Wed, 13 Nov 2024 14:03:57 +0800
Subject: [PATCH] 11.13

---
 fuintAdmin/src/views/shopowner.vue            |  3 +++
 .../src/views/homeComponents/agent.vue        |  2 --
 fuintAdmin_zt/src/views/setting/app/index.vue | 26 +++----------------
 .../src/views/setting/banner/index.vue        |  2 +-
 fuintAdmin_zt/src/views/setting/pay/index.vue |  2 +-
 .../controller/AllOrderInfoController.java    |  2 +-
 6 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/fuintAdmin/src/views/shopowner.vue b/fuintAdmin/src/views/shopowner.vue
index ee80cc4de..0d400467c 100644
--- a/fuintAdmin/src/views/shopowner.vue
+++ b/fuintAdmin/src/views/shopowner.vue
@@ -386,6 +386,7 @@ export default
   },
   methods: {
     sjkbStoreAmount(e) {
+      this.dataTimeShow = false
       console.log(e)
       this.sjkbTitle = e
       let command = e
@@ -421,6 +422,7 @@ export default
       this.$router.push('/notificationList/index')
     },
     editShow(e) {
+      this.showTimeShow = false
       this.disabled = true
       console.log(e)
       this.ypjyTitle = e
@@ -457,6 +459,7 @@ export default
       this.getDataShow()
     },
     editCount(e) {
+      this.countTimeShow = false
       this.disabled = true
       this.sjtjTitle = e
       console.log("e", e)
diff --git a/fuintAdmin_zt/src/views/homeComponents/agent.vue b/fuintAdmin_zt/src/views/homeComponents/agent.vue
index 211068985..1d4bae9c6 100644
--- a/fuintAdmin_zt/src/views/homeComponents/agent.vue
+++ b/fuintAdmin_zt/src/views/homeComponents/agent.vue
@@ -3,8 +3,6 @@
     <el-carousel height="230px">
       <el-carousel-item v-for="(item,index) in bannerList" :key="index">
         <div class="bannser">
-
-          <!--          <img src="../../assets/images/banner.png" alt="" >-->
           <img :src="imagePath+item.productImage" alt="" >
         </div>
       </el-carousel-item>
diff --git a/fuintAdmin_zt/src/views/setting/app/index.vue b/fuintAdmin_zt/src/views/setting/app/index.vue
index fdef2387e..147bb115e 100644
--- a/fuintAdmin_zt/src/views/setting/app/index.vue
+++ b/fuintAdmin_zt/src/views/setting/app/index.vue
@@ -3,18 +3,15 @@
     <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="legalRepresentativeContact">
-
           <el-select
             v-model="queryParams.orgId"
             clearable
             placeholder="所属机构"
-
           >
             <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
             </el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item label="" prop="legalRepresentativeContact">
           <el-input
             v-model="queryParams.legalRepresentativeContact"
@@ -25,7 +22,6 @@
           />
         </el-form-item>
         <el-form-item label="" prop="legalRepresentativeContact">
-
           <el-select v-model="queryParams.appStatus" placeholder="请选择小程序状态">
             <el-option label="停用" value="0" ></el-option>
             <el-option label="启用" value="1" ></el-option>
@@ -41,12 +37,7 @@
           >新增小程序配置</el-button>
         </el-form-item>
       </el-form>
-      <!--    </el-card>-->
-
-      <!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
-      <!--    <el-card style="margin-top: 20px" >-->
-      <div style="height: 70vh;overflow: auto">
-
+      <div style="height: 73vh;overflow: auto">
       <el-table :data="tableData" style="width: 100%" border>
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column prop="orgName" label="机构名称"></el-table-column>
@@ -97,18 +88,8 @@
       />
 
     </div>
-
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
-      <!--      <el-form ref="form" :model="deviceInfo" label-width="80px">-->
       <el-form :model="deviceInfo" ref="deviceForm" label-width="140px" :rules="rule">
-        <!--          <el-form-item label="机构名称" prop="orgName">-->
-        <!--            <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>-->
-        <!--          </el-form-item>-->
-
-        <!--          <el-form-item label="机构名称" prop="orgName">-->
-        <!--            <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>-->
-        <!--          </el-form-item>-->
-        <!--          -->
         <el-form-item label="机构名称" prop="orgId" style="margin-left: -20px;">
           <el-select
             v-model="deviceInfo.orgId"
@@ -119,7 +100,6 @@
             <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName"  :value="item.deptId">
             </el-option>
           </el-select>
-
         </el-form-item>
         <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode" style="margin-left: -20px;">
           <el-input v-model="deviceInfo.unifiedSocialCreditCode" style="width: 100%;" placeholder="请输入统一社会信用代码"></el-input>
@@ -361,7 +341,9 @@ export default {
   line-height: 60px;
 }
 .app-container{
-
+  box-sizing: border-box;
+  padding: 10px;
+  padding-bottom: 0px;
 }
 </style>
 
diff --git a/fuintAdmin_zt/src/views/setting/banner/index.vue b/fuintAdmin_zt/src/views/setting/banner/index.vue
index fae5ff097..5f85eed2f 100644
--- a/fuintAdmin_zt/src/views/setting/banner/index.vue
+++ b/fuintAdmin_zt/src/views/setting/banner/index.vue
@@ -29,7 +29,7 @@
           </el-button>
         </el-form-item>
       </el-form>
-      <div style="height: 74vh;overflow: auto">
+      <div style="height: 73vh;overflow: auto">
         <el-table :data="tableData" style="width: 100%;" border>
           <el-table-column type="index" label="序号"></el-table-column>
           <el-table-column prop="bannerName" label="banner名称"></el-table-column>
diff --git a/fuintAdmin_zt/src/views/setting/pay/index.vue b/fuintAdmin_zt/src/views/setting/pay/index.vue
index 5f85ba04d..4b22eafaf 100644
--- a/fuintAdmin_zt/src/views/setting/pay/index.vue
+++ b/fuintAdmin_zt/src/views/setting/pay/index.vue
@@ -61,7 +61,7 @@
 
 <!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
 <!--    <el-card style="margin-top: 20px" >-->
-      <div style="height: 70vh;overflow: auto">
+      <div style="height: 71vh;overflow: auto">
       <el-table :data="tableData" style="width: 100%">
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column prop="deptName" label="机构名称"></el-table-column>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
index f06862263..32ec2d3fa 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
@@ -519,7 +519,7 @@ public class AllOrderInfoController extends BaseController {
         this.allOrderInfoService.exportExcelBackOrderMsgsApi(response, allOrderInfoRes);
     }
 
-`
+
     /**
      * 交易对账
      * 交易明细分页查询