diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index a0104db..eabbfc9 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -87,14 +87,25 @@
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="订单id" align="center" prop="orderId" />-->
       <el-table-column label="区域" align="center" prop="area" />
-      <el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
-      <el-table-column label="用户" align="center" width="100">
+      <el-table-column label="订单信息" align="center" width="150">
         <template slot-scope="scope">
-          <router-link :to="'/user/user/userName/index/' + scope.row.userName" class="link-type">
-            <span>{{ scope.row.userName }}</span>
-          </router-link>
+          <div>
+            <span>{{ scope.row.orderNo }}</span> <!-- 显示订单号 -->
+            <br> <!-- 换行 -->
+            <router-link :to="'/user/user/userName/index/' + scope.row.userName" class="link-type">
+              <span>{{ scope.row.userName }}</span> <!-- 显示用户名 -->
+            </router-link>
+          </div>
         </template>
       </el-table-column>
+<!--      <el-table-column label="订单号" align="center" prop="orderNo" width="120"/>-->
+<!--      <el-table-column label="用户" align="center" width="100">-->
+<!--        <template slot-scope="scope">-->
+<!--          <router-link :to="'/user/user/userName/index/' + scope.row.userName" class="link-type">-->
+<!--            <span>{{ scope.row.userName }}</span>-->
+<!--          </router-link>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="设备信息" align="center" width="120">
         <template slot-scope="scope">
           <div>
@@ -122,46 +133,62 @@
 <!--          </router-link>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.et_order_status" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间/开始骑行" align="center" width="135">
+      <el-table-column label="状态/支付方式" align="center" width="150">
         <template slot-scope="scope">
           <div>
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span><br />
-            <span>{{ parseTime(scope.row.unlockTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            <dict-tag :options="dict.type.et_order_status" :value="scope.row.status" /> <!-- 显示状态 -->
+            <dict-tag :options="dict.type.et_pay_type" :value="scope.row.payType" /> <!-- 显示支付方式 -->
           </div>
         </template>
       </el-table-column>
-      <!--      <el-table-column label="创建时间" align="center" prop="createTime" width="90">-->
+      <el-table-column label="时间详情" header-align="center" align="left" width="200">
+        <template slot-scope="scope">
+          <div>
+            <span>创建时间：{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span><br />
+            <span>开始骑行：{{ parseTime(scope.row.unlockTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span><br />
+            <span>结束骑行：{{ parseTime(scope.row.returnTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span><br />
+            <span>支付时间：{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </div>
+        </template>
+      </el-table-column>
+
+      <!--      <el-table-column label="创建时间/开始骑行" align="center" width="135">-->
 <!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!--          <div>-->
+<!--            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span><br />-->
+<!--            <span>{{ parseTime(scope.row.unlockTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!--          </div>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-<!--      <el-table-column label="开始骑行" align="center" prop="unlockTime" width="90">-->
+<!--      <el-table-column label="结束骑行" align="center" prop="returnTime" width="90">-->
 <!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.unlockTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!--          <span>{{ parseTime(scope.row.returnTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="结束骑行" align="center" prop="returnTime" width="90">
+<!--      <el-table-column label="支付时间" align="center" prop="payTime" width="90">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="支付方式" align="center" prop="payType" width="80">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.et_pay_type" :value="scope.row.payType"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="金额(元)" align="center" prop="totalFee" width="70"/>-->
+      <el-table-column label="费用详情" header-align="center" align="left" width="200">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.returnTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <div>
+            <span style="font-weight: bold;color: red">总：{{ formatFee(scope.row.totalFee) }}</span><br />
+            <span>预约费：{{ formatFee(scope.row.appointmentFee) }}</span><br />
+            <span>骑行费：{{ formatFee(scope.row.ridingFee) }}</span><br />
+            <span>运营区外调度费：{{ formatFee(scope.row.dispatchFee) }}</span><br />
+            <span>停车点外调度费：{{ formatFee(scope.row.manageFee) }}</span>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column label="支付时间" align="center" prop="payTime" width="90">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="支付方式" align="center" prop="payType" width="80">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.et_pay_type" :value="scope.row.payType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="金额(元)" align="center" prop="totalFee" width="70"/>
-<!--      <el-table-column label="备注" align="center" prop="mark" />-->
+
+      <!--      <el-table-column label="备注" align="center" prop="mark" />-->
 <!--      <el-table-column label="交易金额" align="center" prop="amount" :formatter="formatAmount"/>-->
       <el-table-column label="手续费" align="center" prop="handlingCharge" :formatter="formatAmount"/>
       <el-table-column label="成本" align="center" prop="handlingCharge" :formatter="formatAmount"/>