订单发货

application/admin/controller/unishop/Order.php

@@ -326,10 +326,11 @@ class Order extends Backend
             try {
                 $express_number = $this->request->post('express_number');
                 $express_company = $this->request->post('express_company');
-                $have_delivered = $express_number ? time() : 0;
+//                $have_delivered = $express_number ? time() : 0;
+                $have_delivered = time();
                 $res1 = $row->allowField(true)->save(['have_delivered' => $have_delivered]);
                 $res2 = $row->extend->allowField(true)->save(['express_number' => $express_number, 'express_company' => $express_company]);
-                if ($res1 && $res2) {
+                if ($res1 !== false && $res2 !== false) {
                     $result = true;
                 } else {
                     throw new Exception(__('No rows were updated'));
@@ -354,8 +355,9 @@ class Order extends Backend
         }
         $address = json_decode($row->extend->address_json,true);
         if ($address) {
-            $area = (new Area)->whereIn('id',[$address['province_id'],$address['city_id'],$address['area_id']])->column('name', 'id');
-            $row['addressText'] = $area[$address['province_id']].$area[$address['city_id']].$area[$address['area_id']].' '.$address['address'];
+//            $area = (new Area)->whereIn('id',[$address['province_id'],$address['city_id'],$address['area_id']])->column('name', 'id');
+//            $row['addressText'] = $area[$address['province_id']].$area[$address['city_id']].$area[$address['area_id']].' '.$address['address'];
+            $row['addressText'] = $address['province_name'].$address['city_name'].$address['area_name'].$address['address'];
             $row['address'] = $address;
         }
 

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,7 +36,7 @@
                 {/foreach}
             </select>
         </div>
-    </div>
+    </div>-->
 
 
     <div class="form-group layer-footer">

application/admin/view/unishop/order/edit.html

@@ -62,18 +62,18 @@
             <input id="c-remark" class="form-control" name="row[remark]" type="text" value="{$row.remark}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
 
             <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>-->
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Refund status')}:</label>

application/admin/view/unishop/order/product.html

@@ -39,7 +39,7 @@
         </div>
         {if empty($evaluate[$item.product_id])}
         <div class="media-body">
-            <h4 class="media-heading">未评价</h4>
+            <h4 class="media-heading"><!--未评价--></h4>
         </div>
         {else/}
         <div class="media-body">

public/assets/js/backend/unishop/order.js

@@ -92,7 +92,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'user.username', title: __('User name')},
                         {field: 'out_trade_no', title: __('Out_trade_no')},
                         {field: 'order_price', title: __('Order_price'), operate:'BETWEEN'},
-                        {field: 'discount_price', title: __('Discount_price'), operate:'BETWEEN'},
+//                        {field: 'discount_price', title: __('Discount_price'), operate:'BETWEEN'},
                         {field: 'delivery_price', title: __('Delivery_price'), operate:'BETWEEN'},
                         {field: 'total_price', title: __('Total_price'), operate:'BETWEEN'},
                         {field: 'status', title: __('Status'), searchList: {"-1":__('Refund'),"0":__('Cancel'),"1":__('Normal')}, formatter: Table.api.formatter.status},
@@ -124,13 +124,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     extend: 'data-toggle="tooltip"',
                                     icon: 'fa fa-handshake-o'
                                 },*/
-                               /* {
+                                {
                                     name: 'delivere',
-                                    text: __('Delivere'),
+                                    text: '发货',
                                     classname: 'btn btn-xs btn-info btn-delivere',
                                     extend: 'data-toggle="tooltip"',
-                                    icon: 'fa fa-plane'
-                                },*/
+                                    icon: 'fa fa-plane',
+                                    hidden: function(row){
+                                        if(row.status == 1 && row.have_paid != 0 && row.have_delivered == 0){
+                                            return false;
+                                        }
+                                        if(row.status == -1 && row.have_paid != 0 && row.have_delivered == 0){
+                                            return false;
+                                        }
+                                        return true;
+                                    }
+                                },
                                 {
                                     name: 'product',
                                     text: __('Product'),