diff --git a/fuintAdmin/src/api/staff/user/chainstoreconfig.js b/fuintAdmin/src/api/staff/user/chainstoreconfig.js new file mode 100644 index 000000000..3dcd0c0aa --- /dev/null +++ b/fuintAdmin/src/api/staff/user/chainstoreconfig.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +// 查询会员详细 +export function getChainStoreConfig(id) { + return request({ + url: '/business/userManager/chainStoreConfig', + method: 'get' + }) +} + +// 修改会员 +export function updateChainStoreConfig(data) { + return request({ + url: '/business/userManager/chainStoreConfig', + method: 'put', + data: data + }) +} + diff --git a/fuintAdmin/src/api/staff/user/user.js b/fuintAdmin/src/api/staff/user/user.js new file mode 100644 index 000000000..76941d2d8 --- /dev/null +++ b/fuintAdmin/src/api/staff/user/user.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询会员列表 +export function listUser(query) { + return request({ + url: '/business/userManager/user/list', + method: 'get', + params: query + }) +} + +// 查询会员详细 +export function getUser(id) { + return request({ + url: '/business/userManager/user/' + id, + method: 'get' + }) +} + +// 新增会员 +export function addUser(data) { + return request({ + url: '/business/userManager/user', + method: 'post', + data: data + }) +} + +// 修改会员 +export function updateUser(data) { + return request({ + url: '/business/userManager/user', + method: 'put', + data: data + }) +} + +// 删除会员 +export function delUser(id) { + return request({ + url: '/business/userManager/user/' + id, + method: 'delete' + }) +} diff --git a/fuintAdmin/src/api/staff/user/usergrade.js b/fuintAdmin/src/api/staff/user/usergrade.js new file mode 100644 index 000000000..9872fe133 --- /dev/null +++ b/fuintAdmin/src/api/staff/user/usergrade.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询会员等级列表 +export function listUserGrade(query) { + return request({ + url: '/business/userManager/userGrade/list', + method: 'get', + params: query + }) +} + +// 查询会员等级详细 +export function getUserGrade(id) { + return request({ + url: '/business/userManager/userGrade/' + id, + method: 'get' + }) +} + +// 新增会员等级 +export function addUserGrade(data) { + return request({ + url: '/business/userManager/userGrade', + method: 'post', + data: data + }) +} + +// 修改会员等级 +export function updateUserGrade(data) { + return request({ + url: '/business/userManager/userGrade', + method: 'put', + data: data + }) +} + +// 删除会员等级 +export function delUserGrade(id) { + return request({ + url: '/business/userManager/userGrade/' + id, + method: 'delete' + }) +} diff --git a/fuintAdmin/src/components/map/mapComponent.vue b/fuintAdmin/src/components/map/mapComponent.vue index ef1d86fd5..1543c6bb9 100644 --- a/fuintAdmin/src/components/map/mapComponent.vue +++ b/fuintAdmin/src/components/map/mapComponent.vue @@ -1,6 +1,6 @@ @@ -69,16 +67,19 @@ export default { this.getOption(); }, mounted() { - this.initAMap(); }, methods:{ + pasVal(){ + this.$emit('pform', this.form); // 触发custom-event事件并传递参数 + // this.$refs.pform.pasVal() + }, changeOption(val){ this.remoteMethod(val[2]); }, getOption(){ let _this = this; getClient().then(response => { - this.options = response.data.list; + _this.options = response.data.list; }) }, initAMap() { @@ -93,6 +94,7 @@ export default { zoom: 11, //初始化地图级别 center: [_this.form.lng, _this.form.lat], //初始化地图中心点位置 }); + // console.log(this.map.center) //地址逆解析插件 this.geoCoder = new AMap.Geocoder({ city: "010", //城市设为北京，默认：“全国” @@ -161,6 +163,7 @@ export default { _this.form.lng = result.districtList[0].center.lng _this.form.lat = result.districtList[0].center.lat _this.toGeoCoder(); + _this.pasVal(); _this.initAMap(); }); }, 200); @@ -169,6 +172,23 @@ export default { this.initAMap(); } }, + getLngLat(){ + let _this = this; + const geocoder = new AMap.Geocoder() + // 地址反向查经纬度,cName: 当前选中城市 + geocoder.getLocation(this.form.address, (status, result) => { + if (status === 'complete' && result.info === 'OK') { + // 经纬度 + _this.form.lng = result.geocodes[0].location.lng + _this.form.lat = result.geocodes[0].location.lat + _this.toGeoCoder(); + _this.pasVal(); + _this.initAMap(); + } else { + this.$modal.msgError("定位失败"); + } + }) + }, // 选中提示 currentSelect(val) { // 清空时不执行后面代码 diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index 0a32e9f21..3498a9527 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -1,15 +1,7 @@