charles/frontend-app
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

feat: 首页改造

Browse Source
This commit is contained in:
charles
2026-07-13 18:14:00 +08:00
parent 85fff5c363
commit c6015b8295
15 changed files with 2726 additions and 1399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/active/limited-time/limited-time.vue
+436
View File
@@ -0,0 +1,436 @@
<template>
<view class="content-two">
<TopSafe></TopSafe>
<view class="product_info_header_warp">
<up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper"
@change="(e) => (currentNum = e.current)">
<template #indicator>
<view class="indicator-num">
<text class="indicator-num__text">{{ currentNum + 1 }}/{{ swiperList.length }}</text>
</view>
</template>
</up-swiper>
<view class="img_comm left_warp">
<up-image src="/static/common/left_b_st.png" width="30" height="30" bgColor="#f1f6ff00"
@click="jumpLeft"></up-image>
</view>
</view>
<view class="tab-view">
<!-- 限时秒杀卡片 -->
<view class="tab-card">
<view
class="tab-item"
:class="{ active: activeTab === index }"
@click="onActiveTabChange(index)"
v-for="(item, index) in activeTabList"
:key="index"
>
<text class="tab-text">{{ item.name }}</text>
</view>
</view>
<!-- 限时秒杀标签 -->
<view class="tab-list-container">
<view class="tab-list" @click="onTab(index)" v-for="(item, index) in tabList" :key="index">
<text class="text-28 text-space" :style="{
color: curTab == index ? '#7A35F6' : '#666',
}">{{ item.name }}</text>
<!-- <view class="line" v-if="curTab == index"></view> -->
</view>
</view>
</view>
<view class="setting-view">
<view class="name-box">
<mescroll-uni ref="mescrollRef" @down="downCallback" @up="upCallback" :up="upOption" :down="downOption"
@init="mescrollInit" :fixed="false">
<!-- 原来单个 v-for 替换成两列 -->
<view class="mescrollUniView" v-for="item in dataList" :key="item.id">
<productSeckillCard :item="item" actived-type="seckill" :attributes="attributes" />
</view>
</mescroll-uni>
</view>
</view>
<!-- #ifndef H5 || MP-WEIXIN-->
<CustomTabBar :tabIndex="2" />
<!-- #endif -->
<up-toast ref="uToastRef"></up-toast>
</view>
</template>
<script>
import { toRaw } from "vue";
import { getCascadeCategory, getCarouselImage } from "@/api/common.js";
import Header from "@/components/common/header.vue";
import TopSafe from "@/components/common/top-safe.nvue";
import MyBtn from "@/components/common/my-btn.vue";
import PingItem from "@/components/shop/ping-item.vue";
import { getSeckillGoodsList, getSeckillCurrent, getSeckillPreview } from "@/api/product.js";
import CustomTabBar from "@/components/custom-tab-bar.vue";
import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
import MescrollUni from "@/components/mescroll-uni/mescroll-uni.vue";
import productSeckillCard from "@/components/common/product-seckill-card.vue";
import { APP_PAGE_TYPE } from "@/utils/enumUtils.js";
export default {
mixins: [MescrollMixin],
components: { Header, TopSafe, MyBtn, PingItem, CustomTabBar, MescrollUni, productSeckillCard },
data() {
return {
swiperList: [],
currentNum: 0,
activityId: "",
dataList: [],
tabList: [{ name: "推荐" }],
curTab: 0,
activeTab: 0,
activeTabList: [
{ name: "今日秒杀", type: "current" },
{ name: "活动预告", type: "preview" }
],
upOption: {
auto: false,
page: {
size: 10, // 每页数据的数量,默认10
},
noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
empty: {
tip: `空空如也`,
},
textColor: "#333",
bgColor: "rgba(0,0,0,0)",
},
downOption: {
auto: false,
textColor: "#333",
bgColor: "rgba(0,0,0,0)",
},
mescroll: null,
attributes: {}, // 限时秒杀卡片属性
};
},
onLoad() {
this.init();
this.getCarouselImage()
},
methods: {
// 查询轮播图
async getCarouselImage() {
const params = {
pageUi: APP_PAGE_TYPE.SECKILL,
};
const resp = await getCarouselImage(params);
if (resp && resp.bizcode === 100) {
const data = resp.data || [];
this.swiperList =
data.length !== 0 ? data.map((obj) => obj.carouselImage) : [];
}
},
// 获取秒杀
onGetSeckillCurrent(type = 'current') {
const url = type === 'current' ? getSeckillCurrent : getSeckillPreview;
url().then((res) => {
if (res.bizcode === 100) {
this.activityId = res.data.activityId;
console.log('获取秒杀当前时间',res.data);
this.attributes ={
leftTime: res.data.leftTime || null,
}
this.$nextTick(() => {
this.mescroll && this.mescroll.resetUpScroll();
});
} else {
this.mescroll && this.mescroll.endErr();
}
}).catch(() => {
this.mescroll && this.mescroll.endErr();
});
},
upCallback(page) {
if (!this.activityId) {
this.mescroll && this.mescroll.endErr();
return;
}
let params = {
page: page.num,
pageSize: page.size,
activityId: this.activityId,
};
if (this.curTab != 0) {
params["categoryId"] = this.tabList[this.curTab].id;
} else {
params["isRecomm"] = true;
}
getSeckillGoodsList(params).then((res) => {
let curPageLen = res.data?.entitys ? res.data.entitys.length : 0;
if (page.num === 1) this.dataList = [];
if (res.data?.entitys) {
this.dataList = this.dataList.concat(res.data.entitys);
}
console.log(this.dataList);
this.mescroll.endBySize(curPageLen, res.data ? res.data.totalCount : 0);
}).catch(() => {
this.mescroll && this.mescroll.endErr();
});
},
downCallback() {
this.$nextTick(function () {
this.mescroll && this.mescroll.resetUpScroll();
});
},
mescrollInit(mescroll) {
this.mescroll = mescroll;
},
async cascadeCategory() {
getCascadeCategory({ parentId: 0 }).then((res) => {
if (res && res.bizcode === 100) {
res.data.forEach((item) => {
this.tabList.push(item);
});
}
});
},
onTab(index) {
if (index != this.curTab) {
this.curTab = index;
this.dataList = [];
this.downCallback();
}
},
onActiveTabChange(index) {
if (index !== this.activeTab) {
this.activeTab = index;
this.dataList = [];
const item = this.activeTabList[index];
this.onGetSeckillCurrent(item.type);
}
},
init() {
this.onGetSeckillCurrent();
this.cascadeCategory();
},
jumpLeft() {
uni.navigateBack({
delta: 1, // 返回的页面数，默认为1,返回到上一级
});
},
onSwiper(index) {
uni.previewImage({
current: index,
loop: true,
urls: this.swiperList,
});
},
},
};
</script>
<style lang="scss" scoped>
.content-two {
height: calc(100vh);
background-color: #fff;
display: flex;
flex-direction: column;
}
.product_info_header_warp {
position: relative;
.product_info_header_swiper {
height: 600rpx !important;
border-radius: 0 !important;
::v-deep(.u-swiper__wrapper) {
height: 600rpx !important;
.u-swiper__wrapper {
height: 600rpx !important;
.u-swiper__wrapper__item__wrapper__image {
height: 600rpx !important;
border-radius: 0 !important;
}
}
}
}
.img_comm {
position: absolute;
top: 140rpx;
}
.left_warp {
left: 40rpx;
}
.right_warp {
right: 40rpx;
}
}
.head-view {
width: 100%;
min-height: 88rpx;
height: 88rpx;
display: flex;
align-items: center;
padding: 0 32rpx;
box-sizing: border-box;
background-color: #fff;
.head-search {
width: 100%;
height: 76rpx;
padding: 0 24rpx;
flex-direction: row;
display: flex;
background-color: #f7f7f7;
align-items: center;
border-radius: 16rpx;
}
}
.tab-box {
width: 100%;
height: 160rpx;
min-height: 80rpx;
display: flex;
flex-direction: row;
align-items: center;
padding: 0 32rpx;
box-sizing: border-box;
background-color: #fff;
overflow-x: auto;
.tab-item {
display: flex;
flex: 1;
flex-direction: column;
align-items: center;
.tab-img {
width: 56rpx;
height: 56rpx;
}
.tab-name {
font-size: 28rpx;
margin-top: 24rpx;
}
}
}
.tab-card {
width: 100%;
height: 74rpx;
display: flex;
align-items: center;
background-color: #f5f5f5;
border-radius: 12rpx;
padding: 0 4rpx;
margin-bottom: 16rpx;
.tab-item {
flex: 1;
height: 60rpx;
display: flex;
align-items: center;
justify-content: center;
border-radius: 10rpx;
background-color: transparent;
transition: all 0.3s ease;
&.active {
background-color: #fff;
.tab-text {
color: #7A35F6;
font-weight: 600;
}
}
.tab-text {
font-size: 28rpx;
color: #666666;
transition: color 0.3s ease;
}
}
}
.tab-view {
border-top-left-radius: 20rpx !important;
border-top-right-radius: 20rpx !important;
width: 100%;
display: flex;
flex-direction: column;
padding: 24rpx 32rpx 0;
box-sizing: border-box;
background-color: #fff;;
overflow-x: auto;
position: absolute;
top: 520rpx;
left: 0;
.tab-list-container{
width: 100%;
height: 60rpx;
display: flex;
flex-direction: row;
align-items: center;
}
.tab-list {
margin-right: 24rpx;
display: flex;
flex-direction: column;
height: 60rpx;
min-height: 60rpx;
align-items: center;
justify-content: space-between;
}
}
.setting-view {
margin-top: 0;
width: 100%;
flex: 1;
display: flex;
flex-direction: column;
align-items: center;
overflow-y: auto;
padding: 0 32rpx;
box-sizing: border-box;
position: relative;
margin-top: 106rpx;
.name-box {
width: 100%;
flex: 1;
display: flex;
flex-direction: column;
align-items: center;
.mescrollUniView {
width: calc(100vw - 48rpx);
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.fall-col {
width: 332rpx;
/* 与 PingItem 宽度一致 */
height: 100%;
}
}
}
}
</style>
pages/active/newcomer-exclusive/newcomer-exclusive.vue
+355
View File
@@ -0,0 +1,355 @@
<template>
<view class="content-two">
<TopSafe></TopSafe>
<view class="product_info_header_warp">
<up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper"
@change="(e) => (currentNum = e.current)">
<template #indicator>
<view class="indicator-num">
<text class="indicator-num__text">{{ currentNum + 1 }}/{{ swiperList.length }}</text>
</view>
</template>
</up-swiper>
<view class="img_comm left_warp">
<up-image src="/static/common/left_b_st.png" width="30" height="30" bgColor="#f1f6ff00"
@click="jumpLeft"></up-image>
</view>
</view>
<view class="tab-view">
<view class="tab-list" @click="onTab(index)" v-for="(item, index) in tabList" :key="index">
<text class="text-28 text-space" :style="{
color: curTab == index ? '#7A35F6' : '#666',
}">{{ item.name }}</text>
<view class="line" v-if="curTab == index"></view>
</view>
</view>
<view class="setting-view">
<view class="name-box">
<mescroll-uni ref="mescrollRef" @down="downCallback" @up="upCallback" :up="upOption" :down="downOption"
@init="mescrollInit" :fixed="false">
<!-- 原来单个 v-for 替换成两列 -->
<view class="mescrollUniView" v-for="item in dataList" :key="item.id">
<productSeckillCard :item="item" actived-type="newcomer" />
</view>
</mescroll-uni>
</view>
</view>
<!-- #ifndef H5 || MP-WEIXIN-->
<CustomTabBar :tabIndex="2" />
<!-- #endif -->
<up-toast ref="uToastRef"></up-toast>
</view>
</template>
<script>
import { toRaw } from "vue";
import { getCascadeCategory, getCarouselImage } from "@/api/common.js";
import Header from "@/components/common/header.vue";
import TopSafe from "@/components/common/top-safe.nvue";
import MyBtn from "@/components/common/my-btn.vue";
import PingItem from "@/components/shop/ping-item.vue";
import { searchList, } from "@/api/product.js";
import CustomTabBar from "@/components/custom-tab-bar.vue";
import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
import MescrollUni from "@/components/mescroll-uni/mescroll-uni.vue";
import productSeckillCard from "@/components/common/product-seckill-card.vue";
import { APP_PAGE_TYPE } from "@/utils/enumUtils.js";
export default {
mixins: [MescrollMixin],
components: { Header, TopSafe, MyBtn, PingItem, CustomTabBar, MescrollUni, productSeckillCard },
data() {
return {
swiperList: [],
currentNum: 0,
activityId: "",
dataList: [],
tabList: [{ name: "推荐" }],
curTab: 0,
upOption: {
auto: false,
page: {
size: 10, // 每页数据的数量,默认10
},
noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
empty: {
tip: `空空如也`,
},
textColor: "#333",
bgColor: "rgba(0,0,0,0)",
},
downOption: {
auto: false,
textColor: "#333",
bgColor: "rgba(0,0,0,0)",
},
mescroll: null,
};
},
onLoad() {
this.cascadeCategory();
this.getCarouselImage()
this.upCallback({ num: 1, size: 10 });
},
methods: {
// 查询轮播图
async getCarouselImage() {
const params = {
pageUi: APP_PAGE_TYPE.NEW,
};
const resp = await getCarouselImage(params);
if (resp && resp.bizcode === 100) {
const data = resp.data || [];
this.swiperList =
data.length !== 0 ? data.map((obj) => obj.carouselImage) : [];
}
},
// 获取秒杀
// onGetSeckillCurrent() {
// getSeckillCurrent().then((res) => {
// console.log("获取秒杀", res);
// if (res.bizcode === 100) {
// this.activityId = res.data.activityId;
// this.$nextTick(() => {
// this.mescroll && this.mescroll.resetUpScroll();
// });
// } else {
// this.mescroll && this.mescroll.endErr();
// }
// }).catch(() => {
// this.mescroll && this.mescroll.endErr();
// });
// },
upCallback(page) {
let params = {
page: page.num,
pageSize: page.size,
// tag:
};
if (this.curTab != 0) {
params["categoryId"] = this.tabList[this.curTab].id;
} else {
params["isRecomm"] = true;
}
searchList(params).then((res) => {
let curPageLen = res.data ? res.data.length : 0;
if (res.data) {
this.dataList = this.dataList.concat(res.data);
}
console.log(this.dataList);
this.mescroll.endBySize(curPageLen, res.data ? res.data.totalCount : 0);
}).catch(() => {
this.mescroll && this.mescroll.endErr();
});
},
downCallback() {
this.$nextTick(function () {
this.mescroll && this.mescroll.resetUpScroll();
});
},
mescrollInit(mescroll) {
this.mescroll = mescroll;
},
async cascadeCategory() {
getCascadeCategory({ parentId: 0 }).then((res) => {
if (res && res.bizcode === 100) {
res.data.forEach((item) => {
this.tabList.push(item);
});
}
});
},
onTab(index) {
if (index != this.curTab) {
this.curTab = index;
this.dataList = [];
this.downCallback();
}
},
jumpLeft() {
uni.navigateBack({
delta: 1, // 返回的页面数，默认为1,返回到上一级
});
},
onSwiper(index) {
uni.previewImage({
current: index,
loop: true,
urls: this.swiperList,
});
},
},
};
</script>
<style lang="scss" scoped>
.content-two {
height: calc(100vh);
background-color: #fff;
}
.product_info_header_warp {
position: relative;
.product_info_header_swiper {
height: 600rpx !important;
border-radius: 0 !important;
::v-deep(.u-swiper__wrapper) {
height: 600rpx !important;
.u-swiper__wrapper {
height: 600rpx !important;
.u-swiper__wrapper__item__wrapper__image {
height: 600rpx !important;
border-radius: 0 !important;
}
}
}
}
.img_comm {
position: absolute;
top: 140rpx;
}
.left_warp {
left: 40rpx;
}
.right_warp {
right: 40rpx;
}
}
.head-view {
width: 100%;
min-height: 88rpx;
height: 88rpx;
display: flex;
align-items: center;
padding: 0 32rpx;
box-sizing: border-box;
background-color: #fff;
.head-search {
width: 100%;
height: 76rpx;
padding: 0 24rpx;
flex-direction: row;
display: flex;
background-color: #f7f7f7;
align-items: center;
border-radius: 16rpx;
}
}
.tab-box {
width: 100%;
height: 160rpx;
min-height: 80rpx;
display: flex;
flex-direction: row;
align-items: center;
padding: 0 32rpx;
box-sizing: border-box;
background-color: #fff;
overflow-x: auto;
.tab-item {
display: flex;
flex: 1;
flex-direction: column;
align-items: center;
.tab-img {
width: 56rpx;
height: 56rpx;
}
.tab-name {
font-size: 28rpx;
margin-top: 24rpx;
}
}
}
.tab-view {
border-top-left-radius: 20rpx !important;
border-top-right-radius: 20rpx !important;
width: 100%;
height: 80rpx;
min-height: 80rpx;
display: flex;
flex-direction: row;
padding: 0 32rpx;
box-sizing: border-box;
background-color: #fff;
overflow-x: auto;
position: absolute;
top: 520rpx;
left: 0;
.tab-list {
margin-right: 24rpx;
display: flex;
flex-direction: column;
height: 60rpx;
min-height: 60rpx;
align-items: center;
justify-content: space-between;
margin-top: 22rpx;
}
.line {
width: 48rpx;
height: 6rpx;
background-color: #7a35f6;
}
}
.setting-view {
margin-top: 20rpx;
width: 100%;
height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height));
display: flex;
flex-direction: column;
align-items: center;
overflow-y: auto;
padding: 0 32rpx;
box-sizing: border-box;
position: relative;
.name-box {
width: 100%;
height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height));
display: flex;
flex-direction: column;
align-items: center;
.mescrollUniView {
width: calc(100vw - 48rpx);
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.fall-col {
width: 332rpx;
/* 与 PingItem 宽度一致 */
height: 100%;
}
}
}
}
</style>
pages/active/super-subsidy/super-subsidy.vue
+337
View File
@@ -0,0 +1,337 @@
<template>
<view class="content-two">
<TopSafe></TopSafe>
<view class="product_info_header_warp">
<up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper"
@change="(e) => (currentNum = e.current)">
<template #indicator>
<view class="indicator-num">
<text class="indicator-num__text">{{ currentNum + 1 }}/{{ swiperList.length }}</text>
</view>
</template>
</up-swiper>
<view class="img_comm left_warp">
<up-image src="/static/common/left_b_st.png" width="30" height="30" bgColor="#f1f6ff00"
@click="jumpLeft"></up-image>
</view>
</view>
<view class="tab-view">
<view class="tab-list" @click="onTab(index)" v-for="(item, index) in tabList" :key="index">
<text class="text-28 text-space" :style="{
color: curTab == index ? '#7A35F6' : '#666',
}">{{ item.name }}</text>
<view class="line" v-if="curTab == index"></view>
</view>
</view>
<view class="setting-view">
<view class="name-box">
<mescroll-uni ref="mescrollRef" @down="downCallback" @up="upCallback" :up="upOption" :down="downOption"
@init="mescrollInit" :fixed="false">
<!-- 原来单个 v-for 替换成两列 -->
<view class="mescrollUniView" v-for="item in dataList" :key="item.id">
<productSeckillCard :item="item" actived-type="subsidy" />
</view>
</mescroll-uni>
</view>
</view>
<!-- #ifndef H5 || MP-WEIXIN-->
<CustomTabBar :tabIndex="2" />
<!-- #endif -->
<up-toast ref="uToastRef"></up-toast>
</view>
</template>
<script>
import { getCascadeCategory, getCarouselImage } from "@/api/common.js";
import Header from "@/components/common/header.vue";
import TopSafe from "@/components/common/top-safe.nvue";
import MyBtn from "@/components/common/my-btn.vue";
import PingItem from "@/components/shop/ping-item.vue";
import { searchList } from "@/api/product.js";
import CustomTabBar from "@/components/custom-tab-bar.vue";
import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
import MescrollUni from "@/components/mescroll-uni/mescroll-uni.vue";
import productSeckillCard from "@/components/common/product-seckill-card.vue";
import { APP_PAGE_TYPE } from "@/utils/enumUtils.js";
export default {
mixins: [MescrollMixin],
components: { Header, TopSafe, MyBtn, PingItem, CustomTabBar, MescrollUni, productSeckillCard },
data() {
return {
swiperList: [],
currentNum: 0,
dataList: [],
tabList: [{ name: "推荐" }],
curTab: 0,
upOption: {
auto: false,
page: {
size: 10, // 每页数据的数量,默认10
},
noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
empty: {
tip: `空空如也`,
},
textColor: "#333",
bgColor: "rgba(0,0,0,0)",
},
downOption: {
auto: false,
textColor: "#333",
bgColor: "rgba(0,0,0,0)",
},
mescroll: null,
};
},
onLoad() {
this.cascadeCategory();
this.getCarouselImage()
this.upCallback({ num: 1, size: 10 });
},
methods: {
// 查询轮播图
async getCarouselImage() {
const params = {
pageUi: APP_PAGE_TYPE.SUPER_SUBSIDY,
};
const resp = await getCarouselImage(params);
if (resp && resp.bizcode === 100) {
const data = resp.data || [];
this.swiperList =
data.length !== 0 ? data.map((obj) => obj.carouselImage) : [];
}
},
upCallback(page) {
let params = {
page: page.num,
pageSize: page.size,
type: -2
};
if (this.curTab != 0) {
params["categoryId"] = this.tabList[this.curTab].id;
} else {
params["isRecomm"] = true;
}
searchList(params).then((res) => {
let curPageLen = res.data ? res.data.length : 0;
if (res.data) {
this.dataList = this.dataList.concat(res.data);
}
console.log(this.dataList);
this.mescroll.endBySize(curPageLen, res.data ? res.data.totalCount : 0);
}).catch(() => {
this.mescroll && this.mescroll.endErr();
});
},
downCallback() {
this.$nextTick(function () {
this.mescroll && this.mescroll.resetUpScroll();
});
},
mescrollInit(mescroll) {
this.mescroll = mescroll;
},
async cascadeCategory() {
getCascadeCategory({ parentId: 0 }).then((res) => {
if (res && res.bizcode === 100) {
res.data.forEach((item) => {
this.tabList.push(item);
});
}
});
},
onTab(index) {
if (index != this.curTab) {
this.curTab = index;
this.dataList = [];
this.downCallback();
}
},
jumpLeft() {
uni.navigateBack({
delta: 1, // 返回的页面数，默认为1,返回到上一级
});
},
onSwiper(index) {
uni.previewImage({
current: index,
loop: true,
urls: this.swiperList,
});
},
},
};
</script>
<style lang="scss" scoped>
.content-two {
height: calc(100vh);
background-color: #fff;
}
.product_info_header_warp {
position: relative;
.product_info_header_swiper {
height: 600rpx !important;
border-radius: 0 !important;
::v-deep(.u-swiper__wrapper) {
height: 600rpx !important;
.u-swiper__wrapper {
height: 600rpx !important;
.u-swiper__wrapper__item__wrapper__image {
height: 600rpx !important;
border-radius: 0 !important;
}
}
}
}
.img_comm {
position: absolute;
top: 140rpx;
}
.left_warp {
left: 40rpx;
}
.right_warp {
right: 40rpx;
}
}
.head-view {
width: 100%;
min-height: 88rpx;
height: 88rpx;
display: flex;
align-items: center;
padding: 0 32rpx;
box-sizing: border-box;
background-color: #fff;
.head-search {
width: 100%;
height: 76rpx;
padding: 0 24rpx;
flex-direction: row;
display: flex;
background-color: #f7f7f7;
align-items: center;
border-radius: 16rpx;
}
}
.tab-box {
width: 100%;
height: 160rpx;
min-height: 80rpx;
display: flex;
flex-direction: row;
align-items: center;
padding: 0 32rpx;
box-sizing: border-box;
background-color: #fff;
overflow-x: auto;
.tab-item {
display: flex;
flex: 1;
flex-direction: column;
align-items: center;
.tab-img {
width: 56rpx;
height: 56rpx;
}
.tab-name {
font-size: 28rpx;
margin-top: 24rpx;
}
}
}
.tab-view {
border-top-left-radius: 20rpx !important;
border-top-right-radius: 20rpx !important;
width: 100%;
height: 80rpx;
min-height: 80rpx;
display: flex;
flex-direction: row;
padding: 0 32rpx;
box-sizing: border-box;
background-color: #fff;
overflow-x: auto;
position: absolute;
top: 520rpx;
left: 0;
.tab-list {
margin-right: 24rpx;
display: flex;
flex-direction: column;
height: 60rpx;
min-height: 60rpx;
align-items: center;
justify-content: space-between;
margin-top: 22rpx;
}
.line {
width: 48rpx;
height: 6rpx;
background-color: #7a35f6;
}
}
.setting-view {
margin-top: 20rpx;
width: 100%;
height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height));
display: flex;
flex-direction: column;
align-items: center;
overflow-y: auto;
padding: 0 32rpx;
box-sizing: border-box;
position: relative;
.name-box {
width: 100%;
height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height));
display: flex;
flex-direction: column;
align-items: center;
.mescrollUniView {
width: calc(100vw - 48rpx);
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.fall-col {
width: 332rpx;
/* 与 PingItem 宽度一致 */
height: 100%;
}
}
}
}
</style>
pages/home/home.vue
+1155 -1109
View File
File diff suppressed because it is too large Load Diff
pages/order_package/order_submit/order_submit.vue
+46 -16
View File
@@ -1,7 +1,6 @@
<template>
<view class="order_submit_warp">
<Header :leftTitle="$t('order.submit.title')" leftPathType="switchTab"
leftPath="/pages/shopping_cart/shopping_cart" />
<Header leftTitle="提交订单" leftPathType="switchTab" leftPath="/pages/shopping_cart/shopping_cart" />
<!-- 收件人信息 -->
<view class="order_submit_header_warp" @click="checkAddressShow(true, 'data')"
v-if="orderInfo.address && Object.keys(orderInfo.address).length !== 0">
@@ -61,7 +60,7 @@
<view class="content_right_total">
<view>￥<text style="font-size: 36rpx">{{
pItem.totalPrice
}}</text></view>
}}</text></view>
<view>每件到手价￥{{ pItem.unitPrice }}</view>
</view>
<view class="shopping_info_quantity">
@@ -85,7 +84,7 @@
<view class="content_right_total">
<view>￥<text style="font-size: 36rpx">{{
pItem.totalPrice
}}</text></view>
}}</text></view>
<view>每件到手价￥{{ pItem.unitPrice }}</view>
</view>
<view class="shopping_info_quantity">
@@ -109,7 +108,7 @@
<view class="order_freight_item">
<view>运费<text style="color: #c0c3c6; margin-left: 20rpx">{{
getValue(PRODUCT_DELIVERY_TIME, addItem.deliveryTime)
}}</text></view>
}}</text></view>
<view class="value_">
{{ orderInfo.postage ? "￥" + orderInfo.postage : "包邮" }}
</view>
@@ -188,7 +187,7 @@
<text class="text-32 text-zu">运费</text>
<text class="text-32 text-zu text-bold">￥{{ orderInfo.postage }}</text>
</view>
<view class="price-view" @click="couponShow = true">
<!-- <view class="price-view" @click="couponShow = true">
<text class="text-32 text-zu">优惠券</text>
<view style="display: flex; align-items: center;">
<view class="text-24 " style="margin-right:4rpx;color:#999;">{{ selectedCoupon ? `-${selectedCoupon.amount}` :
@@ -196,6 +195,14 @@
<up-image src="/static/common/right.png" width="12" height="12" bgColor="#f1f6ff00"
style="display:inline-block;vertical-align: middle;"></up-image>
</view>
</view> -->
<view class="price-view" @click="this.sed?.activedType == 'seckill' && allOrderInfo.activity?.activityPrice">
<text class="text-32 text-zu">秒杀价</text>
<view style="display: flex; align-items: center;">
<view class="seckill-tag">限时秒杀</view>
<view class="text-24 " style="margin-right:8rpx;color:#7934F6;font-size: 32rpx;font-weight: bold;">¥{{
allOrderInfo.activity?.activityPrice}}</view>
</view>
</view>
<view class="price-view" v-if="isCoupon">
<text class="text-32 text-zu">数字积分</text>
@@ -261,11 +268,11 @@
<view class="popup_but" @click="addressOk"> 确认 </view>
</view>
</up-popup>
<u-modal :show="tipsShow" title="提示" showCancelButton @cancel="onCancel" @confirm="onConfirm"
<u-modal :show="tipsShow" v-if="tipsShow" title="提示" showCancelButton @cancel="onCancel" @confirm="onConfirm"
:cancelText="type == 1 ? '取消' : '忘记密码'" :confirmText="type == 1 ? '去设置' : '重试'" confirmColor="#7934F6"
:content="content"></u-modal>
<u-keyboard ref="uKeyboard" mode="number" :show="show" @change="onChange" @backspace="onBackspace"
<u-keyboard ref="uKeyboard" mode="number" v-if="show" :show="show" @change="onChange" @backspace="onBackspace"
:dotDisabled="true" :tooltip="false">
<view style="background-color: #fff">
<view class="money">
@@ -287,7 +294,7 @@
<up-toast ref="uToastRef"></up-toast>
<!-- 优惠券选择弹框 -->
<CouponDialog :show="couponShow" @close="couponShow = false" @select="handleCouponSelect"></CouponDialog>
<CouponDialog :show="couponShow" v-if="couponShow" @close="couponShow = false" @select="handleCouponSelect"></CouponDialog>
</view>
</template>
@@ -297,19 +304,17 @@ import { getGoodsDetail } from "@/api/product.js";
import { getAddress } from "@/api/address.js";
import {
PAYMENT_WAY,
PAYMENT_WAY_,
PRODUCT_DELIVERY_TIME,
getValue,
WAY_LIST,
} from "@/utils/enumUtils.js";
import {
getSettleList,
settle,
settlementOrder,
updateGoodsNum,
setSeckillOrder
} from "@/api/cart.js";
import { getSupportPay } from "@/api/order.js";
import { feedback } from "@/api/payment.js";
import { assembleAddress } from "@/utils/index.js";
import Header from "@/components/header.vue";
import { getUserInfo } from "@/api/auth.js";
@@ -535,6 +540,10 @@ export default {
parmas["types"] = "1,2,3";
parmas.isDeduction = true;
}
if(this.sed.activedType == "seckill"){
parmas["types"] = "1,2,3";
}
const result = await getSupportPay(parmas);
if (result && result.bizcode === 100) {
const data = result.data || [];
@@ -613,13 +622,17 @@ export default {
if (this.isCoupon) {
params.type = -1;
}
if (this.sed?.activedType == "seckill") {
params.activityId = Number(this.sed?.activityId);
params.activityType = "seckill";
}
const resp = await getGoodsDetail(params);
if (resp && resp.bizcode === 100) {
const data = resp.data;
this.isPoints = data.type == 3 ? 1 : 0;
this.orderInfo = {
address: null,
amount: this.sed.goodsNum * this.sed.specsId.price,
amount:this.sed?.activedType == "seckill" ? data.activity?.activityPrice :this.sed.goodsNum * this.sed.specsId.price || 0,
postage: 0,
shops: [
{
@@ -886,9 +899,16 @@ export default {
params["goodsId"] = this.sed.id;
params["specsId"] = this.sed.specsId.id;
params["goodsNum"] = this.orderInfo.shops[0].addrTimes[0].goods[0].num;
if (this.isCoupon) params.payway2 = "vcoin";
resp = await settlementOrder(params);
console.log("秦星星params-----", this.sed?.activedType);
if (this.sed?.activedType == "seckill") {
params["activityId"] = Number(this.sed?.activityId); // 秒杀活动ID
resp = await setSeckillOrder(params);
} else {
if (this.isCoupon) params.payway2 = "vcoin";
resp = await settlementOrder(params);
}
} else {
params["cartIds"] = this.ids;
if (
@@ -1056,6 +1076,16 @@ export default {
display: flex;
flex-direction: row;
justify-content: space-between;
.seckill-tag {
background: #7934F6;
border-radius: 4rpx;
font-weight: 600;
font-size: 20rpx;
color: #FFFFFF;
padding: 4rpx 12rpx;
margin-right: 8rpx;
}
}
.way-option {
@@ -1115,7 +1145,7 @@ export default {
.order_submit_warp {
background-color: $app-bj;
height: calc(100vh - 200rpx);
height: calc(100% - 200rpx - env(safe-area-inset-bottom));
padding: 20rpx;
overflow-y: auto;
}
pages/other_package/productInfo/productInfo.vue
+36 -26
View File
@@ -321,7 +321,8 @@
<SharePopup ref="share" v-if="shareOpen" :show="shareShow" @close="onClose" @share="onShare" :id="id"
:text="orderInfo.name ? orderInfo.name : ''" :price="orderInfo.minPrice ? orderInfo.minPrice : ''"
:tu="swiperList.length && swiperList[0]"></SharePopup>
<EvaluateDialog ref="evaluateDialog" :show="evaluateDialogShow" @close="evaluateDialogShow = false" :evalId="id" :mainGraph="orderInfo.mainGraph" :name="orderInfo.name"></EvaluateDialog>
<EvaluateDialog ref="evaluateDialog" :show="evaluateDialogShow" @close="evaluateDialogShow = false" :evalId="id"
:mainGraph="orderInfo.mainGraph" :name="orderInfo.name"></EvaluateDialog>
<view class="hideCanvasView">
<canvas id="myCanvas" canvas-id="myCanvas" :style="{
height: bgObj.height + 'px',
@@ -333,7 +334,7 @@
<script>
import { getGoodsDetail, addGoods, getGoodsSpecs } from "@/api/product.js";
import { getValue, PRODUCT_DELIVERY_TIME } from "@/utils/enumUtils.js";
import { getValue, PRODUCT_DELIVERY_TIME, ACTIVITY_TYPE } from "@/utils/enumUtils.js";
import { copyData } from "@/utils/index.js";
import Evaluation from "@/pages/other_package/productInfo/evaluation.vue";
import EvaluateDialog from "@/pages/other_package/productInfo/evaluate-dialog.vue";
@@ -410,6 +411,8 @@ export default {
isSplash: false,
isCoupon: false, // 是否是优惠券商品
curAmount: 0, // 当前人剩余优惠券金额
activedType: "", // 活动类型
activityId: "", // 秒杀活动ID
};
},
onBackPress(options) {
@@ -425,6 +428,9 @@ export default {
},
onLoad(options) {
const id = options.id;
this.activedType = options.activedType;
this.activityId = options.activityId;
this.isCoupon = options.isPar;
if (this.isCoupon && options.curAmount) {
this.curAmount = options.curAmount;
@@ -840,10 +846,16 @@ export default {
if (this.isCoupon) {
params.type = -1;
}
if(this.activedType === 'seckill'){
params.activityId = this.activityId;
params.activityType = 'seckill';
}
const resp = await getGoodsDetail(params);
if (resp && resp.bizcode === 100) {
const data = resp.data;
this.isShowCart = data.type == 3 ? 1 : 0;
// 限时秒杀 和 积分兑换 不需要购物车
this.isShowCart = this.activedType === 'seckill' || data.type == 3 ? 1 : 0;
// 商品图
if (data.goodsGraph) {
this.swiperList = data.goodsGraph.split(",");
@@ -851,6 +863,9 @@ export default {
data.addressObj = {}; // 收件人地址
data.quantity = 1; // 数量
data.inventory = 0; // 库存
if(this.activedType === 'seckill'){
data.minPrice = data.activity?.activityPrice;
}
this.orderInfo = data;
}
},
@@ -1064,16 +1079,30 @@ export default {
const params = {
id: this.id,
specsId: selectTempl.id, // 规格ID
goodsNum: this.orderInfo.quantity, // 商品数量
goodsNum: this.orderInfo.quantity, // 商品数量
};
console.log("selectTempl", selectTempl);
if (this.isShowCart == 1 || this.isCoupon) {
console.log("活动类型params---秦星星", params,this.isCoupon);
params["specsId"] = selectTempl;
let url = "";
if(this.activedType == "seckill"){
params["activedType"] = this.activedType; // 活动类型
params["activityId"] = this.activityId;// 秒杀活动ID
url = `/pages/order_package/order_submit/order_submit?sed=${JSON.stringify(
params
)}`;
}
if(this.isCoupon){
url =`/pages/order_package/order_submit/order_submit?sed=${JSON.stringify(
params
)}&address=${this.selectAddress?.id}&isCoupon=${this.isCoupon}`
}
uni.navigateTo({
url: `/pages/order_package/order_submit/order_submit?sed=${JSON.stringify(
params
)}&address=${this.selectAddress?.id}&isCoupon=${this.isCoupon}`,
url: url
});
return;
}
@@ -1091,9 +1120,6 @@ export default {
duration: 2000, // 持续时长，单位ms
});
}
// setTimeout(() => {
// this.checkSpecification(false, null);
// }, 2000)
}
},
// 跳转到分享页面
@@ -1124,22 +1150,6 @@ export default {
.product_info_header_warp {
position: relative;
// .product_info_header_swiper {
// height: 562.5rpx !important;
// ::v-deep(.u-swiper__wrapper) {
// height: 562.5rpx !important;
// .u-swiper__wrapper {
// height: 562.5rpx !important;
// .u-swiper__wrapper__item__wrapper__image {
// height: 562.5rpx !important;
// }
// }
// }
// }
.product_info_header_swiper {
height: 800rpx !important;
pages/sort/sort.vue
+3
View File
@@ -193,9 +193,11 @@ export default {
},
// 查询分类
async getSort(pId) {
const params = {
parentId: pId,
};
console.log('查询分类', params,pId);
const resp = await getCascadeCategory(params);
if (resp && resp.bizcode === 100) {
return resp.data;
@@ -207,6 +209,7 @@ export default {
},
// 点击左边的栏目切换
async swichMenu(item, index) {
console.log('点击左边的栏目切换',item, index, "item, index");
if (index == this.current) return;
this.tabbarContentLoading = true;
const firstData = await this.getSort(item.id);
pages/supply_chain/supply_chain.vue
+53 -69
View File
@@ -7,24 +7,6 @@
<text class="text-28 text-fu" style="margin-left: 12rpx">搜索</text>
</view>
</view>
<!-- 原来的tab切换 -->
<!-- <view class="tab-view">
<view
class="tab-list"
@click="onTab(index)"
v-for="(item, index) in tabList"
:key="index"
>
<text
class="text-28 text-space"
:style="{
color: curTab == index ? '#7A35F6' : '#666',
}"
>{{ item.name }}</text
>
<view class="line" v-if="curTab == index"></view>
</view>
</view> -->
<view class="tab-box">
<view
class="tab-item"
@@ -33,7 +15,7 @@
@click="onTab(index)"
>
<image
:src="curTab == index ? item.img : item.greyImg"
:src="curTab == index ? item.icon : item.icon"
mode="aspectFill"
class="tab-img"
></image>
@@ -89,46 +71,22 @@
</template>
<script>
import { toRaw } from "vue";
import { getCascadeCategory } from "@/api/common.js";
import Header from "@/components/common/header.vue";
import TopSafe from "@/components/common/top-safe.nvue";
import MyBtn from "@/components/common/my-btn.vue";
import PingItem from "@/components/shop/ping-item.vue";
import { searchList } from "@/api/product.js";
import { searchList,getGoodsTags } from "@/api/product.js";
import CustomTabBar from "@/components/custom-tab-bar.vue";
import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
import MescrollUni from "@/components/mescroll-uni/mescroll-uni.vue";
export default {
mixins: [MescrollMixin],
components: { Header, TopSafe, MyBtn, PingItem, CustomTabBar, MescrollUni },
components: { Header, TopSafe, MyBtn,PingItem, CustomTabBar, MescrollUni },
data() {
return {
dataList: [],
tabList: [{ name: "推荐" }],
tabArr: [
{
img: "/static/common/xrjx.png",
greyImg: "/static/common/xrjx_grey.png",
name: "信任精选",
},
{
img: "/static/common/cdjk.png",
greyImg: "/static/common/cdjk_grey.png",
name: "吃的健康",
},
{
img: "/static/common/qwhb.png",
greyImg: "/static/common/qwhb_grey.png",
name: "全网爆款",
},
{
img: "/static/common/yxhw.png",
greyImg: "/static/common/yxhw_grey.png",
name: "严选好物",
},
],
tabArr: [ ],
curTab: 0,
upOption: {
auto: false,
@@ -152,10 +110,51 @@ export default {
mescroll: null,
};
},
onLoad() {
onLoad(options) {
this.init();
if(options.index){
this.curTab = options.index;
}
},
onShow() {
if (this.tabArr.length > 0) {
const sortParams = uni.getStorageSync('sortParams');
if (sortParams) {
uni.removeStorageSync('sortParams');
const targetIndex = this.tabArr.findIndex(item => item.name === sortParams.value);
if (targetIndex !== -1 && targetIndex !== this.curTab) {
this.curTab = targetIndex;
this.dataList = [];
this.downCallback();
}
}
}
},
methods: {
/**
* 查询分类列表
*/
async getSortList() {
const resp = await getGoodsTags({ type: 5 });
if (resp && resp.bizcode === 100) {
this.tabArr = resp.data.sort((a, b) => a.sort - b.sort);
this.$nextTick(() => {
this.applySortParams();
this.downCallback();
});
}
},
applySortParams() {
const sortParams = uni.getStorageSync('sortParams');
if (sortParams && this.tabArr.length > 0) {
uni.removeStorageSync('sortParams');
const targetIndex = this.tabArr.findIndex(item => item.name === sortParams.value);
if (targetIndex !== -1 && targetIndex !== this.curTab) {
this.curTab = targetIndex;
this.dataList = [];
}
}
},
mescrollInit(mescroll) {
this.mescroll = mescroll;
},
@@ -167,16 +166,14 @@ export default {
type: 2,
page: page.num,
pageSize: page.size,
isPar: true,
isPar: true
};
if (this.curTab != 0) {
params["categoryId"] = this.tabList[this.curTab].id;
if (this.tabArr.length > 0 && this.tabArr[this.curTab]) {
params["tag"] = this.tabArr[this.curTab].id;
}
searchList(params).then((res) => {
let curPageLen = res.data.length;
if (page.num === 1) this.dataList = [];
this.dataList = this.dataList.concat(res.data);
console.log(this.dataList);
this.waterfall();
this.mescroll.endBySize(curPageLen, res.data.total);
@@ -187,16 +184,6 @@ export default {
this.mescroll && this.mescroll.resetUpScroll();
});
},
async cascadeCategory() {
getCascadeCategory({ parentId: 0 }).then((res) => {
if (res && res.bizcode === 100) {
res.data.forEach((item) => {
this.tabList.push(item);
});
this.downCallback();
}
});
},
onTab(index) {
if (index != this.curTab) {
this.curTab = index;
@@ -204,20 +191,17 @@ export default {
this.downCallback();
}
},
init() {
this.cascadeCategory();
init() {;
this.getSortList();
},
async getSearchList() {
const params = {
type: 2,
page: 1,
pageSize: 10,
isPar: true,
};
if (this.curTab != 0) {
params["categoryId"] = this.tabList[this.curTab].id;
} else {
params["isRecomm"] = true;
if (this.tabArr.length > 0 && this.tabArr[this.curTab]) {
params["type"] = this.tabArr[this.curTab].id;
}
const resp = await searchList(params);
if (resp && resp.bizcode === 100) {