From a43a63c884e3ceff23303c907fcfdca502c77b7a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Wed, 2 Apr 2025 18:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E9=99=86=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=ACbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminLoginProperty.html                   | 49 +++++++++----------
 .../adminLoginProperty/adminLoginProperty.js  | 37 +++++++-------
 public/components/frame/initData/initData.js  | 14 +++---
 .../property/addSmallWeChat/addSmallWeChat.js |  2 +-
 .../deleteSmallWeChat/deleteSmallWeChat.js    | 10 ++--
 .../editSmallWeChat/editSmallWeChat.js        |  2 +-
 6 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/public/components/admin/adminLoginProperty/adminLoginProperty.html b/public/components/admin/adminLoginProperty/adminLoginProperty.html
index 0c5660009..5d11f9daf 100644
--- a/public/components/admin/adminLoginProperty/adminLoginProperty.html
+++ b/public/components/admin/adminLoginProperty/adminLoginProperty.html
@@ -1,38 +1,37 @@
-<div id="adminLoginPropertyModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-     aria-hidden="true">
+<div id="adminLoginPropertyModel" class="modal fade"  role="dialog" aria-labelledby="exampleModalLabel"
+    aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
                 <h3 class="m-t-none m-b ">
-                    <span><vc:i18n name="密码确认" namespace="adminLoginProperty"></vc:i18n></span>
+                        <vc:i18n name="密码确认" namespace="adminLoginProperty"></vc:i18n>
                 </h3>
                 <div class="ibox-content">
-                    <div>
-                        <div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="密码" namespace="adminLoginProperty"></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input :placeholder="vc.i18n('必填，请输入当前账号密码','adminLoginProperty')" type="password"
-                                           class="form-control" v-model="adminLoginPropertyInfo.curPasswd">
-                                </div>
-                            </div>
-                            <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button"
-                                        v-on:click="_adminLoginPropertySubmit()">
-                                    <i class="fa fa-check"></i>&nbsp;登录
-                                </button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                                        data-dismiss="modal">
-                                    <span><vc:i18n name="取消" namespace="adminLoginProperty"></vc:i18n></span>
-                                </button>
-                            </div>
+
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                                <vc:i18n name="密码" namespace="adminLoginProperty"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <input :placeholder="vc.i18n('必填，请输入当前账号密码','adminLoginProperty')" type="password"
+                                class="form-control" v-model="adminLoginPropertyInfo.curPasswd">
                         </div>
                     </div>
+                    <div class="ibox-content">
+                        <button class="btn btn-primary float-right" type="button"
+                            v-on:click="_adminLoginPropertySubmit()">
+                            <i class="fa fa-check"></i>&nbsp;登录
+                        </button>
+                        <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                            data-dismiss="modal">
+                            <span>
+                                <vc:i18n name="取消" namespace="adminLoginProperty"></vc:i18n>
+                            </span>
+                        </button>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
     <vc:create path="frame/initData"></vc:create>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/components/admin/adminLoginProperty/adminLoginProperty.js b/public/components/admin/adminLoginProperty/adminLoginProperty.js
