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

Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-h5 into test

This commit is contained in:
woody 2025-11-04 10:26:23 +08:00
parent 67d8ea296c 54887aa747
commit 45e81f5516
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
components/area-product-list/special-area-wrapper.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view class="goods-sort"> <view class="goods-sort">
<!-- 注册 --> <!-- 注册 -->
<view key="regist" v-if="registList.length > 0" class="goods-flexs"> <!-- <view key="regist" v-if="registList.length > 0" class="goods-flexs">
<view class="goods-view"> <view class="goods-view">
<area-product-list <area-product-list
:list="registList" :list="registList"
@ -10,7 +10,7 @@
:specialAreaId="regist.id" :specialAreaId="regist.id"
></area-product-list> ></area-product-list>
</view> </view>
</view> </view> -->
<!-- 升级 --> <!-- 升级 -->
<view key="upgrade" v-if="upgradeList.length > 0" class="goods-flexs"> <view key="upgrade" v-if="upgradeList.length > 0" class="goods-flexs">
<view class="goods-view"> <view class="goods-view">
@ -34,17 +34,7 @@
></area-product-list> ></area-product-list>
</view> </view>
</view> </view>
<!-- 赠送 -->
<view key="rescission" v-if="rescissionList.length > 0" class="goods-flexs">
<view class="goods-view">
<area-product-list
:list="rescissionList"
:title="rescission.name"
@product-click="redirectList"
:specialAreaId="rescission.id"
></area-product-list>
</view>
</view>
<!-- 五折 --> <!-- 五折 -->
<view key="halfPrice" v-if="halfPriceList.length > 0" class="goods-flexs"> <view key="halfPrice" v-if="halfPriceList.length > 0" class="goods-flexs">
<view class="goods-view"> <view class="goods-view">
@ -56,6 +46,17 @@
></area-product-list> ></area-product-list>
</view> </view>
</view> </view>
<!-- 赠送 -->
<view key="rescission" v-if="rescissionList.length > 0" class="goods-flexs">
<view class="goods-view">
<area-product-list
:list="rescissionList"
:title="rescission.name"
@product-click="redirectList"
:specialAreaId="rescission.id"
></area-product-list>
</view>
</view>
</view> </view>
</template> </template>

2
pages/upgrade/index.vue
View File

@ -343,6 +343,7 @@ import {
UPGRADE_AREA, UPGRADE_AREA,
REPURCHASE_AREA, REPURCHASE_AREA,
REISSUE_AREA, REISSUE_AREA,
HALF_PRICE_AREA,
} from '@/util/specialAreaMap' } from '@/util/specialAreaMap'
export default { export default {
components: { components: {
@ -545,6 +546,7 @@ export default {
UPGRADE_AREA, UPGRADE_AREA,
REISSUE_AREA, REISSUE_AREA,
REPURCHASE_AREA, REPURCHASE_AREA,
HALF_PRICE_AREA,
] ]
const title = areaList.find(item => item.id == areaId)?.name const title = areaList.find(item => item.id == areaId)?.name
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({

2
util/specialAreaMap.js
View File

@ -20,5 +20,5 @@ export const REPURCHASE_AREA = {
export const HALF_PRICE_AREA = { export const HALF_PRICE_AREA = {
id: 47, id: 47,
name: '五折专区', name: '复购专区',
} }