396316021
/
pet_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复问题

master
396316021 1 year ago
parent
d5f28bc2e1
commit
cd0eb28020
16 changed files with 288 additions and 205 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      App.vue
  2. 4
      components/MzButton/components/index.scss
  3. 47
      components/PetPage/index.vue
  4. 4
      components/RightNav/index.vue
  5. 4
      pages/CardDetail/index.vue
  6. 352
      pages/Index/components/HomePage/components/index.scss
  7. 2
      pages/Index/components/OrderPage/index.vue
  8. 2
      pages/Index/components/index.scss
  9. 10
      pages/Index/index.vue
  10. 6
      pages/OrderDetail/index.vue
  11. 2
      pages/OrderPage/index.vue
  12. 20
      pages/Pet/components/index.scss
  13. 26
      pages/Pet/index.vue
  14. 8
      pages/PetDetail/index.vue
  15. 2
      pages/UserDetail/components/index.scss
  16. 2
      uview-plus/index.scss

2
App.vue
Unescape View File

@ -31,4 +31,4 @@
<style lang="scss"> <style lang="scss">
/*每个页面公共css */ /*每个页面公共css */
@import "uview-plus/index.scss"; @import "uview-plus/index.scss";
</style> </style>

4
components/MzButton/components/index.scss
Unescape View File

@ -16,7 +16,7 @@
border-radius:35rpx; border-radius:35rpx;
font-weight: 500; font-weight: 500;
backgound:{ background:{
color:#F7E1C3; color:#F7E1C3;
}; };
position: relative; position: relative;
@ -30,7 +30,7 @@
padding:15rpx 0; padding:15rpx 0;
background:{ background:{
size:100% 100%; size:100% 100%;
postion:center center; position:center center;
repeat:no-repeat; repeat:no-repeat;
} }
} }

47
components/PetPage/index.vue
Unescape View File

