diff --git a/public/components/common/addCommunity/addCommunity.html b/public/components/common/addCommunity/addCommunity.html
index 37dfb4103..01e37d6b0 100755
--- a/public/components/common/addCommunity/addCommunity.html
+++ b/public/components/common/addCommunity/addCommunity.html
@@ -50,9 +50,9 @@
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="联系方式" namespace="addCommunity"></vc:i18n></span></label>
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="客服电话" namespace="addCommunity"></vc:i18n></span></label>
                                 <div class="col-sm-10">
-                                    <input v-model="addCommunityInfo.tel" type="text" :placeholder="vc.i18n('必填，请填写联系方式','addCommunity')" class="form-control">
+                                    <input v-model="addCommunityInfo.tel" type="text" :placeholder="vc.i18n('必填，请填写客服电话','addCommunity')" class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
diff --git a/public/components/common/addNoticeView/addNoticeView.html b/public/components/common/addNoticeView/addNoticeView.html
index c6b042dc9..d61ce0e3d 100755
--- a/public/components/common/addNoticeView/addNoticeView.html
+++ b/public/components/common/addNoticeView/addNoticeView.html
@@ -38,7 +38,7 @@
                     </label>
                     <div class="col-sm-10">
                         <select class="custom-select" v-model="addNoticeViewInfo.objType" @change="_changeObjType()">
-                            <option selected disabled value="">{{vc.i18n('必填','addNoticeView')}}，请选择公告范围</option>
+                            <option selected disabled value="">{{vc.i18n('必填，请选择公告范围','addNoticeView')}}</option>
                             <option value="005">{{vc.i18n('关注用户','addNoticeView')}}</option>
                             <option value="001">{{vc.i18n('小区','addNoticeView')}}</option>
                             <option value="002">{{vc.i18n('楼栋','addNoticeView')}}</option>
@@ -54,7 +54,7 @@
                     </label>
                     <div class="col-sm-10">
                         <select class="custom-select" v-model="addNoticeViewInfo.isAll">
-                            <option selected disabled value="">{{vc.i18n('必填','addNoticeView')}}，请选择是否全部小区公告</option>
+                            <option selected disabled value="">{{vc.i18n('必填，请选择是否全部小区公告','addNoticeView')}}</option>
                             <option value="N">{{vc.i18n('否','addNoticeView')}}</option>
                             <option value="Y">{{vc.i18n('是','addNoticeView')}}</option>
                         </select>
diff --git a/public/components/common/editCommunity/editCommunity.html b/public/components/common/editCommunity/editCommunity.html
index e4b279901..8431d134a 100755
--- a/public/components/common/editCommunity/editCommunity.html
+++ b/public/components/common/editCommunity/editCommunity.html
@@ -1,4 +1,4 @@
-<div id="editCommunityModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+<div id="editCommunityModel" 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">
@@ -39,9 +39,9 @@
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="联系电话" namespace="editCommunity"></vc:i18n></span></label>
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="客服电话" namespace="editCommunity"></vc:i18n></span></label>
                                 <div class="col-sm-10">
-                                    <input v-model="editCommunityInfo.tel" type="text" :placeholder="vc.i18n('必填，请填写联系电话','editCommunity')" class="form-control">
+                                    <input v-model="editCommunityInfo.tel" type="text" :placeholder="vc.i18n('必填，请填写客服电话','editCommunity')" class="form-control">
                                 </div>
                             </div>
                             <div v-for="(item,index) in editCommunityInfo.attrs">
diff --git a/public/components/common/editCommunityArea/editCommunityArea.html b/public/components/common/editCommunityArea/editCommunityArea.html
index aa8bb834c..65a647dbb 100755
--- a/public/components/common/editCommunityArea/editCommunityArea.html
+++ b/public/components/common/editCommunityArea/editCommunityArea.html
@@ -1,95 +1,124 @@
-<div id="editCommunityAreaModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-     aria-hidden="true">
+<div id="editCommunityAreaModel" 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="editCommunityArea"></vc:i18n></span>
+                    <span>
+                        <vc:i18n name="修改小区" namespace="editCommunityArea"></vc:i18n>
+                    </span>
                 </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="editCommunityArea"></vc:i18n></span>
