From d0d830b0ff988b744fb3f1aa3d5183ad0b0707e1 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 11 May 2023 15:20:39 +0800
Subject: [PATCH] delete redis config

---
 .../ownerDetailMember/ownerDetailMember.html  | 119 +++++++++---------
 .../property/editOwner/editOwner.js           |  23 ----
 .../pages/owner/ownerDetail/ownerDetail.html  |  22 ++--
 public/pages/owner/ownerDetail/ownerDetail.js |   4 +-
 4 files changed, 71 insertions(+), 97 deletions(-)

diff --git a/public/components/owner/ownerDetailMember/ownerDetailMember.html b/public/components/owner/ownerDetailMember/ownerDetailMember.html
index 4916f21db..4a5b3d0d6 100644
--- a/public/components/owner/ownerDetailMember/ownerDetailMember.html
+++ b/public/components/owner/ownerDetailMember/ownerDetailMember.html
@@ -1,12 +1,10 @@
 <div class="margin-top">
     <div class="row margin-top-lg">
         <div class="col-lg-2 padding-right-xs padding-left-xl">
-            <input v-model="ownerDetailMemberInfo.name" type="text"
-                   :placeholder="vc.i18n('请填写成员名称','ownerDetailMember')" class="form-control">
+            <input v-model="ownerDetailMemberInfo.name" type="text" :placeholder="vc.i18n('请填写成员名称','ownerDetailMember')" class="form-control">
         </div>
         <div class="col-lg-2 padding-right-xs padding-right-xl">
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                    v-on:click="_qureyOwnerDetailMember()">
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_qureyOwnerDetailMember()">
                 <i class="fa fa-search"></i>查询
             </button>
         </div>
@@ -19,69 +17,69 @@
     <div class="margin-top">
         <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
             <thead>
-            <tr>
-                <th data-hide="phone" class="text-center">
-                    <span><vc:i18n name="名称" namespace="ownerDetailMember"></vc:i18n></span>
-                </th>
-                <th data-hide="phone" class="text-center">
-                    <span><vc:i18n name="性别" namespace="ownerDetailMember"></vc:i18n></span>
-                </th>
-                <th data-hide="phone" class="text-center">
-                    <span><vc:i18n name="类型" namespace="ownerDetailMember"></vc:i18n></span>
-                </th>
-                <th data-hide="phone" class="text-center">
-                    <span><vc:i18n name="身份证" namespace="ownerDetailMember"></vc:i18n></span>
-                </th>
-                <th data-hide="phone" class="text-center">
-                    <span><vc:i18n name="联系方式" namespace="ownerDetailMember"></vc:i18n></span>
-                </th>
-                <th data-hide="phone" class="text-center">
-                    <span><vc:i18n name="家庭住址" namespace="ownerDetailMember"></vc:i18n></span>
-                </th>
-                <th class="text-center">
-                    <span><vc:i18n name="操作" namespace="ownerDetailMember"></vc:i18n></span>
-                </th>
-            </tr>
+                <tr>
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="名称" namespace="ownerDetailMember"></vc:i18n></span>
+                    </th>
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="性别" namespace="ownerDetailMember"></vc:i18n></span>
+                    </th>
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="类型" namespace="ownerDetailMember"></vc:i18n></span>
+                    </th>
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="身份证" namespace="ownerDetailMember"></vc:i18n></span>
+                    </th>
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="联系方式" namespace="ownerDetailMember"></vc:i18n></span>
+                    </th>
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="家庭住址" namespace="ownerDetailMember"></vc:i18n></span>
+                    </th>
+                    <th class="text-center">
+                        <span><vc:i18n name="操作" namespace="ownerDetailMember"></vc:i18n></span>
+                    </th>
+                </tr>
             </thead>
             <tbody>
-            <tr v-for="member in ownerDetailMemberInfo.members">
-                <td class="text-center">
-                    {{member.name}}
-                </td>
-                <td class="text-center">
-                    {{member.sex == 0 ? '男' : '女'}}
-                </td>
-                <td class="text-center">
-                    {{member.ownerTypeName}}
-                </td>
-                <td class="text-center">
-                    {{member.idCard}}
-                </td>
-                <td class="text-center">
-                    {{member.link}}
-                </td>
-                <td class="text-center">
-                    {{member.address}}
-                </td>
-                <td class="text-center">
-                    <div class="btn-group">
-                        <button class="btn-white btn btn-xs" v-on:click="_openEditOwnerModel(member)"  v-if="vc.hasPrivilege('502023032899781711')">
+                <tr v-for="member in ownerDetailMemberInfo.members">
+                    <td class="text-center">
+                        {{member.name}}
+                    </td>
+                    <td class="text-center">
+                        {{member.sex == 0 ? '男' : '女'}}
+                    </td>
+                    <td class="text-center">
+                        {{member.ownerTypeName}}
+                    </td>
+                    <td class="text-center">
+                        {{member.idCard}}
+                    </td>
+                    <td class="text-center">
+                        {{member.link}}
+                    </td>
+                    <td class="text-center">
+                        {{member.address}}
+                    </td>
+                    <td class="text-center">
+                        <div class="btn-group">
+                            <button class="btn-white btn btn-xs" v-on:click="_openEditOwnerModel(member)" v-if="vc.hasPrivilege('502023032899781711')">
                             <span><vc:i18n name="修改" namespace="ownerDetailMember"></vc:i18n></span>
                         </button>
