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

修改

This commit is contained in:
kbing1981 2024-07-01 18:47:17 +08:00
parent 9a1d8e1b25
commit 671ab39c08
4 changed files with 139 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
my/order/revenueDetails.vue
View File

@ -1778,7 +1778,7 @@
color: #029D88;
}
.footers-bor{
border: 3px solid #029D88;
border: 1px solid #029D88;
background-color: #fff;
color: #029D88;
}
@ -1788,14 +1788,15 @@
}
.footers-btn{
width: 204rpx;
height: 69rpx;
height: 82rpx;
text-align: center;
display: flex;
justify-content: center;
align-items: center;
border-radius: 35rpx;
border-radius: 80rpx;
font-weight: 400;
font-size: 29rpx;
margin-right: 8rpx;
}
.footers{
width: 100%;
@ -1854,14 +1855,14 @@
}
.yiji{
width: 100%;
height: 72rpx;
height: 88rpx;
background: linear-gradient(-90deg, #2EC5AC, #08A28A);
border-radius: 21rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 0 5px;
padding: 0 10px;
height: 72rpx;
margin-top: 10px;
}
@ -1879,7 +1880,7 @@
align-items: center;
}
.yingde-title{
font-size: 25rpx;
font-size: 32rpx;
color: #333333;
}
.yingde{
@ -1889,10 +1890,10 @@
align-items: center;
justify-content: space-between;
padding: 0 5px;
height: 73rpx;
height: 80rpx;
background: #DCF4EF;
border-bottom-left-radius: 24rpx;
border-bottom-right-radius: 24rpx;
border-bottom-left-radius: 16rpx;
border-bottom-right-radius: 16rpx;
}
.mian-content-textarea{
width: 100%;
@ -1926,7 +1927,7 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
height: 40px;
height: 50px;
border-bottom: 1px solid #e5e5e5;
padding: 0px 5px;
}
@ -1938,16 +1939,16 @@
padding: 5px;
}
.mian-view-list-text{
font-size: 22rpx;
font-size: 30rpx;
color: #333333;
}
.mian-content-list-title{
font-size: 22rpx;
color: #555555;
font-size: 30rpx;
color: #999;
}
.mian-view-list-title{
font-size: 22rpx;
color: #555555;
font-size: 30rpx;
color: #999;
}
.mian-view-list:last-child{
border: 0px !important;
@ -1959,9 +1960,9 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
height: 40px;
height: 50px;
border-bottom: 1px solid #e5e5e5;
padding: 0px 5px;
padding: 0px 10px;
}
.mian-view{
@ -1971,8 +1972,7 @@
background: #fff;
border-radius: 24rpx;
padding: 10px;
margin-top: 20px;
}
}
.mina-title-bor{
width: 111rpx;
height: 16rpx;
@ -1984,7 +1984,7 @@
}
.mina-title-text{
font-weight: bold;
font-size: 28rpx;
font-size: 32rpx;
color: #333333;
}
.mina-title{
@ -1995,7 +1995,7 @@
position: relative;
align-items: center;
justify-content: center;
margin-top: 10px;
margin:40rpx 0;
}
.mian-view{
width: 100%;
@ -2015,8 +2015,8 @@
margin: 15px 0px 20px 0px;
}
.mian-top-foot-view-img span,.mian-top-foot-view-text{
font-size: 25rpx;
color: #666666;
font-size: 29rpx;
color: #333;
}
.mian-top-foot-view-img image{
width: 26.39rpx;
@ -2029,8 +2029,8 @@
align-items: center;
}
.mian-top-foot-view-title{
font-size: 25rpx;
color: #666666;
font-size: 29rpx;
color: #999;
}
.mian-top-foot-view{
width: 100%;
@ -2075,7 +2075,7 @@
}
.mian-title-view{
font-weight: bold;
font-size: 31rpx;
font-size: 32rpx;
color: #333333;
}
.mian-title{
@ -2108,12 +2108,12 @@
.mian-top{
width: 100%;
/* height: 331rpx; */
padding: 10px;
padding: 30rpx;
background: #FFFFFF;
border-radius: 24rpx;
}
.mian{
width: 95%;
width: 92%;
display: flex;
flex-direction: column;
position: absolute;
@ -2126,13 +2126,13 @@
}
.header{
width: 100%;
height: 228rpx;
height: 300rpx;
background: linear-gradient(-36deg, #11957C, #20A98F, #019C88, #029D88);
margin-top: 45px;
}
.nav-btn{
font-size: 25rpx;
color: #019C88;
color: #019c88;
line-height: 63rpx;
}
.nav-title{

157
pages/index/index.vue
View File

@ -1,12 +1,12 @@
<template>
<view style="padding-bottom: 80upx;">
<view style="padding-bottom: 30px;">
<view class="jishi-index">
<view class=" u-flex padding-lr" style="padding: 30px 30rpx 120px;align-items: center;">
<view class=" u-flex padding-lr" style="padding-top: 35px;">
<view class="u-m-r-10">
<image :src="avatar" style="width: 70px;height: 70px;border-radius: 100rpx; border: 2px solid #fffff;"
<image :src="avatar" class="head-port"
@click="goNav('/pages/my/userinfo')"></image>
</view>
<view class="u-flex-1 u-m-l-10 text-white" v-if="isLogin && userName">
<view class="u-flex-1 margin-left-sm text-white" v-if="isLogin && userName">
<view class="flex align-center justify-between">
<view class="">
<view class="u-font-18 text-white" @click="goNav('/pages/my/user')">
@ -19,21 +19,7 @@
color="#029d88" disabled />
</view>
</view>
<view class="gxbox" @click="goNavs('/my/qiandao/index')">
<template v-if="loglataddress">
<view class="flex align-center gengxin">
更新位置：<text class="wztext">{{ loglataddress }}</text>
</view>
<view class="flex align-center gengxin" style="margin-top: 5px;">
更新时间：<text class="wztext">{{ loglattime }}</text>
</view>
</template>
<template v-else>
<view class="flex align-center gengxin" style="justify-content: center;">
点击更新位置
</view>
</template>
</view>
<!-- <view class="flex margin-left-sm " style="font-size: 22rpx;font-weight: 500;"
v-if="XCXIsSelect != '否'">
<view v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/rzType')">
@ -56,6 +42,21 @@
登录
</view>
</view>
<view class="gxbox" @click="goNavs('/my/qiandao/index')">
<template v-if="loglataddress">
<view class="flex align-center gengxin">
位置：<text class="wztext">{{ loglataddress }}</text>
</view>
<view class="flex align-center gengxin">
时间：<text class="wztext">{{ loglattime }}</text>
</view>
</template>
<template v-else>
<view class="flex align-center gengxin" style="justify-content: center;">
点击更新位置
</view>
</template>
</view>
<!-- <view class="box" v-if="XCXIsSelect != '否'">
<view class="">
￥<text class="text-bold text-xl">{{sumMoney}}</text>
@ -84,10 +85,6 @@
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
</view>
<view class="" style="margin-top: 20px;">
<text style="font-size: 24px;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text>
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
</view>
<!-- <u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
:percent="lineProgressData" :striped-active="true"></u-line-progress>
@ -121,6 +118,12 @@
</view> -->
<view class="flex align-center"
style="justify-content: space-evenly;text-align: center;">
<view class="">
<view style="font-size: 24px;font-weight: bold;">{{ currentWholeIncome ? currentWholeIncome : 0 }}</view>
<text style="font-size: 14px; margin-top: 5px;">当前业绩</text>
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
</view>
<view class="shuxian"></view>
<view class="" @click="dangqian">
<view class="" style="font-size: 24px;font-weight: bold;">
{{ currentRealIncome ? currentRealIncome : 0 }}
@ -426,25 +429,37 @@
:style="{ backgroundColor: item.status == 2 ? '#f6fcfa' : '', border: item.status == 2 ? '2px solid rgb(207, 237, 225)' : '' }"
v-for="(item, index) in goods" :key='index' @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
<view class="flex justify-between padding-sm ">
<view class="text-green">预约时间：{{ item.serveTime }}</view>
<view class="text-green" v-if="item.status == 1">待付款...</view>
<view class="text-green" v-if="item.status == 2">待服务</view>
<view class="text-green" v-if="item.status == 5">已完成</view>
<view class="text-green" v-if="item.status == 6">进行中</view>
<view class="text-green" v-if="item.status == 7">已出发</view>
<view class="text-green" v-if="item.status == 8">已到达</view>
<view class="text-green" v-if="item.status == 3">待评价</view>
<view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view>
<view class="progress-text">预约时间：{{ item.serveTime }}</view>
<view class="progress-status" v-if="item.status == 1">待付款...</view>
<view class="progress-status" v-if="item.status == 2">待服务</view>
<view class="progress-status" v-if="item.status == 5">已完成</view>
<view class="progress-status" v-if="item.status == 6">进行中</view>
<view class="progress-status" v-if="item.status == 7">已出发</view>
<view class="progress-status" v-if="item.status == 8">已到达</view>
<view class="progress-status" v-if="item.status == 3">待评价</view>
<view class="progress-status" v-if="item.status == 4" style="color: #999999;">已取消</view>
<view v-if="item.overTimeOrders == 1" style="color: red;font-size:26rpx">(订单已超时)</view>
<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
</view>
<view class="xian"></view>
<view class="xian" v-if="item.status == 6"></view>
<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
<view class="pintuan-title" >
<image src="../../static/clock.png" class="pintuan-img"></image>
<span class="pintuan-text">服务倒计时</span>
</view>
<!-- <uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
color="#20C675">
</uni-countdown> -->
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="30" separator-size="30"></u-count-down>
</view>
<view class=" u-flex u-p-t-30 padding-sm">
<view class="u-m-r-10">
<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
size="100">
size="80">
</u-avatar>
</view>
<view class="u-flex-1 margin-left-xs">
@ -475,18 +490,6 @@
@click="cancel(item)">订单完成</u-button> -->
</view>
</view>
<view class="xian" v-if="item.status == 6"></view>
<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
<view style="font-size: 28rpx;font-family: PingFang SC;font-weight: bold;color: #2FB57A;">
服务倒计时
</view>
<!-- <uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
color="#20C675">
</uni-countdown> -->
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="30" separator-size="30"></u-count-down>
</view>
</view>
</view>
<uni-popup ref="popup" type="center">
@ -1465,6 +1468,10 @@ export default {
</script>
<style lang="scss" scoped>
@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@300&display=swap');
body {
font-family: Helvetica Neue, Helvetica, sans-serif;
}
.butween-list{
width: 96%;
margin: 0 auto;
@ -1501,14 +1508,27 @@ export default {
.jishi-index{
width: 100%;
height: 215px;
padding: 0 20px;
background-image: url('../../static/index/technician15.png');
background-repeat: no-repeat;
background-size: 100%;
}
page {
background-color: #ffffff;
background-color: #f7f7f7;
}
.progress-text{
font-size: 30rpx;
color: #666;
padding-top: 8rpx;
}
.progress-status{
color: #fff;
border-radius:20rpx 8rpx 20rpx 8rpx ;
padding: 4rpx 10rpx;
background-image: linear-gradient(to bottom, #fe9130, #ff9868);
font-size: 28rpx;
}
// .bg {
// background-color: #05C25C;
// }
@ -1518,25 +1538,29 @@ page {
}
.gxbox {
display: flex;
font-size: 20rpx;
width: 160px;
width: 100%;
background-color: #008e7c;
color: #fff;
border-radius: 15px;
padding: 10px;
border-radius: 15px 15px 0 0;
padding: 0 30rpx;
height: 60rpx;
margin-top: 8rpx;
justify-content: space-between;
}
.wztext {
width: 80px;
overflow: hidden;
text-overflow: ellipsis;
//text-overflow: ellipsis;
white-space: nowrap;
}
.dengjibox {
position: relative;
width: 100%;
height: 360rpx;
height: 300rpx;
background: linear-gradient(-90deg, #019C88, #1BB9A5, #029D88);
box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(26,25,26,0.3);
border-radius: 20rpx;
@ -1615,6 +1639,7 @@ page {
border: 2px #ededed solid;
border-radius: 10px;
padding: 30rpx;
background: #fff;
}
.tapDsalk {
@ -1662,17 +1687,27 @@ page {
width: 100%;
height: 1rpx;
border: 1rpx solid #f8f8f8;
margin-top: 20rpx;
margin-bottom: 10rpx;
}
.pintuan_syrs {
color: #999999;
color: #fff;
font-size: 20upx;
margin: 20rpx 20rpx 0rpx;
display: flex;
padding-right: 18upx;
background: #5abfb2 ;
padding: 10rpx;
border-radius: 10rpx;
}
.pintuan-title{
font-size: 30rpx;
font-family: Helvetica Neue, Helvetica, sans-serif;
color: #fff;
}
.pintuan-img{
width: 40rpx;
height: 40rpx;
}
.box {
color: #FFFFFF;
padding: 40upx 40upx 60upx 40upx;
@ -1759,7 +1794,7 @@ uni-switch::before {
// border-radius: 50px !important;
// }
.radius {
border-radius: 15rpx;
border-radius: 20rpx;
}
::v-deep .u-mode-center-box {
@ -1873,6 +1908,12 @@ uni-switch::before {
.importMaterialPackageInner view:nth-child(1) {
width: 75%;
}
.head-port{
width: 110rpx;
height: 110rpx;
border-radius: 50%;
border: 1px #d6f2ee solid;
}
// ::v-deep .uni-scroll-view-content {
// margin: 20px;

14
pages/my/index.vue
View File

@ -2,12 +2,12 @@
<view class="" style="padding-bottom: 30px;">
<view class="headtop">
<view class="headbox">
<view class="u-flex text-white" style="padding-top: 35px;">
<view class=" u-flex padding-lr" style="padding-top: 35px;">
<view class="u-m-r-10">
<image :src="avatar" style="width: 60px;height: 60px;border-radius: 100rpx; border: 1px solid #d7f2ee; margin-left: 5px;"
<image :src="avatar" class="head-port""
@click="goNav('/pages/my/userinfo')"></image>
</view>
<view class="u-flex-1" v-if="isLogin && userName">
<view class="u-flex-1 text-white" v-if="isLogin && userName">
<view class="u-font-18 ">
<view class="flex align-center" style="margin-bottom: 5px;">
<view class="margin-left-sm">{{ userName }}</view>
@ -36,7 +36,7 @@
</view>
</view>
</view>
<view v-else class="text-xl u-p-l-20 text-bold" @click="goLogin('/pages/public/login')">
<view v-else class="text-xl text-white u-p-l-20 text-bold" @click="goLogin('/pages/public/login')">
登录
</view>
</view>
@ -923,4 +923,10 @@
font-weight: bold;
margin-left: 10rpx;
}
.head-port{
width: 110rpx;
height: 110rpx;
border-radius: 50%;
border: 1px #d6f2ee solid;
}
</style>

BIN
static/clock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB