From 7dd71e63515e76bd487582deb9bedb5a03eca8b5 Mon Sep 17 00:00:00 2001
From: JS-LM <2497833386@QQ.com>
Date: Fri, 2 Jun 2023 14:17:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=95=86=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/order/order/index.vue    | 3 +--
 jsowell-ui/src/views/pile/merchant/detail.vue | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index 0f01c27a0..578fdadaf 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -154,8 +154,7 @@
       <div>开始时间：{{item.chargeStartTime || '一'}}</div>
      </div>
       <div style="display:flex;padding:10px">
-        <el-descriptions :title="item.nickName" :colum="3" style="width:80%">
-  <span>{{item.mobileNumber}}</span>
+        <el-descriptions :title="`${item.nickName || '---'}（${item.mobileNumber || '---'}）`" :colum="3" style="width:80%">
     <el-descriptions-item label="交易流水号">{{item.transactionCode || '一'}}</el-descriptions-item>
     <el-descriptions-item label="站点">{{item.stationName || '一'}}</el-descriptions-item>
     <el-descriptions-item label="充电桩枪口号">{{item.pileConnectorCode || '一'}}</el-descriptions-item>
diff --git a/jsowell-ui/src/views/pile/merchant/detail.vue b/jsowell-ui/src/views/pile/merchant/detail.vue
index 8fb7a08e0..ba144bfc6 100644
--- a/jsowell-ui/src/views/pile/merchant/detail.vue
+++ b/jsowell-ui/src/views/pile/merchant/detail.vue
@@ -1,10 +1,14 @@
 <template>
-   <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+
+    <div class="app-container">
+  <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
     <el-tab-pane label="用户管理" name="first">用户管理</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="fourth">定时任务补偿</el-tab-pane>
   </el-tabs>
+    </div>
+ 
 </template>
 
 <script>