+                                    <span>
+                                        <vc:i18n name="小区名称" namespace="editCommunityArea"></vc:i18n>
+                                    </span>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model="editCommunityAreaInfo.name" type="text" readonly="readonly"
-                                           class="form-control">
+                                        class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="小区地址" namespace="editCommunityArea"></vc:i18n></span>
+                                    <span>
+                                        <vc:i18n name="小区地址" namespace="editCommunityArea"></vc:i18n>
+                                    </span>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model="editCommunityAreaInfo.address" type="text" readonly="readonly"
-                                           class="form-control">
+                                        class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="小区地标" namespace="editCommunityArea"></vc:i18n></span>
+                                    <span>
+                                        <vc:i18n name="小区地标" namespace="editCommunityArea"></vc:i18n>
+                                    </span>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model="editCommunityAreaInfo.nearbyLandmarks" type="text"
-                                           readonly="readonly" class="form-control">
+                                        readonly="readonly" class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="城市编码" namespace="editCommunityArea"></vc:i18n></span>
+                                    <span>
+                                        <vc:i18n name="城市编码" namespace="editCommunityArea"></vc:i18n>
+                                    </span>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model="editCommunityAreaInfo.cityCode" type="text" readonly="readonly"
-                                           class="form-control">
+                                        class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="地区" namespace="editCommunityArea"></vc:i18n></span>X坐标
+                                    <span>
+                                        <vc:i18n name="地区" namespace="editCommunityArea"></vc:i18n>
+                                    </span>X坐标
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model="editCommunityAreaInfo.mapX" type="text" readonly="readonly"
-                                           class="form-control">
+                                        class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="地区" namespace="editCommunityArea"></vc:i18n></span>Y坐标
+                                    <span>
+                                        <vc:i18n name="地区" namespace="editCommunityArea"></vc:i18n>
+                                    </span>Y坐标
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model="editCommunityAreaInfo.mapY" type="text" readonly="readonly"
-                                           class="form-control">
+                                        class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="联系方式" namespace="editCommunityArea"></vc:i18n></span>
+                                    <span>
+                                        <vc:i18n name="客服电话" namespace="editCommunityArea"></vc:i18n>
+                                    </span>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model="editCommunityAreaInfo.tel" type="text"
-                                           :placeholder="vc.i18n('必填，请填写联系方式','editCommunityArea')"
-                                           class="form-control">
+                                        :placeholder="vc.i18n('必填，请填写客服电话','editCommunityArea')" class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="小区面积" namespace="editCommunityArea"></vc:i18n></span>
+                                    <span>
+                                        <vc:i18n name="客服二维码" namespace="editCommunityArea"></vc:i18n>
+                                    </span>
+                                </label>
+                                <div class="col-sm-10">
+                                    <vc:create path="frame/uploadImageUrl" callBackListener="editCommunityArea"
+                                        callBackFunction="notifyUploadImage" imageCount="1"
+                                        namespace="editCommunityArea">
+                                    </vc:create>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">
+                                    <span>
+                                        <vc:i18n name="小区面积" namespace="editCommunityArea"></vc:i18n>
+                                    </span>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model="editCommunityAreaInfo.communityArea" type="text"
-                                           :placeholder="vc.i18n('必填，请填写小区面积','editCommunityArea')"
-                                           class="form-control">
+                                        :placeholder="vc.i18n('必填，请填写小区面积','editCommunityArea')" class="form-control">
                                 </div>
                             </div>
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
-                                        v-on:click="editCommunityArea()">
+                                    v-on:click="editCommunityArea()">
                                     <i class="fa fa-check"></i>&nbsp;保存
                                 </button>
                                 <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                                        data-dismiss="modal">
+                                    data-dismiss="modal">
                                     <i class="fa fa-times"></i>&nbsp;取消
                                 </button>
                             </div>
