wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单

This commit is contained in:
pushuo 2022-08-12 14:50:05 +08:00
parent 224d8d6693
commit 622901eaf5
3 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/beike/admin/views/pages/categories/index.blade.php
View File

@ -20,10 +20,10 @@
<div class="custom-tree-node" slot-scope="{ node, data }" style="flex:1;display:flex">
<span>@{{ data.name }}</span>
<div style="flex:1"></div>
<span class="mr-4">@{{ data.active ? '启用' : '禁用' }}</span>
<span class="me-4">@{{ data.active ? '启用' : '禁用' }}</span>
<div>
<a :href="data.url_edit">编辑</a>
<a>删除</a>
<a :href="data.url_edit" class="btn btn-outline-info btn-sm">编辑</a>
<a class="btn btn-outline-danger btn-sm">删除</a>
</div>
</div>
</el-tree>

6
resources/beike/admin/views/pages/products/index.blade.php
View File

@ -64,7 +64,7 @@
</div>
<template v-if="items.length">
<table class="table" v-loading="loading">
<table class="table table-hover" v-loading="loading">
<thead>
<tr>
<th></th>
@ -107,9 +107,9 @@
<td>@{{ item.position }}</td>
<td>@{{ item.active ? '上架' : '下架' }}</td>
<td>
<a :href="item.url_edit">编辑</a>
<a :href="item.url_edit" class="btn btn-outline-info btn-sm">编辑</a>
<template>
<a v-if="item.deleted_at == ''" href="javascript:void(0)" @click.prevent="deleteProduct(index)">删除</a>
<a v-if="item.deleted_at == ''" href="javascript:void(0)" class="btn btn-outline-danger btn-sm" @click.prevent="deleteProduct(index)">删除</a>
<a v-else href="javascript:void(0)" @click.prevent="restoreProduct(index)">恢复</a>
</template>
</td>

60
themes/default/account/order_info.blade.php
View File

@ -14,13 +14,11 @@
<div class="row">
<x-shop-sidebar/>
{{-- {{ dd($order) }} --}}
<div class="col-12 col-md-9">
<div class="card mb-4 order-head">
<div class="card-header"><h5 class="card-title">订单详情</h5></div>
<div class="card-body">
<div class="bg-light p-2">
<a href="{{ shop_route('orders.pay', $order->number) }}">去支付</a>
<table class="table table-borderless mb-0">
<thead>
<tr>
@ -34,7 +32,12 @@
<tr>
<td>{{ $order->number }}</td>
<td>{{ $order->created_at }}</td>
<td>{{ $order->status }}</td>
<td>
{{ $order->status }}
@if ($order->status == 'unpaid')
<a href="{{ shop_route('orders.pay', $order->number) }}" class="btn btn-primary btn-sm">去支付</a>
@endif
</td>
<td>{{ $order->total }}</td>
</tr>
</tbody>
@ -61,30 +64,55 @@
<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>
<table class="table table-bordered border">
<tbody>
@foreach (array_chunk($order->orderTotals->all(), 2) as $totals)
<tr>
@foreach ($totals as $total)
<td class="bg-light wp-200">{{ $total->title }}</td>
<td><strong>{{ $total->value }}</strong></td>
@endforeach
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
@if (0)
<div class="card mb-4">
<div class="card-header"><h5 class="card-title">物流状态</h5></div>
<div class="card-body">
</div>
</div>
@endif
<div class="card mb-4">
<div class="card-header"><h5 class="card-title">订单状态</h5></div>
<div class="card-body">
@if ($order->orderHistories->count())
<div class="card mb-4">
<div class="card-header"><h5 class="card-title">订单状态</h5></div>
<div class="card-body">
<table class="table ">
<thead class="">
<tr>
<th>状态</th>
<th>备注</th>
<th>更新时间</th>
</tr>
</thead>
<tbody>
@foreach ($order->orderHistories as $orderHistory)
<tr>
<td>{{ $orderHistory->status }}</td>
<td><span class="fw-bold">{{ $orderHistory->comment }}</span></td>
<td><span class="fw-bold">{{ $orderHistory->created_at }}</span></td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
@endif
</div>
</div>
</div>