From 2354e935dd2ff1857f9d6d5790bc550415ac9121 Mon Sep 17 00:00:00 2001 From: 1098226878 <1098226878@qq.com> Date: Tue, 28 Sep 2021 18:22:34 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=91=E8=85=BF?= =?UTF-8?q?=E5=95=86=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/pages/dev/menuGroupManage/menuGroupManage.html | 1 + 1 file changed, 1 insertion(+) diff --git a/public/pages/dev/menuGroupManage/menuGroupManage.html b/public/pages/dev/menuGroupManage/menuGroupManage.html index a646ce6c1..18562b9c5 100755 --- a/public/pages/dev/menuGroupManage/menuGroupManage.html +++ b/public/pages/dev/menuGroupManage/menuGroupManage.html @@ -45,6 +45,7 @@ + From e5ed9dc2cc0319446da89d3d21b76ea07ef07f72 Mon Sep 17 00:00:00 2001 From: 1098226878 <1098226878@qq.com> Date: Tue, 28 Sep 2021 18:23:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=91=E8=85=BF?= =?UTF-8?q?=E5=95=86=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/components/dev/addMenuGroup/addMenuGroup.html | 1 + public/components/dev/editMenuGroup/editMenuGroup.html | 1 + 2 files changed, 2 insertions(+) diff --git a/public/components/dev/addMenuGroup/addMenuGroup.html b/public/components/dev/addMenuGroup/addMenuGroup.html index 843f7d99c..b140d020b 100755 --- a/public/components/dev/addMenuGroup/addMenuGroup.html +++ b/public/components/dev/addMenuGroup/addMenuGroup.html @@ -60,6 +60,7 @@ + diff --git a/public/components/dev/editMenuGroup/editMenuGroup.html b/public/components/dev/editMenuGroup/editMenuGroup.html index b4a5aa869..184bfadf0 100755 --- a/public/components/dev/editMenuGroup/editMenuGroup.html +++ b/public/components/dev/editMenuGroup/editMenuGroup.html @@ -59,6 +59,7 @@ + From 4fa81ef3ed42ffe4d34c1361bf4857cee3fe64d9 Mon Sep 17 00:00:00 2001 From: 1098226878 <1098226878@qq.com> Date: Tue, 28 Sep 2021 18:30:51 +0800 Subject: [PATCH 3/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/dev/menuGroupManage/menuGroupManage.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/pages/dev/menuGroupManage/menuGroupManage.js b/public/pages/dev/menuGroupManage/menuGroupManage.js index 75625e70a..87c11d666 100755 --- a/public/pages/dev/menuGroupManage/menuGroupManage.js +++ b/public/pages/dev/menuGroupManage/menuGroupManage.js @@ -100,7 +100,9 @@ return "商家"; } else if (_storeTypeCd == '800900000000') { return "开发团队"; - } else { + }else if (_storeTypeCd == '800900000006') { + return "跑腿"; + } else { return "未知"; } } From 9941d14e4746491c9a1d2467dc3bf9f238f8565d Mon Sep 17 00:00:00 2001 From: 1098226878 <1098226878@qq.com> Date: Tue, 28 Sep 2021 18:31:27 +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/dev/menuGroupManage/menuGroupManage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/pages/dev/menuGroupManage/menuGroupManage.js b/public/pages/dev/menuGroupManage/menuGroupManage.js index 87c11d666..8d44aa5b7 100755 --- a/public/pages/dev/menuGroupManage/menuGroupManage.js +++ b/public/pages/dev/menuGroupManage/menuGroupManage.js @@ -100,9 +100,9 @@ return "商家"; } else if (_storeTypeCd == '800900000000') { return "开发团队"; - }else if (_storeTypeCd == '800900000006') { + } else if (_storeTypeCd == '800900000006') { return "跑腿"; - } else { + } else { return "未知"; } } From e0676363b0a8d54cd381885ac1bab22a03fd3075 Mon Sep 17 00:00:00 2001 From: 1098226878 <1098226878@qq.com> Date: Tue, 28 Sep 2021 18:33:34 +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/dev/addPrivilegeView/addPrivilegeView.html | 1 + 1 file changed, 1 insertion(+) diff --git a/public/components/dev/addPrivilegeView/addPrivilegeView.html b/public/components/dev/addPrivilegeView/addPrivilegeView.html index 5b3f30e74..9c4ce5807 100755 --- a/public/components/dev/addPrivilegeView/addPrivilegeView.html +++ b/public/components/dev/addPrivilegeView/addPrivilegeView.html @@ -33,6 +33,7 @@ +
From 538b8af518f4fb1177bd1223cc7833b756cba220 Mon Sep 17 00:00:00 2001 From: 1098226878 <1098226878@qq.com> Date: Tue, 28 Sep 2021 18:37:33 +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 --- .../dev/chooseMenuGroup/chooseMenuGroup.js | 82 ++++++++++--------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/public/components/dev/chooseMenuGroup/chooseMenuGroup.js b/public/components/dev/chooseMenuGroup/chooseMenuGroup.js index 50d9ade7b..5303b6250 100755 --- a/public/components/dev/chooseMenuGroup/chooseMenuGroup.js +++ b/public/components/dev/chooseMenuGroup/chooseMenuGroup.js @@ -3,69 +3,69 @@ var DEFAULT_ROWS = 10; vc.extends({ propTypes: { - emitChooseMenuGroup:vc.propTypes.string, - emitLoadData:vc.propTypes.string + emitChooseMenuGroup: vc.propTypes.string, + emitLoadData: vc.propTypes.string }, - data:{ - chooseMenuGroupInfo:{ - menuGroups:[], - _currentMenuGroupName:'', + data: { + chooseMenuGroupInfo: { + menuGroups: [], + _currentMenuGroupName: '', } }, - _initMethod:function(){ + _initMethod: function () { }, - _initEvent:function(){ - vc.on('chooseMenuGroup','openChooseMenuGroupModel',function(_param){ + _initEvent: function () { + vc.on('chooseMenuGroup', 'openChooseMenuGroupModel', function (_param) { $('#chooseMenuGroupModel').modal('show'); vc.component._refreshChooseMenuGroupInfo(); - vc.component._loadAllMenuGroupInfo(DEFAULT_PAGE, DEFAULT_ROWS,''); + vc.component._loadAllMenuGroupInfo(DEFAULT_PAGE, DEFAULT_ROWS, ''); }); vc.on('chooseMenuGroup', 'paginationPlus', 'page_event', function (_currentPage) { vc.component._loadAllMenuGroupInfo(_currentPage, DEFAULT_ROWS); }); }, - methods:{ - _loadAllMenuGroupInfo:function(_page,_row,_name){ + methods: { + _loadAllMenuGroupInfo: function (_page, _row, _name) { var param = { - params:{ - page:_page, - row:_row, - name:_name + params: { + page: _page, + row: _row, + name: _name } }; //发送get请求 - vc.http.get('chooseMenuGroup', - 'list', - param, - function(json){ - var _menuGroupInfo = JSON.parse(json); - vc.component.chooseMenuGroupInfo.menuGroups = _menuGroupInfo.menuGroups; - vc.emit('chooseMenuGroup', 'paginationPlus', 'init', { - total: _menuGroupInfo.records, - dataCount: _menuGroupInfo.total, - currentPage: _page - }); - },function(){ - console.log('请求失败处理'); - } - ); + vc.http.get('chooseMenuGroup', + 'list', + param, + function (json) { + var _menuGroupInfo = JSON.parse(json); + vc.component.chooseMenuGroupInfo.menuGroups = _menuGroupInfo.menuGroups; + vc.emit('chooseMenuGroup', 'paginationPlus', 'init', { + total: _menuGroupInfo.records, + dataCount: _menuGroupInfo.total, + currentPage: _page + }); + }, function () { + console.log('请求失败处理'); + } + ); }, - chooseMenuGroup:function(_menuGroup){ - if(_menuGroup.hasOwnProperty('name')){ - _menuGroup.menuGroupName = _menuGroup.name; + chooseMenuGroup: function (_menuGroup) { + if (_menuGroup.hasOwnProperty('name')) { + _menuGroup.menuGroupName = _menuGroup.name; } - vc.emit($props.emitChooseMenuGroup,'chooseMenuGroup',_menuGroup); - vc.emit($props.emitLoadData,'listMenuGroupData',{ - menuGroupId:_menuGroup.menuGroupId + vc.emit($props.emitChooseMenuGroup, 'chooseMenuGroup', _menuGroup); + vc.emit($props.emitLoadData, 'listMenuGroupData', { + menuGroupId: _menuGroup.menuGroupId }); $('#chooseMenuGroupModel').modal('hide'); }, - queryMenuGroups:function(){ - vc.component._loadAllMenuGroupInfo(DEFAULT_PAGE, DEFAULT_ROWS,vc.component.chooseMenuGroupInfo._currentMenuGroupName); + queryMenuGroups: function () { + vc.component._loadAllMenuGroupInfo(DEFAULT_PAGE, DEFAULT_ROWS, vc.component.chooseMenuGroupInfo._currentMenuGroupName); }, - _refreshChooseMenuGroupInfo:function(){ + _refreshChooseMenuGroupInfo: function () { vc.component.chooseMenuGroupInfo._currentMenuGroupName = ""; }, _getChooseStoreTypeName: function (_storeTypeCd) { @@ -88,6 +88,8 @@ return "商家"; } else if (_storeTypeCd == '800900000000') { return "开发团队"; + } else if (_storeTypeCd == '800900000006') { + return "跑腿"; } else { return "未知"; }