-                    </div>
-                    <div class="btn-group">
-                        <button class="btn-white btn btn-xs" v-on:click="_openDeleteOwnerModel(member)"  v-if="vc.hasPrivilege('502023032818941714')">
+                        </div>
+                        <div class="btn-group">
+                            <button class="btn-white btn btn-xs" v-on:click="_openDeleteOwnerModel(member)" v-if="vc.hasPrivilege('502023032818941714')">
                             <span><vc:i18n name="删除" namespace="ownerDetailMember"></vc:i18n></span>
                         </button>
-                    </div>
-                </td>
-            </tr>
+                        </div>
+                    </td>
+                </tr>
             </tbody>
         </table>
         <!-- 分页 -->
         <div class="row">
             <div class="col-sm-4">
-              
+
             </div>
             <!-- <div class="col-sm-8">
                 <vc:create namespace="ownerDetailMember" path="frame/paginationPlus"></vc:create>
@@ -89,9 +87,8 @@
         </div>
     </div>
 
-    <vc:create path="property/addOwner" notifyLoadDataComponentName="ownerDetailMember"
-    componentTitle="成员"></vc:create>
-<vc:create path="property/editOwner" notifyLoadDataComponentName="ownerDetailMember"
-    componentTitle="成员"></vc:create>
-<vc:create path="property/deleteOwner" notifyLoadDataComponentName="ownerDetailMember"></vc:create>
+    <vc:create path="property/addOwner" notifyLoadDataComponentName="ownerDetailMember" componentTitle="成员"></vc:create>
+    <!-- <vc:create path="property/editOwner" notifyLoadDataComponentName="ownerDetailMember"
+    componentTitle="成员"></vc:create> -->
+    <vc:create path="property/deleteOwner" notifyLoadDataComponentName="ownerDetailMember"></vc:create>
 </div>
\ No newline at end of file
diff --git a/public/components/property/editOwner/editOwner.js b/public/components/property/editOwner/editOwner.js
index 390b51383..d33a106e2 100755
--- a/public/components/property/editOwner/editOwner.js
+++ b/public/components/property/editOwner/editOwner.js
@@ -77,11 +77,6 @@
                         param: "",
                         errInfo: "性别不能为空"
                     }],
-                    /*'editOwnerInfo.idCard': [{
-                        limit: "maxLength",
-                        param: "18",
-                        errInfo: "身份证长度不能超过200位"
-                    }],*/
                     'editOwnerInfo.link': [{
                             limit: "required",
                             param: "",
@@ -105,17 +100,6 @@
                     vc.toast(vc.validate.errInfo);
                     return;
                 }
-                // if (vc.component.editOwnerInfo.idCard != null && vc.component.editOwnerInfo.idCard != '' &&
-                //     vc.component.editOwnerInfo.idCard != undefined) {
-                //     // $that.obtainEditAge();
-                //     // if ($that.editOwnerInfo.flag != null && $that.editOwnerInfo.flag != '' &&
-                //     //     $that.editOwnerInfo.flag != undefined && $that.editOwnerInfo.flag == 1) {
-                //     //     vc.component.editOwnerInfo.idCard = vc.component.editOwnerInfo.card;
-                //     //     // vc.toast("身份证格式不对，请重新填写");
-                //     //     return;
-                //     // }
-                //     // return;
-                // }
                 vc.component.editOwnerInfo.communityId = vc.getCurrentCommunity().communityId;
                 //编辑时 ownerPhoto 中内容不是照片内容，则清空
                 if (vc.component.editOwnerInfo.ownerPhotoUrl.indexOf(_fileUrl) != -1) {
@@ -246,13 +230,6 @@
                     }
                     // 改为异步上传图片
                     this._doUploadImageEditOwner(file);
-                    // var reader = new FileReader(); //新建FileReader对象
-                    // reader.readAsDataURL(file); //读取为base64
-                    // reader.onloadend = function (e) {
-                    //     vc.translate(reader.result, function (_data) {
-                    //         vc.component.editOwnerInfo.ownerPhoto = _data;
-                    //     })
-                    // }
                 }
             },
             // 异步上传图片
