admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-06-12 18:11:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into xinghong-dev

Browse Source
This commit is contained in:
xiaogang 2021-03-10 08:39:20 +08:00
commit 16b4303451
11 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/components/common/addCommunity/addCommunity.js
View File

@ -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);

2
public/components/dev/addMenuGroup/addMenuGroup.html
View File

@ -52,7 +52,7 @@
<div class="form-group row">
<label class="col-sm-2 col-form-label">归属商户</label>
<div class="col-sm-10">
<select class="custom-select" v-model="addMenuGroupInfo.storeTypeCd">
<select class="custom-select" v-model="addMenuGroupInfo.storeType">
<option selected value="">请选择商户类型</option>
<option value="800900000001">运营团队</option>
<option value="800900000002">代理商</option>

4
public/components/dev/addMenuGroup/addMenuGroup.js
View File

@ -15,7 +15,7 @@
seq: '',
description: '',
groupType: '',
storeTypeCd: ''
storeType: ''
}
},
_initMethod: function () {
@ -128,7 +128,7 @@
seq: '',
description: '',
groupType: '',
storeTypeCd: ''
storeType: ''
};
}
}

2
public/components/dev/chooseMenuGroup/chooseMenuGroup.html
View File

@ -32,6 +32,7 @@
<th class="text-center">组名称</th>
<th class="text-center">icon</th>
<th class="text-center">标签</th>
<th class="text-center">归属商户</th>
<th class="text-center">序列</th>
<th class="text-center">描述</th>
<th class="text-center">操作</th>
@ -44,6 +45,7 @@
<td class="text-center">{{menuGroup.name}}</td>
<td class="text-center">{{menuGroup.icon}}</td>
<td class="text-center">{{menuGroup.label}}</td>
<td class="text-center">{{_getChooseStoreTypeName(menuGroup.storeType)}}</td>
<td class="text-center">{{menuGroup.seq}}</td>
<td class="text-center">{{menuGroup.description}}</td>

24
public/components/dev/chooseMenuGroup/chooseMenuGroup.js
View File

@ -56,6 +56,30 @@
},
_refreshChooseMenuGroupInfo:function(){
vc.component.chooseMenuGroupInfo._currentMenuGroupName = "";
},
_getChooseStoreTypeName: function (_storeTypeCd) {
// <option value="800900000001">运营团队</option>
// <option value="800900000002">代理商</option>
// <option value="800900000003">物业</option>
// <option value="800900000004">物流公司</option>
// <option value="800900000005">商家</option>
// <option value="800900000000">开发团队</option>
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 "未知";
}
}
}

1
public/components/dev/deleteAttrSpec/deleteAttrSpec.js
View File

@ -19,7 +19,6 @@
},
methods:{
deleteAttrSpec:function(){
vc.component.deleteAttrSpecInfo.communityId=vc.getCurrentCommunity().communityId;
vc.http.apiPost(
'/attrSpec/deleteAttrSpec',
JSON.stringify(vc.component.deleteAttrSpecInfo),

2
public/components/dev/editMenuGroup/editMenuGroup.html
View File

@ -51,7 +51,7 @@
<div class="form-group row">
<label class="col-sm-2 col-form-label">归属商户</label>
<div class="col-sm-10">
<select class="custom-select" v-model="editMenuGroupInfo.storeTypeCd">
<select class="custom-select" v-model="editMenuGroupInfo.storeType">
<option selected value="">请选择商户类型</option>
<option value="800900000001">运营团队</option>
<option value="800900000002">代理商</option>

4
public/components/dev/editMenuGroup/editMenuGroup.js
View File

@ -10,7 +10,7 @@
seq: '',
description: '',
groupType: '',
storeTypeCd: ''
storeType: ''
}
},
_initMethod: function () {
@ -119,7 +119,7 @@
seq: '',
description: '',
groupType: '',
storeTypeCd: ''
storeType: ''
}
}
}

4
public/pages/dev/menuGroupManage/menuGroupManage.html
View File

@ -37,7 +37,7 @@
</div>
<div class="row">
<div class="col-sm-4">
<select class="custom-select" v-model="menuGroupManageInfo.conditions.storeTypeCd">
<select class="custom-select" v-model="menuGroupManageInfo.conditions.storeType">
<option selected value="">请选择归属商户</option>
<option value="800900000001">运营团队</option>
<option value="800900000002">代理商</option>
@ -84,7 +84,7 @@
<td class="text-center">{{menuGroup.gId}}</td>
<td class="text-center">{{menuGroup.name}}</td>
<td class="text-center">{{menuGroup.groupType == 'P_WEB'?'web菜单':'App菜单'}}</td>
<td class="text-center">{{menuGroup.storeTypeCdName}}</td>
<td class="text-center">{{_getStoreTypeName(menuGroup.storeType)}}</td>
<td class="text-center">{{menuGroup.icon}}</td>
<td class="text-center">{{menuGroup.label}}</td>
<td class="text-center">{{menuGroup.seq}}</td>

6
public/pages/dev/menuGroupManage/menuGroupManage.js
View File

@ -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 "未知";
}
}

4
public/pages/property/listOwnerCar/listOwnerCar.html
View File

@ -124,6 +124,10 @@
v-on:click="_addCarParkingSpace(car)">续租车位
</button>
</div>
<div class="btn-group">
<button class="btn-white btn btn-xs" v-on:click="_toCarMember(car)">子母车辆</button>
</div>
<div class="btn-group">
<button class="btn-white btn btn-xs" v-on:click="_toPayFee(car)">费用</button>
</div>