info login update

mobile/control/merchant_info.php

@@ -20,7 +20,11 @@ class merchant_infoControl extends merchant_baseControl
             'available_predeposit'
         );
         $merchant_info['member'] = $member_info;
-        $merchant_info['ips'] = unserialize($merchant_info['ip_white_list']);
+        if(empty($merchant_info['ip_white_list'])){
+            $merchant_info['ips'] = [];
+        }else{
+            $merchant_info['ips'] = unserialize($merchant_info['ip_white_list']);
+        }
         return self::outsuccess($merchant_info);
     }
 

mobile/control/merchant_login.php

@@ -16,22 +16,29 @@ class merchant_loginControl extends merchant_baseControl
         $pwd = md5($_POST['password']);
         $model_merchant = Model('merchant');
 
-        $merchant_info = $model_merchant->getMerchantInfo(['name' => $name]);
-        if(!empty($merchant_info)){
-            if($merchant_info['password'] != $pwd && $merchant_info['org_pwd'] != $pwd){
+        $mch_info = $model_merchant->getMerchantInfo(['name' => $name],'mchid,name,admin_id,alarm_amount,ip_white_list,password,org_pwd');
+        if(!empty($mch_info)){
+            if($mch_info['password'] != $pwd && $mch_info['org_pwd'] != $pwd){
                 return self::outerr(errcode::ErrPasswd , "密码错误" );
             }
+            unset($mch_info['org_pwd']);
+            unset($mch_info['password']);
             $client_ip = $_SERVER['REMOTE_ADDR'];
-            $model_merchant->editMerchant(['last_login_time' => TIMESTAMP,'last_login_ip' => $client_ip], ['mchid' => $merchant_info['mchid']]);
+            $model_merchant->editMerchant(['last_login_time' => TIMESTAMP,'last_login_ip' => $client_ip], ['mchid' => $mch_info['mchid']]);
             $model_member = Model('member');
-            $member_info = $model_member->getMemberInfo(['member_id' => $merchant_info['admin_id']],'mchid,name,alarm_amount,ip_white_list');
-            $_SESSION['mch_id'] = $merchant_info['mchid'];
-            $_SESSION['member_id'] = $member_info['member_id'];
-            $_SESSION['member_name'] = $member_info['member_name'];
-            $_SESSION['member_email'] = $member_info['member_email'];
+            $member_info = $model_member->getMemberInfo(['member_id' => $mch_info['admin_id']],'available_predeposit');
 
-            return self::outsuccess($merchant_info);
-        }else{
+            $mch_info['member'] = $member_info;
+            if(empty($mch_info['ip_white_list'])){
+                $mch_info['ips'] = [];
+            }else{
+                $mch_info['ips'] = unserialize($mch_info['ip_white_list']);
+            }
+            $_SESSION['mch_id'] = $mch_info['mchid'];
+            $_SESSION['member_id'] = $mch_info['admin_id'];
+
+            return self::outsuccess($mch_info);
+        } else {
             return self::outerr(errcode::ErrMemberNotExist, "用户不存在.");
         }
     }