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

修改

This commit is contained in:
kbing1981 2024-08-07 17:06:25 +08:00
parent 8a75d648c6
commit ae6dd39eb5
6 changed files with 339 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/index/currentIncome.vue
View File

@ -332,7 +332,7 @@
.header-bottom{
display: flex;
align-items: end;
}
}
.header-top-btn{
width: 174rpx;
height: 49rpx;

60
pages/index/currentYeji.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="content">
<view class="header">
<!--<view class="header">
<view class="header-top">
<view class="header-top-left">
<view>
@ -17,8 +17,42 @@
<view class="header-text" style="font-size: 14px; margin-top: -5px;">当前业绩</view>
</view>
<!-- 性别选择 -->
<!--<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
</view>-->
<view class="header">
<view class="header-top">
<view class="header-bottom" >
<image style="width:100rpx; height:100rpx; margin-right: 10rpx;" src="../../static/purse3.png"></image>
<view>
<view class="header-text" style=" margin-top: -5px;">当前业绩</view>
<view class="header-bottom-money">{{shouyiMoeny}}</view>
</view>
</view>
<view class="header-top-left">
<view style="margin-bottom: 10rpx;">
<span class="header-text"></image>当前周期</span>
</view>
<view>
<span class="header-text1">{{startTime}}</span>
<span style="color: #fff; margin-right: 5rpx;">~</span>
<span class="header-text1">{{endTime}}</span>
</view>
</view>
<!-- 性别选择 -->
<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
</view>
<view class="flex justify-end">
<view class="header-top-btn" @click="wangqi" style="font-size: 14px; margin-top: -8px;">往期业绩</view>
</view>
<!--<view class="header-bottom" style="margin-bottom: 40rpx;">
<view class="header-text" style=" margin-top: -5px;">当前收益</view>
<view class="header-bottom-money">{{shouyiMoeny}}</view>
</view>
性别选择 -->
<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
</view>
<t-refresh class="mian" ref="refresh" v-if="listData.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0" >
<template slot="content" >
<view class="mian-view" v-for="(item,index) in listData" :key="index" @click="goOder(item)">
@ -318,36 +352,38 @@
flex-direction: column;
align-items: center;
}
.header-bottom{
display: flex;
align-items: end;
}
.header-bottom-money{
font-weight: bold;
font-size: 49rpx;
color: #FFFFFF;
color: #00b198;
margin-bottom: 3px;
}
.header-top-btn{
width: 174rpx;
height: 49rpx;
line-height: 49rpx;
line-height: 46rpx;
text-align: center;
font-size: 26rpx;
color: #333333;
background: #FFFFFF;
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
border-radius: 24rpx;
color: #fff;
}
.header-text{
font-weight: 400;
font-size: 26rpx;
color: #FFFFFF;
color: #00b198;
margin-right: 8rpx;
}
.header-text1{
font-weight: 400;
font-size: 24rpx;
color: #019c88;
color: #00b198;
margin-right: 8rpx;
border-radius: 30rpx;
background: #fff;
padding: 1rpx 10rpx;
}
.header-top-left image{
width: 24.31rpx;
@ -356,10 +392,8 @@
margin-top: 3px;
}
.header-top-left{
display: flex;
flex-direction: row;
justify-content: space-between;
margin-top: -10rpx;
margin-top:20rpx;
text-align: right;
}
.header-top{
width: 100%;

173
pages/index/index.vue
View File

@ -30,7 +30,6 @@
color="#029d88" disabled />
</view>
<view class="qiandao" @click="goNavs('/my/qiandao/index')">
<image class="qiandaoimg" src="../../static/sign.gif"></image>
签到
</view>
</view>
@ -461,30 +460,30 @@
font-size="30" separator-size="30"></u-count-down>
</view>
<view class="flex justify-between padding-sm ">
<view class="flex justify-between padding-sm-title ">
<view class="progress-text">
<text class="title-font text-bold">预约时间：</text>
<text class="title-font">{{ item.serveTime }}</text>
</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-fk" v-if="item.status == 1">待付款</view>
<view class="progress-status-fw" v-if="item.status == 2">待服务</view>
<view class="progress-status-wa" v-if="item.status == 5">已完成</view>
<view class="progress-status-jx" v-if="item.status == 6">进行中</view>
<view class="progress-status-cf" v-if="item.status == 7">已出发</view>
<view class="progress-status-dd" 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: #666666;">已取消</view>
<view class="progress-status" v-if="item.status == 9&&!item.refusalContent">待确认</view>
<view class="progress-status" v-if="item.status == 9&&item.refusalContent">拒单审核中</view>
<view class="progress-status" v-if="item.status == 10" >待补单</view>
<view class="progress-status-qx" v-if="item.status == 4">已取消</view>
<view class="progress-status-qr" v-if="item.status == 9&&!item.refusalContent">待确认</view>
<view class="progress-status-jd" v-if="item.status == 9&&item.refusalContent">拒单审核中</view>
<view class="progress-status-daibu" v-if="item.status == 10" >待补单</view>
<view v-if="item.overTimeOrders == 1" class="progress-status-chaoshi">[超时]</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=" u-flex u-p-t-30 padding-sm">
<view class=" u-flex u-p-t-10 padding-sm">
<view class="u-m-r-10">
<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
size="160">
size="150">
</u-avatar>
</view>
<view class="u-flex-1 margin-left-xs">
@ -497,12 +496,8 @@
</view>
</view>
<view class="flex justify-between align-center padding-sm">
<view class="flex-sub">
<text class="title-font">实收：</text>
<text class="value-font text-bold" style="color: #FF1200;">￥{{ item.artificerMoneyTotal }}</text>
</view>
<view class="flex title-font2">
【{{ item.ordersNo }}】
{{ item.ordersNo }}
<!-- <u-button v-if="item.status == 1" :custom-style="customStyle" shape="circle" :plain="true"
@click="cancelOrder(item)">取消订单</u-button> -->
<u-button v-if="item.status == 1" :custom-style="customStyle1" shape="circle" :plain="true"
@ -512,6 +507,10 @@
<!-- <u-button v-if="item.status == 6" :custom-style="customStyle" shape="circle" :plain="true"
@click="cancel(item)">订单完成</u-button> -->
</view>
<view class="flex-sub">
<text class="title-font">实收：</text>
<text class="value-font text-bold" style="color: #F95900;">￥{{ item.artificerMoneyTotal }}</text>
</view>
</view>
</view>
</mescroll-body>
@ -1592,7 +1591,7 @@ export default {
border: 1px solid #ffbf49;
color: #ffffb2;
font-size: 28rpx;
text-indent: 50rpx;
text-align:center;
position: absolute;
top: 0;
right: 0;
@ -1664,16 +1663,99 @@ page {
}
.progress-status{
color: #fff;
border-radius:20rpx 8rpx 20rpx 8rpx ;
padding: 4rpx 10rpx;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(to bottom, #fe9130, #ff9868);
font-size: 30rpx;
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-wa{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #7997ec, #597ad8);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-fw{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #16bf5b, #099d46);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-fk{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #019cdc, #40bbf3);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-qx{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #adadad, #959595);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-jx{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #17bd6e, #019c88);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-cf{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #78d289, #62c878);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-dd{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #28b1da, #3bdaa5);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-qr{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #ff7673, #f15c63);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-jd{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #ff8c01, #ff5600);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-daibu{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #2e87dc, #40a1ff);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-chaoshi{
color: #ff0000;
border-radius:20rpx 8rpx 20rpx 8rpx ;
padding: 4rpx 10rpx;
font-size: 30rpx;
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #ffb342, #ec8700);
font-size: 26rpx;
line-height: 46rpx;
}
// .bg {
@ -1742,7 +1824,7 @@ page {
height:140rpx;
font-size: 22px;
text-align: center;
line-height:90px;
line-height:165rpx;
}
.xianb {
@ -2060,30 +2142,35 @@ uni-switch::before {
align-items: center;
// border: 1px solid;
}
.importMaterialPackageInner view:nth-child(1) {
.importMaterialPackageInner view:nth-child(1) {
width: 75%;
}
.head-port{
}
.head-port{
width:64px;
height:64px;
border-radius: 50%;
}
.title-font{
font-size: 30rpx;
}
.flex-sub{
display: flex;
justify-content: right;
}
.title-font{
font-size:28rpx;
color: #666666;
}
.title-font2{
}
.title-font2{
font-size: 28rpx;
color: #666666;
}
.value-font{
color: #999;
}
.value-font{
font-size: 32rpx;
color: #333333;
}
}
.padding-sm{
padding: 11px 11px 0px 11px;
padding:6rpx 24rpx;
}
.padding-sm-title{
padding:20rpx 20rpx 10rpx 20rpx;
}
.avatar-section{
padding:30rpx 0 50rpx 0;

78
pages/index/previousEarnings.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="content">
<view class="header">
<!--<view class="header">
<view class="header-top">
<view class="header-top-left">
<view>
@ -16,7 +16,40 @@
<view class="header-bottom-money">{{shouyiMoeny}}</view>
<view class="header-text">当前收益</view>
</view>
</view>-->
<view class="header">
<view class="header-top">
<view class="header-bottom" >
<image style="width:100rpx; height:100rpx; margin-right: 10rpx;" src="../../static/purse3.png"></image>
<view>
<view class="header-text" style=" margin-top: -5px;">当前业绩</view>
<view class="header-bottom-money">{{shouyiMoeny}}</view>
</view>
</view>
<view class="header-top-left">
<view style="margin-bottom: 10rpx;">
<span class="header-text"></image>当前周期</span>
</view>
<view>
<span class="header-text1">{{startTime}}</span>
<span style="color: #fff; margin-right: 5rpx;">~</span>
<span class="header-text1">{{endTime}}</span>
</view>
</view>
<!-- 性别选择 -->
<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
</view>
<view class="flex justify-end">
<view class="header-top-btn" @click="wangqi" style="font-size: 14px; margin-top: -8px;">往期业绩</view>
</view>
<!--<view class="header-bottom" style="margin-bottom: 40rpx;">
<view class="header-text" style=" margin-top: -5px;">当前收益</view>
<view class="header-bottom-money">{{shouyiMoeny}}</view>
</view>
性别选择 -->
<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
</view>
<!-- 往期时间选择 -->
<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
<t-refresh class="mian" ref="refresh" v-if="listData.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0">
@ -290,36 +323,38 @@
flex-direction: column;
align-items: center;
}
.header-bottom{
display: flex;
align-items: end;
}
.header-bottom-money{
font-weight: bold;
font-size: 49rpx;
color: #FFFFFF;
color: #00b198;
margin-bottom: 3px;
}
.header-top-btn{
width: 174rpx;
height: 49rpx;
line-height: 49rpx;
line-height: 46rpx;
text-align: center;
font-size: 26rpx;
color: #333333;
background: #FFFFFF;
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
border-radius: 24rpx;
color: #fff;
}
.header-text{
font-weight: 400;
font-size: 26rpx;
color: #FFFFFF;
color: #00b198;
margin-right: 8rpx;
}
.header-text1{
font-weight: 400;
font-size: 24rpx;
color: #019c88;
color: #00b198;
margin-right: 8rpx;
border-radius: 30rpx;
background: #fff;
padding: 1rpx 10rpx;
}
.header-top-left image{
width: 24.31rpx;
@ -328,27 +363,26 @@
margin-top: 3px;
}
.header-top-left{
display: flex;
flex-direction: row;
justify-content: space-between;
margin-top:20rpx;
text-align: right;
}
.header-top{
width: 100%;
display: flex;
flex-direction: row;
justify-content: space-between;
margin-bottom: 10px;
}
.header{
width: 100%;
height: 300rpx;
padding:0 15px;
background:#ffffff url('../../static/index/fun_banner4.png');
background-repeat: no-repeat;
background-size: 100% 100%;
display: flex;
flex-direction: column;
justify-content: space-around;
width: 100%;
height: 280rpx;
padding: 15px;
background:#f7f7f7 url('../../static/index/technician15.png');
background-repeat: no-repeat;
background-size: 100%;
display: flex;
flex-direction: column;
justify-content: space-around;
/*border-radius: 24rpx;*/
}
.content{
width: 100%;

137
pages/order/index.vue
View File

@ -92,16 +92,16 @@
<text class="title-font">{{ item.serveTime }}</text>
</view>
<!-- <view class="text-green" v-if="item.status == 1">待支付</view> -->
<view class="progress-status" v-if="item.status == 2">待服务</view>
<view class="progress-status-fk" v-if="item.status == 2">待服务</view>
<view class="progress-status" v-if="item.status == 3">待评价</view>
<view class="progress-status" v-if="item.status == 4" style="color: #666666;">已取消</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 ==9&&!item.refusalContent">待确认</view>
<view class="progress-status" v-if="item.status == 9&&item.refusalContent" >拒单审核中</view>
<view class="progress-status" v-if="item.status ==10">待补单</view>
<view class="progress-status-qx" v-if="item.status == 4">已取消</view>
<view class="progress-status-wa" v-if="item.status == 5">已完成</view>
<view class="progress-status-jx" v-if="item.status == 6">服务中</view>
<view class="progress-status-cf" v-if="item.status == 7">技师出发</view>
<view class="progress-status-dd" v-if="item.status == 8">技师到达</view>
<view class="progress-status-qr" v-if="item.status ==9&&!item.refusalContent">待确认</view>
<view class="progress-status-jd" v-if="item.status == 9&&item.refusalContent" >拒单审核中</view>
<view class="progress-status-daibu" v-if="item.status ==10">待补单</view>
<view v-if="item.overTimeOrders == 1" class="progress-status-chaoshi">[超时]</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> -->
@ -123,12 +123,12 @@
</view>
</view>
<view class="flex justify-between align-center padding-sm">
<view class="flex title-font2">
{{ item.ordersNo }}
</view>
<view class="flex-sub">
<text class="title-font">实收：</text>
<text class="value-font text-bold" style="color: #FF1200;">￥{{ item.artificerMoneyTotal }}</text>
</view>
<view class="flex title-font2">
【{{ item.ordersNo }}】
<text class="value-font text-bold" style="color: #F95900;">￥{{ item.artificerMoneyTotal }}</text>
</view>
</view>
<view class="flex u-p-t-20 u-p-b-20 justify-between align-center padding-sm">
@ -940,10 +940,8 @@
color: #fe9130;
}
.flex-sub{
width: 95%;
text-align: left;
text-align: right;
font-size: 28rpx;
margin-top: 8rpx;
}
.top-title{
width: 95%;
@ -1185,28 +1183,101 @@
padding-top: 8rpx;
}
.progress-status{
// color: #019c88;
// font-weight: bold;
// font-size: 30rpx;
// margin-top: -5rpx;
color: #fff;
border-radius:20rpx 8rpx 20rpx 8rpx ;
padding: 4rpx 10rpx;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(to bottom, #fe9130, #ff9868);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-wa{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #7997ec, #597ad8);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-fw{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #16bf5b, #099d46);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-fk{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #019cdc, #40bbf3);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-qx{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #adadad, #959595);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-jx{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #17bd6e, #019c88);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-cf{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #78d289, #62c878);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-dd{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #28b1da, #3bdaa5);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-qr{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #ff7673, #f15c63);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-jd{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #ff8c01, #ff5600);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-daibu{
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #2e87dc, #40a1ff);
font-size: 26rpx;
line-height: 46rpx;
}
.progress-status-chaoshi{
// color: #019c88;
// font-weight: bold;
// font-size: 30rpx;
// margin-top: -5rpx;
color: #ff0000;
border-radius:20rpx 8rpx 20rpx 8rpx ;
padding: 4rpx 10rpx;
font-size: 30rpx;
color: #fff;
border-radius:30rpx 30rpx 30rpx 8rpx ;
padding: 0 14rpx;
background-image: linear-gradient(-45deg, #ffb342, #ec8700);
font-size: 26rpx;
line-height: 46rpx;
}
.order-details{
font-size: 32rpx;
font-weight: bold;
@ -1261,7 +1332,7 @@
}
.title-font2{
font-size: 28rpx;
color: #666666;
color: #999;
}
.value-font{
font-size: 32rpx;

2
pages/poster/poster.vue
View File

@ -192,7 +192,7 @@
.save-btn{
margin-top: 35rpx;
color: #FFFFFF;
background: linear-gradient(to right, #223845, #00a85b);
background-image: linear-gradient(-45deg, #17bd6e, #019c88);
padding: 15rpx 40rpx;
border-radius: 50rpx;
}