Merge branch 'master' of http://git.huxiukeji.com/lizhen/xiaoshan

addons/shopro/controller/order/Express.php

@@ -29,11 +29,14 @@ class Express extends Common
 
         $address = Db::name('shopro_order_address')->where('order_id',$order_id)->find();
         $order_sn  = Db::name('shopro_order')->where('id',$order_id)->value('order_sn');
+        $items = Db::name('shopro_order_item')->where('order_id',$order_id)->column('goods_image');
+        $items = array_domain_image($items);
 
         $result = [
             'order_sn' => $order_sn,
             'address' => $address,
             'expresses' => $expresses,
+            'goods_image' => $items
         ];
 
         $this->success('获取成功', $result);