From cc65ee33305faafaa41073ed88741f2ea51ce9f4 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Mon, 8 Mar 2021 13:07:25 +0800 Subject: [PATCH 1/6] jiaruguishu --- public/components/dev/addMenuGroup/addMenuGroup.html | 2 +- public/components/dev/addMenuGroup/addMenuGroup.js | 4 ++-- public/components/dev/editMenuGroup/editMenuGroup.html | 2 +- public/components/dev/editMenuGroup/editMenuGroup.js | 4 ++-- public/pages/dev/menuGroupManage/menuGroupManage.html | 4 ++-- public/pages/dev/menuGroupManage/menuGroupManage.js | 6 ++++-- 6 files changed, 12 insertions(+), 10 deletions(-) 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/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 "未知"; } } From f3d4f3a7567d18d07e1279647e796cff4a54c091 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Mon, 8 Mar 2021 14:59:49 +0800 Subject: [PATCH 2/6] jiaru caidanzu xuanze --- .../dev/chooseMenuGroup/chooseMenuGroup.html | 2 ++ .../dev/chooseMenuGroup/chooseMenuGroup.js | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+) 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 "未知"; + } } } From c49944ade7141daead2cccfd87c41b59e1700044 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Tue, 9 Mar 2021 16:13:29 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/components/dev/deleteAttrSpec/deleteAttrSpec.js | 1 - 1 file changed, 1 deletion(-) 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), From 08dff599093bea5a8d71dd7f2559bdf505fa770d Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Tue, 9 Mar 2021 16:34:01 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/pages/property/listOwnerCar/listOwnerCar.html | 4 ++++ 1 file changed, 4 insertions(+) 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)">续租车位
+
+ +
+
From 864770811a11c8ebfb844d43898acee220c41905 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Tue, 9 Mar 2021 16:43:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/components/common/addCommunity/addCommunity.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/components/common/addCommunity/addCommunity.js b/public/components/common/addCommunity/addCommunity.js index aa25fe400..43fb7d9bc 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,8 +145,10 @@ vc.component.addCommunityInfo = { name: '', address: '', + tmpAddress: '', + areaAddress: '', nearbyLandmarks: '', - cityCode: '0971', + cityCode: '', mapX: '101.33', mapY: '101.33', attrs: [] From 83870b276cddce11d9e7464a337769a3dd85c509 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Tue, 9 Mar 2021 16:54:57 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/components/common/addCommunity/addCommunity.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/components/common/addCommunity/addCommunity.js b/public/components/common/addCommunity/addCommunity.js index 43fb7d9bc..51d77b811 100644 --- a/public/components/common/addCommunity/addCommunity.js +++ b/public/components/common/addCommunity/addCommunity.js @@ -153,6 +153,10 @@ mapY: '101.33', attrs: [] }; + $that.selectProv = ''; + $that.selectCity = ''; + $that.selectArea = ''; + $that.allCity = []; }, getProv: function (_prov) { vc.component._initArea('202', _prov);