浏览代码

add to local

stanley-king 9 年之前
父节点
当前提交
0881ccbc85

+ 1 - 0
admin/control/cache.php

@@ -20,6 +20,7 @@ class cacheControl extends SystemControl
         'consult_type',     // 咨询类型
         'circle_level',     // 圈子成员等级
         'area',             // 省市区地址
+        'home_goods',       // 首页商品数据
     );
 
     public function __construct()

+ 1 - 0
admin/language/zh/cache.php

@@ -17,4 +17,5 @@ $lang['cache_cls_express']		= '快遞公司';
 $lang['cache_cls_store_class']	= '店舖分類';
 $lang['cache_cls_store_grade']	= '店舖等級';
 $lang['cache_cls_address']		= '省市區地址缓存';
+$lang['cache_cls_home_goods']	= '首页商品缓存';
 $lang['cache_cls_ok']			= '更新成功';

+ 1 - 0
admin/language/zh_cn/cache.php

@@ -18,4 +18,5 @@ $lang['cache_cls_store_class']	= '店铺分类';
 $lang['cache_cls_store_grade']	= '店铺等级';
 $lang['cache_cls_circle_level']	= '圈子成员等级';
 $lang['cache_cls_address']		= '省市区地址缓存';
+$lang['cache_cls_home_goods']	= '首页商品缓存';
 $lang['cache_cls_ok']			= '更新成功';

+ 5 - 0
admin/templates/default/cache.clear.php

@@ -101,6 +101,11 @@
                           <input type="checkbox" name="cache[]" id="area" value="area" >
                           &nbsp;<?php echo $lang['cache_cls_address']?></label>
                       </li>
+                      <li class="left w18pre">
+                          <label>
+                              <input type="checkbox" name="cache[]" id="home_goods" value="home_goods" >
+                              &nbsp;<?php echo $lang['cache_cls_home_goods']?></label>
+                      </li>
                     </ul></td>
                 </tr>
               </tbody>

+ 2 - 2
helper/field_helper.php

@@ -15,7 +15,7 @@ class field_helper
         {
             if(in_array($key,$keys))
             {
-                if(!isset($val)) {
+                if(is_null($val)) {
                     $datas[$key] = $def_val;
                 }
             }
@@ -29,7 +29,7 @@ class field_helper
         {
             if(in_array($key,$keys))
             {
-                if(!isset($val)) {
+                if(is_null($val)) {
                     $datas[$key] = $def_val;
                 }
             }

+ 7 - 0
mobile/control/home.php

@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: stanley-king
+ * Date: 16/3/29
+ * Time: 下午6:01
+ */

+ 1 - 1
mobile/control/login.php

@@ -126,7 +126,7 @@ class loginControl extends mobileHomeControl
         }
 
         $member_info = $model_member->getMemberInfo($conditions,self::$fields);
-        field_helper::validate_null_string($member_info,'member_mobile,member_wxopenid,member_name,member_truename,member_avatar,member_email');
+        field_helper::validate_null_string($member_info,'member_mobile,member_wxopenid,member_name,member_truename,member_avatar,member_email,member_birthday');
         field_helper::validate_null_int($member_info,'member_sex',0);
 
         return $member_info;

+ 1 - 5
mobile/control/member_buy.php

@@ -25,10 +25,7 @@ class member_buyControl extends mbMemberControl
     public function buy_step1Op()
     {
         $cart_id = explode(',', urldecode($_POST['cart_id']));
-        Log::record('Create cart_id list' . urldecode($_POST['cart_id']), Log::DEBUG);
-
         $logic_buy = logic('buy');
-        Log::record('Create buy logic model', Log::DEBUG);
 
         //得到购买数据
         $result = $logic_buy->buyStep1($cart_id, $_POST['ifcart'], $_SESSION['member_id'], $_SESSION['store_id']);
@@ -37,7 +34,7 @@ class member_buyControl extends mbMemberControl
         } else {
             $result = $result['data'];
         }
-        Log::record('Get buy data', Log::DEBUG);
+
         //整理数据
         $store_cart_list = array();
         foreach ($result['store_cart_list'] as $key => $value) {
@@ -81,7 +78,6 @@ class member_buyControl extends mbMemberControl
      */
     public function buy_step2Op()
     {
-
         $param = array();
         $param['ifcart'] = $_POST['ifcart'];
         $param['cart_id'] = explode(',', urldecode($_POST['cart_id']));

+ 1 - 2
mobile/dispatch_notify.php

@@ -49,8 +49,7 @@ function sendPost($url, $datas) {
     $fd = fsockopen($url_info['host'], 80);
     fwrite($fd, $httpheader);
     $gets = ""; 
-    $headerFlag = true;
-    while (!feof($fd)) {
+     while (!feof($fd)) {
         if (($header = @fgets($fd)) && ($header == "\r\n" || $header == "\n")) {
             break;
         }

+ 1 - 1
mobile/index.php

@@ -13,4 +13,4 @@ define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 require_once (BASE_PATH.'/framework/function/function.php');
 require_once (BASE_PATH.'/control/control.php');
 
-//Base::run();
+//Base::run();

+ 3 - 3
mobile/kdniao_notify.php

@@ -12,7 +12,7 @@ Log::record("kdniao_notify: post data {$requestData}",Log::ERR);
 if ($deliver_info === false || empty($deliver_info))
 {
     Log::record("kdniao_notify:cannot query delivery info from kuaidn.",Log::ERR);
-    exit(0);
+    return;
 }
 
 // 订单sn号
@@ -23,7 +23,7 @@ switch ($deliver_info['Data']['State'])
 {
     case '2':	// 在途中, 不处理
         $msg = '在途中';
-        Log::record('订单: {$order_sn} 在途中'); return;
+        Log::record('订单: {$order_sn} 在途中');
         break;
     case '3':	// 已签收, 设置为已收货
 	    {
@@ -36,7 +36,7 @@ switch ($deliver_info['Data']['State'])
 	        $update['order_state'] = ORDER_STATE_SUCCESS;	// 收货成功状态
 	        $update = $model_order->editOrder($update, $condition);
 	        if (!$update) {
-	            Log::record('更新订单状态为已收货状态时写入失败'); return;
+	            Log::record('更新订单状态为已收货状态时写入失败');
 	        }
 	    }
         break;