master

application/modules/Client/controllers/Shopkeeper.php

@@ -156,6 +156,9 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
     public function getDeliveriersAction(){
         $result = $this->shopkeeperService->getDiliveryManByStoreId($this->memberId);
         if($result!==false){
+            if(!$result){
+                $result=[];
+            }
             $this->success($result,\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
         }
         ErrorModel::throwException(CodeConfigModel::commonError);

application/modules/Client/controllers/User.php

@@ -47,8 +47,9 @@ class UserController extends \Our\Controller_AbstractIndex {
             }else{
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::errorUsernameOrPassword);
             }
-            if($this->memberService->checkUserNamePassWord($mobile,$password)){
-                $member= $this->memberService->getOneByMobileAndPassword($mobile,$password);
+            $member= $this->memberService->getOneByMobileAndPassword($mobile,$password);
+            if($this->memberService->checkUserNamePassWord($member['member_mobile'],$password)){
+                //$member= $this->memberService->getOneByMobileAndPassword($mobile,$password);
 //                //第二步保存扫码会员信息
 //                $result = $this->memberService->saveStoreMembers($member['member_id']);
 //                if(!$result){