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

View File

@@ -13,18 +13,33 @@
{
"path": "pages/order_addcart/order_addcart",
"style": {
"navigationBarTitleText": "购物车"
"navigationBarTitleText": "购物车",
"navigationBarBackgroundColor": "#E93323",
"navigationStyle": "custom",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "pages/user/index",
"style": {
"navigationBarTitleText": "个人中心",
"navigationBarBackgroundColor": "#e93323"
// #ifdef MP
,
"navigationBarTextStyle": "#fff"
//"navigationBarTitleText": "个人中心",
// #ifdef MP || APP-PLUS
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#E93323",
// #endif
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
@@ -36,7 +51,15 @@
{
"path": "pages/goods_cate/goods_cate",
"style": {
"navigationBarTitleText": "商品分类"
"navigationBarBackgroundColor": "#E93323",
//"navigationBarTitleText": "商品分类",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
@@ -62,33 +85,65 @@
{
"path": "pages/goods_list/index",
"style": {
"navigationBarTitleText": "商品列表"
"navigationBarTitleText": "商品列表",
"navigationBarBackgroundColor": "#E93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "pages/news_list/index",
"style": {
"navigationBarTitleText": "资讯"
//"navigationBarTitleText": "资讯",
"navigationBarBackgroundColor": "#E93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "pages/news_details/index",
"style": {
"navigationBarTitleText": "资讯详情"
//"navigationBarTitleText": "资讯详情",
"navigationBarBackgroundColor": "#E93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
//#ifdef H5
{
"path": "pages/auth/index",
"style": {
"navigationBarTitleText": "CRMEB"
//"navigationBarTitleText": "CRMEB"
}
},
//#endif
{
"path": "pages/goods_search/index",
"style": {
"navigationBarTitleText": "搜索商品"
//"navigationBarTitleText": "搜索商品",
"navigationBarBackgroundColor": "#E93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
@@ -100,13 +155,16 @@
{
"path": "pages/order_details/index",
"style": {
"navigationBarTitleText": "订单详情",
"navigationBarBackgroundColor": "#e93323"
// #ifdef MP
,
"navigationBarTextStyle": "#fff"
//"navigationBarTitleText": "订单详情",
"navigationBarBackgroundColor": "#E93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
}, {
"path": "pages/index/components/a_seckill",
"style": {}
@@ -139,112 +197,228 @@
{
"path": "user_info/index",
"style": {
"navigationBarTitleText": "个人资料"
//"navigationBarTitleText": "个人资料",
"navigationBarBackgroundColor": "#E93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "user_get_coupon/index",
"style": {
"navigationBarTitleText": "领取优惠券"
//"navigationBarTitleText": "领取优惠券",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "user_goods_collection/index",
"style": {
"navigationBarTitleText": "收藏商品"
//"navigationBarTitleText": "收藏商品",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "user_sgin/index",
"style": {
"navigationBarTitleText": "签到"
//"navigationBarTitleText": "签到",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "user_sgin_list/index",
"style": {
"navigationBarTitleText": "签到记录"
//"navigationBarTitleText": "签到记录",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "user_money/index",
"style": {
"navigationBarTitleText": "我的账户"
//"navigationBarTitleText": "我的账户",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "user_bill/index",
"style": {
"navigationBarTitleText": "账单明细"
//"navigationBarTitleText": "账单明细",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "user_integral/index",
"style": {
"navigationBarTitleText": "积分详情"
//"navigationBarTitleText": "积分详情",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "user_coupon/index",
"style": {
"navigationBarTitleText": "我的优惠券"
//"navigationBarTitleText": "我的优惠券",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "user_spread_user/index",
"style": {
"navigationBarTitleText": "我的推广",
"navigationBarBackgroundColor": "#e93323"
// #ifdef MP
,
"navigationBarTextStyle": "#fff"
// #endif
"navigationBarBackgroundColor": "#e93323",
"navigationBarTextStyle": "#fff",
"app-plus": {
"titleNView": {
"type": "default"
}
}
}
},
{
"path": "user_spread_code/index",
"style": {
"navigationBarTitleText": "分销海报"
//"navigationBarTitleText": "分销海报",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "user_spread_money/index",
"style": {
"navigationBarTitleText": "佣金记录",
"navigationBarBackgroundColor": "#e93323"
// #ifdef MP
,
"navigationBarTextStyle": "#fff"
// #endif
"navigationBarBackgroundColor": "#e93323",
"navigationBarTextStyle": "#fff",
"app-plus": {
"titleNView": {
"type": "default"
}
}
}
},
{
"path": "user_cash/index",
"style": {
"navigationBarTitleText": "提现",
"navigationBarBackgroundColor": "#e93323"
// #ifdef MP
,
"navigationBarTextStyle": "#fff"
// #endif
"navigationBarBackgroundColor": "#e93323",
"navigationBarTextStyle": "#fff",
"app-plus": {
"titleNView": {
"type": "default"
}
}
}
},
{
"path": "user_vip/index",
"style": {
"navigationBarTitleText": "会员中心"
"navigationBarTitleText": "会员中心",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default",
"backgroundColor": "#fff"
}
// #endif
}
}
},
{
"path": "user_address_list/index",
"style": {
"navigationBarTitleText": "地址管理"
"navigationBarTitleText": "地址管理",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "user_address/index",
"style": {
"navigationBarTitleText": "添加地址"
"navigationBarTitleText": "添加地址",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
@@ -278,99 +452,192 @@
{
"path": "order_confirm/index",
"style": {
"navigationBarTitleText": "提交订单"
"navigationBarTitleText": "提交订单",
"navigationBarBackgroundColor": "#e93323",
// "navigationStyle": "custom",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "goods_details_store/index",
"style": {
"navigationBarTitleText": "门店列表"
"navigationBarTitleText": "门店列表",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "promoter-list/index",
"style": {
"navigationBarTitleText": "推广人列表",
"navigationBarBackgroundColor": "#e93323"
// #ifdef MP
,
"navigationBarTextStyle": "#fff"
// #endif
"navigationBarBackgroundColor": "#e93323",
"navigationBarTextStyle": "#fff",
"app-plus": {
"titleNView": {
"type": "default"
}
}
}
},
{
"path": "promoter-order/index",
"style": {
"navigationBarTitleText": "推广人订单",
"navigationBarBackgroundColor": "#e93323"
// #ifdef MP
,
"navigationBarTextStyle": "#fff"
// #endif
"navigationBarBackgroundColor": "#e93323",
"navigationBarTextStyle": "#fff",
"app-plus": {
"titleNView": {
"type": "default"
}
}
}
},
{
"path": "promoter_rank/index",
"style": {
"navigationBarTitleText": "推广人排行",
"navigationBarBackgroundColor": "#e93323"
// #ifdef MP
,
"navigationBarTextStyle": "#fff"
// #endif
"navigationBarBackgroundColor": "#e93323",
"navigationBarTextStyle": "#fff",
"app-plus": {
"titleNView": {
"type": "default"
}
}
}
},
{
"path": "commission_rank/index",
"style": {
"navigationBarTitleText": "佣金排行",
"navigationBarBackgroundColor": "#e93323"
// #ifdef MP
,
"navigationBarTextStyle": "#fff"
// #endif
"navigationBarBackgroundColor": "#e93323",
"navigationBarTextStyle": "#fff",
"app-plus": {
"titleNView": {
"type": "default"
}
}
}
},
{
"path": "order_list/index",
"style": {
"navigationBarTitleText": "我的订单"
"navigationBarTitleText": "我的订单",
"navigationBarBackgroundColor": "#e93323",
"navigationStyle": "custom",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "goods_logistics/index",
"style": {
"navigationBarTitleText": "物流信息"
"navigationBarTitleText": "物流信息",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "user_return_list/index",
"style": {
"navigationBarTitleText": "退货列表"
"navigationBarTitleText": "退货列表",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "goods_return/index",
"style": {
"navigationBarTitleText": "申请退货"
"navigationBarTitleText": "申请退货",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "login/index",
"style": {
"navigationBarTitleText": "登录"
"navigationBarTitleText": "登录",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "goods_comment_list/index",
"style": {
"navigationBarTitleText": "商品评分"
"navigationBarTitleText": "商品评分",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "goods_comment_con/index",
"style": {
"navigationBarTitleText": "商品评价"
"navigationBarTitleText": "商品评价",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
@@ -428,13 +695,29 @@
{
"path": "goods_combination_details/index",
"style": {
"navigationStyle": "custom"
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "goods_combination_status/index",
"style": {
"navigationBarTitleText": "拼团"
"navigationBarTitleText": "拼团",
"navigationBarBackgroundColor": "#e93323",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
@@ -490,8 +773,8 @@
],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "crmeb",
"navigationBarBackgroundColor": "#fff",
//"navigationBarTitleText": "crmeb",
"navigationBarBackgroundColor": "#ff5500",
"backgroundColor": "#F8F8F8",
"titleNView": false,
"rpxCalcMaxDeviceWidth": 960,

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>
@@ -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;
@@ -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;
}
@@ -948,13 +963,21 @@
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 {
width: 118rpx;
@@ -1355,5 +1378,17 @@
height: 304rpx;
background: linear-gradient(180deg, #E93323 0%, #F5F5F5 100%, #751A12 100%);
// border-radius: 0 0 30rpx 30rpx;
}
.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;
}
.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%;