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-03 21:02:59 +08:00
parent 47c981a528 81c3308c83
commit 1790ba749b
13 changed files with 128 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
my/order/payModify.vue
View File

@ -3,7 +3,7 @@
<view class="padding-bottom u-skeleton"> <view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;"> <view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
<view class="head-top"> <view class="head-top">
<view class="pay-title" style="">服务项目</view> <view class="pay-title">服务项目333</view>
<view class="flex"> <view class="flex">
<view class="" style="width: 160upx;height: 160upx;"> <view class="" style="width: 160upx;height: 160upx;">
<image :src="orderXm.massageImg" <image :src="orderXm.massageImg"
@ -1362,9 +1362,9 @@
} }
.pay-title{ .pay-title{
font-weight: bold; font-weight: bold;
font-size: 28rpx; font-size: 31rpx;
color: #333333; color: #333333;
margin-bottom: 5px; margin-bottom: 8px;
} }
.view-more{ .view-more{
display:inline-block; display:inline-block;
@ -1382,9 +1382,7 @@
} }
.ske-padding{ .ske-padding{
padding: 5rpx 30rpx 36rpx 30rpx; padding: 5rpx 30rpx 36rpx 30rpx;
} }
.header-bottom-money-zhen span{ .header-bottom-money-zhen span{
color: #F95900 !important; color: #F95900 !important;
font-weight: bold !important; font-weight: bold !important;
@ -1567,7 +1565,10 @@
color: #ffffff; color: #ffffff;
margin-left: 5px; margin-left: 5px;
border-radius: 30rpx; border-radius: 30rpx;
padding: 6rpx 16rpx; height:50rpx;
line-height: 50rpx;
width: 100rpx;
text-align:center;
font-size: 26rpx; font-size: 26rpx;
} }
.header-view-data{ .header-view-data{
@ -1816,12 +1817,7 @@
width: 100%; width: 100%;
background-color: #f7f7f7; background-color: #f7f7f7;
} }
.pay-title{
font-weight: bold;
font-size: 28rpx;
color: #333333;
margin-bottom: 5px;
}
page { page {
background: #f7f7f7; background: #f7f7f7;
} }
@ -2000,4 +1996,7 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.head-title{
font-size: 30rpx;
}
</style> </style>

6
my/order/payModifyDzhifu.vue
View File

@ -3,7 +3,7 @@
<view class="padding-bottom u-skeleton"> <view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;"> <view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
<view class="head-top"> <view class="head-top">
<view class="pay-title">服务项目11111111</view> <view class="pay-title">服务项目</view>
<view class="flex justify-around"> <view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;"> <view class="" style="width: 160upx;height: 160upx;">
<image :src="orderXm.ordersMassageList[0].massageType.massageImg" <image :src="orderXm.ordersMassageList[0].massageType.massageImg"
@ -49,7 +49,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="ske-padding margin-top-sm header-view"> <view class="ske-padding margin-top-sm header-view" >
<view v-if="!detailaddress">请选择地址</view> <view v-if="!detailaddress">请选择地址</view>
<view class="margin-right-xs"> <view class="margin-right-xs">
<view class="flex justify-between margin-top-lg"> <view class="flex justify-between margin-top-lg">
@ -1400,7 +1400,7 @@
} }
.pay-title{ .pay-title{
font-weight: bold; font-weight: bold;
font-size: 30rpx; font-size: 31rpx;
color: #333333; color: #333333;
margin-bottom: 8px; margin-bottom: 8px;
} }

2
my/order/payModifyJsDetail.vue
View File

@ -1813,7 +1813,7 @@
} }
.pay-title{ .pay-title{
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 31rpx;
color: #333333; color: #333333;
margin-bottom: 8px; margin-bottom: 8px;
} }

2
my/order/payModifyTc.vue
View File

@ -1317,7 +1317,7 @@
.pay-title{ .pay-title{
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 31rpx;
color: #333333; color: #333333;
margin-bottom: 8px; margin-bottom: 8px;
} }

52
my/order/payModifyTcMy.vue
View File

