From cd0eb28020afe88c1d2411cff8769be1bc56ae11 Mon Sep 17 00:00:00 2001 From: 396316021 <396316021@qq.com> Date: Wed, 27 Sep 2023 16:42:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- components/MzButton/components/index.scss | 4 +- components/PetPage/index.vue | 47 ++- components/RightNav/index.vue | 4 +- pages/CardDetail/index.vue | 4 +- .../components/HomePage/components/index.scss | 352 ++++++++++-------- pages/Index/components/OrderPage/index.vue | 2 +- pages/Index/components/index.scss | 2 +- pages/Index/index.vue | 10 + pages/OrderDetail/index.vue | 6 + pages/OrderPage/index.vue | 2 +- pages/Pet/components/index.scss | 20 +- pages/Pet/index.vue | 26 +- pages/PetDetail/index.vue | 8 +- pages/UserDetail/components/index.scss | 2 +- uview-plus/index.scss | 2 +- 16 files changed, 288 insertions(+), 205 deletions(-) diff --git a/App.vue b/App.vue index 589f927..5bf65cc 100644 --- a/App.vue +++ b/App.vue @@ -31,4 +31,4 @@ + \ No newline at end of file diff --git a/components/MzButton/components/index.scss b/components/MzButton/components/index.scss index 0e0b5f3..4e583b7 100644 --- a/components/MzButton/components/index.scss +++ b/components/MzButton/components/index.scss @@ -16,7 +16,7 @@ border-radius:35rpx; font-weight: 500; - backgound:{ + background:{ color:#F7E1C3; }; position: relative; @@ -30,7 +30,7 @@ padding:15rpx 0; background:{ size:100% 100%; - postion:center center; + position:center center; repeat:no-repeat; } } diff --git a/components/PetPage/index.vue b/components/PetPage/index.vue index f391826..30ff53d 100644 --- a/components/PetPage/index.vue +++ b/components/PetPage/index.vue @@ -10,7 +10,7 @@ - 宝贝姓名 + *宝贝姓名 @@ -75,9 +75,9 @@ - + - 最近疫苗时间 + 最近狂犬疫苗时间 @@ -276,7 +276,7 @@ - + + + + + + + - - - - - - - - - - - - - { if (page === 1){ this.petList = data.data.map(item => { @@ -672,6 +678,7 @@ if (data.data.length < 10) { this.status = 'nomore'; } + uni.hideLoading(); }); }, getDetail(id){ diff --git a/components/RightNav/index.vue b/components/RightNav/index.vue index 5ec839c..e92e9b0 100644 --- a/components/RightNav/index.vue +++ b/components/RightNav/index.vue @@ -47,9 +47,9 @@ }, mounted() { let that = this; - // uni.$on('getMsgNumber', (data) => { + if(uni.getStorageSync('token')){ that.getMsgNumber(); - // }); + } }, methods: { getMsgNumber(){ diff --git a/pages/CardDetail/index.vue b/pages/CardDetail/index.vue index 6717475..2af6b07 100644 --- a/pages/CardDetail/index.vue +++ b/pages/CardDetail/index.vue @@ -84,7 +84,7 @@ - 我已阅读并同意《付费权益卡协议》 + 我已阅读并同意《付费权益卡协议》 diff --git a/pages/Index/components/HomePage/components/index.scss b/pages/Index/components/HomePage/components/index.scss index f2f56a6..e0ba62c 100644 --- a/pages/Index/components/HomePage/components/index.scss +++ b/pages/Index/components/HomePage/components/index.scss @@ -1,181 +1,203 @@ -.app-wallpaper{ - background:{ - size: 100% 100%; - repeat: no-repeat; - } - } - .index-banner { - .img{ - width:100%; - border:{ - width:2rpx; - color:#3F3F3F; - style:solid; - radius:25rpx - } - } - background:{ - image:url("http://live.admin.jinghkb.com/banner-backgrond.png"); - size: 100% 100%; - repeat: no-repeat; +.app-wallpaper { + background: { + size: 100% 100%; + repeat: no-repeat; + } +} + +.index-banner { + .img { + width: 100%; + border: { + width: 2rpx; + color: #3F3F3F; + style: solid; + radius: 25rpx } - .index-banner-container{ - padding:{ - top:20rpx; - bottom:20rpx; - left:20rpx; - right:20rpx; - }; + } + + background: { + image: url("http://live.admin.jinghkb.com/banner-backgrond.png"); + size: 100% 100%; + repeat: no-repeat; + } + + .index-banner-container { + padding: { + top: 20rpx; + bottom: 20rpx; + left: 20rpx; + right: 20rpx; + }; + } +} + +.index-user-detail { + + position: relative; + top: -45rpx; + background: { + size: 100% 100%; + repeat: no-repeat; + } + + .user-detail-container { + align-items: center; + padding: { + top: 95rpx; + bottom: 50rpx; + left: 50rpx; + right: 50rpx; } - } - .index-user-detail { + .user-avatar { + width: 75rpx; + height: 75rpx; + margin-right: 35rpx; + overflow: hidden; + border: { + width: 2rpx; + color: #262626; + style: solid; + radius: 50%; + } + box-shadow: 0rpx 10rpx 11rpx 0rpx rgba(63, 63, 63, 0.3);; - position: relative; - top:-45rpx; - background:{ - size: 100% 100%; - repeat: no-repeat; + .img { + width: 75rpx; + height: 75rpx; } - .user-detail-container{ - align-items: center; - padding:{ - top:95rpx; - bottom:50rpx; - left:50rpx; - right:50rpx; + } + + .user-content { + .user-title-top { + margin: { + bottom: 15rpx; } - .user-avatar{ - width:75rpx; - height:75rpx; - margin-right:35rpx; - overflow: hidden; - border:{ - width:2rpx; - color:#262626; - style:solid; - radius:50%; - } - box-shadow: 0rpx 10rpx 11rpx 0rpx rgba(63,63,63,0.3);; - .img{ - width:75rpx; - height:75rpx; - } + + .img { + width: 83rpx; + height: auto; } - .user-content{ - .user-title-top{ - margin:{ - bottom:15rpx; - } - .img{ - width:83rpx; - height:auto; - } - font:{ - size:30rpx; - weight:500; - } - color:#131313; - line-height:30rpx; - .user-title-text{ - padding:{ - left:10rpx; - } - } - } - .user-title-bottom{ - - .img{ - width:41rpx; - height:100% - } - font:{ - size:26rpx; - weight:400; - } - color:#131313; - line-height:30rpx; - .user-title-idcard{ - - } - } + + font: { + size: 30rpx; + weight: 500; } - .user-coupons{ - width:165rpx; - height:45rpx; - background:{ - size: 100% 100%; - repeat: no-repeat; - } - display: flex; - align-items: center; - justify-content: end; - .user-coupons-number{ - width:100%; - padding:{ - left:112.5rpx; - top:2.5rpx; - } - margin:{ - bottom:auto; - top:auto; - right:auto; - } - .user-coupons-number-container{ - width:100%; - text-align: center; - } - } - //text-align: end; + color: #131313; + line-height: 30rpx; - margin:{ - bottom:auto; - left:auto; + .user-title-text { + padding: { + left: 10rpx; } - font:{ - size:26rpx; - weight:bold; - } - color:#131313; - line-height:30rpx; + } + } + + .user-title-bottom { + + .img { + width: 41rpx; + height: 100% } + font: { + size: 26rpx; + weight: 400; + } + color: #131313; + line-height: 30rpx; + + .user-title-idcard { + + } } - } - - .index-button-group { - width: 100%; - .index-button-detail { - &:nth-child(1){padding:{right:9rpx;bottom:5rpx;}} - &:nth-child(2){padding:{left:9rpx;bottom:5rpx;}} - &:nth-child(3){padding:{right:9rpx;top:5rpx;}} - &:nth-child(4){padding: {left: 9rpx;top: 5rpx;}} - height: 330rpx; - flex-wrap: wrap; - } - .index-button-detail-container{ - width:100%; - height:100%; - justify-content: center; - align-items: flex-end; - display: flex; - margin:{ - top:auto; + } + + .user-coupons { + width: 165rpx; + height: 45rpx; + background: { + size: 100% 100%; + repeat: no-repeat; + } + display: flex; + align-items: center; + justify-content: flex-end; + + .user-coupons-number { + width: 100%; + padding: { + left: 112.5rpx; + top: 2.5rpx; } - .img{ - display: block; - width:175rpx; + margin: { + bottom: auto; + top: auto; + right: auto; + } + + .user-coupons-number-container { + width: 100%; + text-align: center; } - padding:{ - bottom:50rpx; - right:80rpx; - left:80rpx; - }; } - .index-button-detail .index-button-detail-container{ - background:{ - size: 100% 100%; - repeat: no-repeat; - } - } - } + + //text-align: end; + + margin: { + bottom: auto; + left: auto; + } + font: { + size: 26rpx; + weight: bold; + } + color: #131313; + line-height: 30rpx; + } + + } +} + +.index-button-group { + width: 100%; + + .index-button-detail { + //&:nth-child(1){padding:{right:9rpx;bottom:5rpx;}} + //&:nth-child(2){padding:{left:9rpx;bottom:5rpx;}} + //&:nth-child(3){padding:{right:9rpx;top:5rpx;}} + //&:nth-child(4){padding: {left: 9rpx;top: 5rpx;}} + height: 330rpx; + flex-wrap: wrap; + } + + .index-button-detail-container { + width: 100%; + height: 100%; + justify-content: center; + align-items: flex-end; + display: flex; + margin: { + top: auto; + } + + .img { + display: block; + width: 175rpx; + } + + padding: { + bottom: 50rpx; + right: 80rpx; + left: 80rpx; + }; + } + + .index-button-detail .index-button-detail-container { + background: { + size: 100% 100%; + repeat: no-repeat; + } + } +} diff --git a/pages/Index/components/OrderPage/index.vue b/pages/Index/components/OrderPage/index.vue index 630556f..053fdd5 100644 --- a/pages/Index/components/OrderPage/index.vue +++ b/pages/Index/components/OrderPage/index.vue @@ -79,7 +79,7 @@ diff --git a/pages/Index/components/index.scss b/pages/Index/components/index.scss index 0a2294e..f858a83 100644 --- a/pages/Index/components/index.scss +++ b/pages/Index/components/index.scss @@ -110,7 +110,7 @@ } display: flex; align-items: center; - justify-content: end; + justify-content: flex-end; .user-coupons-number{ width:100%; padding:{ diff --git a/pages/Index/index.vue b/pages/Index/index.vue index 8885114..6e5a060 100644 --- a/pages/Index/index.vue +++ b/pages/Index/index.vue @@ -133,6 +133,16 @@ // this.footGroup = this.footGroup.filter(v => v.is_show ); }, mounted() { + // uni.getClipboardData({ + // success: function (res) { + // console.log('res',res) + // uni.showModal({ + // content:JSON.stringify(res.data) + // }) + // },fail:function(err){ + // console.log('err',err) + // } + // }); this.title = this.$store.state.title; let token = uni.getStorageSync('token'); if (!token) { diff --git a/pages/OrderDetail/index.vue b/pages/OrderDetail/index.vue index bbdcf3a..5bf6256 100644 --- a/pages/OrderDetail/index.vue +++ b/pages/OrderDetail/index.vue @@ -242,6 +242,12 @@ this.id = option.id; this.getDetail(option.id); }, + onShareAppMessage() { + return { + title:'订单详情', + path:'/pages/OrderDetail/index?id='+this.id, + } + }, methods: { delPet(){ functions.confirm("确认删除该宠物吗？").then(() => { diff --git a/pages/OrderPage/index.vue b/pages/OrderPage/index.vue index 55e4837..0f43635 100644 --- a/pages/OrderPage/index.vue +++ b/pages/OrderPage/index.vue @@ -195,7 +195,7 @@ > - 阅读并同意《上门喂养协议》 + 阅读并同意《上门喂养协议》 diff --git a/pages/Pet/components/index.scss b/pages/Pet/components/index.scss index f53cb3d..4c93f79 100644 --- a/pages/Pet/components/index.scss +++ b/pages/Pet/components/index.scss @@ -4,10 +4,9 @@ size: 100% 100%; repeat: no-repeat; }; - padding-bottom:50rpx; + //padding-bottom:50rpx; .order-capsule-container{ position: sticky; - box-sizing: border-box; width:100%; padding:10rpx; @@ -261,4 +260,21 @@ repeat:no-repeat; } } +} +.footer-menu{ + padding:30rpx; + position: fixed; + bottom:0; + left:0; + z-index: 9999; + width: 100%; + background: #FFFFFF; + border: 2rpx solid #262626; + box-shadow: 0rpx -2rpx 20rpx 0rpx rgba(0,0,0,0.06); + border-radius: 26rpx 26rpx 0rpx 0rpx; + text-align: center; + .footer-button{ + display: flex; + justify-content: center; + } } \ No newline at end of file diff --git a/pages/Pet/index.vue b/pages/Pet/index.vue index fae48f1..d483060 100644 --- a/pages/Pet/index.vue +++ b/pages/Pet/index.vue @@ -43,9 +43,31 @@ marginBottom="30" marginTop="30" @loadmore="getMyPets()"/> - - + + + + + + + + + + + + + + + + + diff --git a/pages/PetDetail/index.vue b/pages/PetDetail/index.vue index 38e3e71..6951bbc 100644 --- a/pages/PetDetail/index.vue +++ b/pages/PetDetail/index.vue @@ -86,18 +86,18 @@ 宝贝性别： - 男 - 女 + 弟弟 + 妹妹 保密 - + - 最近疫苗时间： + 最近狂犬疫苗时间： {{ pet.last_vaccine_time.substr(0, 10) }} diff --git a/pages/UserDetail/components/index.scss b/pages/UserDetail/components/index.scss index 0bbf4bf..13a7881 100644 --- a/pages/UserDetail/components/index.scss +++ b/pages/UserDetail/components/index.scss @@ -104,7 +104,7 @@ background: #EBF2F3; border: 3rpx solid #262626; border-radius: 45rpx; - line-heihgt:1; + line-height:1; font-size: 30rpx; font-weight: 400; color: #202020; diff --git a/uview-plus/index.scss b/uview-plus/index.scss index 9e0376d..d275b34 100644 --- a/uview-plus/index.scss +++ b/uview-plus/index.scss @@ -34,7 +34,7 @@ uni-page-body{ box-sizing: border-box; flex: 0 0 100%; } -.col-6{ +.col-8{ box-sizing: border-box; flex: 0 0 66.66%; }