orderEdit

application/library/Our/ArrayConst.php

@@ -113,7 +113,7 @@ class ArrayConst
     const orderCloseTemplate=array(
         'type'=>14,
         'title'=>'订单关闭通知',
-        'content'=>'您的定单超过5分钟没人接单，自动关闭',
+        'content'=>'您的订单超过10分钟没人接单，自动关闭',
         'thumb'=>'',
         'href'=>'',
         'price'=>0

application/models/Business/Order/OrderService.php

@@ -736,7 +736,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 $delivery['finishTime'] = $value['finishTime'];
                 $delivery['mobPhone'] = $delivery['mobPhone'] ? $delivery['mobPhone'] : '';
                 $delivery['finishTime'] = $delivery['finishTime'] ? $delivery['finishTime'] : ApiConst::zero;
-                $delivery['orderGoods'] = $orderGoods;
+                $delivery['orderGoods'] = $goodsDao->convert($orderMerge[$value['orderId']]['orderGoods']);
                 $delivery['street'] = $delivery['reciverInfo']['address'] . $delivery['reciverInfo']['street'];
                 $delivery['lng'] = $delivery['reciverInfo']['lng'] ? $delivery['reciverInfo']['lng'] : 0.0;
                 $delivery['lat'] = $delivery['reciverInfo']['lat'] ? $delivery['reciverInfo']['lat'] : 0.0;

application/models/Error/CodeConfig.php

@@ -411,7 +411,7 @@ const notAllowDelete=300114;
             self::emptyUsername => "用户名不能为空",
             self::emptyPassword=>"密码不能为空",
             self::errorUsernameOrPassword=>'用户名或密码错误',
-            self::illegalAccess=>"非法访问",
+            self::illegalAccess=>"非法访问,还未授权,或者授权过期",
             self::wrongTelnumber=>"请输入正确的手机号码",
             self::maxGetAccess=>'今天授权次数已经用完',
             self::isLogin=>'你已经登录',