From 3b879c92829d9185cd3e3266d3e9e13397a88100 Mon Sep 17 00:00:00 2001 From: woody Date: Fri, 11 Jul 2025 10:40:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(index):=20=E6=B5=8B=E8=AF=95=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E4=B9=90=E5=AD=A6=E7=94=84=E9=80=89=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.vue | 7 ++- pages/specialArea/index.vue | 86 +++++++++++++++++++++---------------- 2 files changed, 56 insertions(+), 37 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index a9df1af..6ac2f5f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -448,7 +448,12 @@ export default { }, getAreaGoods() { getAreaGoods().then(res => { - this.recommendSpecialAreaList = res.data?.recommendSpecialAreaList || [] + // this.recommendSpecialAreaList = res.data?.recommendSpecialAreaList || [] + let list = res.data?.recommendSpecialAreaList || [] + if (this.userInfo.memberCode == 'CN68880628') { + list = list.filter(item => item.specialArea != 26) + } + this.recommendSpecialAreaList = list }) }, toDel() { diff --git a/pages/specialArea/index.vue b/pages/specialArea/index.vue index ef77e7c..7b85a73 100644 --- a/pages/specialArea/index.vue +++ b/pages/specialArea/index.vue @@ -1,6 +1,6 @@ @@ -8,15 +8,19 @@ - - - + + @@ -38,7 +42,8 @@ export default { }, data() { return { - user: '', + user: uni.getStorageSync('User'), + goodsList: [], specialImg: require('@/static/images/two2.jpg'), zoneList: [ @@ -153,20 +158,20 @@ export default { label: '专供专区', value: 31, children: [], - name: "wolesaleArea", + name: 'wolesaleArea', }, { label: '续约专区', value: 30, children: [], - name: "renewalArea", + name: 'renewalArea', }, { label: '创客空间专区', - value:28, + value: 28, children: [], isShow: true, - name: "makerArea", + name: 'makerArea', }, { label: '架构管理', @@ -228,6 +233,16 @@ export default { ], } }, + computed: { + recommendSpecialAreaList() { + if (this.user.memberCode == 'CN68880628') { + return this.goodsList?.recommendSpecialAreaList.filter( + item => item.specialArea !== 26 + ) + } + return this.goodsList?.recommendSpecialAreaList || [] + }, + }, onLoad() { // this.getMenuList() this.getGoodsInfo() @@ -238,19 +253,19 @@ export default { }, methods: { goUrl() { - ban.agreementName().then((res) => { - if (res.data==0) { + ban.agreementName().then(res => { + if (res.data == 0) { uni.navigateTo({ - url: - "/pages/specialArea/list?label=续约专区" + - "&specialArea=30" + - "&children=[]", - }); + url: + '/pages/specialArea/list?label=续约专区' + + '&specialArea=30' + + '&children=[]', + }) } else { uni.showModal({ title: '提示', content: '请先进行实名认证', - success: (res) => { + success: res => { if (res.confirm) { uni.navigateTo({ url: '/pages/selfService/realName/realName', @@ -276,7 +291,7 @@ export default { }) if (tapx == -1) { this.zoneList.forEach((items, index) => { - items.children.forEach((ctem) => { + items.children.forEach(ctem => { if (ctem.value == item.specialArea) { if (item.specialArea == 21) { uni.navigateTo({ @@ -302,39 +317,38 @@ export default { }) }) } else { - if(item.specialArea == 30){ + if (item.specialArea == 30) { this.goUrl() - }else{ + } else { uni.navigateTo({ - url: - '/pages/specialArea/list?label=' + - item.specialAreaName + - '&specialArea=' + - item.specialArea + - '&children=' + - JSON.stringify(this.zoneList[tapx].children), - }) + url: + '/pages/specialArea/list?label=' + + item.specialAreaName + + '&specialArea=' + + item.specialArea + + '&children=' + + JSON.stringify(this.zoneList[tapx].children), + }) } - } } }, getGoodsInfo() { let userInfo = uni.getStorageSync('User') - getAreaGoods().then((res) => { + getAreaGoods().then(res => { this.goodsList = res.data this.$forceUpdate() }) }, getMenuList() { - api.menuList().then((res) => { - res.data.forEach((item) => { - this.zoneList.forEach((ctem) => { + api.menuList().then(res => { + res.data.forEach(item => { + this.zoneList.forEach(ctem => { if (ctem.name == item.menuKey) { ctem.isShow = true } if (ctem.children.length > 0) { - ctem.children.forEach((stem) => { + ctem.children.forEach(stem => { if (stem.name == item.menuKey) { stem.isShow = true } From bda6e298d6c7903669717013a6cc9efb9023f83e Mon Sep 17 00:00:00 2001 From: woody Date: Sat, 12 Jul 2025 14:01:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(specialArea):=20=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=A7=92=E6=A0=87=E5=A4=A7=E5=B0=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/specialArea/list.vue | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pages/specialArea/list.vue b/pages/specialArea/list.vue index a37048c..c529a72 100644 --- a/pages/specialArea/list.vue +++ b/pages/specialArea/list.vue @@ -657,16 +657,16 @@ export default { .goodList_i { display: flex; border-bottom: 1px solid #eee; - padding: 20rpx 0; + padding: 30rpx 0; position: relative; .goodList_ir { - margin-left: 20rpx; + margin-left: 24rpx; flex: 1; display: flex; flex-direction: column; justify-content: space-between; - font-size: 24rpx; + font-size: 28rpx; font-family: Microsoft YaHei; font-weight: 400; color: #333333; @@ -675,14 +675,14 @@ export default { display: flex; align-items: center; justify-content: space-between; - font-size: 28rpx; + font-size: 32rpx; font-family: Source Han Sans CN; font-weight: 400; color: #f82c1a; img { - width: 56rpx; - height: 56rpx; + width: 60rpx; + height: 60rpx; } } } @@ -698,8 +698,8 @@ export default { } .cover { - width: 152rpx; - height: 152rpx; + width: 200rpx; + height: 200rpx; background: #ffffff; border: 1px solid #eeeeee; border-radius: 10rpx; @@ -707,7 +707,7 @@ export default { } .pv { - font-size: 22rpx; + font-size: 26rpx; font-family: Source Han Sans CN; font-weight: 400; color: #999999; @@ -765,8 +765,8 @@ export default { left: 0; width: 0; height: 0; - border-top: 90rpx solid #005bac; - border-right: 90rpx solid transparent; + border-top: 100rpx solid #005bac; + border-right: 100rpx solid transparent; border-radius: 10rpx 0 0 0; z-index: 10; } @@ -784,22 +784,22 @@ export default { /* 2个字样式 */ .triangle-badge-text.text-2 { - top: -68rpx; + top: -76rpx; left: 10rpx; - font-size: 22rpx; + font-size: 24rpx; } /* 3个字样式 */ .triangle-badge-text.text-3 { - top: -68rpx; - left: 4rpx; - font-size: 20rpx; + top: -70rpx; + left: -2rpx; + font-size: 24rpx; } /* 4个字样式 */ .triangle-badge-text.text-4 { - top: -64rpx; - left: 0rpx; - font-size: 18rpx; + top: -72rpx; + left: -4rpx; + font-size: 20rpx; }