Browse Source

后台、商城订单

lizhen_gitee 10 months ago
parent
commit
290a5c41d0

+ 2 - 1
addons/unishop/lang/zh-cn/order.php

@@ -7,7 +7,8 @@ return [
     'Product not exist' => '商品不存在',
 
     'Online'           => '在线支付',
-    'Offline'          => '到货付款',
+    'Offline'          => '钱包余额',
+    'Wallet'           => '钱包余额',
     'wxPay'            => '微信付款',
     'aliPay'           => '支付宝付',
     'Please fill in the refund amount'           => '请填写退款金额',

+ 15 - 14
application/admin/view/unishop/order/edit.html

@@ -5,27 +5,27 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="username" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id}">
+            <input id="c-user_id" disabled data-rule="required" data-source="user/user/index" data-field="username" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Out_trade_no')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-out_trade_no" class="form-control" name="row[out_trade_no]" type="text" value="{$row.out_trade_no}">
+            <input id="c-out_trade_no" disabled class="form-control" name="row[out_trade_no]" type="text" value="{$row.out_trade_no}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Order_price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-order_price" class="form-control" step="0.01" name="row[order_price]" type="number" value="{$row.order_price}">
+            <input id="c-order_price" disabled class="form-control" step="0.01" name="row[order_price]" type="number" value="{$row.order_price}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Discount_price')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-discount_price" class="form-control" step="0.01" name="row[discount_price]" type="number" value="{$row.discount_price}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Delivery_price')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -42,7 +42,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Pay_type')}:</label>
         <div class="col-xs-12 col-sm-8">
 
-            <select  id="c-pay_type" data-rule="required" class="form-control selectpicker" name="row[pay_type]">
+            <select  id="c-pay_type" data-rule="required" disabled class="form-control selectpicker" name="row[pay_type]">
                 {foreach name="payTypeList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.pay_type"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -50,12 +50,12 @@
 
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Ip')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-ip" class="form-control" name="row[ip]" type="text" value="{$row.ip}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -100,18 +100,19 @@
             <input id="c-have_delivered" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[have_delivered]" type="text" value="{:$row.have_delivered?datetime($row.have_delivered):''}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Commented time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-have_commented" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[have_commented]" type="text" value="{:$row.have_commented?datetime($row.have_commented):''}">
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Received time')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-have_received" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[have_received]" type="text" value="{:$row.have_received?datetime($row.have_received):''}">
         </div>
     </div>
+    <!--<div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Commented time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-have_commented" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[have_commented]" type="text" value="{:$row.have_commented?datetime($row.have_commented):''}">
+        </div>
+    </div>-->
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 4 - 4
application/admin/view/unishop/order/index.html

@@ -19,18 +19,18 @@
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
 <!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('unishop/order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('unishop/order/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('unishop/order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <!--<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('unishop/order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
 <!--                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('unishop/order/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
 
-                        <div class="dropdown btn-group {:$auth->check('unishop/order/multi')?'':'hide'}">
+                        <!--<div class="dropdown btn-group {:$auth->check('unishop/order/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
                             </ul>
-                        </div>
+                        </div>-->
 
-                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('unishop/order/recyclebin')?'':'hide'}" href="unishop/order/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
+                        <!--<a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('unishop/order/recyclebin')?'':'hide'}" href="unishop/order/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>-->
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('unishop/order/edit')}"

+ 2 - 2
application/admin/view/unishop/order/recyclebin.html

@@ -8,9 +8,9 @@
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh')}
                         <a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('unishop/order/restore')?'':'hide'}" href="javascript:;" data-url="unishop/order/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
-                        <a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('unishop/order/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/order/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>
+                        <!--<a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('unishop/order/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/order/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>-->
                         <a class="btn btn-success btn-restoreall {:$auth->check('unishop/order/restore')?'':'hide'}" href="javascript:;" data-url="unishop/order/restore" title="{:__('Restore all')}"><i class="fa fa-rotate-left"></i> {:__('Restore all')}</a>
-                        <a class="btn btn-danger btn-destroyall {:$auth->check('unishop/order/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/order/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>
+                        <!--<a class="btn btn-danger btn-destroyall {:$auth->check('unishop/order/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/order/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>-->
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover"
                            data-operate-restore="{:$auth->check('unishop/order/restore')}"

+ 13 - 13
public/assets/js/backend/unishop/order.js

@@ -26,7 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'unishop/order/index' + location.search,
                     add_url: 'unishop/order/add',
                     edit_url: 'unishop/order/edit',
-                    del_url: 'unishop/order/del',
+//                    del_url: 'unishop/order/del',
                     multi_url: 'unishop/order/multi',
                     delivere_url: 'unishop/order/delivery',
                     product_url: 'unishop/order/product',
@@ -117,20 +117,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             events: Table.api.events.operate,
                             formatter: Table.api.formatter.operate,
                             buttons:[
-                                {
+                                /*{
                                     name: 'refund',
                                     text: __('Refund'),
                                     classname: 'btn btn-xs btn-info btn-refund',
                                     extend: 'data-toggle="tooltip"',
                                     icon: 'fa fa-handshake-o'
-                                },
-                                {
+                                },*/
+                               /* {
                                     name: 'delivere',
                                     text: __('Delivere'),
                                     classname: 'btn btn-xs btn-info btn-delivere',
                                     extend: 'data-toggle="tooltip"',
                                     icon: 'fa fa-plane'
-                                },
+                                },*/
                                 {
                                     name: 'product',
                                     text: __('Product'),
@@ -217,14 +217,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     url: 'unishop/order/restore',
                                     refresh: true
                                 },
-                                {
-                                    name: 'Destroy',
-                                    text: __('Destroy'),
-                                    classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
-                                    icon: 'fa fa-times',
-                                    url: 'unishop/order/destroy',
-                                    refresh: true
-                                }
+//                                {
+//                                    name: 'Destroy',
+//                                    text: __('Destroy'),
+//                                    classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
+//                                    icon: 'fa fa-times',
+//                                    url: 'unishop/order/destroy',
+//                                    refresh: true
+//                                }
                             ],
                             formatter: Table.api.formatter.operate
                         }