diff --git a/public/pages/owner/ownerDetail/ownerDetail.html b/public/pages/owner/ownerDetail/ownerDetail.html
index 4b5f64120..bb23d9ba2 100644
--- a/public/pages/owner/ownerDetail/ownerDetail.html
+++ b/public/pages/owner/ownerDetail/ownerDetail.html
@@ -102,7 +102,7 @@
                         </div>
                     </div>
                 </div>
-                <div v-for="(item,index) in ownerDetailInfo.attrs">
+                <div v-for="(item,index) in ownerDetailInfo.ownerAttrDtos">
                     <div class="row" v-if="index % 4 == 0">
                         <div class="col-sm-3">
                             <div class="form-group">
@@ -110,22 +110,22 @@
                                 <label class="">{{item.valueName}}</label>
                             </div>
                         </div>
-                        <div class="col-sm-3" v-if="index < ownerDetailInfo.attrs.length-1">
+                        <div class="col-sm-3" v-if="index < ownerDetailInfo.ownerAttrDtos.length-1">
                             <div class="form-group">
-                                <label class="col-form-label">{{ownerDetailInfo.attrs[index+1].specName}}：</label>
-                                <label class="">{{ownerDetailInfo.attrs[index+1].valueName}}</label>
+                                <label class="col-form-label">{{ownerDetailInfo.ownerAttrDtos[index+1].specName}}：</label>
+                                <label class="">{{ownerDetailInfo.ownerAttrDtos[index+1].valueName}}</label>
                             </div>
                         </div>
-                        <div class="col-sm-3" v-if="index < ownerDetailInfo.attrs.length-2">
+                        <div class="col-sm-3" v-if="index < ownerDetailInfo.ownerAttrDtos.length-2">
                             <div class="form-group">
-                                <label class="col-form-label">{{ownerDetailInfo.attrs[index+2].specName}}：</label>
-                                <label class="">{{ownerDetailInfo.attrs[index+2].valueName}}</label>
+                                <label class="col-form-label">{{ownerDetailInfo.ownerAttrDtos[index+2].specName}}：</label>
+                                <label class="">{{ownerDetailInfo.ownerAttrDtos[index+2].valueName}}</label>
                             </div>
                         </div>
-                        <div class="col-sm-3" v-if="index < ownerDetailInfo.attrs.length-3">
+                        <div class="col-sm-3" v-if="index < ownerDetailInfo.ownerAttrDtos.length-3">
                             <div class="form-group">
-                                <label class="col-form-label">{{ownerDetailInfo.attrs[index+3].specName}}：</label>
-                                <label class="">{{ownerDetailInfo.attrs[index+3].valueName}}</label>
+                                <label class="col-form-label">{{ownerDetailInfo.ownerAttrDtos[index+3].specName}}：</label>
+                                <label class="">{{ownerDetailInfo.ownerAttrDtos[index+3].valueName}}</label>
                             </div>
                         </div>
                     </div>
@@ -202,7 +202,7 @@
                     <vc:i18n name="合同" namespace="ownerDetail"></vc:i18n>
                 </a>
             </li>
-            
+
             <li class="nav-item">
                 <a class="nav-link" v-bind:class="{active:ownerDetailInfo._currentTab == 'ownerDetailReceipt'}" v-on:click="changeTab('ownerDetailReceipt')">
                     <vc:i18n name="补打收据" namespace="ownerDetail"></vc:i18n>
diff --git a/public/pages/owner/ownerDetail/ownerDetail.js b/public/pages/owner/ownerDetail/ownerDetail.js
index 6f835e629..c7165bbe2 100644
--- a/public/pages/owner/ownerDetail/ownerDetail.js
+++ b/public/pages/owner/ownerDetail/ownerDetail.js
@@ -16,7 +16,7 @@
                 idCard: "",
                 link: "",
                 ownerPhoto: "/img/noPhoto.jpg",
-                attrs: [],
+                ownerAttrDtos: [],
                 url: '',
                 _currentTab: 'ownerDetailRoom',
                 needBack: false,
@@ -60,7 +60,7 @@
                     function(json, res) {
                         var listOwnerData = JSON.parse(json);
                         vc.copyObject(listOwnerData.owners[0], vc.component.ownerDetailInfo);
-                        $that.ownerDetailInfo.attrs = listOwnerData.owners[0].ownerAttrDtos
+                        $that.ownerDetailInfo.ownerAttrDtos = listOwnerData.owners[0].ownerAttrDtos
                             //加载图片
                         vc.component._loadOwnerPhoto();
                     },