diff --git a/components/bonus/ckkj.vue b/components/bonus/ckkj.vue deleted file mode 100644 index 8c166d8..0000000 --- a/components/bonus/ckkj.vue +++ /dev/null @@ -1,413 +0,0 @@ - - - - - diff --git a/components/bonus/hfsy.vue b/components/bonus/hfsy.vue deleted file mode 100644 index 8c8ef77..0000000 --- a/components/bonus/hfsy.vue +++ /dev/null @@ -1,321 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/bonus/hignfsy.vue b/components/bonus/hignfsy.vue deleted file mode 100644 index f8a8e33..0000000 --- a/components/bonus/hignfsy.vue +++ /dev/null @@ -1,321 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/bonus/sbydsy.vue b/components/bonus/sbydsy.vue deleted file mode 100644 index 55f9c9f..0000000 --- a/components/bonus/sbydsy.vue +++ /dev/null @@ -1,329 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/region-select/index.vue b/components/region-select/index.vue new file mode 100644 index 0000000..f4fefc0 --- /dev/null +++ b/components/region-select/index.vue @@ -0,0 +1,370 @@ + + + + + diff --git a/config/login.js b/config/login.js index a461fe0..9b245d2 100644 --- a/config/login.js +++ b/config/login.js @@ -60,14 +60,6 @@ export const queryBonusFirst = (data, data1) => export const queryBonusRepurchase = (data, data1) => http.post('/bonus/api/bonus/query-bonus-repurchase/' + data1, data) -//嗨粉收益 -export const queryBonusHiFun = (data, data1) => - http.post('/bonus/api/bonus/query-bonus-hi-fun' + data1, data) - -//云代收益 -export const queryBonusCloud = (data, data1) => - http.post('/bonus/api/bonus/query-bonus-cloud/' + data1, data) - //复购券收益 export const queryBonusCoupon = (data, data1) => http.post('/bonus/api/bonus/query-bonus-coupon/' + data1, data) @@ -76,10 +68,6 @@ export const queryBonusCoupon = (data, data1) => export const queryBonusMaker = (data, data1) => http.post('/bonus/api/bonus/query-bonus-maker/' + data1, data) -//海粉收益 -export const queryBonusHaiFun = (data, data1) => - http.post('/bonus/api/bonus/query-bonus-hai-fun/' + data1, data) - //获取奖金收益类型 export const getBonusType = params => http.get('/system/api/bd-bonus-items/list', { params }) @@ -144,7 +132,3 @@ export const getNoticeDetail = params => //校验服务有效期 export const agreement_expire = params => http.get('/member/api/member/agreement_expire', { params }) - -//创客空间收益 -export const markBonus = params => - http.post('/bonus/api/bonus/query-mark-bonus-detail', params) diff --git a/config/mine.js b/config/mine.js index 8956170..2bf6544 100644 --- a/config/mine.js +++ b/config/mine.js @@ -30,3 +30,16 @@ export const getRefundList = params => // 退款列表接口（别名） export const refundList = params => http.get('/sale/api/my-order/refund-list', { params }) + +// 获取是否能区域选择的资格 +export const getRegionSelect = () => { + return http.get('/member/api/member/get-region') +} + +// 设置区域 +export const setRegion = data => + http.post('/member/api/member/set-region', data) + +// 获取可选择区域 +export const getRegionAreaTree = params => + http.get('/member/api/member/get-region-list', { params }) diff --git a/config/request.js b/config/request.js index f800f96..a5cfc05 100644 --- a/config/request.js +++ b/config/request.js @@ -19,7 +19,7 @@ module.exports = vm => { //#ifdef DEV_SERVER console.log('DEV_SERVER') - config.baseURL = 'https://t-app.beida666.com/prod-api' + config.baseURL = 'http://192.168.0.86:8080' //#endif //#ifdef QA_SERVER diff --git a/pages.json b/pages.json index a6df4ea..3313612 100644 --- a/pages.json +++ b/pages.json @@ -492,6 +492,13 @@ "navigationBarBackgroundColor": "#fff" } }, + { + "path": "pages/mine/region/index", + "style": { + "navigationBarTitleText": "收益区域", + "navigationBarBackgroundColor": "#fff" + } + }, { "path": "pages/mine/balance/transDetail", "style": { diff --git a/pages/index/index.vue b/pages/index/index.vue index 5f5c25b..487f279 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -155,6 +155,7 @@ > + @@ -171,6 +172,8 @@ import znNewsPopup from '@/components/znNewsPopup.vue' import areaProductList from '@/components/area-product-list/index.vue' import { formatCurrency } from '@/util/index.js' import { mapGetters } from 'vuex' +import RegionSelect from '@/components/region-select/index.vue' + export default { components: { noticePopup, @@ -178,6 +181,7 @@ export default { 'cl-tabbar': clTabbar, getTree, areaProductList, + RegionSelect, }, filters: { seles(value) { diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 12d067f..8b4d7d1 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -341,6 +341,9 @@ + @@ -350,10 +353,12 @@ import clTabbar from '@/components/cl-tabbar.vue' import * as min from '@/config/balance.js' import * as api from '@/config/login.js' import { getMemberBalance } from '@/config/mine.js' -// import talentList from "@/components/talentList.vue"; +import RegionSelect from '@/components/region-select/index.vue' + export default { components: { 'cl-tabbar': clTabbar, + RegionSelect, // talentList, }, data() { @@ -479,6 +484,13 @@ export default { menuKey: '', ifshow: false, }, + { + url: '/pages/mine/region/index', + name: '收益区域', + imgurl: '../../static/images/region-area.svg', + menuKey: '', + ifshow: false, + }, // { // url: "2", // name: "达人榜单", @@ -712,7 +724,7 @@ export default { getInfo() { api.getInfo().then(res => { if (res) { - this.userInfo = res.data + this.userInfo = res.data || {} if (this.userInfo.memberCode == 'BD68880628') { this.ifSpecial = true this.otherMenuList = [ @@ -861,6 +873,7 @@ export default { //达人榜单 this.drShow = true } else { + console.log(url, 'url?') uni.navigateTo({ url: url, }) diff --git a/pages/mine/region/index.vue b/pages/mine/region/index.vue new file mode 100644 index 0000000..9cf2f2c --- /dev/null +++ b/pages/mine/region/index.vue @@ -0,0 +1,330 @@ + + + + + diff --git a/static/images/region-area.svg b/static/images/region-area.svg new file mode 100644 index 0000000..f90371e --- /dev/null +++ b/static/images/region-area.svg @@ -0,0 +1 @@ + \ No newline at end of file