index 2ed74e537..6f7f99159 100644
--- a/public/components/admin/adminLoginProperty/adminLoginProperty.js
+++ b/public/components/admin/adminLoginProperty/adminLoginProperty.js
@@ -19,7 +19,7 @@
         methods: {
             adminLoginPropertyValidate() {
                 return vc.validate.validate({
-                    adminLoginPropertyInfo: vc.component.adminLoginPropertyInfo
+                    adminLoginPropertyInfo: $that.adminLoginPropertyInfo
                 }, {
                     'adminLoginPropertyInfo.curPasswd': [
                         {
@@ -31,11 +31,11 @@
                 });
             },
             _adminLoginPropertySubmit: function () {
-                if (!vc.component.adminLoginPropertyValidate()) {
+                if (!$that.adminLoginPropertyValidate()) {
                     vc.toast(vc.validate.errInfo);
                     return;
                 }
-                vc.http.apiPost('/adminLoginPropertyAccount',
+                vc.http.apiPost('/login.adminLoginProperty',
                     JSON.stringify($that.adminLoginPropertyInfo),
                     {
                         emulateJSON: true
@@ -43,19 +43,18 @@
                     function (json, res) {
                         $that.clearAddBasePrivilegeInfo();
                         $('#adminLoginPropertyModel').modal('hide');
-                        let _data = JSON.parse(json);
-                        if (_data.hasOwnProperty('code') && _data.code != '0') {
-                            vc.toast(_data.msg);
-                            return;
-                        }
-                        if (res.status == 200) {
-                            vc.component.clearCacheData();
-                            vc.component._loadSysInfo();
-                            vc.emit('initData', 'loadCommunityInfo', {
-                                url: '/'
-                            });
+                        let _json = JSON.parse(json);
+                        if (_json.code != 0) {
+                            vc.toast(_json.msg);
                             return;
                         }
+                        let _data = _json.data;
+                        $that.clearCacheData();
+                        $that._loadSysInfo();
+                        vc.emit('initData', 'loadCommunityInfo', {
+                            url: '/',
+                            loginUsers:_data
+                        });
                     },
                     function (errInfo, error) {
                         console.log('请求失败处理');
@@ -63,7 +62,7 @@
                     });
             },
             clearAddBasePrivilegeInfo: function () {
-                vc.component.adminLoginPropertyInfo = {
+                $that.adminLoginPropertyInfo = {
                     username: '',
                     userId: '',
                     curPasswd: '',
@@ -88,18 +87,18 @@
                         if (res.status != 200) {
                             console.log("加载系统信息失败");
                             vc.saveData("_sysInfo", {logo: 'HC'});
-                            vc.copyObject(json, vc.component.loginInfo);
+                            vc.copyObject(json, $that.loginInfo);
                             return;
                         }
-                        vc.copyObject(JSON.parse(json), vc.component.loginInfo);
+                        vc.copyObject(JSON.parse(json), $that.loginInfo);
                         //保存到浏览器
                         vc.saveData("_sysInfo", JSON.parse(json));
                     },
                     function (errInfo, error) {
                         console.log('请求失败处理');
                         vc.saveData("_sysInfo", {logo: 'HC'});
-                        vc.copyObject(json, vc.component.loginInfo);
-                        vc.component.loginInfo.errorInfo = errInfo;
+                        vc.copyObject(json, $that.loginInfo);
+                        $that.loginInfo.errorInfo = errInfo;
                     });
             },
         }
diff --git a/public/components/frame/initData/initData.js b/public/components/frame/initData/initData.js
index 49e5254d2..bd60eb31d 100644
--- a/public/components/frame/initData/initData.js
+++ b/public/components/frame/initData/initData.js
@@ -11,13 +11,13 @@
         },
         _initEvent: function () {
             vc.on('initData', 'loadCommunityInfo', function (_param) {
-                $that.loginInfo.loginUsers = _param.loginUsers;
-                $that.loginInfo.pageUrl = _param.url;
-                if ($that.loginInfo.loginUsers.length > 1) {
+                $that.initDataInfo.loginUsers = _param.loginUsers;
+                $that.initDataInfo.pageUrl = _param.url;
+                if ($that.initDataInfo.loginUsers.length > 1) {
                     $that._initOpenModal();
                     return;
                 }
-                $that._initLoginUserInfo($that.loginInfo.loginUsers[0]);
+                $that._initLoginUserInfo($that.initDataInfo.loginUsers[0]);
             })
         },
         methods: {
@@ -26,7 +26,7 @@
                 content += '<table class="layui-table">';
                 content += '<thead><tr><th>选择</th><th>账号</th><th>隶属</th><th>角色</th></tr></thead>';
                 content += '<tbody>';
-                $that.loginInfo.loginUsers.forEach(function (item) {
+                $that.initDataInfo.loginUsers.forEach(function (item) {
                     content += `<tr>
                     <td><input type="radio" name="selectedItem" value='${JSON.stringify(item)}'></td>
                     <td>${item.userName}(${item.userId})</td>
@@ -88,11 +88,11 @@
                                 vc.toast('运营团队未分配小区，请联系运营团队');
                                 return;
                             }
-                            vc.jumpToPage($that.loginInfo.pageUrl);
+                            vc.jumpToPage($that.initDataInfo.pageUrl);
                         }
                     },
                     function () {
-                        vc.jumpToPage($that.loginInfo.pageUrl);
+                        vc.jumpToPage($that.initDataInfo.pageUrl);
                     }
                 );
             },
diff --git a/public/components/property/addSmallWeChat/addSmallWeChat.js b/public/components/property/addSmallWeChat/addSmallWeChat.js
index 9e0d5c288..8a9928564 100644
--- a/public/components/property/addSmallWeChat/addSmallWeChat.js
+++ b/public/components/property/addSmallWeChat/addSmallWeChat.js
@@ -114,7 +114,7 @@
                 }
                 $that.addSmallWeChatInfo.objId = vc.getCurrentCommunity().communityId;
                 vc.http.apiPost(
-                    'smallWeChat.saveSmallWeChat',
+                    '/smallWeChat.saveSmallWeChat',
                     JSON.stringify($that.addSmallWeChatInfo), {
                         emulateJSON: true
                     },
diff --git a/public/components/property/deleteSmallWeChat/deleteSmallWeChat.js b/public/components/property/deleteSmallWeChat/deleteSmallWeChat.js
index 017f54526..4a6470004 100644
--- a/public/components/property/deleteSmallWeChat/deleteSmallWeChat.js
+++ b/public/components/property/deleteSmallWeChat/deleteSmallWeChat.js
@@ -12,17 +12,17 @@
          _initEvent:function(){
              vc.on('deleteSmallWeChat','openDeleteSmallWeChatModal',function(_params){
 
-                vc.component.deleteSmallWeChatInfo = _params;
+                $that.deleteSmallWeChatInfo = _params;
                 $('#deleteSmallWeChatModel').modal('show');
 
             });
         },
         methods:{
             deleteSmallWeChat:function(){
-                vc.component.deleteSmallWeChatInfo.communityId=vc.getCurrentCommunity().communityId;
+                $that.deleteSmallWeChatInfo.communityId=vc.getCurrentCommunity().communityId;
                 vc.http.apiPost(
-                    'smallWeChat.deleteSmallWeChat',
-                    JSON.stringify(vc.component.deleteSmallWeChatInfo),
+                    '/smallWeChat.deleteSmallWeChat',
+                    JSON.stringify($that.deleteSmallWeChatInfo),
                     {
                         emulateJSON:true
                      },
@@ -48,4 +48,4 @@
         }
     });
 
-})(window.vc,window.vc.component);
+})(window.vc,window.$that);
diff --git a/public/components/property/editSmallWeChat/editSmallWeChat.js b/public/components/property/editSmallWeChat/editSmallWeChat.js
index e439978f7..878a12430 100644
--- a/public/components/property/editSmallWeChat/editSmallWeChat.js
+++ b/public/components/property/editSmallWeChat/editSmallWeChat.js
@@ -99,7 +99,7 @@
                 //1000表示改小程序作用于当前小区 否则作用于所有小区
                 $that.editSmallWeChatInfo.objId = vc.getCurrentCommunity().communityId;
                 vc.http.apiPost(
-                    'smallWeChat.updateSmallWeChat',
+                    '/smallWeChat.updateSmallWeChat',
                     JSON.stringify($that.editSmallWeChatInfo), {
                         emulateJSON: true
                     },