angelo
/
web-base-h5
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lx-test' of gitee.com:cabbage_qd/web-base-h5 into lx-online

This commit is contained in:
woody 2025-07-18 09:08:04 +08:00
parent 2c1f7690c5 bda6e298d6
commit 00f271ccea
3 changed files with 75 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pages/index/index.vue
View File

@ -448,7 +448,12 @@ export default {
}, },
getAreaGoods() { getAreaGoods() {
getAreaGoods().then(res => { 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() { toDel() {

86
pages/specialArea/index.vue
View File

@ -1,6 +1,6 @@
<!-- <!--
* @Descripttion: * @Descripttion:
* @version: * @version:
* @Author: kBank * @Author: kBank
* @Date: 2022-11-21 15:11:22 * @Date: 2022-11-21 15:11:22
--> -->
@ -8,15 +8,19 @@
<view class="content"> <view class="content">
<view class="goods-sort"> <view class="goods-sort">
<view class="goods-flexs"> <view class="goods-flexs">
<view <view
class="goods-view" class="goods-view"
@click="navTap(item)" @click="navTap(item)"
v-for="item in goodsList.recommendSpecialAreaList " v-for="item in recommendSpecialAreaList"
:key="item.pkWares" :key="item.pkWares"
> >
<view class="bg-color"></view> <view class="bg-color"></view>
<area-product-list v-if="item.waresList && item.waresList.length > 0" :list="item.waresList" :title="item.specialAreaName"></area-product-list> <area-product-list
v-if="item.waresList && item.waresList.length > 0"
:list="item.waresList"
:title="item.specialAreaName"
></area-product-list>
</view> </view>
</view> </view>
</view> </view>
@ -38,7 +42,8 @@ export default {
}, },
data() { data() {
return { return {
user: '', user: uni.getStorageSync('User'),
goodsList: [], goodsList: [],
specialImg: require('@/static/images/two2.jpg'), specialImg: require('@/static/images/two2.jpg'),
zoneList: [ zoneList: [
@ -153,20 +158,20 @@ export default {
label: '专供专区', label: '专供专区',
value: 31, value: 31,
children: [], children: [],
name: "wolesaleArea", name: 'wolesaleArea',
}, },
{ {
label: '续约专区', label: '续约专区',
value: 30, value: 30,
children: [], children: [],
name: "renewalArea", name: 'renewalArea',
}, },
{ {
label: '创客空间专区', label: '创客空间专区',
value:28, value: 28,
children: [], children: [],
isShow: true, isShow: true,
name: "makerArea", name: 'makerArea',
}, },
{ {
label: '架构管理', 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() { onLoad() {
// this.getMenuList() // this.getMenuList()
this.getGoodsInfo() this.getGoodsInfo()
@ -238,19 +253,19 @@ export default {
}, },
methods: { methods: {
goUrl() { goUrl() {
ban.agreementName().then((res) => { ban.agreementName().then(res => {
if (res.data==0) { if (res.data == 0) {
uni.navigateTo({ uni.navigateTo({
url: url:
"/pages/specialArea/list?label=续约专区" + '/pages/specialArea/list?label=续约专区' +
"&specialArea=30" + '&specialArea=30' +
"&children=[]", '&children=[]',
}); })
} else { } else {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '请先进行实名认证', content: '请先进行实名认证',
success: (res) => { success: res => {
if (res.confirm) { if (res.confirm) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/selfService/realName/realName', url: '/pages/selfService/realName/realName',
@ -276,7 +291,7 @@ export default {
}) })
if (tapx == -1) { if (tapx == -1) {
this.zoneList.forEach((items, index) => { this.zoneList.forEach((items, index) => {
items.children.forEach((ctem) => { items.children.forEach(ctem => {
if (ctem.value == item.specialArea) { if (ctem.value == item.specialArea) {
if (item.specialArea == 21) { if (item.specialArea == 21) {
uni.navigateTo({ uni.navigateTo({
@ -302,39 +317,38 @@ export default {
}) })
}) })
} else { } else {
if(item.specialArea == 30){ if (item.specialArea == 30) {
this.goUrl() this.goUrl()
}else{ } else {
uni.navigateTo({ uni.navigateTo({
url: url:
'/pages/specialArea/list?label=' + '/pages/specialArea/list?label=' +
item.specialAreaName + item.specialAreaName +
'&specialArea=' + '&specialArea=' +
item.specialArea + item.specialArea +
'&children=' + '&children=' +
JSON.stringify(this.zoneList[tapx].children), JSON.stringify(this.zoneList[tapx].children),
}) })
} }
} }
} }
}, },
getGoodsInfo() { getGoodsInfo() {
let userInfo = uni.getStorageSync('User') let userInfo = uni.getStorageSync('User')
getAreaGoods().then((res) => { getAreaGoods().then(res => {
this.goodsList = res.data this.goodsList = res.data
this.$forceUpdate() this.$forceUpdate()
}) })
}, },
getMenuList() { getMenuList() {
api.menuList().then((res) => { api.menuList().then(res => {
res.data.forEach((item) => { res.data.forEach(item => {
this.zoneList.forEach((ctem) => { this.zoneList.forEach(ctem => {
if (ctem.name == item.menuKey) { if (ctem.name == item.menuKey) {
ctem.isShow = true ctem.isShow = true
} }
if (ctem.children.length > 0) { if (ctem.children.length > 0) {
ctem.children.forEach((stem) => { ctem.children.forEach(stem => {
if (stem.name == item.menuKey) { if (stem.name == item.menuKey) {
stem.isShow = true stem.isShow = true
} }

38
pages/specialArea/list.vue
View File

@ -657,16 +657,16 @@ export default {
.goodList_i { .goodList_i {
display: flex; display: flex;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
padding: 20rpx 0; padding: 30rpx 0;
position: relative; position: relative;
.goodList_ir { .goodList_ir {
margin-left: 20rpx; margin-left: 24rpx;
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
font-size: 24rpx; font-size: 28rpx;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
@ -675,14 +675,14 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
font-size: 28rpx; font-size: 32rpx;
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #f82c1a; color: #f82c1a;
img { img {
width: 56rpx; width: 60rpx;
height: 56rpx; height: 60rpx;
} }
} }
} }
@ -698,8 +698,8 @@ export default {
} }
.cover { .cover {
width: 152rpx; width: 200rpx;
height: 152rpx; height: 200rpx;
background: #ffffff; background: #ffffff;
border: 1px solid #eeeeee; border: 1px solid #eeeeee;
border-radius: 10rpx; border-radius: 10rpx;
@ -707,7 +707,7 @@ export default {
} }
.pv { .pv {
font-size: 22rpx; font-size: 26rpx;
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
@ -765,8 +765,8 @@ export default {
left: 0; left: 0;
width: 0; width: 0;
height: 0; height: 0;
border-top: 90rpx solid #005bac; border-top: 100rpx solid #005bac;
border-right: 90rpx solid transparent; border-right: 100rpx solid transparent;
border-radius: 10rpx 0 0 0; border-radius: 10rpx 0 0 0;
z-index: 10; z-index: 10;
} }
@ -784,22 +784,22 @@ export default {
/* 2个字样式 */ /* 2个字样式 */
.triangle-badge-text.text-2 { .triangle-badge-text.text-2 {
top: -68rpx; top: -76rpx;
left: 10rpx; left: 10rpx;
font-size: 22rpx; font-size: 24rpx;
} }
/* 3个字样式 */ /* 3个字样式 */
.triangle-badge-text.text-3 { .triangle-badge-text.text-3 {
top: -68rpx; top: -70rpx;
left: 4rpx; left: -2rpx;
font-size: 20rpx; font-size: 24rpx;
} }
/* 4个字样式 */ /* 4个字样式 */
.triangle-badge-text.text-4 { .triangle-badge-text.text-4 {
top: -64rpx; top: -72rpx;
left: 0rpx; left: -4rpx;
font-size: 18rpx; font-size: 20rpx;
} }
</style> </style>