diff --git a/src/api/bonus.js b/src/api/bonus.js index 230c998..6fcc166 100644 --- a/src/api/bonus.js +++ b/src/api/bonus.js @@ -4,11 +4,11 @@ import request from '@/utils/request' export function getExpandList() { return request({ url: '/system/manage/grade/expandList', - method: 'get', + method: 'get' }) } -//修改拓展配置列表 +// 修改拓展配置列表 export function updateExpand(data) { return request({ url: '/system/manage/grade/updateExpand', @@ -17,32 +17,31 @@ export function updateExpand(data) { }) } -//4-N配置列表 +// 4-N配置列表 export function getbdBonusExpand() { return request({ url: '/system/manage/bd-bonus-expand/list', - method: 'get', + method: 'get' }) } -//辅导分红列表 +// 辅导分红列表 export function getcoachBonusList() { return request({ url: '/system/manage/awards/coachBonusList', - method: 'get', + method: 'get' }) } -//考核类型下拉选 +// 考核类型下拉选 export function getAssessmentType() { return request({ url: '/system/pub/enums/assessmentType', - method: 'get', + method: 'get' }) } - -//修改辅导分红 +// 修改辅导分红 export function updateCoachBonus(data) { return request({ url: '/system/manage/awards/updateCoachBonus', @@ -51,15 +50,15 @@ export function updateCoachBonus(data) { }) } -//获取环球积分、车奖积分列表 +// 获取环球积分、车奖积分列表 export function getintegralList() { return request({ url: '/system/manage/awards/integralList', - method: 'get', + method: 'get' }) } -//修改环球积分 +// 修改环球积分 export function updategLobalIntegral(data) { return request({ url: '/system/manage/awards/updategLobalIntegral', @@ -68,7 +67,7 @@ export function updategLobalIntegral(data) { }) } -//修改车奖积分 +// 修改车奖积分 export function updategCarAwardPoints(data) { return request({ url: '/system/manage/awards/updategCarAwardPoints', @@ -77,15 +76,15 @@ export function updategCarAwardPoints(data) { }) } -//云代配置列表获取 +// 云代配置列表获取 export function getCloudList() { return request({ url: '/system/manage/bd-bonus-cloud/list', - method: 'get', + method: 'get' }) } -//修改云代配置 +// 修改云代配置 export function updateCloud(data) { return request({ url: '/system/manage/bd-bonus-cloud/save', @@ -94,15 +93,15 @@ export function updateCloud(data) { }) } -//服务补贴配置列表 +// 服务补贴配置列表 export function getServiceList() { return request({ url: '/system/manage/bonus-service/list', - method: 'get', + method: 'get' }) } -//修改服务补贴配置 +// 修改服务补贴配置 export function updateService(data) { return request({ url: '/system/manage/bonus-service/update', @@ -111,23 +110,23 @@ export function updateService(data) { }) } -//服务补贴类型枚举值 +// 服务补贴类型枚举值 export function getServiceTypeList() { return request({ url: '/system/pub/enums/get-service-type', - method: 'get', + method: 'get' }) } -//奖金扣项列表 +// 奖金扣项列表 export function getDeductList() { return request({ url: '/system/manage/bonus-deduct/list', - method: 'get', + method: 'get' }) } -//奖金扣项修改 +// 奖金扣项修改 export function updateDeduct(data) { return request({ url: '/system/manage/bonus-deduct/update', @@ -136,24 +135,24 @@ export function updateDeduct(data) { }) } -//奖金扣项枚举查询 +// 奖金扣项枚举查询 export function getDeductTypeList() { return request({ url: '/system/pub/enums/get-bonus-deduct', - method: 'get', + method: 'get' }) } // 奖金来源 -export function bonusSource(data,data1) { +export function bonusSource(data, data1) { return request({ - url: '/bonus/manage/bonus/query-bonus-source'+data1, + url: '/bonus/manage/bonus/query-bonus-source' + data1, method: 'post', data }) } // 奖金计算 -export function listPeriod(data,data1) { +export function listPeriod(data, data1) { return request({ url: '/bonus/manage/settle/list-period' + data1, method: 'post', @@ -161,7 +160,7 @@ export function listPeriod(data,data1) { }) } // 奖金明细 -export function queryBonusDetail(data,data1) { +export function queryBonusDetail(data, data1) { return request({ url: '/bonus/manage/bonus/query-bonus-detail' + data1, method: 'post', @@ -169,7 +168,7 @@ export function queryBonusDetail(data,data1) { }) } // 奖金汇总 -export function queryBonusTotal(data,data1) { +export function queryBonusTotal(data, data1) { return request({ url: '/bonus/manage/bonus/query-bonus-total' + data1, method: 'post', @@ -177,40 +176,39 @@ export function queryBonusTotal(data,data1) { }) } -//获取直推配置列表 +// 获取直推配置列表 export function getdirectLoopList() { return request({ url: '/system/manage/bd-bonus-direct-loop/list', - method: 'get', + method: 'get' }) } -//级差枚举类型列表1等级2奖衔 +// 级差枚举类型列表1等级2奖衔 export function getrangeTypeList() { return request({ url: '/system/pub/enums/range-type', - method: 'get', + method: 'get' }) } -//计算类型枚举值 +// 计算类型枚举值 export function getcellTypeList() { return request({ url: '/system/pub/enums/cal-type', - method: 'get', + method: 'get' }) } -//取值类型枚举 +// 取值类型枚举 export function getTakeValueTypeList() { return request({ url: '/system/pub/enums/take-value-type', - method: 'get', + method: 'get' }) } - -//保存修改直推配置 +// 保存修改直推配置 export function updateDirectLoop(data) { return request({ url: '/system/manage/bd-bonus-direct-loop/save', @@ -219,7 +217,7 @@ export function updateDirectLoop(data) { }) } -//奖项配置列表 +// 奖项配置列表 export function getbonusList(params) { return request({ url: '/system/manage/bd-bonus-items/list', @@ -228,41 +226,41 @@ export function getbonusList(params) { }) } -//删除奖项配置 +// 删除奖项配置 export function deletebonusList(pkId) { return request({ - url: '/system/manage/bd-bonus-items/'+pkId, - method: 'delete', + url: '/system/manage/bd-bonus-items/' + pkId, + method: 'delete' }) } -//获取单条奖项配置列表 +// 获取单条奖项配置列表 export function getOneBounsList(pkId) { return request({ - url: '/system/manage/bd-bonus-items/getOne/'+pkId, - method: 'get', + url: '/system/manage/bd-bonus-items/getOne/' + pkId, + method: 'get' }) } -//生成奖项配置列表 +// 生成奖项配置列表 export function scBonusList(data) { return request({ - url: '/system/manage/bd-bonus-items/generate', - method: 'post', - data + url: '/system/manage/bd-bonus-items/generate', + method: 'post', + data }) } -//修改奖项配置列表 +// 修改奖项配置列表 export function updateBonus(data) { return request({ - url: '/system/manage/bd-bonus-items/update', - method: 'post', - data + url: '/system/manage/bd-bonus-items/update', + method: 'post', + data }) } -//结算周期枚举列表 +// 结算周期枚举列表 export function getsettlement(params) { return request({ url: '/system/pub/enums/settlement-cycle', @@ -271,7 +269,7 @@ export function getsettlement(params) { }) } -//公布日期、发布日期、可提现日期 枚举 +// 公布日期、发布日期、可提现日期 枚举 export function getPublishDate(params) { return request({ url: '/system/pub/enums/publish-date', @@ -280,7 +278,7 @@ export function getPublishDate(params) { }) } -//直推配置-获取代数列表 +// 直推配置-获取代数列表 export function getAlgebra(params) { return request({ url: '/system/pub/enums/algebra', @@ -289,4 +287,18 @@ export function getAlgebra(params) { }) } +export function getAreaRegionConfig() { + return request({ + url: '/system/manage/bd-awards-region-config/list', + method: 'get' + }) +} + +export function updateAreaRegionConfig(data) { + return request({ + url: '/system/manage/bd-awards-region-config/update', + method: 'post', + data + }) +} diff --git a/src/api/configManage.js b/src/api/configManage.js index 26857c7..b3c5498 100644 --- a/src/api/configManage.js +++ b/src/api/configManage.js @@ -937,3 +937,42 @@ export function updateransferWhite(data) { }) } +export function getQueryMemberInfo(data) { + return request({ + url: '/member/manager/member/query-member-info', + method: 'post', + data + }) +} +export function delRetailRegion(id) { + return request({ + url: '/member/manage/cu-member-region/' + id, + method: 'delete' + }) +} + +export function retailRegionAdd(data) { + return request({ + url: '/member/manage/cu-member-region/save', + method: 'post', + data + }) +} + +// 会员收益区域-列表 +export function getRetailRegionList(params) { + return request({ + url: '/member/manage/cu-member-region/list', + method: 'get', + params + }) +} + +export function retailRegionUpdate(data) { + return request({ + url: '/member/manage/cu-member-region/update', + method: 'post', + data + }) +} + diff --git a/src/api/manage.js b/src/api/manage.js index 4da369a..13f4499 100644 --- a/src/api/manage.js +++ b/src/api/manage.js @@ -801,3 +801,12 @@ export function freeLogin(data) { data }) } + +// 来源下拉 +export function noticeWebsiteType(params) { + return request({ + url: '/system/pub/enums/notice-website-type', + method: 'get', + params + }) +} diff --git a/src/router/index.js b/src/router/index.js index ce73849..12a1185 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1354,7 +1354,13 @@ export const constantRoutes = [ meta: { title: '辅导分红', icon: 'table' }, hidden: true }, - + { + path: 'areaRegionConfig', + name: 'AreaRegionConfig', + component: () => import('@/views/configManage/bonus/areaRegionConfig'), + meta: { title: '收益区域配置', icon: 'table' }, + hidden: true + }, { path: 'fwbt', name: 'ServiceSubsidies', @@ -1767,6 +1773,22 @@ export const constantRoutes = [ ] }, + { + path: 'memberRetailRegion', + name: 'memberRetailRegion', + meta: { title: i18n.t('收益区域配置') }, + component: ParentView, + redirect: 'memberRetailRegion/index', + children: [ + { + path: 'memberRetailRegion', + name: 'memberRetailRegion', + component: () => import('@/views/configManage/memberRetailRegion/index'), + meta: { title: i18n.t('收益区域配置') } + } + + ] + }, { path: 'freePostageAreas', name: 'FreePostageAreas', diff --git a/src/views/configManage/bonus/areaRegionConfig.vue b/src/views/configManage/bonus/areaRegionConfig.vue new file mode 100644 index 0000000..1a99c61 --- /dev/null +++ b/src/views/configManage/bonus/areaRegionConfig.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/views/configManage/bonus/fdfh.vue b/src/views/configManage/bonus/fdfh.vue index 1596297..bbbaed8 100644 --- a/src/views/configManage/bonus/fdfh.vue +++ b/src/views/configManage/bonus/fdfh.vue @@ -82,53 +82,16 @@ diff --git a/src/views/goodsManage/goodsList/goodsEdit/ggmx.vue b/src/views/goodsManage/goodsList/goodsEdit/ggmx.vue index c29011c..be6e61d 100644 --- a/src/views/goodsManage/goodsList/goodsEdit/ggmx.vue +++ b/src/views/goodsManage/goodsList/goodsEdit/ggmx.vue @@ -91,7 +91,7 @@ - + { + item.sj = this.agreeList[0].val if (item.showList) { item.showList.forEach((ctm) => { this.$set(ctm, 'productPrice', 0) diff --git a/src/views/goodsManage/goodsRelease/ggmx.vue b/src/views/goodsManage/goodsRelease/ggmx.vue index f58e25d..1cd82ec 100644 --- a/src/views/goodsManage/goodsRelease/ggmx.vue +++ b/src/views/goodsManage/goodsRelease/ggmx.vue @@ -97,7 +97,7 @@ - +