From 8a9bd2e7cbaa5ae676d04e3a7042ba2992a2db25 Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 23 Jul 2025 16:05:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat(regionselect):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/region-select/index.vue | 284 +++++++++++++++++++++++++++++ pages/index/index.vue | 4 + 2 files changed, 288 insertions(+) create mode 100644 components/region-select/index.vue diff --git a/components/region-select/index.vue b/components/region-select/index.vue new file mode 100644 index 0000000..beab06f --- /dev/null +++ b/components/region-select/index.vue @@ -0,0 +1,284 @@ + + + + + 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) { From cb69eea60df36977d3f35eb5c93f4d9d878ed234 Mon Sep 17 00:00:00 2001 From: woody Date: Fri, 25 Jul 2025 09:07:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(region-select):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=94=B6=E7=9B=8A=E5=8C=BA=E5=9F=9F=E6=9F=A5=E7=9C=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/region-select/index.vue | 224 ++++++++++++++------ config/mine.js | 13 ++ config/request.js | 2 +- pages.json | 7 + pages/mine/index.vue | 17 +- pages/mine/region/index.vue | 328 +++++++++++++++++++++++++++++ static/images/region-area.svg | 1 + 7 files changed, 520 insertions(+), 72 deletions(-) create mode 100644 pages/mine/region/index.vue create mode 100644 static/images/region-area.svg diff --git a/components/region-select/index.vue b/components/region-select/index.vue index beab06f..f4fefc0 100644 --- a/components/region-select/index.vue +++ b/components/region-select/index.vue @@ -1,12 +1,8 @@ @@ -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..529e5a5 --- /dev/null +++ b/pages/mine/region/index.vue @@ -0,0 +1,328 @@ + + + + + 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 From 0253e396bfd51558e3707dc4045ca1e4917abe77 Mon Sep 17 00:00:00 2001 From: woody Date: Fri, 25 Jul 2025 09:42:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat(region-select):=20=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/region/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/mine/region/index.vue b/pages/mine/region/index.vue index 529e5a5..9cf2f2c 100644 --- a/pages/mine/region/index.vue +++ b/pages/mine/region/index.vue @@ -225,6 +225,7 @@ export default { justify-content: center; flex-wrap: wrap; margin-bottom: 15rpx; + // margin-top: 10rpx; padding: 10rpx 0; .region-name { @@ -241,6 +242,7 @@ export default { } .region-action { + margin-top: 16rpx; .select-btn { width: 100%; height: 70rpx; From b220b728ee5759458d8131bd04df4b5e7a917b74 Mon Sep 17 00:00:00 2001 From: woody Date: Fri, 25 Jul 2025 10:00:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat(bonus):=20=E7=A7=BB=E9=99=A4=E5=A5=96?= =?UTF-8?q?=E9=87=91=E6=97=A0=E7=94=A8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/bonus/ckkj.vue | 413 ----------------------------------- components/bonus/hfsy.vue | 321 --------------------------- components/bonus/hignfsy.vue | 321 --------------------------- components/bonus/sbydsy.vue | 329 ---------------------------- config/login.js | 16 -- 5 files changed, 1400 deletions(-) delete mode 100644 components/bonus/ckkj.vue delete mode 100644 components/bonus/hfsy.vue delete mode 100644 components/bonus/hignfsy.vue delete mode 100644 components/bonus/sbydsy.vue 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/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)