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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
曹磊 2024-09-03 09:34:40 +08:00
parent 24d6801523 49c3687142
commit d217078e51
6 changed files with 142 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
my/order/payModifyDzhifu.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view class="content"> <view class="content">
<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 20rpx;">
<view class="head-top"> <view class="head-top">
<view class="pay-title">服务项目</view> <view class="pay-title">服务项目</view>
<view class="flex justify-around"> <view class="flex justify-around">
@ -37,6 +37,7 @@
<view class="money-pay" style="justify-content: space-between;"> <view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen" v-if="orderXm.userPackageDetailId==null"> <view class="money-pay-zhen" v-if="orderXm.userPackageDetailId==null">
<text class="title-font">价格：</text>
<span>￥</span> <span>￥</span>
<span> <span>
{{technicianRate}} {{technicianRate}}
@ -55,8 +56,40 @@
</view> </view>
</view> </view>
</view> </view>
<view class="ske-padding margin-top-sm header-view" >
<view class="add-content" @click="getAddressList()" >
<view v-if="!detailaddress">请选择地址</view> <view v-if="!detailaddress">请选择地址</view>
<view class="Service-Address">
{{province}}/{{city}}/{{district}}/{{detailaddress}}
</view>
<view class="Service-name">
<span>{{name}}</span>
<span>{{mobile}}</span>
</view>
<!-- <view class="margin-right-xs">
<view class="flex justify-between margin-top-lg">
<view class="header-view-text">联系人</view>
<view class="header-view-data">
<text>{{name}}</text>
<text class="xuanzhe" @click="getAddressList()">修改</text>
</view>
</view>
<view class="flex justify-between margin-top-lg">
<view class="header-view-text">手机号码</view>
<view class="header-view-data">
{{mobile}}
</view>
</view>
<view class="flex justify-between margin-top-lg" v-if="order.remark">
<view style="width: 170rpx;">备注内容</view>
<view class="flex">
<view class="">
{{order.remark}}
</view>
</view>
</view>
</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">
<view class="header-view-text">联系人</view> <view class="header-view-text">联系人</view>
@ -88,10 +121,9 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view> -->
</view> </view>
<view class="padding margin-top-sm header-view"> <view class="padding margin-top-sm header-view">
<view class="fuwu-time" @click="liliaoshi"> <view class="fuwu-time" @click="liliaoshi">
<view class="fuwu-title" > <view class="fuwu-title" >
<span>技师</span> <span>技师</span>
@ -184,8 +216,9 @@
</view> </view>
<view class="push-button">
<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view> <view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
</view>
</view> </view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> --> <!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
@ -1501,14 +1534,14 @@
} }
.money-pay-zhen span{ .money-pay-zhen span{
color: #FF6000; color: #FF6000;
} font-size: 32rpx;
.money-pay-zhen span:nth-child(1){
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 31.25rpx;
font-weight: bold; font-weight: bold;
} }
.money-pay-zhen{
display: flex;
flex-direction: row;
align-items: center;
}
.money-pay-zhen{ .money-pay-zhen{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -1980,9 +2013,9 @@
} }
.content{ .content{
padding-top: 1px; padding-top: 12px;
width: 100%; width: 100%;
background-color: #f7f7f7; background-color: #f7f7f7;
} }
page { page {
background: #f7f7f7; background: #f7f7f7;
@ -2146,15 +2179,15 @@
} }
.pay_btn { .pay_btn {
width: 90%; width: 90%;
margin: 0 auto; margin: 0 auto;
text-align: center; text-align: center;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495); background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
height:80rpx; height: 80rpx;
border-radius: 80rpx; border-radius: 60rpx;
color: #ffffff; color: #ffffff;
line-height: 80rpx; line-height: 80rpx;
font-size: 32rpx; font-size: 36rpx;
} }
.serverAddress { .serverAddress {
@ -2163,7 +2196,53 @@
align-items: center; align-items: center;
} }
.head-title{ .head-title{
font-size: 30rpx; font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.zhuangtai{
color: #029D88;
font-weight: bold;
font-size: 32rpx;
}
.add-content{
background: #FFFFFF url(../../static/address/map.png)no-repeat top right;
background-size:40%;
padding: 30rpx;
border-radius: 24rpx;
margin-top: 24rpx;
}
.Service-Address{
font-size:34rpx;
color: #333;
font-weight: bold;
padding: 6rpx 0;
flex-direction: column;
}
.Service-name{
font-size: 30rpx;
color: #333;
display: flex;
align-items: flex-end;
padding:4rpx 0;
}
.Service-name span:nth-child(1){
font-size:30rpx;
color:#333;
margin-right: 15rpx;
}
.Service-name span:nth-child(2){
font-size:30rpx;
color:#666;
}
.push-button{
width: 100%;
// height: 48px;
position: fixed;
bottom:10px;
display: flex;
flex-direction: column;
align-items: center;
margin: 0 auto;
} }
.zhuangtai{}
</style> </style>

4
pages/my/fuwuGengduo.vue
View File

@ -333,12 +333,12 @@
} }
.rightGoods { .rightGoods {
width:80%; width:76%;
height: 100%; height: 100%;
// padding: 0 16rpx 27rpx; // padding: 0 16rpx 27rpx;
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
right: 0; right:20rpx;
.whiteBox { .whiteBox {
height: 100%; height: 100%;
background: #ffffff; background: #ffffff;

4
pages/my/fuwuxiangm.vue
View File

@ -332,12 +332,12 @@
} }
.rightGoods { .rightGoods {
width:80%; width:76%;
height: 100%; height: 100%;
// padding: 0 16rpx 27rpx; // padding: 0 16rpx 27rpx;
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
right: 0; right: 20rpx;
.whiteBox { .whiteBox {
height: 100%; height: 100%;
background: #ffffff; background: #ffffff;

4
pages/my/hangyedana.vue
View File

@ -434,12 +434,12 @@
} }
.rightGoods { .rightGoods {
width:80%; width:76%;
height: 100%; height: 100%;
// padding: 0 16rpx 27rpx; // padding: 0 16rpx 27rpx;
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
right: 0; right:20rpx;
.whiteBox { .whiteBox {
height: 100%; height: 100%;
background: #ffffff; background: #ffffff;

52
pages/order/index.vue
View File

@ -1150,7 +1150,11 @@
} }
.status-button-b{ .status-button-b{
font-weight: bold; font-weight: bold;
color: #7446fc; color: #ff9d01;
}
.status-button-c{
font-weight: bold;
color: #599abd;
} }
.status-button-d{ .status-button-d{
font-weight: bold; font-weight: bold;
@ -1170,7 +1174,7 @@
} }
.status-button-h{ .status-button-h{
font-weight: bold; font-weight: bold;
color: #965fb9; color: #75452a;
} }
.status-button-i{ .status-button-i{
font-weight: bold; font-weight: bold;
@ -1180,10 +1184,6 @@
font-weight: bold; font-weight: bold;
color: #43b943; color: #43b943;
} }
.status-button-h{
font-weight: bold;
color: #1bcada;
}
.status-num{ .status-num{
margin-right: 15rpx; margin-right: 15rpx;
} }
@ -1200,31 +1200,39 @@
height:50rpx; height:50rpx;
} }
.ticket{ .ticket{
border: 1px solid #4dbaab; background: #34ace7;
color: #4dbaab; color: #fff;
padding:1px 5px; height: 40rpx;
border-radius:3px; line-height: 40rpx;
padding: 0 20rpx;
border-radius:20rpx 20rpx 20rpx 3px;
font-size: 22rpx; font-size: 22rpx;
} }
.ticket1{ .ticket1{
border: 1px solid #529ccc; background: #feb449;
color: #1374b1; color: #fff;
padding:1px 5px; height: 40rpx;
border-radius:3px; line-height: 40rpx;
padding: 0 20rpx;
border-radius:20rpx 20rpx 20rpx 3px;
font-size: 22rpx; font-size: 22rpx;
} }
.ticket2{ .ticket2{
border: 1px solid #c8b1e8; background: #497da5;
color: #725b97; color: #fff;
padding:1px 5px; height: 40rpx;
border-radius:3px; line-height: 40rpx;
padding: 0 20rpx;
border-radius:20rpx 20rpx 20rpx 3px;
font-size: 22rpx; font-size: 22rpx;
} }
.ticket3{ .ticket3{
border: 1px solid #d77e25; background: #2bbd93;
color: #d5c3b3; color: #fff;
padding:1px 5px; height: 40rpx;
border-radius:3px; line-height: 40rpx;
padding: 0 20rpx;
border-radius:20rpx 20rpx 20rpx 3px;
font-size: 22rpx; font-size: 22rpx;
} }
</style> </style>

2
pages/videoCircle/index.vue
View File

@ -60,7 +60,7 @@
</view> </view>
<!-- 3.评论 --> <!-- 3.评论 -->
<view class="comment list-view" @click="toComment(index)" style="opacity: 0.9; margin-top: 17px;"> <view class="comment list-view" @click="toComment(index)" style="opacity: 0.9; margin-top: 17px;">
<image src="@/static/img/index/liaotian-2.png" style="width: 35px; height: 35px; position: absolute; right: 7px;"></image> <image src="@/static/img/index/liaotian-2.png" style="width:38px; height:36px; position: absolute; right: 7px;"></image>
<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">{{list.pls}}</text> <text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">{{list.pls}}</text>
</view> </view>
<!-- 4.分享 --> <!-- 4.分享 -->