diff --git a/commons/hengmei.css b/commons/hengmei.css index 60bfa8d..1ca46a5 100644 --- a/commons/hengmei.css +++ b/commons/hengmei.css @@ -26,6 +26,7 @@ .home-quan-box{background: rgba(0,0,0,.54);position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 11;display: flex;justify-content: center;flex-direction: column;align-items: center;} .home-quan-box image:first-child{width: 542rpx;height: 600rpx;} .home-quan-box image:last-child{width: 96rpx;height: 96rpx;margin-top: 56rpx;} +.shopKf{position: fixed;right: 16rpx;bottom: 140rpx;z-index: 999;} /* 分类 */ .catemo{color: #4D4D4D;padding: 20rpx 10rpx;text-align: center;margin-left: 10rpx;} .cateActive{background-color: #F5F5F5;border-radius: 10rpx 0rpx 0rpx 10rpx;padding: 20rpx 10rpx;text-align: center;margin-left: 10rpx;} @@ -76,6 +77,7 @@ .yutime{width: 160rpx;height: 130rpx;} .timed{width: 210rpx;height: 80rpx;line-height: 80rpx;} .titlel{width: 18%;} +.titlel2{width: 20%;} .height-68{height: 80rpx;} .btnl{margin: 50rpx 80rpx;height: 90rpx;line-height: 90rpx;} /* 客户列表 */ @@ -136,7 +138,7 @@ .cart-box .posia,.detail-cart-box .posia{background: #F85050;width: 36rpx;height: 36rpx;line-height: 36rpx;border-radius: 100%;color: #FFFFFF;font-size: 24rpx;text-align: center;top: 20rpx;right: 20rpx;} .cart-box .posia view,.detail-cart-box .posia view{transform: scale(.8);} .moban{background: rgba(0,0,0,.54);width: 100%;position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 2;} -.detail-cart-box{position: fixed;right: 30rpx;bottom: 300rpx;} +.detail-cart-box{position: fixed;right: 30rpx;bottom: 300rpx;z-index: 999;} /* 商品详情 */ .activelei,.molei{border-radius: 20rpx;padding: 10rpx 24rpx;color: #333333;margin-left: 20rpx;} .activelei{color: #FFFFFF;} @@ -287,6 +289,22 @@ swiper-item view:last-child .duan-xian{border-bottom: none;} .message-status{border-radius: 5rpx;font-size: 24rpx;color: #FFFFFF;padding: 2rpx 8rpx 4rpx 6rpx;transform: scale(.8);} +/* 我的日记 */ +.diary-img{margin-right: 13rpx;width: 32%; height: 212rpx;background-color: #F5F5F5;border-radius: 12rpx;} +.diary-img:nth-child(3n){ + margin-right: 0; +} +.diary-item-img { + width: 32%;height: 168rpx;border-radius: 10rpx; + margin-right: 10rpx; + margin-bottom: 10rpx; +} +.diary-item-img .addImg { + height: 168rpx;width: 100%;border-radius: 10rpx; +} +.diary-item-img:nth-child(3n){ + margin-right: 0; +} @media screen and (height:812px){ .blue-img{height: 500rpx;} } diff --git a/pages.json b/pages.json index e49c518..a6d6e4b 100644 --- a/pages.json +++ b/pages.json @@ -156,6 +156,24 @@ "enablePullDownRefresh": false } + } + ,{ + "path" : "my-diary/my-diary", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "my-diary-edit/my-diary-edit", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } ] }, diff --git a/pages/tabbar/my/staffDuan.vue b/pages/tabbar/my/staffDuan.vue index e31e79b..c335214 100644 --- a/pages/tabbar/my/staffDuan.vue +++ b/pages/tabbar/my/staffDuan.vue @@ -46,8 +46,8 @@ - - {{itemt.num}} + + {{itemt.num}} {{itemt.title}} @@ -167,7 +167,8 @@ tongList:[ {num:'0',title:'我的积分'}, {num:'0',title:'孔雀币'}, - {num:'0',title:'连续签到'} + {num:'0',title:'连续签到'}, + {num:'0',title:'我的分享人'} ], yuanList:[], //'customer-list','footmarks','scan' zanCyuanList:[ @@ -199,6 +200,7 @@ {src:'/static/public/staff-collection60.png',title:'收藏',num:''}, {src:'/static/public/staff-share.png',title:'分享中心',num:''}, {src:'/static/public/staff-msg60.png',title:'消息通知',num:''}, + {src:'/static/public/diary.png',title:'我的日记',num:''}, {src:'/static/public/staff-tou60.png',title:'投诉与建议',num:''}, {src:'/static/public/staff-about60.png',title:'关于我们',num:''}, ], @@ -397,6 +399,7 @@ }, chooseone(index){ if(index==2){uni.navigateTo({url:'/pagesA/signIn/signIn'})} + if(index==3){uni.navigateTo({url:'/pagesB/mysharer/mysharer'})} }, goPageNew(index){ if(index==0){uni.navigateTo({url:'/pagesA/pointsMall/pointsMall'})} @@ -408,16 +411,17 @@ if(index==6){uni.navigateTo({url:'/pagesA/integralManage/integralManage'})} if(index==7){uni.navigateTo({url:'/pagesA/signIn/signIn'})} }, - goPageTwo(index){//自助预约、个人海报、收藏、分享中心、消息通知、投诉与建议、关于我们、专属客服 - if(index!=7){ + goPageTwo(index){//自助预约、个人海报、收藏、分享中心、消息通知、我的日记、投诉与建议、关于我们、专属客服 + if(index!=8){ let newUrl = '' if(index==0) newUrl = '/pagesA/makeAnPppointment/makeAnPppointment' if(index==1) newUrl = '/pagesB/personalPoster/personalPoster' if(index==2) newUrl = '/pagesB/myCollection/myCollection' if(index==3) newUrl = '/pagesB/sharingCenter/sharingCenter' if(index==4) newUrl = '/pagesB/messagecenter/messagecenter' - if(index==5) newUrl = '/pagesA/suggestions/suggestions' - if(index==6) newUrl = '/pagesB/aboutUs/aboutUs' + if(index==5) newUrl = '/pagesA/my-diary/my-diary' + if(index==6) newUrl = '/pagesA/suggestions/suggestions' + if(index==7) newUrl = '/pagesB/aboutUs/aboutUs' uni.navigateTo({ url:newUrl }) diff --git a/pages/tabbar/shop/shop.vue b/pages/tabbar/shop/shop.vue index 1b0aca3..c90dcd7 100644 --- a/pages/tabbar/shop/shop.vue +++ b/pages/tabbar/shop/shop.vue @@ -77,7 +77,8 @@ ¥{{item1.zhePrice}} - ¥{{item1.yuanPrice}} + + ¥{{item1.yuanPrice}} 已拼团{{item1.activity_group_num}}组 @@ -115,7 +116,8 @@ ¥{{item1.zhePrice}} - ¥{{item1.yuanPrice}} + + ¥{{item1.yuanPrice}} 已拼团{{item1.activity_group_num}}组 diff --git a/pagesA/getReadyDan/getReadyDan.vue b/pagesA/getReadyDan/getReadyDan.vue index f1b9489..be70828 100644 --- a/pagesA/getReadyDan/getReadyDan.vue +++ b/pagesA/getReadyDan/getReadyDan.vue @@ -94,7 +94,7 @@ - 合计:¥{{allPrice}}+{{zf_kqPrice}}孔雀币 + 合计:¥{{allPrice<0?0:allPrice}}+{{zf_kqPrice}}孔雀币 合计积分:{{allPrice}}+ ¥{{expressInfo.default_price}} 去支付 去兑换 @@ -154,7 +154,7 @@ 支付成功 - ¥{{jsPrice}}合计:{{jsPrice}} + ¥{{jsPrice<0?0:jsPrice}}合计:{{jsPrice}} 查看订单 再逛一逛 diff --git a/pagesA/my-diary-edit/my-diary-edit.vue b/pagesA/my-diary-edit/my-diary-edit.vue new file mode 100644 index 0000000..32fac58 --- /dev/null +++ b/pagesA/my-diary-edit/my-diary-edit.vue @@ -0,0 +1,274 @@ +