@ -3,7 +3,7 @@
<view class="padding-bottom u-skeleton"> <view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;"> <view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
<view class="head-top"> <view class="head-top">
<view class="pay-title" style="">服务项目</view> <view class="pay-title">服务项目2222</view>
<view class="flex"> <view class="flex">
<view class="" style="width: 160upx;height: 160upx;"> <view class="" style="width: 160upx;height: 160upx;">
<image :src="orderXm.massageImg" <image :src="orderXm.massageImg"
@ -34,23 +34,23 @@
</view> </view>
</view> </view>
<view class="ske-padding margin-top-sm header-view"> <view class="header-padd header-view header-margin">
<view v-if="!detailaddress">请选择地址</view> <view v-if="!detailaddress">请选择地址</view>
<view class="margin-right-xs"> <view class="margin-right-xs">
<view class="flex justify-between margin-top-lg"> <view class="flex justify-between heaer-height">
<view class="header-view-text">联系人</view> <view class="header-view-text">联系人</view>
<view class="header-view-data"> <view class="header-view-data">
<text>{{name}}</text> <text>{{name}}</text>
<text class="xuanzhe" @click="getAddressList()">修改</text> <text class="xuanzhe" @click="getAddressList()">修改</text>
</view> </view>
</view> </view>
<view class="flex justify-between margin-top-lg"> <view class="flex justify-between heaer-height">
<view class="header-view-text">手机号码</view> <view class="header-view-text">手机号码</view>
<view class="header-view-data"> <view class="header-view-data">
{{mobile}} {{mobile}}
</view> </view>
</view> </view>
<view class="flex justify-between margin-top-lg"> <view class="flex justify-between heaer-height">
<view class="header-view-text">详细地址</view> <view class="header-view-text">详细地址</view>
<view class="flex adders-view"> <view class="flex adders-view">
<span> <span>
@ -62,24 +62,23 @@
</view> </view>
</view> </view>
<view class="ske-padding margin-top-sm header-view"> <view class="header-view header-padd header-margin ">
<view class="fuwu-time" @click="liliaoshi"> <view class="fuwu-time heaer-height" @click="liliaoshi">
<view class="fuwu-title" > <view class="fuwu-title" >
<span>技师</span> <span>技师</span>
<!-- <span v-if="jishiName">{{jishiName.technicianTypeName}}</span> --> <!-- <span v-if="jishiName">{{jishiName.technicianTypeName}}</span> -->
</view> </view>
<view class="liliao-bottom" style="margin-right: 6px;"> <view class="liliao-bottom" >
<span v-if="jishiName.artificerId">{{jishiName.artificerName}}</span> <span v-if="jishiName.artificerId">{{jishiName.artificerName}}</span>
<span v-else>请选择技师</span> <span v-else>请选择技师</span>
<span class="view-more"></span> <span class="view-more"></span>
</view> </view>
</view> </view>
<view class="fuwu-time"> <view class="fuwu-time heaer-height">
<view class="fuwu-title"> <view class="fuwu-title">
服务时间 服务时间
</view> </view>
<view class="flex align-center justify-between" <view class="flex align-center justify-between" style="ppadding: 0rpx 10rpx;">
style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
<view class="flex justify-between margin-tb-sm" @click="openData()"> <view class="flex justify-between margin-tb-sm" @click="openData()">
<view v-if="startTime">{{startTime}}</view> <view v-if="startTime">{{startTime}}</view>
<view class="tetx-sm" v-else>请选择预约时间<span class="view-more"></span></view> <view class="tetx-sm" v-else>请选择预约时间<span class="view-more"></span></view>
@ -1386,12 +1385,6 @@
margin-top: 10px; margin-top: 10px;
} }
.pay-title{
font-weight: bold;
font-size: 38rpx;
color: #333333;
margin-bottom: 5px;
}
.header-bottom-money-zhen span{ .header-bottom-money-zhen span{
color: #F95900 ; color: #F95900 ;
} }
@ -1678,8 +1671,15 @@
margin-top: 5px; margin-top: 5px;
} }
.xuanzhe{ .xuanzhe{
background: linear-gradient(90deg, #029d88, #2fc094);
color: #ffffff;
margin-left: 5px; margin-left: 5px;
border: 1px solid; border-radius: 30rpx;
height:50rpx;
line-height: 50rpx;
width: 100rpx;
text-align:center;
font-size: 26rpx;
} }
.header-view-data{ .header-view-data{
display: flex; display: flex;
@ -1703,7 +1703,7 @@
} }
.header-view{ .header-view{
background-color: #fff; background-color: #fff;
margin-bottom: 10px; margin-bottom: 12px;
border-radius: 11px; border-radius: 11px;
} }
.head-foot span:nth-child(1){ .head-foot span:nth-child(1){
@ -1929,9 +1929,9 @@
} }
.pay-title{ .pay-title{
font-weight: bold; font-weight: bold;
font-size: 28rpx; font-size: 31rpx;
color: #333333; color: #333333;
margin-bottom: 5px; margin-bottom: 8px;
} }
page { page {
background: #f7f7f7; background: #f7f7f7;
@ -2110,4 +2110,14 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.header-margin{
margin: 26rpx;
}
.header-padd{
padding: 36rpx;
}
.heaer-height{
height: 80rpx;
align-items: center;
}
</style> </style>

2
my/order/paydingTc.vue
View File

@ -1424,7 +1424,7 @@
} }
.pay-title{ .pay-title{
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 31rpx;
color: #333333; color: #333333;
margin-bottom: 8px; margin-bottom: 8px;
} }

15
my/wallet/index.vue
View File

@ -47,7 +47,7 @@
</view> </view>
</view> </view>
<view class="padding-lr radius fuqian" style="margin-top: 20rpx;"> <view class="padding-lr radius fuqian" style="margin-top: 24rpx;">
<view> <view>
<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'>
@ -59,7 +59,7 @@
<radio-group name="openWay" style="margin-left: 20upx;" @tap='selectWay(item)'> <radio-group name="openWay" style="margin-left: 20upx;" @tap='selectWay(item)'>
<label class="tui-radio"> <label class="tui-radio">
<radio color="#096f4b" :checked="openWay === item.id ? true : false" /> <radio color="#019c88" :checked="openWay === item.id ? true : false" />
</label> </label>
</radio-group> </radio-group>
</view> </view>
@ -1039,9 +1039,9 @@
height: 76rpx; height: 76rpx;
} }
/deep/uni-radio .uni-radio-input{ /deep/uni-radio .uni-radio-input{
width: 31.86rpx; width: 38.86rpx;
height: 31.86rpx; height: 38.86rpx;
margin: -4px 4px 0px -8px; margin: -1px 2px 0px -8px;
} }
.chong-list-radio{ .chong-list-radio{
width: 29.86rpx; width: 29.86rpx;
@ -1189,7 +1189,7 @@
/deep/.fuqian{ /deep/.fuqian{
background: #fff; background: #fff;
border-radius: 15px; border-radius: 15px;
width: 95%; width: 94%;
margin: 9px auto 70px auto; margin: 9px auto 70px auto;
} }
.chongzhi span:nth-child(2){ .chongzhi span:nth-child(2){
@ -1283,7 +1283,8 @@
} }
.content{ .content{
width: 100%; width: 100%;
height: 100vh; /* height: 100vh; */
padding-bottom: 10rpx;
background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), #f7f7f7), url('../../static/background-img.png'); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), #f7f7f7), url('../../static/background-img.png');
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;

37
pages/my/fuwuliaocheng.vue
View File

@ -48,8 +48,9 @@
<span class="img-span">{{item.status=='1'?'未用完':item.status=='2'?'退款':'已用完'}}</span> <span class="img-span">{{item.status=='1'?'未用完':item.status=='2'?'退款':'已用完'}}</span>
</view> </view>
<view class="item-view"> <view class="item-view">
<view class="item-view-title"> <view class="view-cata">
{{item.title}} <view class="item-view-title">{{item.title}}</view>
<span class="xiaoer item-view-biao">{{item.classifyName}}1</span>
</view> </view>
<view class="item-view-bottom-qian"> <view class="item-view-bottom-qian">
<span>￥</span> <span>￥</span>
@ -63,8 +64,7 @@
</view> </view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
<span class="xiaoer item-view-biao">{{item.classifyName}}</span> <span>已售</span><span>{{item.sales}}w+ <!-- | 好评{{item.esteemRate}}% --></span>
<span>已售{{item.sales}}w+ <!-- | 好评{{item.esteemRate}}% --></span>
</view> </view>
<view class="item-view-bottom-btn"> <view class="item-view-bottom-btn">
查看 查看
@ -228,8 +228,8 @@
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.item-view-biao{ .item-view-biao{
padding: 1px 2px; padding: 1px 5px;
border-radius: 6rpx; border-radius: 15rpx 3rpx 15rpx 3rpx;
} }
.tuina{ .tuina{
background-color:#d1f2df; background-color:#d1f2df;
@ -247,24 +247,31 @@
background-color:#fcf3da; background-color:#fcf3da;
color: #ff8600; color: #ff8600;
} }
.item-view-xiangmu span:nth-child(2){ .item-view-xiangmu span:nth-child(2){
font-weight: normal; font-weight: normal;
color: #666666; color: #666666;
margin-left: 5px; }
font-size: 25rpx; .item-view-xiangmu span:nth-child(1){
font-weight: normal;
color: #999;
margin-right: 5rpx;
} }
.item-view-xiangmu{ .item-view-xiangmu{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
font-weight: 400; font-weight: 400;
font-size: 21rpx; font-size: 25rpx;
margin-top: 5px; align-items: flex-end;
} }
.item-view-title{ .item-view-title{
width: 76%;
font-weight: bold; font-weight: bold;
font-size: 33rpx; font-size: 32rpx;
color: #333333; color: #333333;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.item-view{ .item-view{
width: 55%; width: 55%;
@ -420,5 +427,9 @@
justify-content: space-between; justify-content: space-between;
background-color: #fff; background-color: #fff;
} }
.view-cata{
display: flex;
flex-direction: row;
align-items: center;
}
</style> </style>

37
pages/my/index.vue
View File

@ -18,11 +18,11 @@
</view> </view>
</view> </view>
<view class="my-head-mian back-width"> <view class="my-head-mian back-width">
<view class="my-head-mian-top-view-qian">我的钱包</view>
<view class="my-head-mian-top"> <view class="my-head-mian-top">
<view class="flex" style="align-items: flex-end;"> <view class="flex" style="align-items: flex-end;">
<image class="money-img" src="../../static/money.png" mode="" @click="qidai()"></image> <image class="money-img" src="../../static/money2.png" mode="" @click="qidai()"></image>
<view class="my-head-mian-top-yuE">{{money}}</view> <view class="my-head-mian-top-yuE">{{money}}</view>
<view class="my-head-mian-top-view-qian">我的钱包</view>
</view> </view>
</view> </view>
@ -683,14 +683,15 @@
padding-top: 30rpx; padding-top: 30rpx;
} }
.my-head-mian-top-yuE{ .my-head-mian-top-yuE{
font-size: 55rpx; font-size: 70rpx;
color: #f95900; color: #333;
margin-top: 20rpx; margin-top: 30rpx;
font-weight: bold;
} }
.my-head-mian-top-view-chong,.my-head-mian-top-view-ming{ .my-head-mian-top-view-chong,.my-head-mian-top-view-ming{
width: 150rpx; width: 120rpx;
height: 60rpx; height: 50rpx;
line-height: 60rpx; line-height: 50rpx;
text-align: center; text-align: center;
border-radius: 60rpx; border-radius: 60rpx;
font-size: 28rpx; font-size: 28rpx;
@ -705,16 +706,22 @@
color: #333; color: #333;
} }
.my-head-mian-top-view-qian{ .my-head-mian-top-view-qian{
width: 300rpx;
font-size: 24rpx; font-size: 24rpx;
color: #999; color: #999;
margin-left: 20rpx; background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
margin-bottom: 12rpx; text-align: center;
margin: 0 auto;
border-radius: 0 0 30rpx 30rpx;
height: 36rpx;
color: #ffffff;
} }
.my-head-mian-top-view{ .my-head-mian-top-view{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
margin-top: 30rpx; margin-top: 30rpx;
justify-content: center;
} }
.my-head-mian-top{ .my-head-mian-top{
width: 95%; width: 95%;
@ -723,8 +730,9 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding-top: 5px; padding-top: 20rpx;
text-align: center; text-align: center;
justify-content: center;
} }
.my-head-mian{ .my-head-mian{
width: 100%; width: 100%;
@ -733,7 +741,6 @@
justify-content: space-between; justify-content: space-between;
background: #FFFFFF; background: #FFFFFF;
border-radius: 21rpx; border-radius: 21rpx;
padding: 10px;
} }
.my-head-top-id{ .my-head-top-id{
margin-top: 10px; margin-top: 10px;
@ -794,9 +801,9 @@
margin: 12px auto; margin: 12px auto;
} }
.money-img{ .money-img{
width: 40rpx; width: 45rpx;
height: 40rpx; height: 45rpx;
margin-bottom: 15rpx; margin-bottom: 20rpx;
margin-right: 8rpx; margin-right: 8rpx;
} }
</style> </style>

2
pages/my/indextaociliaoList.vue
View File

@ -219,7 +219,7 @@
.item-view-jianjie{ .item-view-jianjie{
font-weight: 400; font-weight: 400;
font-size: 24rpx; font-size: 24rpx;
color: #848484; color: #999999;
margin:5px 0px; margin:5px 0px;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;

38
pages/my/servicePackage.vue
View File

@ -48,8 +48,9 @@
<span class="img-span">{{item.status=='1'?'未用完':item.status=='2'?'退款':'已用完'}}</span> <span class="img-span">{{item.status=='1'?'未用完':item.status=='2'?'退款':'已用完'}}</span>
</view> </view>
<view class="item-view"> <view class="item-view">
<view class="item-view-title"> <view class="view-cata">
{{item.title}} <view class="item-view-title">{{item.title}}</view>
<span class="xiaoer item-view-biao">{{item.classifyName}}11</span>
</view> </view>
<view class="item-view-bottom-qian" style="margin-top: 5px;"> <view class="item-view-bottom-qian" style="margin-top: 5px;">
<span>￥</span> <span>￥</span>
@ -63,8 +64,7 @@
</view> </view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
<span class="xiaoer item-view-biao">{{item.classifyName}}</span> <span>已售</span><span>{{item.sales}}w+ <!-- | 好评{{item.esteemRate}}% --></span>
<span>已售{{item.sales}}w+ <!-- | 好评{{item.esteemRate}}% --></span>
</view> </view>
<view class="item-view-bottom-btn"> <view class="item-view-bottom-btn">
查看 查看
@ -238,8 +238,8 @@
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.item-view-biao{ .item-view-biao{
padding: 1px 2px; padding: 1px 5px;
border-radius: 6rpx; border-radius: 15rpx 3rpx 15rpx 3rpx;
} }
.tuina{ .tuina{
background-color:#d1f2df; background-color:#d1f2df;
@ -257,24 +257,31 @@
background-color:#fcf3da; background-color:#fcf3da;
color: #ff8600; color: #ff8600;
} }
.item-view-xiangmu span:nth-child(2){ .item-view-xiangmu span:nth-child(2){
font-weight: normal; font-weight: normal;
color: #666666; color: #666666;
margin-left: 5px; }
font-size: 25rpx; .item-view-xiangmu span:nth-child(1){
font-weight: normal;
color: #999;
margin-right: 5rpx;
} }
.item-view-xiangmu{ .item-view-xiangmu{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
font-weight: 400; font-weight: 400;
font-size: 21rpx; font-size: 25rpx;
margin-top: 5px; align-items: flex-end;
} }
.item-view-title{ .item-view-title{
width: 76%;
font-weight: bold; font-weight: bold;
font-size: 33rpx; font-size: 32rpx;
color: #333333; color: #333333;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.item-view{ .item-view{
width: 55%; width: 55%;
@ -415,6 +422,11 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
background: #ffffff;
}
.view-cata{
display: flex;
flex-direction: row;
align-items: center;
} }
</style> </style>

BIN
static/money.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.0 KiB

BIN
static/money2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB