发货，商品，退款

application/admin/controller/unishop/Order.php

@@ -324,8 +324,8 @@ class Order extends Backend
             $result = false;
             Db::startTrans();
             try {
-                $express_number = $this->request->post('express_number');
-                $express_company = $this->request->post('express_company');
+                $express_number = $this->request->post('express_number','');
+                $express_company = $this->request->post('express_company','');
 //                $have_delivered = $express_number ? time() : 0;
                 $have_delivered = time();
                 $res1 = $row->allowField(true)->save(['have_delivered' => $have_delivered]);
@@ -384,13 +384,21 @@ class Order extends Backend
         if ($this->request->isPost()) {
             $this->success();
         }
-        $row = $this->model->get($ids, ['product','evaluate']);
+        $row = $this->model->get($ids, ['product','evaluate','extend']);
         $this->view->assign('product', $row->product);
         $evaluate = [];
         foreach ($row->evaluate as $key => $item) {
             $evaluate[$item['product_id']] = $item;
         }
 
+        //地址
+        $row['addressText'] = '';
+        $address = json_decode($row->extend->address_json,true);
+        if ($address) {
+            $row['addressText'] = $address['province_name'].$address['city_name'].$address['area_name'].$address['address'];
+            $row['address'] = $address;
+        }
+
         $this->view->assign('order', $row);
         $this->view->assign('evaluate', $evaluate);
         return $this->view->fetch();

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

@@ -1,11 +1,28 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Consignee name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-username" disabled class="form-control" type="text" value="{$order.address.name}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Consignee mobile')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-mobile" disabled class="form-control" type="text" value="{$order.address.mobile}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Consignee address')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-address" disabled class="form-control" type="text" value="{$order.addressText}">
+        </div>
+    </div>
     <ul class="list-group">
         <li class="list-group-item">
             订单金额：￥{$order.order_price}
         </li>
         <li class="list-group-item">
-            实付金额：￥{$order.total_price}元 (包含优惠￥{$order.discount_price}，物流费用￥{$order.delivery_price})
+            实付金额：￥{$order.total_price}元 (包含:<!--优惠￥{$order.discount_price}，-->物流费用￥{$order.delivery_price})
         </li>
     </ul>
 

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

@@ -101,12 +101,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'have_paid_status', title: __('Have_paid'), searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
                         {field: 'have_delivered_status', title: __('Have_delivered'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
                         {field: 'have_received_status', title: __('Have_received'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
-                        {field: 'have_commented_status', title: __('Have_commented'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
+//                        {field: 'have_commented_status', title: __('Have_commented'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
                         {field: 'refund_status', title: __('Refund status'),searchList: {"0":__('None'),"1":__('Apply'),"2":__('Waiting for shipment'),"3":__('Pass'),"4":__('Refuse')},  formatter: Table.api.formatter.status},
                         {field: 'have_paid', title: __('Pay time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
                         {field: 'have_delivered', title: __('Delivered time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
                         {field: 'have_received', title: __('Received time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
-                        {field: 'have_commented', title: __('Commented time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
+//                        {field: 'have_commented', title: __('Commented time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         {field: 'remark', title: __('Remark'), operate: 'LIKE %...%', placeholder: '模糊搜索，*表示任意字符'},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
@@ -117,13 +117,19 @@ 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'
-                                },*/
+                                    icon: 'fa fa-handshake-o',
+                                    hidden: function(row){
+                                        if(row.status == -1){
+                                            return false;
+                                        }
+                                        return true;
+                                    }
+                                },
                                 {
                                     name: 'delivere',
                                     text: '发货',