mirror of
https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git
synced 2025-12-18 16:35:53 +08:00
feat: 🎨 合并其他分支代码
This commit is contained in:
学习很差啦
@@ -3,7 +3,7 @@
|
||||
<u-navbar :custom-back="back" back-icon-color="#fff" :background="background" :border-bottom="false">
|
||||
</u-navbar>
|
||||
|
||||
<div class="wrapper">
|
||||
<div class="wrapper-box">
|
||||
<!-- 砍价列表 -->
|
||||
<div class="box box1">
|
||||
<div class="bargain">
|
||||
@@ -106,10 +106,6 @@
|
||||
<popupGoods ref="popupGoods" :buyMask="maskFlag" @closeBuy="closePopupBuy" :goodsDetail="bargainDetail"
|
||||
:goodsSpec="goodsSpec" v-if="bargainDetail.id " @handleClickSku="getGoodsDetail" />
|
||||
|
||||
<!-- 产品详情 -->
|
||||
<div class=" box4">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -352,11 +348,11 @@ page {
|
||||
align-items: center;
|
||||
padding: 10rpx 0;
|
||||
}
|
||||
.wrapper {
|
||||
background: url("https://lilishop-oss.oss-cn-beijing.aliyuncs.com/aac88f4e8eff452a8010af42c4560b04.png");
|
||||
.wrapper-box {
|
||||
background: url("https://lili-system.oss-cn-beijing.aliyuncs.com/kanjia.png");
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
height: 700rpx;
|
||||
height: 506rpx;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@@ -371,16 +367,16 @@ page {
|
||||
}
|
||||
}
|
||||
.box1 {
|
||||
top: 750rpx;
|
||||
top: 560rpx;
|
||||
}
|
||||
.box2 {
|
||||
top: 770rpx;
|
||||
top: 580rpx;
|
||||
}
|
||||
.box3 {
|
||||
top: 790rpx;
|
||||
top: 600rpx;
|
||||
}
|
||||
.box4 {
|
||||
top: 810rpx;
|
||||
top: 620 rpx;
|
||||
height: 200rpx;
|
||||
}
|
||||
.bargain-item {
|
||||
|
||||
@@ -6,22 +6,7 @@
|
||||
<!-- 砍价列表 -->
|
||||
<div class="box">
|
||||
<!-- 已砍的商品 -->
|
||||
<div class="bargain" v-if="bargainList.length!=0">
|
||||
<div class="flex bargain-item" v-for="(item,index) in bargainList" :key="index">
|
||||
<div class="goods-img">
|
||||
<u-image width="150" height="150" :src="item.thumbnail"></u-image>
|
||||
</div>
|
||||
<div class="goods-config">
|
||||
<div class="goods-title wes-2">
|
||||
{{item.goodsName}}
|
||||
</div>
|
||||
<div class="flex goods-buy">
|
||||
<div class="max-price">最低：<span>￥{{item.purchasePrice | unitPrice}}</span></div>
|
||||
<div class="bargaining" @click="navigateToBargainDetail(item)">参与砍价</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<goodsTemplate type="kanJia" v-if="bargainList.length!=0" :res="bargainList" />
|
||||
<div class="bargain empty" v-else>
|
||||
<u-empty text="暂无活动" mode="list"></u-empty>
|
||||
</div>
|
||||
@@ -32,7 +17,9 @@
|
||||
|
||||
<script>
|
||||
import { getBargainList } from "@/api/promotions";
|
||||
import goodsTemplate from '@/components/m-goods-list/promotion'
|
||||
export default {
|
||||
components:{goodsTemplate},
|
||||
data() {
|
||||
return {
|
||||
background: {
|
||||
@@ -91,7 +78,7 @@ page {
|
||||
background: url("https://lili-system.oss-cn-beijing.aliyuncs.com/kanjia.png");
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
height: 600rpx;
|
||||
height: 506rpx;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@@ -99,7 +86,7 @@ page {
|
||||
background: #fff;
|
||||
border-radius: 20rpx;
|
||||
position: relative;
|
||||
top: 650rpx;
|
||||
top: 560rpx;
|
||||
width: 94%;
|
||||
margin: 0 auto;
|
||||
> .bargain {
|
||||
|
||||
@@ -1,155 +1,133 @@
|
||||
<template>
|
||||
<view class="wrapper">
|
||||
<view class="wrapper">
|
||||
<u-navbar :border-bottom="false" :title="title">
|
||||
<!-- 中间 -->
|
||||
<view class="slot-wrap container-wrap">
|
||||
<view v-if="search">
|
||||
<u-search @search="searchFun()" @custom="searchFun()" v-model="params.goodsName"></u-search>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 右侧 -->
|
||||
<view slot="right">
|
||||
<view style="margin-right: 24rpx;" @click="searchFlag()">
|
||||
<view v-if="search">取消</view>
|
||||
<u-icon v-if="!search" size="44rpx" name="search"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
</u-navbar>
|
||||
<!-- 顶部栏 -->
|
||||
<div class='header-wraper'>
|
||||
<image src="/static/join-buy.png"></image>
|
||||
</div>
|
||||
<!-- 商品栏 -->
|
||||
<div class="swiper">
|
||||
<goodsTemplate v-if="goodsList.length" :res="goodsList" />
|
||||
|
||||
<u-empty v-else style="margin-top:20%" text="暂无拼团活动" mode="data"></u-empty>
|
||||
</div>
|
||||
|
||||
<u-navbar :border-bottom="false" :background="background" class="unavbar" :title="title">
|
||||
<!-- 中间 -->
|
||||
<view class="slot-wrap container-wrap">
|
||||
|
||||
<view v-if="search">
|
||||
<u-search @search="searchFun()" @custom="searchFun()" v-model="params.goodsName"></u-search>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<!-- 右侧 -->
|
||||
<view slot="right">
|
||||
<view style="margin-right: 24rpx;" @click="searchFlag()">
|
||||
<view v-if="search">取消</view>
|
||||
<u-icon v-if="!search" size="44rpx" name="search"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
</u-navbar>
|
||||
<!-- 顶部栏 -->
|
||||
|
||||
<!-- 商品栏 -->
|
||||
<div class="swiper">
|
||||
|
||||
<div v-if="groupBuy.length !=0">
|
||||
<view class="view-item" v-for="(groupItem, groupIndex) in groupBuy" :key="groupIndex">
|
||||
<view class="view-left">
|
||||
<u-image border-radius="10" shape="square" :src="groupItem.thumbnail" width="186rpx" height="186rpx">
|
||||
|
||||
<view slot="error" style="font-size: 24rpx;">加载失败</view>
|
||||
</u-image>
|
||||
</view>
|
||||
<view class="view-content">
|
||||
<view class="view-content-name">
|
||||
{{ groupItem.goodsName }}
|
||||
</view>
|
||||
<view class="view-content-bottom">
|
||||
<view>
|
||||
<view class="view-content-price">
|
||||
<!-- ￥{{groupItem.sales_price | unitPrice }} <span v-if="groupItem.point">+{{groupItem.point}}积分</span> -->
|
||||
￥{{groupItem.price | unitPrice }}
|
||||
</view>
|
||||
<view class="view-content-original_price">
|
||||
￥{{ groupItem.originalPrice | unitPrice }}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view>
|
||||
<view class="btn-group" @click="toHref(groupItem)"> 去拼团 </view>
|
||||
<view class="buy-content">已售{{groupItem.num || 0}}件</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<u-loadmore bg-color='#f8f8f8' :status="status" />
|
||||
</div>
|
||||
<u-empty v-else style="margin-top:20%" text="暂无拼团活动" mode="data"></u-empty>
|
||||
|
||||
</div>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import * as API_Promotions from "@/api/promotions";
|
||||
import * as API_Goods from "@/api/goods";
|
||||
export default {
|
||||
components: {},
|
||||
data() {
|
||||
return {
|
||||
status: "loadmore",
|
||||
is_empty: false,
|
||||
search: false,
|
||||
title: "拼团活动",
|
||||
background: {
|
||||
backgroundColor: "#fff",
|
||||
},
|
||||
empty: false,
|
||||
params: {
|
||||
pageNumber: 1,
|
||||
pageSize: 10,
|
||||
categoryPath: "",
|
||||
goodsName: "",
|
||||
},
|
||||
groupBuy: [],
|
||||
};
|
||||
},
|
||||
mounted() {},
|
||||
watch: {
|
||||
search(val) {
|
||||
val ? (this.title = "") : (this.title = "拼团活动");
|
||||
},
|
||||
},
|
||||
onReachBottom() {
|
||||
this.loadMore();
|
||||
},
|
||||
// 点击搜索按钮
|
||||
onNavigationBarButtonTap(e) {
|
||||
this.popupFlag = !this.popupFlag;
|
||||
},
|
||||
async onLoad() {
|
||||
this.GET_AssembleGoods();
|
||||
},
|
||||
import * as API_Promotions from "@/api/promotions";
|
||||
import * as API_Goods from "@/api/goods";
|
||||
import goodsTemplate from '@/components/m-goods-list/promotion.vue'
|
||||
export default {
|
||||
components: {
|
||||
goodsTemplate
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
is_empty: false,
|
||||
search: false,
|
||||
title: "拼团活动",
|
||||
|
||||
methods: {
|
||||
loadMore() {
|
||||
this.params.pageNumber++;
|
||||
this.GET_AssembleGoods();
|
||||
},
|
||||
searchFlag() {
|
||||
this.search = !this.search;
|
||||
},
|
||||
empty: false,
|
||||
params: {
|
||||
pageNumber: 1,
|
||||
pageSize: 10,
|
||||
categoryPath: "",
|
||||
goodsName: "",
|
||||
},
|
||||
goodsList: [],
|
||||
};
|
||||
},
|
||||
mounted() {},
|
||||
watch: {
|
||||
search(val) {
|
||||
val ? (this.title = "") : (this.title = "拼团活动");
|
||||
},
|
||||
},
|
||||
onReachBottom() {
|
||||
this.loadMore();
|
||||
},
|
||||
// 点击搜索按钮
|
||||
onNavigationBarButtonTap(e) {
|
||||
this.popupFlag = !this.popupFlag;
|
||||
},
|
||||
async onLoad() {
|
||||
this.GET_AssembleGoods();
|
||||
},
|
||||
|
||||
toHref(goods) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/product/goods?id=${goods.skuId}&goodsId=${goods.goodsId}`,
|
||||
});
|
||||
},
|
||||
searchFun() {
|
||||
this.groupBuy = [];
|
||||
this.GET_AssembleGoods();
|
||||
},
|
||||
// 请求拼团数据
|
||||
GET_AssembleGoods() {
|
||||
this.status = "loading";
|
||||
const params = JSON.parse(JSON.stringify(this.params));
|
||||
if (params.category_id === 0) delete params.category_id;
|
||||
methods: {
|
||||
loadMore() {
|
||||
this.params.pageNumber++;
|
||||
this.GET_AssembleGoods();
|
||||
},
|
||||
searchFlag() {
|
||||
this.search = !this.search;
|
||||
},
|
||||
|
||||
API_Promotions.getAssembleList(params)
|
||||
.then((response) => {
|
||||
const data = response.data.result.records;
|
||||
toHref(goods) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/product/goods?id=${goods.skuId}&goodsId=${goods.goodsId}`,
|
||||
});
|
||||
},
|
||||
searchFun() {
|
||||
this.goodsList = [];
|
||||
this.GET_AssembleGoods();
|
||||
},
|
||||
// 请求拼团数据
|
||||
GET_AssembleGoods() {
|
||||
|
||||
if (!data || !data.length) {
|
||||
this.is_empty = true;
|
||||
this.status = "nomore";
|
||||
} else {
|
||||
if (data.length <= this.params.pageSize) {
|
||||
this.status = "nomore";
|
||||
} else {
|
||||
this.status = "loadmore";
|
||||
}
|
||||
this.is_empty = false;
|
||||
this.groupBuy.push(...(data || []));
|
||||
}
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
},
|
||||
};
|
||||
const params = JSON.parse(JSON.stringify(this.params));
|
||||
if (params.category_id === 0) delete params.category_id;
|
||||
|
||||
API_Promotions.getAssembleList(params)
|
||||
.then((response) => {
|
||||
const data = response.data.result.records;
|
||||
|
||||
if (!data || !data.length) {
|
||||
this.is_empty = true;
|
||||
|
||||
} else {
|
||||
if (data.length <= this.params.pageSize) {
|
||||
|
||||
} else {
|
||||
|
||||
}
|
||||
this.is_empty = false;
|
||||
this.goodsList.push(...(data || []));
|
||||
}
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@import "./style.scss";
|
||||
.header-wraper {
|
||||
background: url('/static/bg.png');
|
||||
height: 200rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
>image{
|
||||
width: 188rpx;
|
||||
height: 60rpx;
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
<u-loading slot="loading"></u-loading>
|
||||
</u-image>
|
||||
<view class="index-item-title">{{ item.goodsName }}</view>
|
||||
<view class="index-item-price">
|
||||
{{ item.points }}积分
|
||||
<view class="index-item-price flex flex-a-c flex-j-sb">
|
||||
<div class="point"><span>{{ item.points }}</span>积分</div>
|
||||
<span class="tipsMkt">¥{{ item.originalPrice | unitPrice }}</span>
|
||||
</view>
|
||||
</view>
|
||||
@@ -194,46 +194,12 @@ page {
|
||||
height: 100%;
|
||||
}
|
||||
.tipsMkt {
|
||||
float: right;
|
||||
color: #c0c4cc;
|
||||
font-size: 24rpx;
|
||||
font-size: 24rpx !important;
|
||||
text-decoration: line-through;
|
||||
margin-right: 20rpx;
|
||||
margin-right: 20rpx !important;
|
||||
}
|
||||
|
||||
.header {
|
||||
background: $light-color;
|
||||
position: relative;
|
||||
color: #fff;
|
||||
display: flex;
|
||||
height: 80rpx;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 26rpx;
|
||||
font-size: 34rpx;
|
||||
|
||||
.left,
|
||||
.right {
|
||||
position: absolute;
|
||||
width: max-content;
|
||||
height: max-content;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.left {
|
||||
float: left;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 20rpx;
|
||||
}
|
||||
|
||||
.right {
|
||||
float: right;
|
||||
right: 20rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.index {
|
||||
height: 100vh;
|
||||
@@ -341,15 +307,19 @@ page {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.index-item-title-desc {
|
||||
font-size: 25rpx;
|
||||
color: #999999;
|
||||
margin-top: 10rpx;
|
||||
}
|
||||
|
||||
|
||||
.index-item-price {
|
||||
font-size: 28rpx;
|
||||
color: #ff5a10;
|
||||
overflow: hidden;
|
||||
color: $main-color;
|
||||
padding: 20rpx 0 0 20rpx;
|
||||
>.point{
|
||||
>span{
|
||||
font-size: 42rpx;
|
||||
font-weight: bold;
|
||||
margin-right:10rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
<template>
|
||||
<view class="sale">
|
||||
<view class="sale-head">
|
||||
<image src="@/pages/promotion/static/head-sample.png"></image>
|
||||
<u-navbar title='限时抢购'></u-navbar>
|
||||
<view class="header-wraper">
|
||||
<image mode="widthFix" src="/static/seckill.png"></image>
|
||||
</view>
|
||||
<scroll-view scroll-x>
|
||||
<view class="index-navs">
|
||||
@@ -14,10 +15,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="trailer" v-if="timeLine[nav] && times">
|
||||
{{ timeLine[nav].distanceStartTime === 0 ? (onlyOne ? '距结束' : '距下一轮') : '距开始' }}
|
||||
{{ times.hours == '00' ? '0' : times.hours }}小时{{ times.minutes }}分{{ times.seconds }}秒
|
||||
</view>
|
||||
|
||||
</scroll-view>
|
||||
<view class="sale-items" v-if="goodsList.length > 0">
|
||||
<goodsTemplate :res="goodsList" />
|
||||
@@ -39,7 +37,7 @@
|
||||
getSeckillTimeGoods
|
||||
} from "@/api/promotions.js";
|
||||
import Foundation from "@/utils/Foundation.js";
|
||||
import goodsTemplate from '@/components/m-goods-list/seckill.vue'
|
||||
import goodsTemplate from '@/components/m-goods-list/promotion.vue'
|
||||
export default {
|
||||
components: {
|
||||
goodsTemplate
|
||||
@@ -184,10 +182,15 @@
|
||||
}
|
||||
}
|
||||
|
||||
.sale-head {
|
||||
image {
|
||||
width: 100%;
|
||||
height: 280rpx;
|
||||
.header-wraper {
|
||||
background: url('/static/bg.png');
|
||||
height: 200rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
>image{
|
||||
width: 300rpx;
|
||||
height: 100rpx;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -195,22 +198,8 @@
|
||||
padding-top: 20rpx;
|
||||
}
|
||||
|
||||
.trailer {
|
||||
height: 100rpx;
|
||||
background: #ffffff;
|
||||
display: -webkit-box;
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 22rpx;
|
||||
color: #666666;
|
||||
box-sizing: border-box;
|
||||
position: relative;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.index-navs {
|
||||
background: #fff;
|
||||
background-color: #f7f7f7;
|
||||
display: -webkit-box;
|
||||
display: -webkit-flex;
|
||||
@@ -241,17 +230,19 @@
|
||||
height: 115rpx;
|
||||
line-height: 1em;
|
||||
position: relative;
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
|
||||
&-active {
|
||||
background-image: url(/static/seckill/active.png);
|
||||
background-size: 100% 115rpx;
|
||||
background-repeat: no-repeat;
|
||||
color: #ffffff;
|
||||
color: $main-color;
|
||||
position: relative;
|
||||
z-index: 30;
|
||||
|
||||
.index-nav-desc {
|
||||
color: #ffffff;
|
||||
color: #fff;
|
||||
font-weight: bold;
|
||||
background: $main-color;
|
||||
padding: 6rpx 16rpx;
|
||||
border-radius: 50px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user