Browse Source

fix:后台优化

super-yimizi 1 month ago
parent
commit
ce18540e2a

+ 1 - 1
application/admin/view/shop/goods/index.html

@@ -1,7 +1,7 @@
 <div class="panel panel-default panel-intro">
     
     <div class="panel-heading">
-        <div class="panel-lead"><em>商品管理</em>用于商品管理tian'ji</div>
+        <div class="panel-lead"><em>商品管理</em>用于商品管理添加、修改</div>
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
             <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>

+ 6 - 11
application/admin/view/shop/order/detail.html

@@ -90,23 +90,23 @@
                             <div>
                                 {if $row['order_status']==101}
                                     <!-- 待支付状态 -->
-                                    <button type="button" class="btn btn-danger btn-status-click" data-order='{"order_status":102}'>
+                                    <!-- <button type="button" class="btn btn-danger btn-status-click" data-order='{"order_status":102}'>
                                         <i class="fa fa-times"></i> 取消订单
                                     </button>
                                     <button type="button" class="btn btn-success btn-status-click" data-order='{"pay_time":1}'>
                                         <i class="fa fa-check"></i> 设为已支付
-                                    </button>
+                                    </button> -->
                                 {elseif $row['order_status']==201}
                                     <!-- 已支付状态 -->
-                                    <button type="button" class="btn btn-primary btn-deliver" data-expressname="{$row.express_name|htmlentities}" data-expressno="{$row.express_no|htmlentities}" data-type="0">
+                                    <!-- <button type="button" class="btn btn-primary btn-deliver" data-expressname="{$row.express_name|htmlentities}" data-expressno="{$row.express_no|htmlentities}" data-type="0">
                                         <i class="fa fa-truck"></i> 发货
                                     </button>
                                     <button type="button" class="btn btn-success btn-status-click" data-order='{"order_status":401}'>
                                         <i class="fa fa-check-circle"></i> 设为已完成
-                                    </button>
+                                    </button> -->
                                 {elseif $row['order_status']==301}
                                     <!-- 已发货状态 -->
-                                    <button type="button" class="btn btn-warning btn-deliver" data-expressname="{$row.express_name|htmlentities}" data-expressno="{$row.express_no|htmlentities}" data-type="1">
+                                    <!-- <button type="button" class="btn btn-warning btn-deliver" data-expressname="{$row.express_name|htmlentities}" data-expressno="{$row.express_no|htmlentities}" data-type="1">
                                         <i class="fa fa-edit"></i> 修改快递
                                     </button>
                                     <button type="button" class="btn btn-info btn-logistics" data-expressno="{$row.express_no|htmlentities}">
@@ -114,7 +114,7 @@
                                     </button>
                                     <button type="button" class="btn btn-success btn-status-click" data-order='{"order_status":401}'>
                                         <i class="fa fa-check-circle"></i> 设为已完成
-                                    </button>
+                                    </button> -->
                                 {elseif $row['order_status']==401}
                                     <!-- 已完成状态 -->
                                     <span class="label label-success">
@@ -224,11 +224,6 @@
                     <ul class="list-group">
                         <li class="list-group-item">支付订单号:{$row.pay_info.order_sn|default='无'}</li>
                         <li class="list-group-item">支付金额:¥{$row.pay_info.amount|default='0.00'}</li>
-                        <li class="list-group-item">支付状态:
-                            <span class="label label-{if $row.pay_info.status == 'success'}success{elseif $row.pay_info.status == 'pending'}warning{elseif $row.pay_info.status == 'failed'}danger{else/}default{/if}">
-                                {$row.pay_info.status_text|default='未知'}
-                            </span>
-                        </li>
                         <li class="list-group-item">支付平台:{$row.pay_info.platform_text|default='无'}</li>
                     </ul>
                 </div>

+ 2 - 3
application/admin/view/shop/order/index.html

@@ -1,12 +1,11 @@
 <div class="panel panel-default panel-intro">
-
     <div class="panel-heading">
         <div class="panel-lead"><em>订单管理</em>用于商品订单管理查看订单进度</div>
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="order_status">
-            <li class="active"><a href="#t-all" data-value='' data-toggle="tab">{:__('All')}</a></li>
+            <li class="{:$Think.get.order_status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
             {foreach name="orderStatusList" item="vo"}
-            <li><a href="#t-{$key|htmlentities}" data-value='{$vo|htmlentities}'  data-toggle="tab">{$vo|htmlentities}</a></li>
+            <li class="{:$Think.get.order_status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
             {/foreach}
         </ul>
     </div>