diff --git a/public/components/common/addCommunity/addCommunity.js b/public/components/common/addCommunity/addCommunity.js index aa25fe400..51d77b811 100644 --- a/public/components/common/addCommunity/addCommunity.js +++ b/public/components/common/addCommunity/addCommunity.js @@ -23,7 +23,7 @@ }, _initMethod: function () { vc.component._initArea('101', '0'); - + }, _initEvent: function () { vc.on('addCommunity', 'openAddCommunityModal', function () { @@ -145,12 +145,18 @@ vc.component.addCommunityInfo = { name: '', address: '', + tmpAddress: '', + areaAddress: '', nearbyLandmarks: '', - cityCode: '0971', + cityCode: '', mapX: '101.33', mapY: '101.33', attrs: [] }; + $that.selectProv = ''; + $that.selectCity = ''; + $that.selectArea = ''; + $that.allCity = []; }, getProv: function (_prov) { vc.component._initArea('202', _prov); diff --git a/public/components/dev/addMenuGroup/addMenuGroup.html b/public/components/dev/addMenuGroup/addMenuGroup.html index edd2b5c51..843f7d99c 100644 --- a/public/components/dev/addMenuGroup/addMenuGroup.html +++ b/public/components/dev/addMenuGroup/addMenuGroup.html @@ -52,7 +52,7 @@
- diff --git a/public/components/dev/addMenuGroup/addMenuGroup.js b/public/components/dev/addMenuGroup/addMenuGroup.js index b31cec99b..2ea6c4e09 100644 --- a/public/components/dev/addMenuGroup/addMenuGroup.js +++ b/public/components/dev/addMenuGroup/addMenuGroup.js @@ -15,7 +15,7 @@ seq: '', description: '', groupType: '', - storeTypeCd: '' + storeType: '' } }, _initMethod: function () { @@ -128,7 +128,7 @@ seq: '', description: '', groupType: '', - storeTypeCd: '' + storeType: '' }; } } diff --git a/public/components/dev/chooseMenuGroup/chooseMenuGroup.html b/public/components/dev/chooseMenuGroup/chooseMenuGroup.html index c6465eeaa..a5ff2cf7e 100644 --- a/public/components/dev/chooseMenuGroup/chooseMenuGroup.html +++ b/public/components/dev/chooseMenuGroup/chooseMenuGroup.html @@ -32,6 +32,7 @@ 组名称 icon 标签 + 归属商户 序列 描述 操作 @@ -44,6 +45,7 @@ {{menuGroup.name}} {{menuGroup.icon}} {{menuGroup.label}} + {{_getChooseStoreTypeName(menuGroup.storeType)}} {{menuGroup.seq}} {{menuGroup.description}} diff --git a/public/components/dev/chooseMenuGroup/chooseMenuGroup.js b/public/components/dev/chooseMenuGroup/chooseMenuGroup.js index 10d65aba8..97369cdce 100644 --- a/public/components/dev/chooseMenuGroup/chooseMenuGroup.js +++ b/public/components/dev/chooseMenuGroup/chooseMenuGroup.js @@ -56,6 +56,30 @@ }, _refreshChooseMenuGroupInfo:function(){ vc.component.chooseMenuGroupInfo._currentMenuGroupName = ""; + }, + _getChooseStoreTypeName: function (_storeTypeCd) { + // + // + // + // + // + // + + if (_storeTypeCd == '800900000001') { + return "运营团队"; + } else if (_storeTypeCd == '800900000002') { + return "代理商"; + } else if (_storeTypeCd == '800900000003') { + return "物业"; + } else if (_storeTypeCd == '800900000004') { + return "物流公司"; + } else if (_storeTypeCd == '800900000005') { + return "商家"; + } else if (_storeTypeCd == '800900000000') { + return "开发团队"; + } else { + return "未知"; + } } } diff --git a/public/components/dev/deleteAttrSpec/deleteAttrSpec.js b/public/components/dev/deleteAttrSpec/deleteAttrSpec.js index b2ac96e5c..de2c98ad0 100644 --- a/public/components/dev/deleteAttrSpec/deleteAttrSpec.js +++ b/public/components/dev/deleteAttrSpec/deleteAttrSpec.js @@ -19,7 +19,6 @@ }, methods:{ deleteAttrSpec:function(){ - vc.component.deleteAttrSpecInfo.communityId=vc.getCurrentCommunity().communityId; vc.http.apiPost( '/attrSpec/deleteAttrSpec', JSON.stringify(vc.component.deleteAttrSpecInfo), diff --git a/public/components/dev/editMenuGroup/editMenuGroup.html b/public/components/dev/editMenuGroup/editMenuGroup.html index 5d6682751..b4a5aa869 100644 --- a/public/components/dev/editMenuGroup/editMenuGroup.html +++ b/public/components/dev/editMenuGroup/editMenuGroup.html @@ -51,7 +51,7 @@
- diff --git a/public/components/dev/editMenuGroup/editMenuGroup.js b/public/components/dev/editMenuGroup/editMenuGroup.js index 21cfa5b1b..aa916cd65 100644 --- a/public/components/dev/editMenuGroup/editMenuGroup.js +++ b/public/components/dev/editMenuGroup/editMenuGroup.js @@ -10,7 +10,7 @@ seq: '', description: '', groupType: '', - storeTypeCd: '' + storeType: '' } }, _initMethod: function () { @@ -119,7 +119,7 @@ seq: '', description: '', groupType: '', - storeTypeCd: '' + storeType: '' } } } diff --git a/public/pages/dev/menuGroupManage/menuGroupManage.html b/public/pages/dev/menuGroupManage/menuGroupManage.html index b582ae7d3..16d6ec621 100644 --- a/public/pages/dev/menuGroupManage/menuGroupManage.html +++ b/public/pages/dev/menuGroupManage/menuGroupManage.html @@ -37,7 +37,7 @@
- @@ -84,7 +84,7 @@ {{menuGroup.gId}} {{menuGroup.name}} {{menuGroup.groupType == 'P_WEB'?'web菜单':'App菜单'}} - {{menuGroup.storeTypeCdName}} + {{_getStoreTypeName(menuGroup.storeType)}} {{menuGroup.icon}} {{menuGroup.label}} {{menuGroup.seq}} diff --git a/public/pages/dev/menuGroupManage/menuGroupManage.js b/public/pages/dev/menuGroupManage/menuGroupManage.js index 7ce3aee5e..e80787cd1 100644 --- a/public/pages/dev/menuGroupManage/menuGroupManage.js +++ b/public/pages/dev/menuGroupManage/menuGroupManage.js @@ -16,7 +16,7 @@ name: '', icon: '', label: '', - storeTypeCd: '' + storeType: '' } } }, @@ -97,8 +97,10 @@ return "物流公司"; } else if (_storeTypeCd == '800900000005') { return "商家"; - } else { + } else if (_storeTypeCd == '800900000000') { return "开发团队"; + } else { + return "未知"; } } diff --git a/public/pages/property/listOwnerCar/listOwnerCar.html b/public/pages/property/listOwnerCar/listOwnerCar.html index 2d6065418..eec871324 100644 --- a/public/pages/property/listOwnerCar/listOwnerCar.html +++ b/public/pages/property/listOwnerCar/listOwnerCar.html @@ -124,6 +124,10 @@ v-on:click="_addCarParkingSpace(car)">续租车位
+
+ +
+