Merge pull request 'wpd_sub_user3' (#17) from wpd_sub_user3 into master

Reviewed-on: #17

config/define.php

@@ -37,7 +37,7 @@
 
     define('CSS_URL', '//zhishiku.yizherenxin.cn');
     //css/js版本
-    define('CSS_JS_VERSION', '1.0.0000004');
+    define('CSS_JS_VERSION', '1.0.0000005');
 
     define('ALIYUN_OSS_ACCESS_KEY_ID', 'LTAI5tRBq7yr1vcdvhqNMb7P');
     define('ALIYUN_OSS_ACCESS_KEY_SECRET', 'E4No4AjlWGrHSULsR8apZkTAC8DMw6');

control/callback.php

@@ -37,7 +37,7 @@ class callback extends publicBase {
             $obj = new mUser();
             $rdobj = $obj->initRedis();
             $rdobj->setex(sprintf(_RC_KNOWLEDGE_BIND_USER_INFO, $state[1], $state[2]), 6*60*60, $sub_user_id);
-            //header('Location:http://zhishiku.yizherenxin.cn/index/bind_user?pageid='.$state[2]);
+            header('Location:http://zhishiku.yizherenxin.cn/index/bind_user?pageid='.$state[2]);
             exit;
         }
         exit;

control/index.php

@@ -30,13 +30,24 @@ class index extends publicBase {
         $user_info = $this->get_user_info();
         if (!$user_info['is_super_admin']) $this->show_message(false, '您还有此权限');
 
-        $obj = new mUser();
-        $pageid = $obj->genPasswd(16);
+        $uobj = new mUser();
+        $pageid = trim($this->get('pageid'));
+
+        if(!empty($pageid)){
+            $rdobj = $uobj->initRedis();
+            $sub_user_id = $rdobj->get(sprintf(_RC_KNOWLEDGE_BIND_USER_INFO, $user_info['aid'], $pageid));
+            if (!$sub_user_id) $this->show_message(false, '扫码失败，请刷新重试');
+
+            $bind_user_info = $uobj->getAdminUserById($sub_user_id);
+            if (!$bind_user_info) $this->show_message(false, '绑定失败');
+
+            $this->view['bind_user_info'] = $bind_user_info;
+        }
 
         $this->view['pageid'] = $pageid;
         $this->view['appid'] = WEIXIN_OPEN_APPID;
         $this->view['redirect_uri'] = urlencode(CALLBACK_KNOWLEDGE_LOGIN_REDIRECT);
-        $this->view['state'] = CALLBACK_KNOWLEDGE_BIND . "-" . $user_info['aid'] . "-" . $pageid;
+        $this->view['state'] = CALLBACK_KNOWLEDGE_BIND . "-" . $user_info['aid'] . "-" . $uobj->genPasswd(16);
     }
 
     public function ajax_user_list() {

view/js/subCount.js

@@ -336,14 +336,24 @@ function renderList() {
         })
     }
 
+    checkAddNewBtn();
+    function checkAddNewBtn(){
+        if($('#bind_id').val().length>0){
+            $('.addChildNumWrap, .modal-overlay').fadeIn();
+        }
+    }
+
+    // $('.addChildNumWrap, .modal-overlay').fadeIn();
+    // $('.addChildNumWrap, .modal-overlay').attr("display",'block')
+
     $('.addNewBtn').click(function () {
         $('.addChildNumWrap, .modal-overlay').fadeIn();
-        setTimeout(listenLogin,3000)
+        // setTimeout(listenLogin,3000)
     });
     $('.cancelBtn').click(function(){
         $('.addChildNumWrap, .modal-overlay').fadeOut();
         if(!$('.scanSuccess').hasClass('hide')){
-            setTimeout(function (){ window.location.reload();},1000)
+            setTimeout(function (){ window.location.href = '/index/user_list'},1000)
         }
     })
     $('.confirmBtn').click(function(){
@@ -362,7 +372,7 @@ function renderList() {
                     alert(res.info);
                 }
                 $('.addChildNumWrap, .modal-overlay').fadeOut();
-                setTimeout(function (){ window.location.reload();},1000)
+                setTimeout(function (){ window.location.href = '/index/user_list'},1000)
             }
         })
     })

view/templates/index/user_list.html

@@ -68,6 +68,9 @@
 
         <div class="addChildNumWrap">
             <h3>新增子账号</h3>
+            {if $bind_user_info}
+            <img class="temImg" src="../../images/userTem.png" alt="">
+            {else}
             <div id="login_container" class="temImg">
                 {literal}
                 <script>
@@ -83,6 +86,7 @@
                 </script>
                 {/literal}
             </div>
+            {/if}
             <div class="scanSuccess code-filter column {if !$bind_user_info}hide{/if}">
                 <img src="{$smarty.const.CSS_URL}/images/step_success.png" alt="">
                 <span class="scanSuccessText">{$bind_user_info.nickname}，扫码成功</span>