lizhen_gitee 1 rok pred
rodič
commit
77aa20edd5

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

@@ -24,7 +24,7 @@
         </div>
     </div>
 
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Express number')}:</label>
         <div class="col-xs-12 col-sm-4">
             <input id="c-express_number" name="express_number" placeholder="输入快递单号并保存" class="form-control" type="text" value="{$row.extend.express_number}">
@@ -36,14 +36,14 @@
                 {/foreach}
             </select>
         </div>
-    </div>
+    </div>-->
 
 
-    <div class="form-group layer-footer">
+   <!-- <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">
             <button type="submit" class="btn btn-success btn-embossed disabled">{:__('Confirm delivery')}</button>
             <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
         </div>
-    </div>
+    </div>-->
 </form>

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

@@ -5,44 +5,44 @@
     <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">
         <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}">
+            <input id="c-discount_price" disabled class="form-control" step="0.01" name="row[discount_price]" type="number" value="{$row.discount_price}">
         </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">
-            <input id="c-delivery_price" class="form-control" step="0.01" name="row[delivery_price]" type="number" value="{$row.delivery_price}">
+            <input id="c-delivery_price" disabled class="form-control" step="0.01" name="row[delivery_price]" type="number" value="{$row.delivery_price}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Total_price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-total_price" class="form-control" step="0.01" name="row[total_price]" type="number" value="{$row.total_price}">
+            <input id="c-total_price" disabled class="form-control" step="0.01" name="row[total_price]" type="number" value="{$row.total_price}">
         </div>
     </div>
     <div class="form-group">
         <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" disabled data-rule="required" 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}
@@ -53,7 +53,7 @@
     <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}">
+            <input id="c-ip" disabled class="form-control" name="row[ip]" type="text" value="{$row.ip}">
         </div>
     </div>
     <div class="form-group">
@@ -68,30 +68,30 @@
 
             <div class="radio">
             {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label>
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" disabled name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label>
             {/foreach}
             </div>
 
         </div>
     </div>
 
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Refund status')}:</label>
         <div class="col-xs-12 col-sm-8">
 
             <div class="radio">
                 {foreach name="refundStatusList" item="vo"}
-                <label for="row[refund_status]-{$key}"><input id="row[refund_status]-{$key}" name="row[refund_status]" type="radio" value="{$key}" {in name="key" value="$row.refund_status"}checked{/in} /> {$vo}</label>
+                <label for="row[refund_status]-{$key}"><input id="row[refund_status]-{$key}" disabled name="row[refund_status]" type="radio" value="{$key}" {in name="key" value="$row.refund_status"}checked{/in} /> {$vo}</label>
                 {/foreach}
             </div>
 
         </div>
     </div>
-
+-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Pay time')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-have_paid" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[have_paid]" type="text" value="{:$row.have_paid?datetime($row.have_paid):''}">
+            <input id="c-have_paid" class="form-control datetimepicker" disabled data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[have_paid]" type="text" value="{:$row.have_paid?datetime($row.have_paid):''}">
         </div>
     </div>
     <div class="form-group">
@@ -103,13 +103,13 @@
     <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):''}">
+            <input id="c-have_commented" class="form-control datetimepicker" disabled 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):''}">
+            <input id="c-have_received" class="form-control datetimepicker" disabled 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 layer-footer">

+ 2 - 0
application/admin/view/unishop/order/index.html

@@ -33,6 +33,8 @@
                         <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-delivere="{:$auth->check('unishop/order/delivere')}"
+                           data-operate-product="{:$auth->check('unishop/order/product')}"
                            data-operate-edit="{:$auth->check('unishop/order/edit')}"
                            data-operate-del="{:$auth->check('unishop/order/del')}"
                            width="100%">

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

@@ -117,13 +117,13 @@ 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'),