jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.0

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

539
app/pages.json
View File

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

4
app/pages/goods_cate/goods_cate.vue
View File

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

2
app/pages/goods_details/index.vue
View File

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

1
app/pages/goods_search/index.vue
View File

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

71
app/pages/index/index.vue
View File

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

27
app/pages/order_addcart/order_addcart.vue
View File

@@ -9,13 +9,13 @@
<view class="borRadius14 cartBox"> <view class="borRadius14 cartBox">
<view <view
v-if="(cartList.valid.length === 0 && cartList.invalid.length === 0) || (cartList.valid.length > 0)" 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>购物数量 <text class='num font-color'>{{cartCount}}</text></view>
<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0" <view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0"
class='administrate acea-row row-center-wrapper' @click='manage'>{{ footerswitch ? '管理' : '取消'}} class='administrate acea-row row-center-wrapper' @click='manage'>{{ footerswitch ? '管理' : '取消'}}
</view> </view>
</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'> <view class='list'>
<checkbox-group @change="checkboxChange"> <checkbox-group @change="checkboxChange">
<block v-for="(item,index) in cartList.valid" :key="index"> <block v-for="(item,index) in cartList.valid" :key="index">
@@ -904,6 +904,7 @@
} }
.shoppingCart .labelNav { .shoppingCart .labelNav {
position: sticky;
height: 178rpx; height: 178rpx;
padding: 30rpx 30rpx 0 30rpx; padding: 30rpx 30rpx 0 30rpx;
font-size: 22rpx; font-size: 22rpx;
@@ -915,6 +916,13 @@
background-color: $theme-color; background-color: $theme-color;
z-index: 5; z-index: 5;
top: 0; 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 { .shoppingCart .labelNav .item .iconfont {
@@ -1224,4 +1232,17 @@
.uni-p-b-96 { .uni-p-b-96 {
height: 96rpx; 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>

3
app/pages/user/index.vue
View File

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