diff --git a/public/components/admin/editHousekeepingType/editHousekeepingType.js b/public/components/admin/editHousekeepingType/editHousekeepingType.js
index 64cd66c21..6e627400d 100644
--- a/public/components/admin/editHousekeepingType/editHousekeepingType.js
+++ b/public/components/admin/editHousekeepingType/editHousekeepingType.js
@@ -9,6 +9,8 @@
hktDesc: '',
label: '',
seq: '',
+ url: '',
+ skipType: '',
isShow: '',
typeCd: ''
@@ -151,6 +153,8 @@
hktDesc: '',
label: '',
seq: '',
+ url: '',
+ skipType: '',
isShow: '',
typeCd: ''
}
diff --git a/public/components/admin/editShopRange/editShopRange.html b/public/components/admin/editShopRange/editShopRange.html
deleted file mode 100644
index 222265906..000000000
--- a/public/components/admin/editShopRange/editShopRange.html
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
修改经营范围
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/public/components/admin/editShopRange/editShopRange.js b/public/components/admin/editShopRange/editShopRange.js
deleted file mode 100644
index 62666d392..000000000
--- a/public/components/admin/editShopRange/editShopRange.js
+++ /dev/null
@@ -1,141 +0,0 @@
-(function (vc, vm) {
-
- vc.extends({
- data: {
- editShopRangeInfo: {
- shopRangeId: '',
- shopRangeId: '',
- shopTypeId: '',
- rangeName: '',
- isShow: '',
- isDefault: '',
- seq: '',
- remark: '',
-
- }
- },
- _initMethod: function () {
-
- },
- _initEvent: function () {
- vc.on('editShopRange', 'openEditShopRangeModal', function (_params) {
- vc.component.refreshEditShopRangeInfo();
- $('#editShopRangeModel').modal('show');
- vc.copyObject(_params, vc.component.editShopRangeInfo);
- });
- },
- methods: {
- editShopRangeValidate: function () {
- return vc.validate.validate({
- editShopRangeInfo: vc.component.editShopRangeInfo
- }, {
- 'editShopRangeInfo.shopTypeId': [
- {
- limit: "required",
- param: "",
- errInfo: "店铺类型id不能为空"
- },
- {
- limit: "maxLength",
- param: "30",
- errInfo: "店铺类型ID太长"
- },
- ],
- 'editShopRangeInfo.rangeName': [
- {
- limit: "required",
- param: "",
- errInfo: "范围名称不能为空"
- },
- {
- limit: "maxLength",
- param: "30",
- errInfo: "范围名称太长"
- },
- ],
- 'editShopRangeInfo.isShow': [
- {
- limit: "required",
- param: "",
- errInfo: "是否展示不能为空"
- },],
- 'editShopRangeInfo.isDefault': [
- {
- limit: "required",
- param: "",
- errInfo: "是否默认不能为空"
- },],
- 'editShopRangeInfo.seq': [
- {
- limit: "required",
- param: "",
- errInfo: "显示序号不能为空"
- },
- {
- limit: "num",
- param: "",
- errInfo: "显示序号不是有效数字"
- },
- ],
- 'editShopRangeInfo.remark': [
- {
- limit: "maxLength",
- param: "120",
- errInfo: "描述太长"
- },
- ],
- 'editShopRangeInfo.shopRangeId': [
- {
- limit: "required",
- param: "",
- errInfo: "店铺经营范围id不能为空"
- }]
-
- });
- },
- editShopRange: function () {
- if (!vc.component.editShopRangeValidate()) {
- vc.toast(vc.validate.errInfo);
- return;
- }
-
- vc.http.apiPost(
- '/shopRange/updateShopRange',
- JSON.stringify(vc.component.editShopRangeInfo),
- {
- emulateJSON: true
- },
- function (json, res) {
- //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
- let _json = JSON.parse(json);
- if (_json.code == 0) {
- //关闭model
- $('#editShopRangeModel').modal('hide');
- vc.emit('shopRangeManage', 'listShopRange', {});
- return;
- }
- vc.message(_json.msg);
- },
- function (errInfo, error) {
- console.log('请求失败处理');
-
- vc.message(errInfo);
- });
- },
- refreshEditShopRangeInfo: function () {
- vc.component.editShopRangeInfo = {
- shopRangeId: '',
- shopRangeId: '',
- shopTypeId: '',
- rangeName: '',
- isShow: '',
- isDefault: '',
- seq: '',
- remark: '',
-
- }
- }
- }
- });
-
-})(window.vc, window.vc.component);
diff --git a/public/pages/admin/shopRangeManage/shopRangeManage.html b/public/pages/admin/shopRangeManage/shopRangeManage.html
deleted file mode 100644
index 1f710eb70..000000000
--- a/public/pages/admin/shopRangeManage/shopRangeManage.html
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
经营范围信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/public/pages/admin/shopRangeManage/shopRangeManage.js b/public/pages/admin/shopRangeManage/shopRangeManage.js
deleted file mode 100644
index 3dec37f84..000000000
--- a/public/pages/admin/shopRangeManage/shopRangeManage.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- 入驻小区
-**/
-(function(vc){
- var DEFAULT_PAGE = 1;
- var DEFAULT_ROWS = 10;
- vc.extends({
- data:{
- shopRangeManageInfo:{
- shopRanges:[],
- total:0,
- records:1,
- moreCondition:false,
- rangeName:'',
- shopTypes:[],
- conditions:{
- rangeName:'',
- isShow:'',
- isDefault:'',
-
- }
- }
- },
- _initMethod:function(){
- vc.component._listShopRanges(DEFAULT_PAGE, DEFAULT_ROWS);
- },
- _initEvent:function(){
- vc.on('shopRangeManage','listShopRange',function(_param){
- vc.component._listShopRanges(DEFAULT_PAGE, DEFAULT_ROWS);
- });
- vc.on('pagination','page_event',function(_currentPage){
- vc.component._listShopRanges(_currentPage,DEFAULT_ROWS);
- });
- vc.component._listShopTypes(1,50);
- },
- methods:{
- _listShopTypes:function(_page, _rows){
- var param = {
- params:{
- page : _page,
- row : _rows,
- }
- };
-
- //发送get请求
- vc.http.apiGet('/shopType/queryShopType',
- param,
- function(json,res){
- var _shopTypeManageInfo=JSON.parse(json);
- vc.component.shopRangeManageInfo.shopTypes = _shopTypeManageInfo.data;
- },function(errInfo,error){
- console.log('请求失败处理');
- }
- );
- },
- _listShopRanges:function(_page, _rows){
-
- vc.component.shopRangeManageInfo.conditions.page = _page;
- vc.component.shopRangeManageInfo.conditions.row = _rows;
- var param = {
- params:vc.component.shopRangeManageInfo.conditions
- };
-
- //发送get请求
- vc.http.apiGet('/shopRange/queryShopRange',
- param,
- function(json,res){
- var _shopRangeManageInfo=JSON.parse(json);
- vc.component.shopRangeManageInfo.total = _shopRangeManageInfo.total;
- vc.component.shopRangeManageInfo.records = _shopRangeManageInfo.records;
- vc.component.shopRangeManageInfo.shopRanges = _shopRangeManageInfo.data;
- vc.emit('pagination','init',{
- total:vc.component.shopRangeManageInfo.records,
- currentPage:_page
- });
- },function(errInfo,error){
- console.log('请求失败处理');
- }
- );
- },
- _openAddShopRangeModal:function(){
- vc.emit('addShopRange','openAddShopRangeModal',{});
- },
- _openEditShopRangeModel:function(_shopRange){
- vc.emit('editShopRange','openEditShopRangeModal',_shopRange);
- },
- _openDeleteShopRangeModel:function(_shopRange){
- vc.emit('deleteShopRange','openDeleteShopRangeModal',_shopRange);
- },
- _queryShopRangeMethod:function(){
- vc.component._listShopRanges(DEFAULT_PAGE, DEFAULT_ROWS);
-
- },
- _moreCondition:function(){
- if(vc.component.shopRangeManageInfo.moreCondition){
- vc.component.shopRangeManageInfo.moreCondition = false;
- }else{
- vc.component.shopRangeManageInfo.moreCondition = true;
- }
- }
-
-
- }
- });
-})(window.vc);