diff --git a/app.js b/app.js
index 4614f283a..73e5494ed 100755
--- a/app.js
+++ b/app.js
@@ -36,8 +36,8 @@ let opts = {
// app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
-app.use('/callComponent', proxy('http://proxy.homecommunity.cn:9011', opts));
-app.use('/app', proxy('http://proxy.homecommunity.cn:9011', opts));
+app.use('/callComponent', proxy('http://proxy.homecommunity.cn:9034', opts));
+app.use('/app', proxy('http://proxy.homecommunity.cn:9034', opts));
// app.use('/callComponent', proxy('http://127.0.0.1:8008', opts));
// app.use('/app', proxy('http://127.0.0.1:8008', opts));
diff --git a/public/components/admin/addPropertyCompany/addPropertyCompany.html b/public/components/admin/addPropertyCompany/addPropertyCompany.html
index 9763e18bd..233dcb17b 100644
--- a/public/components/admin/addPropertyCompany/addPropertyCompany.html
+++ b/public/components/admin/addPropertyCompany/addPropertyCompany.html
@@ -68,7 +68,7 @@
- 温馨提示:账号为手机号;密码为手机号
+ 温馨提示:默认账号为手机号;密码为手机号
保存
取消
diff --git a/public/pages/admin/propertyCompanyManage/propertyCompanyManage.html b/public/pages/admin/propertyCompanyManage/propertyCompanyManage.html
index 1a47999ca..e69ce20bb 100644
--- a/public/pages/admin/propertyCompanyManage/propertyCompanyManage.html
+++ b/public/pages/admin/propertyCompanyManage/propertyCompanyManage.html
@@ -82,6 +82,9 @@
删除
+
+ 管理小区
+
@@ -95,7 +98,16 @@
-
+
+
+ 温馨提示:默认管理员账号为手机号;密码为手机号
+
+
+
+
+
+
+
diff --git a/public/pages/admin/propertyCompanyManage/propertyCompanyManage.js b/public/pages/admin/propertyCompanyManage/propertyCompanyManage.js
index bb19ecf75..89c23600a 100644
--- a/public/pages/admin/propertyCompanyManage/propertyCompanyManage.js
+++ b/public/pages/admin/propertyCompanyManage/propertyCompanyManage.js
@@ -78,6 +78,9 @@
vc.component.propertyCompanyManageInfo.moreCondition = true;
}
},
+ _openManageCommunity: function(_propertyCompany) {
+ vc.jumpToPage('/#/pages/common/propertyCommunity?storeId=' + _propertyCompany.storeId);
+ }
}
});
diff --git a/public/pages/common/enterCommunity/enterCommunity.html b/public/pages/common/enterCommunity/enterCommunity.html
index 9d58305d3..0fcc2facf 100755
--- a/public/pages/common/enterCommunity/enterCommunity.html
+++ b/public/pages/common/enterCommunity/enterCommunity.html
@@ -5,9 +5,9 @@
@@ -91,10 +91,10 @@
-
-
-
+
\ No newline at end of file
diff --git a/public/pages/common/propertyCommunity/propertyCommunity.html b/public/pages/common/propertyCommunity/propertyCommunity.html
new file mode 100644
index 000000000..42cce0c98
--- /dev/null
+++ b/public/pages/common/propertyCommunity/propertyCommunity.html
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
小区信息
+
+
+ 加入小区
+
+
+ 返回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/pages/common/propertyCommunity/propertyCommunity.js b/public/pages/common/propertyCommunity/propertyCommunity.js
new file mode 100644
index 000000000..a9a765317
--- /dev/null
+++ b/public/pages/common/propertyCommunity/propertyCommunity.js
@@ -0,0 +1,83 @@
+/**
+ 入驻小区
+ **/
+(function(vc) {
+ var DEFAULT_PAGE = 1;
+ var DEFAULT_ROWS = 10;
+ vc.extends({
+ data: {
+ propertyCommunityInfo: {
+ communitys: [],
+ total: 0,
+ records: 1,
+ storeTypeCd: vc.getData('/nav/getUserInfo').storeTypeCd,
+ conditions: {
+ name: '',
+ memberId: '',
+ communityId: ''
+ }
+ }
+ },
+ _initMethod: function() {
+ $that.propertyCommunityInfo.conditions.memberId = vc.getParam('storeId');
+ vc.component._listCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
+
+ },
+ _initEvent: function() {
+ vc.on('propertyCommunity', 'listCommunity', function(_param) {
+ vc.component._listCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
+ });
+ vc.on("propertyCommunity", "propertyCommunity", "notifyArea", function(_param) {
+ vc.component.propertyCommunityInfo.conditions.cityCode = _param.selectArea;
+ });
+ vc.on('pagination', 'page_event', function(_currentPage) {
+ vc.component._listCommunitys(_currentPage, DEFAULT_ROWS);
+ });
+ },
+ methods: {
+ _listCommunitys: function(_page, _rows) {
+ vc.component.propertyCommunityInfo.conditions.page = _page;
+ vc.component.propertyCommunityInfo.conditions.row = _rows;
+ var _param = {
+ params: vc.component.propertyCommunityInfo.conditions
+ }
+ //发送get请求
+ vc.http.apiGet('/community.listCommunitys',
+ _param,
+ function(json, res) {
+ var _propertyCommunityInfo = JSON.parse(json);
+ vc.component.propertyCommunityInfo.total = _propertyCommunityInfo.total;
+ vc.component.propertyCommunityInfo.records = _propertyCommunityInfo.records;
+ vc.component.propertyCommunityInfo.communitys = _propertyCommunityInfo.communitys;
+ vc.emit('pagination', 'init', {
+ total: vc.component.propertyCommunityInfo.records,
+ dataCount: vc.component.propertyCommunityInfo.total,
+ currentPage: _page
+ });
+ },
+ function(errInfo, error) {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ _openAddCommunityModal: function() {
+ vc.emit('addCommunity', 'openAddCommunityModal', {});
+ },
+ _openEditCommunityModel: function(_community) {
+ vc.emit('editCommunity', 'openEditCommunityModal', _community);
+ },
+ _openDeleteCommunityModel: function(_community) {
+ vc.emit('deleteCommunity', 'openDeleteCommunityModal', _community);
+ },
+ _openRecallCommunityModel: function(_community) {
+ vc.emit('recallAuditFinishCommunity', 'openRecallAuditFinishCommunityModal', _community);
+ },
+ _queryCommunityMethod: function() {
+ vc.component._listCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
+ },
+ _openDeleteCommunityModel(_community) {
+ vc.emit('deleteCommunity', 'openDeleteCommunityModal', _community);
+ },
+ }
+ });
+})(window.vc);
\ No newline at end of file