diff --git a/components/bonus/sgsy.vue b/components/bonus/sgsy.vue index dde3ad1..e34fb81 100644 --- a/components/bonus/sgsy.vue +++ b/components/bonus/sgsy.vue @@ -48,6 +48,20 @@ {{ item.directIncome | toThousandthAndKeepDecimal }} + + 级差收益 + + {{ item.repurRangeIncome | toThousandthAndKeepDecimal }} + + + + + {{ $t('直推级差') }} + + + {{ item.globalPoints | toThousandthAndKeepDecimal }} + + {{ '拓展收益' }} @@ -80,20 +94,7 @@ {{ item.serviceIncome | toThousandthAndKeepDecimal }} - - 级差收益 - - {{ item.repurRangeIncome | toThousandthAndKeepDecimal }} - - - - - {{ $t('直推级差') }} - - - {{ item.globalPoints | toThousandthAndKeepDecimal }} - - + {{ '重复消费' }} diff --git a/config/regiest.js b/config/regiest.js index 16d2489..ddeca01 100644 --- a/config/regiest.js +++ b/config/regiest.js @@ -1,71 +1,104 @@ const http = uni.$u.http //幂等性 -export const generate = (params) => http.get('/system/api/idempotent/generate', { params }) +export const generate = params => + http.get('/system/api/idempotent/generate', { params }) //商品列表 -export const getAllGoods = (params) => http.post('/sale/api/wares/query-spe-wares', params) +export const getAllGoods = params => + http.post('/sale/api/wares/query-spe-wares', params) //商品详情 -export const waresDetail = (params) => http.post('/sale/api/wares/query-spe-wares-detail', params) +export const waresDetail = params => + http.post('/sale/api/wares/query-spe-wares-detail', params) //获取国家 -export const countryList = (params) => http.get('/system/api/country/list', { params }) +export const countryList = params => + http.get('/system/api/country/list', { params }) //发货 -export const deliveryList = (params) => http.get('/system/pub/enums/delivery-list', { params }) +export const deliveryList = params => + http.get('/system/pub/enums/delivery-list', { params }) //运输 -export const transportList = (params) => http.get('/system/pub/enums/transport-type', { params }) +export const transportList = params => + http.get('/system/pub/enums/transport-type', { params }) //行列表输 -export const bankList = (params) => http.get('/system/api/bank/list', { params }) +export const bankList = params => http.get('/system/api/bank/list', { params }) //购物车商品详情 -export const shoppingWaresDetail = (params) => http.post('/sale/api/shopping/get-shopping-wares-detail', params) +export const shoppingWaresDetail = params => + http.post('/sale/api/shopping/get-shopping-wares-detail', params) //一键注册 -export const quickReg = (params) => http.post('/sale/api/order/quick-reg', params) +export const quickReg = params => http.post('/sale/api/order/quick-reg', params) //获取会员等级 -export const memLevel = (params) => http.post('/sale/api/order/valid-mem-level', params) +export const memLevel = params => + http.post('/sale/api/order/valid-mem-level', params) //注册页面显示权限 -export const registerList = (params) => http.get('/system/api/register-page/list', { params }) +export const registerList = params => + http.get('/system/api/register-page/list', { params }) //获取地址列表 -export const addressList = (params) => http.get('/member/api/member-address/list', { params }) +export const addressList = params => + http.get('/member/api/member-address/list', { params }) //查询邮费 -export const queryPostage = (params) => http.post('/sale/api/order/query-order-postage', params) +export const queryPostage = params => + http.post('/sale/api/order/query-order-postage', params) //确认注册订单-生成待支付订单 -export const confirmRegOrder = (params) => http.post('/sale/api/order/confirm-reg-order', params) +export const confirmRegOrder = params => + http.post('/sale/api/order/confirm-reg-order', params) //根据推荐人编号获取安置信息 -export const validPcode = (params) => http.post('/sale/api/order/valid-p-code', params) +export const validPcode = params => + http.post('/sale/api/order/valid-p-code', params) //注册订单验证安置人编号 -export const validPPcode = (params) => http.post('/sale/api/order/valid-p-p-code', params) +export const validPPcode = params => + http.post('/sale/api/order/valid-p-p-code', params) //注册订单验证手机号 -export const validPhone = (params) => http.post('/sale/api/order/valid-phone', params) +export const validPhone = params => + http.post('/sale/api/order/valid-phone', params) //获取name -export const upgRel = (params) => http.post('/sale/api/order/validate-upg-rel', params) +export const upgRel = params => + http.post('/sale/api/order/validate-upg-rel', params) //升级复购单确认 -export const confirmOthOrder = (params) => http.post('/sale/api/order/confirm-oth-order', params) +export const confirmOthOrder = params => + http.post('/sale/api/order/confirm-oth-order', params) //嗨粉确认订单 -export const confirmFunOrder = (params) => http.post('/sale/api/order/confirm-fun-order', params) +export const confirmFunOrder = params => + http.post('/sale/api/order/confirm-fun-order', params) //协议 -export const waresAgreement = (params) => http.post('/sale/api/wares/get-wares-agreement', params) +export const waresAgreement = params => + http.post('/sale/api/wares/get-wares-agreement', params) //海粉订单详情 -export const waresinfo = (params) => http.post('/sale/api/wares/query-confirm-waresinfo', params) +export const waresinfo = params => + http.post('/sale/api/wares/query-confirm-waresinfo', params) //海粉订单确认 -export const confirmShareOrder = (params) => http.post('/sale/api/order/confirm-share-order', params) +export const confirmShareOrder = params => + http.post('/sale/api/order/confirm-share-order', params) //删除地址 -export const delAddress = (data) => http.delete('/member/api/member-address/' + data) +export const delAddress = data => + http.delete('/member/api/member-address/' + data) //省市区 -export const areaList = (params) => http.get('system/api/area/get-level-list', { params }) +export const areaList = params => + http.get('system/api/area/get-level-list', { params }) //创客空间选择 -export const list_maker = (data) => http.post('/member/api/maker-space/list-maker?pageNum=' + data.pageNum + '&pageSize=' + data.pageSize, data ) +export const list_maker = data => + http.post( + '/member/api/maker-space/list-maker?pageNum=' + + data.pageNum + + '&pageSize=' + + data.pageSize, + data + ) // 礼包获取邮费 -export const queryAdressPostage = (params) => http.post('/sale/api/order/self-order-postage', params) +export const queryAdressPostage = params => + http.post('/sale/api/order/self-order-postage', params) // 特殊会员完善信息 -export const saveSpecial = (params) => http.post('/member/api/member-special/save-special', params) +export const saveSpecial = params => + http.post('/member/api/member-special/save-special', params) // 下载 -export const specialExport = (params) => http.post('/member/api/member-special/special-export', params,{header: { 'Content-Type': 'application/x-www-form-urlencoded' }, -responseType: 'blob',}) +export const specialExport = params => + http.post('/member/api/member-special/special-export', params, { + header: { 'Content-Type': 'application/x-www-form-urlencoded' }, + responseType: 'blob', + }) //特殊信息列表 -export const specialList = (params) => http.get('/member/api/member-special/special-list', { params }) - +export const specialList = params => + http.get('/member/api/member-special/special-list', { params }) // 创客空间接口 -export const queryCard = (params) => http.post('/sale/api/wares/query-cabin-card', params) - -//复购特殊商品列表 -export const makerList = (params) => http.get('/sale/api/order/list-maker-ware', { params }) \ No newline at end of file +export const queryCard = params => + http.post('/sale/api/wares/query-cabin-card', params) diff --git a/pages/other/index.vue b/pages/other/index.vue index 4a56ad0..444ec4e 100644 --- a/pages/other/index.vue +++ b/pages/other/index.vue @@ -819,35 +819,8 @@ export default { ) { this.getMember() } - // 判断特殊商品 - if (this.specialArea == 3) { - this.checkGoods() - } }) }, - checkGoods() { - // 判断特殊商品 - api.makerList().then(res => { - if (res.data.length > 0) { - let isYes = 0 - res.data.forEach(item => { - if ( - this.allGoodsData.orderItemsParams.some( - ctem => ctem.waresCode == item - ) - ) { - isYes++ - } - }) - if (isYes != 0) { - this.howSure = true - if (this.howSure) { - this.getQueryCard() - } - } - } - }) - }, transPass(rule, value, callback) { if (this.isDeliveryWay) { if (!value) {