yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

This commit is contained in:
Mr.jiang 2024-07-04 22:45:13 +08:00
parent eee5e792dc d3bd4a1f2a
commit 384e3d9fa3
12 changed files with 72 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
my/order/pay.vue
View File

@ -169,7 +169,7 @@
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
<view class="justify-title-nav"> <view class="justify-title-nav">
<view class="add-con-title">出行费用</view> <view class="justify-title">出行费用</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="flex justify-between add-lin" v-if="order.tripWay" > <view class="flex justify-between add-lin" v-if="order.tripWay" >
@ -193,7 +193,7 @@
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<view class="add-con-title">优惠券</view> <view class="add-con-title">优惠券</view>
<view class="add-con-cont" style="color: #F93731;font-size: 26rpx;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view> <view class="add-con-cont" style="color: #F93731;font-size: 30rpx;font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="" v-else>-</view> <view class="" v-else>-</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
@ -216,9 +216,10 @@
-￥<text style="font-weight: bold;">{{order.couponMoney}}</text></view> -￥<text style="font-weight: bold;">{{order.couponMoney}}</text></view>
<view class="" v-else>-</view> <view class="" v-else>-</view>
</view> </view>
<view class="jusitify-line-end"></view>
<view class="flex justify-between add-lin" > <view class="flex justify-between add-lin" >
<view class="add-con-title">合计：</view> <view class="add-con-title">合计：</view>
<view class="add-con-cont" style="color: #333;">￥ <view class="add-con-cont" style="color: #FF3939;font-size: 32rpx;">￥
<text style="font-size: 35rpx;font-weight: bold;"> <text style="font-size: 35rpx;font-weight: bold;">
{{order.payMoney}} {{order.payMoney}}
</text> </text>
@ -1908,9 +1909,9 @@
} }
.fei-view-list-z{ .fei-view-list-z{
height: 65rpx; height: 65rpx;
background-color: rgba(247, 247, 247, 0.8); border-top: 1px solid #f3f3f3;
border-radius: 33rpx; padding-top: 20rpx;
padding: 0px 5px; font-weight: bold;
} }
.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){ .fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
color: #666666; color: #666666;

6
my/order/payding.vue
View File

@ -1773,9 +1773,9 @@
} }
.fei-view-list-z{ .fei-view-list-z{
height: 65rpx; height: 65rpx;
background-color: rgba(247, 247, 247, 0.8); border-top: 1px solid #f3f3f3;
border-radius:30rpx; padding-top: 20rpx;
padding: 0 20rpx; font-weight: bold;
} }
.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){ .fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
color: #666666; color: #666666;

6
my/order/paydingDd.vue
View File

@ -1717,9 +1717,9 @@
} }
.fei-view-list-z{ .fei-view-list-z{
height: 65rpx; height: 65rpx;
background-color: rgba(247, 247, 247, 0.8); border-top: 1px solid #f3f3f3;
border-radius: 33rpx; padding-top: 20rpx;
padding: 0px 5px; font-weight: bold;
} }
.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){ .fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
color: #666666; color: #666666;

8
my/order/paydingTc.vue
View File

@ -1296,9 +1296,9 @@
} }
.fei-view-list-z{ .fei-view-list-z{
height: 65rpx; height: 65rpx;
background-color: rgba(247, 247, 247, 0.8); border-top: 1px solid #f3f3f3;
border-radius: 33rpx; padding-top: 20rpx;
padding: 0px 5px; font-weight: bold;
} }
.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){ .fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
color: #666666; color: #666666;
@ -1328,7 +1328,7 @@
color: #333333; color: #333333;
padding-bottom: 10px; padding-bottom: 10px;
margin-bottom: 10px; margin-bottom: 10px;
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #f3f3f3;
} }
.feiuong{ .feiuong{
padding: 29rpx; padding: 29rpx;

8
my/vip/index.vue
View File

@ -541,14 +541,14 @@
.bgbox-top-show-youxiao{ .bgbox-top-show-youxiao{
width: 448rpx; width: 448rpx;
height: 42rpx; height: 42rpx;
background: #FFBE95; background: #ff9f65;
border-radius: 21rpx; border-radius: 21rpx;
font-weight: 400; font-weight: 400;
font-size: 31rpx; font-size: 31rpx;
color: #FFE5D1; color: #FFE5D1;
line-height: 42rpx; line-height: 42rpx;
text-align: center; text-align: center;
text-shadow: 0rpx 0rpx 3rpx rgba(218,139,85,0.48); text-shadow: 0rpx 0rpx 3rpx rgba(255,159,101,0.48);
margin-bottom: 70px; margin-bottom: 70px;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
@ -557,12 +557,12 @@
} }
.bgbox-top-show image{ .bgbox-top-show image{
width: 560.42rpx; width: 560.42rpx;
height: 300.69rpx; height: 320.69rpx;
} }
.bgbox-top-show{ .bgbox-top-show{
width: 100%; width: 100%;
height: 536.11rpx; height: 536.11rpx;
background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), #f7f7f7), url('../../static/background-img.png'); background-image: linear-gradient(to bottom, #f9f1e7, #f7f7f7);
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: cover; background-size: cover;

6
my/wallet/index.vue
View File

@ -10,7 +10,7 @@
<view class="bgimg"> <view class="bgimg">
<view class="bgimg-top"> <view class="bgimg-top">
<view class="bgimg-top-tou"> <view class="bgimg-top-tou">
<u-avatar :src="avatar" size="106"></u-avatar> <u-avatar :src="avatar" size="120" style=" border: 2px solid #F2F2F2;"></u-avatar>
</view> </view>
<view class="bgimg-top-view"> <view class="bgimg-top-view">
<view class="bgimg-top-money"> <view class="bgimg-top-money">
@ -51,7 +51,7 @@
<view class="flex align-center justify-between" style="height: 100upx;padding: 20upx 0;" <view class="flex align-center justify-between" style="height: 100upx;padding: 20upx 0;"
v-for="(item,index) in openLists" :key='index'> v-for="(item,index) in openLists" :key='index'>
<view class="flex align-center"> <view class="flex align-center">
<image :src="item.image" style="width: 50upx;height: 50upx;border-radius: 50upx;"></image> <image :src="item.image" style="width: 50upx;height: 50upx;border-radius: 50upx; "></image>
<view style="font-size: 30upx;margin-left: 20upx;">{{item.text}} <view style="font-size: 30upx;margin-left: 20upx;">{{item.text}}
</view> </view>
</view> </view>
@ -1340,8 +1340,6 @@
.bgimg-top-tou{ .bgimg-top-tou{
margin-left: 10px; margin-left: 10px;
margin-top: 2px; margin-top: 2px;
border:2px solid #fff;
border-radius: 50%;
} }
.align-line{ .align-line{
border: solid 1px #000000; border: solid 1px #000000;

29
pages/my/index.vue
View File

@ -3,7 +3,7 @@
<view class="my-head"> <view class="my-head">
<view class="my-head-top back-width"> <view class="my-head-top back-width">
<view class="u-m-r-10" style="position: relative;"> <view class="u-m-r-10" style="position: relative;">
<image :src="avatar" style="width: 100rpx;height: 100rpx;border-radius: 50%; border:#fff 1px solid;" <image :src="avatar" style="width: 100rpx;height: 100rpx;border-radius: 50%; margin-left: 10rpx; border:#fff 1px solid;"
@click="goNav('/pages/my/userinfo')"></image> @click="goNav('/pages/my/userinfo')"></image>
</view> </view>
<view class="my-head-top-view" v-if="!isLogin"> <view class="my-head-top-view" v-if="!isLogin">
@ -104,7 +104,9 @@
</view> </view>
</view> </view>
</view> </view>
<view class="prompt-text">-当你累了 想起盛安到家-</view>
</view> </view>
</template> </template>
<script> <script>
@ -568,7 +570,13 @@
<style scoped> <style scoped>
.prompt-text{
font-size: 20rpx;
color: #99999;
height: 170rpx;
text-align: top;
text-align: center;
}
.my-use-list-text{ .my-use-list-text{
color: #6C6C6C; color: #6C6C6C;
margin-top: 5px; margin-top: 5px;
@ -584,7 +592,7 @@
padding: 12px 14px; padding: 12px 14px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 0px auto 70px auto; margin: 0px auto 12px auto;
} }
.my-use-view{ .my-use-view{
width: 100%; width: 100%;
@ -709,14 +717,15 @@
color: #019c88; color: #019c88;
} }
.my-head-mian-top-view-qian{ .my-head-mian-top-view-qian{
width: 300rpx; width: 360rpx;
font-size: 26rpx; font-size: 26rpx;
color: #999; color: #999;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495); background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
text-align: center; text-align: center;
margin: 0 auto; margin: 0 auto;
border-radius: 0 0 50rpx 50rpx; border-radius: 0 0 50rpx 50rpx;
height: 42rpx; height: 55rpx;
line-height: 55rpx;
color: #ffffff; color: #ffffff;
} }
.my-head-mian-top-view{ .my-head-mian-top-view{
@ -829,4 +838,14 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
margin-right: 8rpx; margin-right: 8rpx;
} }
.text-xl{
width: 100rpx;
height: 56rpx;
font-size: 26rpx;
background: linear-gradient(-90deg, #0CA891, #23BBA2);
border-radius: 30rpx;
line-height: 56rpx;
color: #fff;
text-align: center;
}
</style> </style>

2
pages/my/myCiLiaoDetail.vue
View File

@ -85,7 +85,7 @@
</view> </view>
</view> </view>
<view class="detail-btn btn" @click="goumai(getList)"> <view class="detail-btn btn" @click="goumai(getList)">
立即购买 立即预约
</view> </view>
</view> </view>
</template> </template>

29
pages/my/serviceOderDrtail.vue
View File

@ -64,20 +64,22 @@
<view class="detail-foot-list" v-for="(item,index) in detailData" :key="index" @click="detail(item)"> <view class="detail-foot-list" v-for="(item,index) in detailData" :key="index" @click="detail(item)">
<view class="detail-foot-list-top"> <view class="detail-foot-list-top">
<span style="margin-right: 5px;">{{item.title}}</span> <span style="margin-right: 5px;">{{item.title}}</span>
<span>详情</span>
</view> </view>
<view class="detail-view" style="position: relative;"> <view class="detail-view" style="position: relative;">
<image class="detail-view-img" :src="item.massageImg" mode=""></image> <image class="detail-view-img" :src="item.massageImg" mode=""></image>
<span v-if="serviData.name!='index'" class="img-span">{{item.status=='1'?'已使用':'未使用'}}</span> <span v-if="serviData.name!='index'" class="img-span">{{item.status=='1'?'已使用':'未使用'}}</span>
<view class="detail-view-mina"> <view class="detail-view-mina">
<view class="header-bottom-money" style="margin: 7px 0px;"> <view class="header-bottom-money" style="margin: 7px 0px;display: flex;justify-content: space-between; ">
<view class="header-bottom-money-zhen"> <view style="display: flex; align-items: flex-end;">
<span>￥</span> <view class="header-bottom-money-zhen">
<span>{{item.price}}</span> <span>￥</span>
</view> <span>{{item.price}}</span>
<view class="header-bottom-money-jia" style="margin-left: 5px; "> </view>
￥{{item.oldPrice}} <view class="header-bottom-money-jia" >
￥{{item.oldPrice}}
</view>
</view> </view>
<view class="service-more">详情</view>
</view> </view>
<view style="color: #019c88;">服务时长:{{item.duration}}分钟</view> <view style="color: #019c88;">服务时长:{{item.duration}}分钟</view>
<view class="tese"> <view class="tese">
@ -1103,4 +1105,15 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.service-more{
width: 50px;
height: 28px;
font-size: 13px;
background: linear-gradient(-90deg, #0CA891, #23BBA2);
border-radius: 15px;
line-height: 28px;
color: #fff;
text-align: center;
justify-content: fex-end;
}
</style> </style>

4
pages/public/forgetPwd.vue
View File

@ -141,7 +141,7 @@
} }
.send-msg { .send-msg {
color: #096f4b; color: #019c88;
height: 30px; height: 30px;
font-size: 29rpx; font-size: 29rpx;
line-height: 30px; line-height: 30px;
@ -189,7 +189,7 @@
line-height: 80upx; line-height: 80upx;
border-radius: 60upx; border-radius: 60upx;
margin-top: 32upx; margin-top: 32upx;
background: linear-gradient(to right, #223845, #00a85b); background: linear-gradient(to right, #019c88, #2ebf93);
color: #fff; color: #fff;
font-size: 30upx; font-size: 30upx;

2
pages/therapist/orderDetail.vue
View File

@ -1268,7 +1268,7 @@
width: 30rpx; width: 30rpx;
height: 30rpx; height: 30rpx;
margin-right: 8rpx; margin-right: 8rpx;
margin-top: 3rpx; margin-top: 4rpx;
} }
.order-sname-text{ .order-sname-text{
font-size: 30rpx; font-size: 30rpx;

BIN
static/vip/membership.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 188 KiB