From 1fae241ccb5ba6f31fa617b4c4d703c270cc6e07 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Tue, 2 Aug 2022 11:48:41 +0800
Subject: [PATCH] wip

---
 .../views/pages/admin_roles/edit.blade.php    | 13 ++++----
 .../admin/views/pages/orders/form.blade.php   | 30 +++++++++++--------
 themes/default/account/order_info.blade.php   | 14 +++++++++
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/resources/beike/admin/views/pages/admin_roles/edit.blade.php b/resources/beike/admin/views/pages/admin_roles/edit.blade.php
index ac6b9009..f4df28d5 100644
--- a/resources/beike/admin/views/pages/admin_roles/edit.blade.php
+++ b/resources/beike/admin/views/pages/admin_roles/edit.blade.php
@@ -5,13 +5,13 @@
 @section('content')
   <div id="app" class="card" v-cloak>
     <div class="card-body h-min-600">
-      <el-form ref="form" :rules="rules" :model="form" label-width="100px" class="w-max-700">
+      <el-form ref="form" :rules="rules" :model="form" label-width="100px">
         <el-form-item label="角色名称" prop="name">
-          <el-input v-model="form.name" placeholder="角色名称"></el-input>
+          <el-input v-model="form.name" placeholder="角色名称" class="w-auto"></el-input>
         </el-form-item>
 
         <el-form-item label="权限" prop="roles">
-          <div class="roles-wrap border">
+          <div class="roles-wrap border w-max-900">
             <div class="header-wrap bg-dark p-2 text-dark bg-opacity-10 px-2">
               <el-button size="small" @click="updateAllState(true)">选中所有</el-button>
               <el-button size="small" @click="updateAllState(false)">取消选中</el-button>
@@ -21,8 +21,8 @@
                 @{{ role.title }}
                 <div class="row-update ms-2 link-secondary">[<span @click="updateState(true, index)">全选</span> / <span @click="updateState(false, index)">取消</span>]</div>
               </div>
-              <div class="role.methods">
-                <div class="d-flex px-3">
+              <div class="role-methods">
+                <div class="d-flex flex-wrap px-3">
                   <div v-for="method,index in role.permissions" class="me-3">
                     <el-checkbox class="text-dark" v-model="method.selected">@{{ method.name }}</el-checkbox>
                   </div>
@@ -99,7 +99,8 @@
             }
 
             $http[type](url, this.form).then((res) => {
-              this.$message.success(res.message);
+              layer.msg(res.message);
+              window.history.back();
             })
           });
         },
diff --git a/resources/beike/admin/views/pages/orders/form.blade.php b/resources/beike/admin/views/pages/orders/form.blade.php
index f4dda9e9..97490c7e 100644
--- a/resources/beike/admin/views/pages/orders/form.blade.php
+++ b/resources/beike/admin/views/pages/orders/form.blade.php
@@ -50,36 +50,40 @@
       </div>
     </div>
   </div>
-
   <div class="card mb-4">
     <div class="card-header"><h6 class="card-title">商品信息</h6></div>
     <div class="card-body">
-      <table class="table table-bordered">
-        <thead class="table-light">
+      <table class="table ">
+        <thead class="">
           <tr>
-            <td>ID</td>
-            <td>商品</td>
-            <td>价格</td>
-            <td>数量</td>
-            <td>sku</td>
+            <th>ID</th>
+            <th>商品</th>
+            <th>价格</th>
+            <th class="text-end">数量</th>
+            <th class="text-end">sku</th>
           </tr>
         </thead>
         <tbody>
           @foreach ($order->orderProducts as $product)
           <tr>
             <td>{{ $product->id }}</td>
-            <td>{{ $product->name }}</td>
+            <td>
+              <div class="d-flex align-items-center">
+                <div class="wh-60 me-2"><img src="{{ $product->image }}" class="img-fluid"></div>{{ $product->name }}
+              </div>
+            </td>
             <td>{{ $product->price }}</td>
-            <td>{{ $product->quantity }}</td>
-            <td>{{ $product->product_sku }}</td>
+            <td class="text-end">{{ $product->quantity }}</td>
+            <td class="text-end">{{ $product->product_sku }}</td>
           </tr>
           @endforeach
         </tbody>
         <tfoot>
           @foreach ($order->orderTotals as $order)
             <tr>
-              <td colspan="5" class="text-end">{{ $order->title }}： <span class="fw-bold">{{ $order->value }}</span></td>
-              {{-- <td>{{ $order->title }}: {{ $order->value }}</td> --}}
+              {{-- <td colspan="4" class="text-end">{{ $order->title }}： <span class="fw-bold">{{ $order->value }}</span></td> --}}
+              <td colspan="4" class="text-end">{{ $order->title }}</td>
+              <td class="text-end"><span class="fw-bold">{{ $order->value }}</span></td>
             </tr>
           @endforeach
         </tfoot>
diff --git a/themes/default/account/order_info.blade.php b/themes/default/account/order_info.blade.php
index a8cb87e9..7124a163 100644
--- a/themes/default/account/order_info.blade.php
+++ b/themes/default/account/order_info.blade.php
@@ -57,6 +57,20 @@
           </div>
         </div>
 
+        <div class="card mb-4">
+          <div class="card-header"><h5 class="card-title">Order Total</h5></div>
+          <div class="card-body">
+            <ul class="list-group list-group-sm list-group-flush-y list-group-flush-x">
+              @foreach ($order->orderTotals as $order)
+              <li class="list-group-item d-flex">
+                <span>{{ $order->title }}</span>
+                <span class="ms-auto">{{ $order->value }}</span>
+              </li>
+              @endforeach
+            </ul>
+          </div>
+        </div>
+
         <div class="card mb-4">
           <div class="card-header"><h5 class="card-title">物流状态</h5></div>
           <div class="card-body">