@ -10,7 +10,7 @@
<view class="pet-page-group row" v-if="type === 'create'"> <view class="pet-page-group row" v-if="type === 'create'">
<view class="order-item row"> <view class="order-item row">
<view class="item-title"> <view class="item-title">
宝贝姓名 <text style="color: red;">*</text>宝贝姓名
</view> </view>
<view class="item-content row col"> <view class="item-content row col">
<view class="item-content-text"> <view class="item-content-text">
@ -75,9 +75,9 @@
</view> </view>
</view> </view>
</view> </view>
<view class="order-item row"> <view class="order-item row" v-if="data.type === 2">
<view class="item-title"> <view class="item-title">
最近疫苗时间 最近狂犬疫苗时间
</view> </view>
<view class="item-content row col"> <view class="item-content row col">
<view class="item-content-text"> <view class="item-content-text">
@ -276,7 +276,7 @@
</view> </view>
<view class="pet-page-button row"> <view class="pet-page-button row">
<view class="col-12" style="justify-content: center;" v-if="type === 'lists'"> <view class="col-6" style="justify-content: center;" v-if="type === 'lists'">
<view class="" style="display: inline-block;"> <view class="" style="display: inline-block;">
<MzButton <MzButton
title="选择萌宠" title="选择萌宠"
@ -284,24 +284,24 @@
font-color="#262626" font-color="#262626"
button-width="300rpx" button-width="300rpx"
class="" class=""
@click="$refs.petPopup.open()" @click="openPet"
>
</MzButton>
</view>
</view>
<view class="col-6" style="justify-content: center;" v-if="type === 'lists'">
<view class="" style="display: inline-block;">
<MzButton
title="添加萌宠"
button-color="#4DC3B8"
font-color="#fff"
button-width="300rpx"
class=""
@click="type = 'create'"
> >
</MzButton> </MzButton>
</view> </view>
</view> </view>
<!-- <view class="col-6" style="justify-content: center;" v-if="type === 'lists'">-->
<!-- <view class="" style="display: inline-block;">-->
<!-- <MzButton-->
<!-- title="添加萌宠"-->
<!-- button-color="#FFFFFF"-->
<!-- font-color="#262626"-->
<!-- button-width="300rpx"-->
<!-- class=""-->
<!-- @click="type = 'create'"-->
<!-- >-->
<!-- </MzButton>-->
<!-- </view>-->
<!-- </view>-->
<view class="col-6" v-if="type === 'create' && showCancel"> <view class="col-6" v-if="type === 'create' && showCancel">
<MzButton <MzButton
title="取消" title="取消"
@ -579,8 +579,8 @@
], ],
sexList:[ sexList:[
{name:'未知',value:0}, {name:'未知',value:0},
{name:'男',value:1}, {name:'弟弟',value:1},
{name:'女',value:2}, {name:'妹妹',value:2},
{name:'其他',value:9}, {name:'其他',value:9},
], ],
petTypeList:[ petTypeList:[
@ -633,6 +633,11 @@
} }
}, },
methods: { methods: {
openPet(){
this.status = 'loadmore';
this.getMyPets();
this.$refs.petPopup.open()
},
petCheckChange(e){ petCheckChange(e){
console.log(e) console.log(e)
this.petList[e].checked = !this.petList[e].checked; this.petList[e].checked = !this.petList[e].checked;
@ -660,6 +665,7 @@
return; return;
} }
this.status = 'loading'; this.status = 'loading';
uni.showLoading('加载中');
getMyPets(page).then(data => { getMyPets(page).then(data => {
if (page === 1){ if (page === 1){
this.petList = data.data.map(item => { this.petList = data.data.map(item => {
@ -672,6 +678,7 @@
if (data.data.length < 10) { if (data.data.length < 10) {
this.status = 'nomore'; this.status = 'nomore';
} }
uni.hideLoading();
}); });
}, },
getDetail(id){ getDetail(id){

4
components/RightNav/index.vue
Unescape View File

@ -47,9 +47,9 @@
}, },
mounted() { mounted() {
let that = this; let that = this;
// uni.$on('getMsgNumber', (data) => { if(uni.getStorageSync('token')){
that.getMsgNumber(); that.getMsgNumber();
// }); }
}, },
methods: { methods: {
getMsgNumber(){ getMsgNumber(){

4
pages/CardDetail/index.vue
Unescape View File

@ -84,7 +84,7 @@
<view class="foot-menu-checkbox" > <view class="foot-menu-checkbox" >
<u-checkbox <u-checkbox
shape="circle" shape="circle"
size="26" size="28"
custom-style="margin-top:0;margin-bottom:0;" custom-style="margin-top:0;margin-bottom:0;"
icon-size="24" icon-size="24"
active-color="#4DC3B8" active-color="#4DC3B8"
@ -93,7 +93,7 @@
></u-checkbox> ></u-checkbox>
</view> </view>
<view class="foot-menu-title"> <view class="foot-menu-title">
<text>我已阅读并同意</text><text class="foot-menu-url" @click="showAgreement">《付费权益卡协议》</text> <text @click="readInfo = !readInfo">我已阅读并同意</text><text class="foot-menu-url" @click="showAgreement">《付费权益卡协议》</text>
</view> </view>
</view> </view>
<view> <view>

352
pages/Index/components/HomePage/components/index.scss
Unescape View File

@ -1,181 +1,203 @@
.app-wallpaper{ .app-wallpaper {
background:{ background: {
size: 100% 100%; size: 100% 100%;
repeat: no-repeat; repeat: no-repeat;
} }
} }
.index-banner {
.img{ .index-banner {
width:100%; .img {
border:{ width: 100%;
width:2rpx; border: {
color:#3F3F3F; width: 2rpx;
style:solid; color: #3F3F3F;
radius:25rpx style: solid;
} radius: 25rpx
}
background:{
image:url("http://live.admin.jinghkb.com/banner-backgrond.png");
size: 100% 100%;
repeat: no-repeat;
} }
.index-banner-container{ }
padding:{
top:20rpx; background: {
bottom:20rpx; image: url("http://live.admin.jinghkb.com/banner-backgrond.png");
left:20rpx; size: 100% 100%;
right:20rpx; 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; .img {
top:-45rpx; width: 75rpx;
background:{ height: 75rpx;
size: 100% 100%;
repeat: no-repeat;
} }
.user-detail-container{ }
align-items: center;
padding:{ .user-content {
top:95rpx; .user-title-top {
bottom:50rpx; margin: {
left:50rpx; bottom: 15rpx;
right:50rpx;
} }
.user-avatar{
width:75rpx; .img {
height:75rpx; width: 83rpx;
margin-right:35rpx; height: auto;
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;
}
} }
.user-content{
.user-title-top{ font: {
margin:{ size: 30rpx;
bottom:15rpx; weight: 500;
}
.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{
}
}
} }
.user-coupons{ color: #131313;
width:165rpx; line-height: 30rpx;
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;
margin:{ .user-title-text {
bottom:auto; padding: {
left:auto; left: 10rpx;
} }
font:{ }
size:26rpx; }
weight:bold;
} .user-title-bottom {
color:#131313;
line-height:30rpx; .img {
width: 41rpx;
height: 100%
} }
font: {
size: 26rpx;
weight: 400;
}
color: #131313;
line-height: 30rpx;
.user-title-idcard {
}
} }
} }
.index-button-group { .user-coupons {
width: 100%; width: 165rpx;
.index-button-detail { height: 45rpx;
&:nth-child(1){padding:{right:9rpx;bottom:5rpx;}} background: {
&:nth-child(2){padding:{left:9rpx;bottom:5rpx;}} size: 100% 100%;
&:nth-child(3){padding:{right:9rpx;top:5rpx;}} repeat: no-repeat;
&:nth-child(4){padding: {left: 9rpx;top: 5rpx;}} }
height: 330rpx; display: flex;
flex-wrap: wrap; align-items: center;
} justify-content: flex-end;
.index-button-detail-container{
width:100%; .user-coupons-number {
height:100%; width: 100%;
justify-content: center; padding: {
align-items: flex-end; left: 112.5rpx;
display: flex; top: 2.5rpx;
margin:{
top:auto;
} }
.img{ margin: {
display: block; bottom: auto;
width:175rpx; 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:{ //text-align: end;
size: 100% 100%;
repeat: no-repeat; 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;
}
}
}

2
pages/Index/components/OrderPage/index.vue
Unescape View File

@ -79,7 +79,7 @@
</view> </view>
<view v-if="item.status === 0" class="card-button" @click="navTo('/pages/OrderConfirm/index?id=' + item.id)"> <view v-if="item.status === 0" class="card-button" @click="navTo('/pages/OrderConfirm/index?id=' + item.id)">
<MzButton <MzButton
title="已完成" title="未完成"
font-color="#4DC3B8" font-color="#4DC3B8"
button-color="#D6FFF6" button-color="#D6FFF6"
button-width="100%"></MzButton> button-width="100%"></MzButton>

2
pages/Index/components/index.scss
Unescape View File

@ -110,7 +110,7 @@
} }
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: end; justify-content: flex-end;
.user-coupons-number{ .user-coupons-number{
width:100%; width:100%;
padding:{ padding:{

10
pages/Index/index.vue
Unescape View File

@ -133,6 +133,16 @@
// this.footGroup = this.footGroup.filter(v => v.is_show ); // this.footGroup = this.footGroup.filter(v => v.is_show );
}, },
mounted() { 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; this.title = this.$store.state.title;
let token = uni.getStorageSync('token'); let token = uni.getStorageSync('token');
if (!token) { if (!token) {

6
pages/OrderDetail/index.vue
Unescape View File

@ -242,6 +242,12 @@
this.id = option.id; this.id = option.id;
this.getDetail(option.id); this.getDetail(option.id);
}, },
onShareAppMessage() {
return {
title:'订单详情',
path:'/pages/OrderDetail/index?id='+this.id,
}
},
methods: { methods: {
delPet(){ delPet(){
functions.confirm("确认删除该宠物吗？").then(() => { functions.confirm("确认删除该宠物吗？").then(() => {

2
pages/OrderPage/index.vue
Unescape View File

@ -195,7 +195,7 @@
></u-checkbox> ></u-checkbox>
</view> </view>
<view class="foot-menu-title"> <view class="foot-menu-title">
<text>阅读并同意</text><text class="foot-menu-url" @click="showAgreement">《上门喂养协议》</text> <text @click="readInfo = !readInfo">阅读并同意</text><text class="foot-menu-url" @click="showAgreement">《上门喂养协议》</text>
</view> </view>
</view> </view>
</view> </view>

20
pages/Pet/components/index.scss
Unescape View File

@ -4,10 +4,9 @@
size: 100% 100%; size: 100% 100%;
repeat: no-repeat; repeat: no-repeat;
}; };
padding-bottom:50rpx; //padding-bottom:50rpx;
.order-capsule-container{ .order-capsule-container{
position: sticky; position: sticky;
box-sizing: border-box; box-sizing: border-box;
width:100%; width:100%;
padding:10rpx; padding:10rpx;
@ -261,4 +260,21 @@
repeat:no-repeat; 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;
}
} }

26
pages/Pet/index.vue
Unescape View File

@ -43,9 +43,31 @@
marginBottom="30" marginTop="30" @loadmore="getMyPets()"/> marginBottom="30" marginTop="30" @loadmore="getMyPets()"/>
</view> </view>
<view class="right-nav row" v-if="type === 'pet'"> <view class="footer-menu row">
<view class="right-nav-button col-12" :style="{backgroundImage:'url('+staticImage.addPet+')'}" @click="navTo('/pages/Pet/create')"></view> <!-- <view class="footer-button col-6">-->
<!-- <MzButton-->
<!-- title="管理"-->
<!-- button-color="#ffffff"-->
<!-- font-color="##262626"-->
<!-- button-width="250rpx"-->
<!-- >-->
<!-- </MzButton>-->
<!-- </view>-->
<view class="footer-button col-12"
@click="navTo('/pages/AddrDetail/index')">
<MzButton
title="新增地址"
button-color="#4DC3B8"
font-color="#FFFFFF"
button-width="100%"
style="width:90%;"
>
</MzButton>
</view>
</view> </view>
<!-- <view class="right-nav row" v-if="type === 'pet'">-->
<!-- <view class="right-nav-button col-12" :style="{backgroundImage:'url('+staticImage.addPet+')'}" @click="navTo('/pages/Pet/create')"></view>-->
<!-- </view>-->
<!-- <RightNav></RightNav> --> <!-- <RightNav></RightNav> -->
</template> </template>

8
pages/PetDetail/index.vue
Unescape View File

@ -86,18 +86,18 @@
宝贝性别： 宝贝性别：
</view> </view>
<view class="item-content"> <view class="item-content">
<span v-if="pet.sex === 1">男</span> <span v-if="pet.sex === 1">弟弟</span>
<span v-if="pet.sex === 2">女</span> <span v-else-if="pet.sex === 2">妹妹</span>
<span v-else>保密</span> <span v-else>保密</span>
</view> </view>
</view> </view>
<view class="content-item row"> <view class="content-item row" v-if="pet.type === 2">
<view class="item-icon"> <view class="item-icon">
<image class="img" mode="widthFix" :src="staticImage.petYm"/> <image class="img" mode="widthFix" :src="staticImage.petYm"/>
</view> </view>
<view class="item-title"> <view class="item-title">
最近疫苗时间： 最近狂犬疫苗时间：
</view> </view>
<view class="item-content"> <view class="item-content">
{{ pet.last_vaccine_time.substr(0, 10) }} {{ pet.last_vaccine_time.substr(0, 10) }}

2
pages/UserDetail/components/index.scss
Unescape View File

@ -104,7 +104,7 @@
background: #EBF2F3; background: #EBF2F3;
border: 3rpx solid #262626; border: 3rpx solid #262626;
border-radius: 45rpx; border-radius: 45rpx;
line-heihgt:1; line-height:1;
font-size: 30rpx; font-size: 30rpx;
font-weight: 400; font-weight: 400;
color: #202020; color: #202020;

2
uview-plus/index.scss
Unescape View File

@ -34,7 +34,7 @@ uni-page-body{
box-sizing: border-box; box-sizing: border-box;
flex: 0 0 100%; flex: 0 0 100%;
} }
.col-6{ .col-8{
box-sizing: border-box; box-sizing: border-box;
flex: 0 0 66.66%; flex: 0 0 66.66%;
} }

Write Preview
Loading…
Cancel
Save