change log time zone,express,remote image url

core/33hao.php

@@ -13,6 +13,9 @@ if (!@include(BASE_DATA_PATH.'/config/config.ini.php')) exit('config.ini.php isn
 if (file_exists(BASE_PATH.'/config/config.ini.php')){
 	include(BASE_PATH.'/config/config.ini.php');
 }
+
+@date_default_timezone_set('Asia/Shanghai');
+
 global $config;
 //默认平台店铺id
 define('DEFAULT_PLATFORM_STORE_ID', $config['default_store_id']);

core/framework/function/core.php

@@ -1159,13 +1159,22 @@ function getStoreDecorationImageUrl($image_name = '', $store_id = null) {
 /**
  * 获取运单图片地址
  */
-function getWaybillImageUrl($image_name = '') {
+function getWaybillImageUrl($image_name = '')
+{
     $image_path = DS . ATTACH_WAYBILL . DS . $image_name;
-    if(is_file(BASE_UPLOAD_PATH . $image_path)) {
-        return UPLOAD_SITE_URL . $image_path;
-    } else {
-        return UPLOAD_SITE_URL.'/'.defaultGoodsImage('240');
-    }
+	
+	if(defined('MOBILE_SERVER') && USE_REMOTE_IMAGE == true)
+	{
+		return UPLOAD_SITE_URL . $image_path;
+	}
+	else
+	{
+		if(is_file(BASE_UPLOAD_PATH . $image_path)) {
+			return UPLOAD_SITE_URL . $image_path;
+		} else {
+			return UPLOAD_SITE_URL.'/'.defaultGoodsImage('240');
+		}
+	}
 }
 
 /**
@@ -1178,11 +1187,19 @@ function getMbSpecialImageUrl($image_name = '') {
     } else {
         $image_path = DS . ATTACH_MOBILE . DS . 'special' . DS . $image_name;
     }
-    if(is_file(BASE_UPLOAD_PATH . $image_path)) {
-        return UPLOAD_SITE_URL . $image_path;
-    } else {
-        return UPLOAD_SITE_URL.'/'.defaultGoodsImage('240');
-    }
+
+	if(defined('MOBILE_SERVER') && USE_REMOTE_IMAGE == true)
+	{
+		return UPLOAD_SITE_URL . $image_path;
+	}
+	else
+	{
+		if(is_file(BASE_UPLOAD_PATH . $image_path)) {
+			return UPLOAD_SITE_URL . $image_path;
+		} else {
+			return UPLOAD_SITE_URL.'/'.defaultGoodsImage('240');
+		}
+	}
 }
 
 /**

core/lrlz.php

@@ -7,6 +7,8 @@
  *
  */
 
+@date_default_timezone_set('Asia/Shanghai');
+
 global $config;
 
 //默认平台店铺id

data/model/cache.model.php

@@ -88,7 +88,7 @@ class cacheModel extends Model {
 	 * @return array
 	 */
 	private function _express(){
-	    $fields = 'id,e_name,e_code,e_kdn_code,e_letter,e_order,e_url,e_zt_state';
+	    $fields = 'id,e_name,e_code,e_letter,e_order,e_url,e_zt_state';
 		$list = $this->table('express')->field($fields)->order('e_order,e_letter')->where(array('e_state'=>1))->limit(false)->select();
 		if (!is_array($list)) return null;
 		$array = array();

fooder.php

@@ -1,6 +1,6 @@
 <?php
 
-date_default_timezone_set('UTC');
+@date_default_timezone_set('Asia/Shanghai');
 
 define('BASE_CORE_PATH',BASE_ROOT_PATH.'/core');
 define('BASE_DATA_PATH',BASE_ROOT_PATH.'/data');

mobile/control/member_order.php

@@ -223,7 +223,7 @@ class member_orderControl extends mbMemberControl
         }
 
         $express = rkcache('express', true);
-        $e_code = $express[$order_info['extend_order_common']['shipping_express_id']]['e_kdn_code'];
+        $e_code = $express[$order_info['extend_order_common']['shipping_express_id']]['e_code'];
         $e_name = $express[$order_info['extend_order_common']['shipping_express_id']]['e_name'];
 
         $key = "express_" . $order_info['shipping_code'];