Merge pull request '删除无用代码' (#19) from wpd_sub_user4 into master

Reviewed-on: #19

config/define.php

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

control/index.php

@@ -33,7 +33,7 @@ class index extends publicBase {
         $uobj = new mUser();
         $pageid = trim($this->get('pageid'));
 
-        if(!empty($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, '扫码失败，请刷新重试');
@@ -80,6 +80,7 @@ class index extends publicBase {
         $id = $this->post('id') + 0;
         $status = $this->post('status') + 0;
         $realname = trim($this->post('realname'));
+        if (mb_strlen($realname, 'UTF-8') > 10) $this->ajax_json(false, '字数太多啦');
 
         $data = array();
         if ($status > 0) $data['status'] = $status;
@@ -91,21 +92,4 @@ class index extends publicBase {
 
         $this->ajax_json(true, '设置成功');
     }
-
-    public function ajax_get_user_login() {
-        $user_info = $this->get_user_info();
-        if (!$user_info['is_super_admin']) $this->ajax_json(false, '您还有此权限');
-
-        $pageid = trim($this->post('pageid'));
-
-        $uobj = new mUser();
-        $rdobj = $uobj->initRedis();
-        $sub_user_id = $rdobj->get(sprintf(_RC_KNOWLEDGE_BIND_USER_INFO, $user_info['aid'], $pageid));
-        if (!$sub_user_id) $this->ajax_json(false, '还未扫码');
-
-        $bind_user_info = $uobj->getAdminUserById($sub_user_id);
-        if (!$bind_user_info) $this->ajax_json(false, '未知错误');
-
-        $this->ajax_json(true, '扫码成功', $bind_user_info);
-    }
 }

view/js/subCount.js

@@ -89,7 +89,7 @@ $(document).ready(function () {
         pageData.forEach((item)=>{
             html += ` <tr data-id="${item.id}">
                             <td>${item.nickname}</td>
-                            <td>${item.realname} <img class="action-icon" src="../../images/edit.svg" alt=""></td>
+                            <td>${item.realname}<img class="action-icon" src="../../images/edit.svg" alt=""></td>
                             <td>${item.addtime}</td>
                             <td>
                                 <label class="switch">
@@ -241,7 +241,6 @@ function renderList() {
         currentRow = row;
         const cell = row.find('td').eq(1); // 编辑第2列数据
         const currentValue = cell.text();
-        console.log($('#editPopover').width(),'-----offset');
         $('#editInput').val(currentValue);
         $('#editPopover').css({
           top: row.offset().top - $('#editPopover').height() - row.height(),
@@ -265,10 +264,10 @@ function renderList() {
             },
             success: function (res) {
               if(!res.status){
-                alert(`请求失败`);
+                alert(res.info);
+              }else{
+                  currentRow.find('td').eq(1).html(newValue+'<img class="action-icon" src="../../images/edit.svg" alt="">');
               }
-
-              currentRow.find('td').eq(1).text(newValue);
               $('#editPopover').hide();
             }
           })
@@ -282,7 +281,6 @@ function renderList() {
 
     //Switch 开关切换
     $('#tbody-wrap').on('change','.switch input',function () {
-        // row.find('td').eq(2).text(status); // 更新状态列
         const that = $(this);
         const row = that.closest('tr');
         const isChecked = that.is(':checked');
@@ -310,32 +308,6 @@ function renderList() {
         })
     });
 
-
-    function listenLogin() {
-        if($('.addChildNumWrap, .modal-overlay').css("display") === "none"){
-            return false;
-        }
-
-        const pageid = $('#pageid').val();
-        $.ajax({
-            type: "post",
-            dataType: 'json',
-            url: '/index/ajax_get_user_login',
-            data: {
-                pageid
-            },
-            success: function (res) {
-                if(res.status){
-                   $('#bind_id').val(res.data.id);
-                   $('.scanSuccessText').html(res.data.nickname + '，扫码成功');
-                   $('.scanSuccess').removeClass('hide');
-                }else{
-                    setTimeout(listenLogin,3000)
-                }
-            }
-        })
-    }
-
     checkAddNewBtn();
     function checkAddNewBtn(){
         if($('#bind_id').val().length>0){
@@ -343,12 +315,8 @@ function renderList() {
         }
     }
 
-    // $('.addChildNumWrap, .modal-overlay').fadeIn();
-    // $('.addChildNumWrap, .modal-overlay').attr("display",'block')
-
     $('.addNewBtn').click(function () {
         $('.addChildNumWrap, .modal-overlay').fadeIn();
-        // setTimeout(listenLogin,3000)
     });
     $('.cancelBtn').click(function(){
         $('.addChildNumWrap, .modal-overlay').fadeOut();