From 170cfd02302c70722f59a6d5e528a39c0c71596f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Sat, 17 Apr 2021 14:09:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/view/shop/order/index.html        | 16 ++++++++--------
 app/data/view/shop/order/index_search.html |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/data/view/shop/order/index.html b/app/data/view/shop/order/index.html
index df71d7a67..8e3ab1815 100644
--- a/app/data/view/shop/order/index.html
+++ b/app/data/view/shop/order/index.html
@@ -9,7 +9,7 @@
 {block name="content"}
 <div class="layui-tab layui-tab-card">
     <ul class="layui-tab-title notselect">
-        {php}$types = ['ta' => '全部订单', 't2' => '待支付的订单', 't3' => '待审核的订单', 't4' => '待发货的订单', 't5' => '待收货的订单', 't6' => '已完成的订单', 't0' => '已取消的订单'];{/php}
+        {php}$types = ['ta' => '全部订单', 't2' => '等待支付', 't3' => '等待审核', 't4' => '等待发货', 't5' => '等待收货', 't6' => '已经完成', 't0' => '已经取消'];{/php}
         {foreach $types as $k=>$v}{if isset($type) and 't'.$type eq $k}
         <li class="layui-this" data-open="{:url('index')}?type={$k}">{$v}<sup class="layui-badge border-radius">{$total[$k]??0}</sup></li>
         {else}
@@ -59,13 +59,13 @@
                     </div>
                 </td>
                 <td class='nowrap'>
-                    {eq name='vo.status' value='0'}<span class="layui-badge layui-badge-middle layui-bg-gray layui-border-cyan" data-tips-text="{$vo.cancel_remark}">已取消</span>{/eq}
-                    {eq name='vo.status' value='1'}<span class="layui-badge layui-badge-middle layui-bg-red">预订单</span>{/eq}
-                    {eq name='vo.status' value='2'}<span class="layui-badge layui-badge-middle layui-bg-red">待付款</span>{/eq}
-                    {eq name='vo.status' value='3'}<span class="layui-badge layui-badge-middle layui-bg-orange">待审核</span>{/eq}
-                    {eq name='vo.status' value='4'}<span class="layui-badge layui-badge-middle layui-bg-black">待发货</span>{/eq}
-                    {eq name='vo.status' value='5'}<span class="layui-badge layui-badge-middle layui-bg-green">已发货</span>{/eq}
-                    {eq name='vo.status' value='6'}<span class="layui-badge layui-badge-middle layui-bg-blue">已完成</span>{/eq}
+                    {eq name='vo.status' value='0'}<span class="layui-badge layui-badge-middle layui-bg-gray layui-border-cyan" data-tips-text="{$vo.cancel_remark}">已经取消</span>{/eq}
+                    {eq name='vo.status' value='1'}<span class="layui-badge layui-badge-middle layui-bg-red">预购订单</span>{/eq}
+                    {eq name='vo.status' value='2'}<span class="layui-badge layui-badge-middle layui-bg-red">等待待付款</span>{/eq}
+                    {eq name='vo.status' value='3'}<span class="layui-badge layui-badge-middle layui-bg-orange">等待审核</span>{/eq}
+                    {eq name='vo.status' value='4'}<span class="layui-badge layui-badge-middle layui-bg-black">等待发货</span>{/eq}
+                    {eq name='vo.status' value='5'}<span class="layui-badge layui-badge-middle layui-bg-green">已经发货</span>{/eq}
+                    {eq name='vo.status' value='6'}<span class="layui-badge layui-badge-middle layui-bg-blue">已经完成</span>{/eq}
                     <div class="inline-block text-middle">
                         <div class="sub-strong-blue">
                             订单单号：<b>{$vo.order_no|default=''}</b>
diff --git a/app/data/view/shop/order/index_search.html b/app/data/view/shop/order/index_search.html
index a75eabd7f..c1bdfc47e 100644
--- a/app/data/view/shop/order/index_search.html
+++ b/app/data/view/shop/order/index_search.html
@@ -49,7 +49,7 @@
             <label class="layui-input-inline">
                 <select class="layui-select" name="status">
                     <option value=''>- 全部订单 -</option>
-                    {foreach ['2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
+                    {foreach ['1'=>'预购订单','2'=>'等待支付','3'=>'等待审核','4'=>'等待发货','5'=>'已经发货','6'=>'已经完成','0'=>'已经取消'] as $k=>$v}
                     {if input('status') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -64,7 +64,7 @@
             <label class="layui-input-inline">
                 <select class="layui-select" name="payment_status">
                     <option value=''>-- 全部 --</option>
-                    {foreach ['0'=>'未支付的订单','1'=>'已支付的订单'] as $k=>$v}
+                    {foreach ['0'=>'等待支付','1'=>'已经支付'] as $k=>$v}
                     {if input('payment_status') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}