@@ -99,4 +128,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/components/common/editCommunityArea/editCommunityArea.js b/public/components/common/editCommunityArea/editCommunityArea.js
index 0e2d973af..b2ba63f97 100755
--- a/public/components/common/editCommunityArea/editCommunityArea.js
+++ b/public/components/common/editCommunityArea/editCommunityArea.js
@@ -10,7 +10,8 @@
                 mapX: '101.33',
                 mapY: '101.33',
                 tel: '',
-                communityArea: ''
+                communityArea: '',
+                qrCode:''
             }
         },
         _initMethod: function () {
@@ -21,8 +22,19 @@
                     vc.component.refreshEditCommunityInfo();
                     $('#editCommunityAreaModel').modal('show');
                     vc.copyObject(_params, vc.component.editCommunityAreaInfo);
-                    //vc.component.editCommunityAreaInfo.communityId = vc.getCurrentCommunity().communityId;
+                    if(_params.qrCode){
+                        let photos = [];
+                        photos.push(_params.qrCode);
+                        vc.emit('editCommunityArea', 'uploadImageUrl', 'notifyPhotos', photos);
+                    }
                 });
+            vc.on("editCommunityArea", "notifyUploadImage", function (_param) {
+                if (_param.length > 0) {
+                    vc.component.editCommunityAreaInfo.qrCode = _param[0].url;
+                } else {
+                    vc.component.editCommunityAreaInfo.qrCode = ''
+                }
+            });
         },
         methods: {
             editCommunityAreaValidate: function () {
@@ -120,8 +132,8 @@
                     return;
                 }
                 vc.http.apiPost('/community.updateCommunity', JSON.stringify(vc.component.editCommunityAreaInfo), {
-                        emulateJSON: true
-                    },
+                    emulateJSON: true
+                },
                     function (json, res) {
                         let _json = JSON.parse(json);
                         if (_json.code == 0) {
@@ -150,7 +162,8 @@
                     mapY: '101.33',
                     tel: '',
                     state: '',
-                    communityArea: ''
+                    communityArea: '',
+                    qrCode:''
                 }
             }
         }
diff --git a/public/pages/common/enterCommunity/enterCommunity.html b/public/pages/common/enterCommunity/enterCommunity.html
index b3a78f1af..0969129c6 100755
--- a/public/pages/common/enterCommunity/enterCommunity.html
+++ b/public/pages/common/enterCommunity/enterCommunity.html
@@ -35,7 +35,7 @@
                                 <span><vc:i18n name="小区编码" namespace="enterCommunity"></vc:i18n></span>
                             </th>
                             <th data-hide="phone" class="text-center">
-                                <span><vc:i18n name="联系方式" namespace="enterCommunity"></vc:i18n></span>
+                                <span><vc:i18n name="客服电话" namespace="enterCommunity"></vc:i18n></span>
                             </th>
                             <th data-hide="phone" class="text-center">
                                 <span><vc:i18n name="面积" namespace="enterCommunity"></vc:i18n></span>
@@ -99,12 +99,6 @@
                                 {{_showCommunityStatus(community.auditStatusCd)}}
                             </td>
                             <td class="text-center">
-                                <!-- <div class="btn-group" v-if="community.auditStatusCd == '1100'
-                                      && community.communityId != '7020181217000001'">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openExitCommunityModel(community)">
-                                       <span><vc:i18n name="申请退出" namespace="enterCommunity"></vc:i18n></span>
-                                    </button>
-                                </div>-->
                                 <div class="btn-group" v-if="community.auditStatusCd == '1100' ">
                                     <button class="btn-white btn btn-xs"
                                             v-on:click="_openUpdateCommunityModel(community)">
@@ -145,7 +139,5 @@
             </div>
         </div>
     </div>
-    <!-- <vc:create path="common/storeEnterCommunity"></vc:create>
-    <vc:create path="common/storeExitCommunity"></vc:create> -->
     <vc:create path="common/editCommunityArea"></vc:create>
 </div>