Merge branch 'master' of gitee.com:yiguanjia/php

www/protected/controllers/JgEmployeController.php

@@ -11,10 +11,8 @@ class JGEmployeController extends AdminController
 {
     public function actionIndex()
     {
-        //$tmp = JGEmploye::model()->findAll();
-        //foreach ($tmp as $k => $v) {
-        //$v->delete();
-        //}
+        $tmp = JGEmploye::get(new MongoId('5acaca9a9f5160d2048b6c13'));
+        //$tmp->delete();
         $status = CommonFn::getComboboxData(JGEmploye::$status_options, 100, true, 100);//人员状态
         $skill = CommonFn::getComboboxData(JGEmploye::$skill_options, 100, true, 100);
         $work_type = CommonFn::getComboboxData(JGEmploye::$work_type_options, 100, true, 100);

www/protected/modules/j/controllers/WebController.php

@@ -25,7 +25,7 @@ class WebController extends JBaseController {
 					$user = RUser::model()->find($criteria);
 					if ($user) {
 						$userId = $user->_id;
-						if(!isset($user->wx_pub_openid) || empty($user->wx_pub_openid) || $user->source != "巾帼家政"){
+						if(!isset($user->wx_pub_openid) || empty($user->wx_pub_openid) || $user->source != "真·巾帼家政"){
 							$user->wx_pub_openid = $accessInfo['openid'];
 							$user->wx_have_follow = 1;
                             $user->source = '真·巾帼家政';
@@ -77,8 +77,8 @@ class WebController extends JBaseController {
 				'version' => '2015082505',
 				'debug' => 'false',
 				'signPackage' => $signPackage,
-				'userId' => $userId,
-				'appToken' => $appToken,
+				'userId1' => $userId,
+				'appToken1' => $appToken,
 			));
 		}else{
 			/* var_dump(array(
@@ -92,8 +92,8 @@ class WebController extends JBaseController {
 				'version' => '2015111601',
 				'debug' => 'false',
 				'signPackage' => $signPackage,
-				'userId' => $userId,
-				'appToken' => $appToken,
+				'userId1' => $userId,
+				'appToken1' => $appToken,
 			));
 		}
 	}

www/protected/modules/j/views/web/index.php

@@ -39,31 +39,31 @@
     <?php
     if (isset($from_channel)) {
       echo "var from_channel = '$from_channel';";
-      if (!empty($userId) && $from_channel == 'baidu') {
-        echo "var bd_userId = localStorage.setItem('bd_userId',  '" . $userId . "');";
+      if (!empty($userId1) && $from_channel == 'baidu') {
+        echo "var bd_userId = localStorage.setItem('bd_userId',  '" . $userId1 . "');";
       }
     }
     ?>
     if (ua.match(/MicroMessenger/i) == 'micromessenger') {
       <?php
-      if (!empty($userId) && !empty($appToken)) {
+      if (!empty($userId1) && !empty($appToken1)) {
         echo '
-        var wxUserID = localStorage.setItem("wxUserID",  "' . $userId . '");
-        var appToken = localStorage.setItem("appToken", "' . $appToken . '");
+        var wxUserID1 = localStorage.setItem("wxUserID1",  "' . $userId1 . '");
+        var appToken1 = localStorage.setItem("appToken1", "' . $appToken1 . '");
         ';
       }
       ?>
-      var userID = localStorage.getItem('wxUserID');
-      var appToken = localStorage.getItem('appToken');
-      console.log(userID);
-      console.log(appToken);
+      var userID1 = localStorage.getItem('wxUserID1');
+      var appToken1 = localStorage.getItem('appToken1');
+      console.log(userID1);
+      console.log(appToken1);
       var uri = location.href;
-      if (!userID || !appToken) {
+      if (!userID1 || !appToken1) {
         localStorage.clear();
         location.href = '<?php echo Yii::app()->request->baseUrl . 'index.php?r=j/web/wxIndex'; ?>';
       }
 
-      if (uri.indexOf('state=yiguanjia') > -1 && userID && appToken) {
+      if (uri.indexOf('state=yiguanjia') > -1 && userID1 && appToken1) {
         window.location.href='http://common.yiguanjia.me/index.php?r=j/web/index';
       }
       document.write('<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"><\/script>');