This commit is contained in:
hetian
2024-03-29 09:26:47 +08:00
parent ee3c912011
commit ded47a0973
7 changed files with 495 additions and 152 deletions

View File

@@ -135,8 +135,8 @@
<style scoped lang="scss">
.productSort .header {
width: 100%;
height: 96rpx;
margin-top:var(--status-bar-height);
height: 78rpx;
background-color: #fff;
position: fixed;
left: 0;

View File

@@ -1376,6 +1376,7 @@
<style scoped lang="scss">
.product-con {
height: 100%;
}
@@ -1846,6 +1847,7 @@
}
.icon-xiangzuo {
margin-top: var(--status-bar-height);
/* #ifdef H5 */
top: 20rpx !important;
/* #endif */

View File

@@ -150,6 +150,7 @@
<style lang="scss">
page {
margin-top: var(--status-bar-height);
background-color: #fff !important;
}

View File

@@ -1,7 +1,7 @@
<template>
<view>
<view class="page-index" :class="{'bgf':navIndex >0}">
<!-- #ifdef H5||APP -->
<!-- #ifdef H5||APP||MP-WEIXIN -->
<view class="header">
<view class="serch-wrapper flex">
<view class="logo">
@@ -37,8 +37,8 @@
</view>
<text class='line'>|</text>
<view class='swipers'>
<swiper :indicator-dots="indicatorDots" :autoplay="autoplay" interval="2500" duration="500" vertical="true"
circular="true">
<swiper :indicator-dots="indicatorDots" :autoplay="autoplay" interval="2500" duration="500"
vertical="true" circular="true">
<block v-for="(item,index) in roll" :key='index'>
<swiper-item>
<navigator class='item' :url='item.url' hover-class='none'>
@@ -79,11 +79,16 @@
</navigator>
</view>
<view class="listBox acea-row">
<view class="list" :class='item.isUse ? "listHui" : "listActive" ' v-for="(item, index) in couponList.slice(0,2)" :key="index">
<view class="tit line1" :class='item.isUse ? "pricehui" : "titActive" '>{{item.name}}</view>
<view class="price" :class='item.isUse ? "pricehui" : "icon-color" '>{{item.money?Number(item.money):''}}<text class="yuan"></text></view>
<view class="ling" v-if="!item.isUse" :class='item.isUse ? "pricehui" : "icon-color" ' @click="getCoupon(item.id,index)">领取</view>
<view class="ling" v-else :class='item.isUse ? "pricehui fonthui" : "icon-color" '>已领取</view>
<view class="list" :class='item.isUse ? "listHui" : "listActive" '
v-for="(item, index) in couponList.slice(0,2)" :key="index">
<view class="tit line1" :class='item.isUse ? "pricehui" : "titActive" '>{{item.name}}
</view>
<view class="price" :class='item.isUse ? "pricehui" : "icon-color" '>
{{item.money?Number(item.money):''}}<text class="yuan"></text></view>
<view class="ling" v-if="!item.isUse" :class='item.isUse ? "pricehui" : "icon-color" '
@click="getCoupon(item.id,index)">领取</view>
<view class="ling" v-else :class='item.isUse ? "pricehui fonthui" : "icon-color" '>已领取
</view>
<view class="priceM">{{item.minPrice?Number(item.minPrice):''}}元可用</view>
</view>
</view>
@@ -608,7 +613,7 @@
get_host_product: function() {
let that = this;
that.loading = true;
if (that.hotScroll) return
getProductHot(
that.hotPage,
@@ -673,7 +678,7 @@
}
</style>
<style lang="scss">
.notice{
.notice {
width: 100%;
height: 70rpx;
border-radius: 10rpx;
@@ -681,22 +686,27 @@
margin-bottom: 25rpx;
line-height: 70rpx;
padding: 0 14rpx;
.line {
color: #CCCCCC;
}
.pic{
.pic {
width: 130rpx;
height: 36rpx;
image{
image {
width: 100%;
height: 100%;
display: block !important;
}
}
.swipers {
height: 100%;
width: 444rpx;
overflow: hidden;
swiper {
height: 100%;
width: 100%;
@@ -705,11 +715,13 @@
color: #333333;
}
}
.iconfont {
color: #999999;
font-size: 20rpx;
}
}
}
.couponIndex {
width: auto;
height: 238rpx;
@@ -717,7 +729,7 @@
background-size: 100% 100%;
padding-left: 42rpx;
margin-bottom: 30rpx;
.titBox {
padding: 47rpx 0;
text-align: center;
@@ -732,12 +744,13 @@
.tit2 {
color: #FFEBD2;
font-size: 22rpx;
margin:10rpx 0 26rpx 0;
margin: 10rpx 0 26rpx 0;
}
.tit3 {
color: #FFDAAF;
font-size: 24rpx;
.iconfont {
font-size: 20rpx;
}
@@ -782,9 +795,11 @@
.pricehui {
color: #B2B2B2;
}
.fonthui{
.fonthui {
background-color: #F5F5F5 !important;
}
.yuan {
font-size: 24rpx;
}
@@ -818,7 +833,7 @@
/* #ifdef H5*/
top: var(--window-top);
/* #endif */
z-index: 99;
flex-direction: row;
margin: 0px;
@@ -948,12 +963,20 @@
background: linear-gradient(180deg, #fff 0%, #f5f5f5 100%);
.header {
position: sticky;
top: 0;
z-index: 200000;
width: 100%;
background-color: $theme-color;
padding: 28rpx 30rpx;
.serch-wrapper {
margin-top: var(--status-bar-height);
align-items: center;
/* #ifdef MP-WEIXIN */
width: 75%;
/* #endif */
.logo {
@@ -1355,5 +1378,17 @@
height: 304rpx;
background: linear-gradient(180deg, #E93323 0%, #F5F5F5 100%, #751A12 100%);
// border-radius: 0 0 30rpx 30rpx;
}
</style>
.stats {
position: absolute;
left: 0px;
top: 0px;
z-index: 2000000;
width: 750rpx;
height: var(--status-bar-height);
background: #ffffff;
}
</style>

View File

@@ -9,13 +9,13 @@
<view class="borRadius14 cartBox">
<view
v-if="(cartList.valid.length === 0 && cartList.invalid.length === 0) || (cartList.valid.length > 0)"
class='nav acea-row row-between-wrapper'>
class='nav acea-row row-between-wrapper my_nav'>
<view>购物数量 <text class='num font-color'>{{cartCount}}</text></view>
<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0"
class='administrate acea-row row-center-wrapper' @click='manage'>{{ footerswitch ? '管理' : '取消'}}
</view>
</view>
<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0" class="pad30">
<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0" class="pad30 my_nav_top">
<view class='list'>
<checkbox-group @change="checkboxChange">
<block v-for="(item,index) in cartList.valid" :key="index">
@@ -904,6 +904,7 @@
}
.shoppingCart .labelNav {
position: sticky;
height: 178rpx;
padding: 30rpx 30rpx 0 30rpx;
font-size: 22rpx;
@@ -915,6 +916,13 @@
background-color: $theme-color;
z-index: 5;
top: 0;
/* #ifdef MP-WEIXIN */
// top: calc(44px + 88rpx);
height: calc(178rpx + 44px + 45rpx);
padding-top: calc(44px + 50rpx);
// background-color: #282828;
/* #endif */
}
.shoppingCart .labelNav .item .iconfont {
@@ -1224,4 +1232,17 @@
.uni-p-b-96 {
height: 96rpx;
}
</style>
.my_nav {
/* #ifdef MP-WEIXIN */
top: calc(44px + 88rpx + 50rpx) !important;
// background-color: #00aaff;
/* #endif */
}
.my_nav_top{
/* #ifdef MP-WEIXIN */
margin-top: calc(44px + 88rpx + 30rpx + 105rpx) !important;
// background-color: #00aaff;
/* #endif */
}
</style>

View File

@@ -1,5 +1,5 @@
<template>
<view class="new-users copy-data" :style="{height:pageHeight}">
<view class="new-users copy-data" ><!-- 去掉了 :style="{height:pageHeight}" -->
<view class="mid" style="flex:1;overflow: hidden;">
<scroll-view scroll-y="true" style="height: 100%;">
<view class="bg"></view>
@@ -391,6 +391,7 @@
}
.new-users {
//margin-top: var(--status-bar-height);
display: flex;
flex-direction: column;
height: 100%;