Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz_version1

application/library/Our/ApiConst.php

@@ -423,10 +423,11 @@ class ApiConst
     const set = 2;
 
     //桌面最新版本
-    const xpClietnAppVersion='1.0.4';
+    const xpClientAppVersion='1.0.4';
     const winClientAppVersion='1.0.4';
-
-//微信小程序是否发布
+    const xpClientAppVersionOnline='1.0.0';
+    const winClientAppVersionOnline='1.0.0';
+//微信小是否发布
     const isWxPublish = 0;
 
     //消息模板类型

application/models/Business/Common/SettingService.php

@@ -26,21 +26,23 @@ class SettingServiceModel extends \Business\AbstractModel{
     public function getAppVersion($data){
         $settingDAO = \DAO\SettingModel::getInstance();
         $version=array();
-        $version['app_version'] = ApiConst::xpClietnAppVersion;
         if($data['opSystem']==NameConst::xp){
-            $version['app_version']=ApiConst::xpClietnAppVersion;
             if(APP_ENV=='pre'){
+                $version['app_version'] = ApiConst::xpClientAppVersion;
                 $fileName='/'.NameConst::xpClientUpdateUrl;
             }
             if(APP_ENV=='product'|| APP_ENV=='productOne'){
+                $version['app_version'] = ApiConst::xpClientAppVersionOnline;
                 $fileName='/'.NameConst::xpOnlineClientUpdateUrl;
             }
         }else{
-            $version['app_version']=ApiConst::winClientAppVersion;
+
             if(APP_ENV=='pre'){
+                $version['app_version']=ApiConst::winClientAppVersion;
                 $fileName='/'.NameConst::clientUpdateUrl;
             }
             if(APP_ENV=='product'|| APP_ENV=='productOne'){
+                $version['app_version']=ApiConst::winClientAppVersionOnline;
                 $fileName='/'.NameConst::onlineClientUpdateUrl;
             }
 

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

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