yangjun
/
sadjv3_jishi
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_jishi

This commit is contained in:
yangjun 2024-06-28 14:47:16 +08:00
parent deb48abfe7 f0e0102c9e
commit 164f03fd5e
11 changed files with 141 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifest.json
View File

@ -23,7 +23,8 @@
"OAuth" : {}, "OAuth" : {},
"Maps" : {}, "Maps" : {},
"Camera" : {}, "Camera" : {},
"Record" : {} "Record" : {},
"Push" : {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute" : {

15
my/fund/index.css
View File

@ -34,7 +34,7 @@
.innerTopRight { .innerTopRight {
height: fit-content; height: fit-content;
font-size: 16px; font-size: 13px;
display: flex; display: flex;
justify-content: right; justify-content: right;
padding-right: 10px; padding-right: 10px;
@ -64,9 +64,9 @@
} }
.innerTimer{ .innerTimer{
font-size: 14px; font-size: 13px;
margin-top: 5px; margin-top: 5px;
color: #666; color: #999;
margin-right: 10px; margin-right: 10px;
} }
.totalIntegral { .totalIntegral {
@ -159,7 +159,7 @@
color: #0aa86a; color: #0aa86a;
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 6px; padding: 6px;
border-radius: 10px; border-radius: 30px;
width: 60px; width: 60px;
text-align: center; text-align: center;
} }
@ -224,12 +224,14 @@
.storedIntegralMiddle view:nth-child(1) { .storedIntegralMiddle view:nth-child(1) {
margin-left: 3px; margin-left: 3px;
color: #666; color: #999;
font-size: 30rpx;
} }
.storedIntegralMiddleofRight { .storedIntegralMiddleofRight {
margin-right: 19px; margin-right: 19px;
color: #666; color: #333;
font-size: 30rpx;
} }
.storedIntegralBottom { .storedIntegralBottom {
@ -238,6 +240,7 @@
margin-left: 3px; margin-left: 3px;
border-bottom: 1px solid #f4f4f4; border-bottom: 1px solid #f4f4f4;
color:#999; color:#999;
font-size: 26rpx;
} }
.withdrawalMoneyBtn { .withdrawalMoneyBtn {

59
my/order/revenueDetails.vue
View File

@ -16,14 +16,15 @@
<view class="mian-title" v-if="order && order.ordersMassageList"> <view class="mian-title" v-if="order && order.ordersMassageList">
<view class="mian-title-view">{{(order.ordersMassageList[0].massageType || {}).title}}</view> <view class="mian-title-view">{{(order.ordersMassageList[0].massageType || {}).title}}</view>
<view class="nav-btn" v-if="order.status ==1">待付款</view> <!-- <view class="nav-btn" v-if="order.status ==1">待支付</view> -->
<view class="nav-btn" v-if="order.status ==2">待服务</view> <view class="nav-btn" v-if="order.status ==2">待服务</view>
<view class="nav-btn" v-if="order.status ==5">待评价</view> <view class="nav-btn" v-if="order.status ==3">待评价</view>
<view class="nav-btn" v-if="order.status ==3">已完成</view> <!-- <view class="nav-btn" v-if="order.status ==4">已取消</view> -->
<view class="nav-btn" v-if="order.status ==5">已完成</view>
<view class="nav-btn" v-if="order.status ==6">服务中</view> <view class="nav-btn" v-if="order.status ==6">服务中</view>
<view class="nav-btn" v-if="order.status ==7">已出发</view> <view class="nav-btn" v-if="order.status ==7">技师出发</view>
<view class="nav-btn" v-if="order.status ==8">已到达</view> <view class="nav-btn" v-if="order.status ==8">技师到达</view>
<view class="nav-btn" v-if="order.status ==4">已取消</view> <view class="nav-btn" v-if="order.status ==9">确认接单</view>
</view> </view>
<view class="mian-time" v-if="order && order.ordersMassageList"> <view class="mian-time" v-if="order && order.ordersMassageList">
服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟 服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
@ -103,50 +104,59 @@
<span class="mian-view-list-text">70.00%</span> <span class="mian-view-list-text">70.00%</span>
</view> --> </view> -->
</view> </view>
<view class="mian-view" v-if="order.status != 9"> <view class="mian-view" v-if="order.status == 6">
<view class="mian-view-list" style="font-size: 16px;font-weight: bold;">
<span class="mian-view-list-title">加钟信息</span>
</view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">是否加钟</span> <span class="mian-view-list-title">是否加钟</span>
<span class="mian-view-list-text">{{order.addNum!=''?'是':'否'}}</span> <span class="mian-view-list-text">{{order.addNum!=null?'是':'-'}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">加钟项目</span> <span class="mian-view-list-title">加钟项目</span>
<span class="mian-view-list-text">{{order.jzName!=''?order.jzName:'无'}}</span> <span class="mian-view-list-text">{{order.jzName!=null?order.jzName:'-'}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">加钟数量</span> <span class="mian-view-list-title">加钟数量</span>
<span class="mian-view-list-text">{{order.addNum}}</span> <span class="mian-view-list-text">{{order.addNum!=null?order.addNum:'-'}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">加钟金额</span> <span class="mian-view-list-title">加钟金额</span>
<span class="mian-view-list-text">￥{{order.addMoney}}</span> <span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.addMoney}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view> </view>
</view> </view>
<view class="mian-view" v-if="order.status != 9"> <view class="mian-view" v-if="order.status == 6">
<view class="mian-view-list"> <view class="mian-view-list" style="font-size: 16px;font-weight: bold;">
<span class="mian-view-list-title">是否改价</span> <span class="mian-view-list-title">服务升级</span>
<span class="mian-view-list-text">{{order.isSupplement!=''?'是':'否'}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">改价项目</span> <span class="mian-view-list-title">是否升级</span>
<span class="mian-view-list-text">{{order.gjName!=''?order.gjName:'无'}}</span> <span class="mian-view-list-text">{{order.isSupplement!=null?'是':'-'}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">改价金额</span> <span class="mian-view-list-title">升级项目</span>
<span class="mian-view-list-text">￥{{order.gjPrice}}</span> <span class="mian-view-list-text">{{order.gjName!=null?order.gjName:'-'}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级金额</span>
<span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.gjPrice}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">支付差价</span> <span class="mian-view-list-title">支付差价</span>
<span class="mian-view-list-text">￥{{order.gjcePrice}}</span> <span class="mian-view-list-text" v-if="order.gjcePrice!=null">￥{{order.gjcePrice}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view> </view>
</view> </view>
<view class="mian-content" style="margin-bottom: 10px;" v-if="order.status != 9"> <view class="mian-content" style="margin-bottom: 10px;" v-if="order.status == 6">
<view class="mian-content-list"> <view class="mian-content-list">
<span class="mian-content-list-title">是否提前结束</span> <span class="mian-content-list-title">是否提前结束</span>
<span class="mian-content-list-text">{{order.earlyFinishReason!=''?'是':'否'}}</span> <span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view> </view>
<view class="mian-content-textarea"> <view class="mian-content-textarea">
<span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span> <span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" v-model="order.earlyFinishReason" placeholder="请输入备注...." maxlength="100" name="" id=""></textarea> <textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</view> </view>
<!-- <view class="yingde"> <!-- <view class="yingde">
<view class="yingde-title">应得收益</view> <view class="yingde-title">应得收益</view>
@ -238,7 +248,7 @@
</view> </view>
</view> </view>
<view class="bg padding radius margin-top" v-if="order.status==8 && startImgSel != '否'"> <view class="bg padding radius margin-top" v-if="order.status==8 && startImgSel != '否'">
<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片1 <view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
</view> </view>
<view class="flex flex-wrap"> <view class="flex flex-wrap">
<view v-if="startImgs.length"> <view v-if="startImgs.length">
@ -485,6 +495,7 @@
textareaTxt:'', textareaTxt:'',
checkbox2:[], checkbox2:[],
refusalContent:'', refusalContent:'',
imgList:[]
} }
}, },
watch: { watch: {

11
pages/index/addClock.vue
View File

@ -11,7 +11,7 @@
</view> </view>
<view class="header-top-btn" @click="wangqi">往期{{orderType=='2'?'加钟率':'充值率'}}</view> <view class="header-top-btn" @click="wangqi">往期{{orderType=='2'?'加钟率':'充值率'}}</view>
</view> </view>
<view class="header-bottom"> <view class="header-bottom" style="margin-bottom: 40rpx;">
<view class="header-bottom-money"> <view class="header-bottom-money">
{{earnings}} {{earnings}}
</view> </view>
@ -281,7 +281,7 @@
} }
.tapNav-name{ .tapNav-name{
font-weight: bold; font-weight: bold;
font-size: 31rpx; font-size: 28rpx;
color: #333333; color: #333333;
} }
@ -497,10 +497,11 @@
color: #333333; color: #333333;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;
margin-top: 8rpx;
} }
.header-text{ .header-text{
font-weight: 400; font-weight: 400;
font-size: 22rpx; font-size: 27rpx;
color: #FFFFFF; color: #FFFFFF;
margin-top: 2px; margin-top: 2px;
} }
@ -525,8 +526,8 @@
.header{ .header{
width: 100%; width: 100%;
height: 300rpx; height: 300rpx;
padding: 15px; padding: 15px 20px;
background-image: url('../../static/index/fun_banner4.png'); background:#fff url('../../static/index/fun_banner4.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
display: flex; display: flex;

24
pages/index/currentIncome.vue
View File

@ -2,22 +2,22 @@
<view class="content"> <view class="content">
<view class="header"> <view class="header">
<view class="header-top"> <view class="header-top">
<view class="header-top-left"> <view class="header-top-left" style="margin-top: -10px;">
<image src="../../static/index/dangqian1.png" mode=""></image> <image src="../../static/index/dangqian1.png" mode=""></image>
<span class="header-text" style="margin-right: 5px;">当前周期</span> <span class="header-text">当前周期</span>
<span class="header-text">{{startTime}}~{{endTime}}</span> <span class="header-text" style="font-size: 16px;">{{startTime}}~{{endTime}}</span>
</view> </view>
<view class="header-top-btn" @click="wangqi">往期收益</view> <view class="header-top-btn" @click="wangqi" style="font-size: 14px; margin-top: -8px;">往期收益</view>
</view> </view>
<view class="header-bottom"> <view class="header-bottom" style="margin-bottom: 40rpx;">
<view class="header-bottom-money">{{shouyiMoeny}}</view> <view class="header-bottom-money">{{shouyiMoeny}}</view>
<view class="header-text">当前收益</view> <view class="header-text" style="font-size: 14px; margin-top: -5px;">当前收益</view>
</view> </view>
</view> </view>
<!-- 性别选择 --> <!-- 性别选择 -->
<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet> <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"> <t-refresh class="mian" ref="refresh" v-if="listData.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0" >
<template slot="content"> <template slot="content" >
<view class="mian-view" v-for="(item,index) in listData" :key="index" @click="goOder(item)"> <view class="mian-view" v-for="(item,index) in listData" :key="index" @click="goOder(item)">
<view class="mian-head"> <view class="mian-head">
<view class="mian-head-biao">{{item.status=='3'?'已完成':'待评价'}}</view> <view class="mian-head-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
@ -320,16 +320,16 @@
height: 49rpx; height: 49rpx;
line-height: 49rpx; line-height: 49rpx;
text-align: center; text-align: center;
font-size: 21rpx; font-size: 26rpx;
color: #333333; color: #333333;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;
} }
.header-text{ .header-text{
font-weight: 400; font-weight: 400;
font-size: 22rpx; font-size: 28rpx;
color: #FFFFFF; color: #FFFFFF;
margin-top: 2px; margin-right: 8rpx;
} }
.header-top-left image{ .header-top-left image{
width: 24.31rpx; width: 24.31rpx;
@ -352,7 +352,7 @@
width: 100%; width: 100%;
height: 300rpx; height: 300rpx;
padding: 15px; padding: 15px;
background-image: url('../../static/index/fun_banner4.png'); background:#fff url('../../static/index/fun_banner4.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
display: flex; display: flex;

64
pages/index/currentPoints.vue
View File

@ -11,7 +11,7 @@
</view> </view>
<view class="header-top-btn" @click="wangqi">往期积分</view> <view class="header-top-btn" @click="wangqi">往期积分</view>
</view> </view>
<view class="header-bottom"> <view class="header-bottom" style="margin-bottom: 40rpx;">
<view class="header-bottom-money">{{sumJf}}<text style="font-size: 23rpx;font-weight: 400;">分</text> </view> <view class="header-bottom-money">{{sumJf}}<text style="font-size: 23rpx;font-weight: 400;">分</text> </view>
<view class="header-text">当前积分</view> <view class="header-text">当前积分</view>
</view> </view>
@ -77,22 +77,22 @@
<view class="view-title"> <view class="view-title">
<view class="view-title-left"> <view class="view-title-left">
<span class="view-title-left-shuxian"></span> <span class="view-title-left-shuxian"></span>
<span class="view-title-left-text">时长积分: <text class="view-num">{{zxscjf}}</text>(在线时长10分钟可获取1积分)</span> <span class="view-title-left-text ">时长积分: <text class="view-num">{{zxscjf}}</text>(在线时长10分钟可获取1积分)</span>
</view> </view>
<!-- <view class="view-title-right" @click.stop="toggle('时长积分')">更多</view> --> <!-- <view class="view-title-right" @click.stop="toggle('时长积分')">更多</view> -->
</view> </view>
<view class="mian-table"> <view class="mian-table">
<view class="table-view"> <view class="table-view">
<span style="font-size: 22rpx;">序号</span> <span style="font-weight: bold;">序号</span>
<span v-for="(item , index) in zxscList">{{index+1}}</span> <span class="table-view-child" v-for="(item , index) in zxscList">{{index+1}}</span>
</view> </view>
<view class="table-view"> <view class="table-view">
<span style="font-size: 22rpx;">获取时间</span> <span style="font-weight: bold;">获取时间</span>
<span v-for="(item , index) in zxscList">{{item.jftime}}</span> <span class="table-view-child" v-for="(item , index) in zxscList">{{item.jftime}}</span>
</view> </view>
<view class="table-view"> <view class="table-view">
<span style="font-size: 22rpx;">获取积分</span> <span style="font-weight: bold;">获取积分</span>
<span v-for="(item , index) in zxscList">{{item.jifen}}</span> <span class="table-view-child" v-for="(item , index) in zxscList">{{item.jifen}}</span>
</view> </view>
</view> </view>
</view> </view>
@ -107,16 +107,16 @@
</view> </view>
<view class="mian-table"> <view class="mian-table">
<view class="table-view"> <view class="table-view">
<span style="font-size: 22rpx;">序号</span> <span style="font-weight: bold;">序号</span>
<span v-for="(item , index) in czjfList">{{index+1}}</span> <span class="table-view-child" v-for="(item , index) in czjfList">{{index+1}}</span>
</view> </view>
<view class="table-view"> <view class="table-view">
<span style="font-size: 22rpx;">获取时间</span> <span style="font-weight: bold;">获取时间</span>
<span v-for="(item , index) in czjfList">{{item.jftime}}</span> <span class="table-view-child" v-for="(item , index) in czjfList">{{item.jftime}}</span>
</view> </view>
<view class="table-view"> <view class="table-view">
<span style="font-size: 22rpx;">获取积分</span> <span style="font-weight: bold;">获取积分</span>
<span v-for="(item , index) in czjfList">{{item.jifen}}</span> <span class="table-view-child" v-for="(item , index) in czjfList">{{item.jifen}}</span>
</view> </view>
</view> </view>
</view> </view>
@ -332,7 +332,7 @@
<style scoped> <style scoped>
.tapNav-name{ .tapNav-name{
font-weight: bold; font-weight: bold;
font-size: 31rpx; font-size: 28rpx;
color: #333333; color: #333333;
} }
@ -346,13 +346,15 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
.tapNav-list{ .tapNav-list{
width: 100%; width: 96%;
margin: 0 auto; margin: 0 auto;
display: flex; display: flex;
flex-direction:row; flex-direction:row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
background-color: #fff; background-color: #fff;
border-radius: 15rpx;
margin-top: -30px;
} }
.tapNav-view{ .tapNav-view{
height: 40px; height: 40px;
@ -452,15 +454,16 @@
flex-direction: column; flex-direction: column;
} }
.table-view span{ .table-view span{
font-weight: 400; font-size: 27rpx;
font-size: 19rpx; }
color: #666666; .table-view-bold{
}
.table-view span:nth-child(1){
font-weight: bold; font-weight: bold;
} }
.table-view-child{
color: #888;
}
.table-view span{ .table-view span{
margin-bottom: 15px; margin-bottom: 20px;
} }
.table-view{ .table-view{
display: flex; display: flex;
@ -470,13 +473,13 @@
} }
.mian-table{ .mian-table{
width: 100%; width: 100%;
padding: 10px; padding: 15px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 21rpx;
margin-bottom: 10px; margin-bottom: 10px;
} }
.view-num{ .view-num{
@ -618,7 +621,8 @@
flex-direction: column; flex-direction: column;
} }
.mina{ .mina{
width: 95%; width: 94%;
margin: 0 auto;
height: 300px; height: 300px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -633,14 +637,14 @@
height: 49rpx; height: 49rpx;
line-height: 49rpx; line-height: 49rpx;
text-align: center; text-align: center;
font-size: 21rpx; font-size: 26rpx;
color: #333333; color: #333333;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;
} }
.header-text{ .header-text{
font-weight: 400; font-weight: 400;
font-size: 22rpx; font-size: 26rpx;
color: #FFFFFF; color: #FFFFFF;
} }
.header-top-left image{ .header-top-left image{
@ -663,9 +667,9 @@
} }
.header{ .header{
width: 100%; width: 100%;
height: 200rpx; height: 300rpx;
padding: 15px; padding: 5px 20px;
background-image: url('../../static/index/fun_banner4.png'); background:#f7f7f7 url('../../static/index/fun_banner4.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
display: flex; display: flex;

12
pages/index/index.vue
View File

@ -3,7 +3,7 @@
<view class="jishi-index"> <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: 30px 30rpx 120px;align-items: center;">
<view class="u-m-r-10"> <view class="u-m-r-10">
<image :src="avatar" style="width: 70px;height: 70px;border-radius: 100rpx;" <image :src="avatar" style="width: 70px;height: 70px;border-radius: 100rpx; border: 2px solid #fffff;"
@click="goNav('/pages/my/userinfo')"></image> @click="goNav('/pages/my/userinfo')"></image>
</view> </view>
<view class="u-flex-1 u-m-l-10 text-white" v-if="isLogin && userName"> <view class="u-flex-1 u-m-l-10 text-white" v-if="isLogin && userName">
@ -85,7 +85,7 @@
</view> </view>
<view class="" style="margin-top: 20px;"> <view class="" style="margin-top: 20px;">
<text style="font-size: 30px;font-weight: bold;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text> <text style="font-size: 24px;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text>
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> --> <!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
</view> </view>
<!-- <u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a" <!-- <u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
@ -122,16 +122,16 @@
<view class="flex align-center" <view class="flex align-center"
style="justify-content: space-evenly;text-align: center;"> style="justify-content: space-evenly;text-align: center;">
<view class="" @click="dangqian"> <view class="" @click="dangqian">
<view class="" style="font-size: 22px;font-weight: bold;"> <view class="" style="font-size: 24px;font-weight: bold;">
{{ currentRealIncome ? currentRealIncome : 0 }} {{ currentRealIncome ? currentRealIncome : 0 }}
</view> </view>
<view class="" style="font-size: 12px;">当期收益(元)</view> <view class="" style="font-size: 14px; margin-top: 5px;">当期收益(元)</view>
</view> </view>
<view class="shuxian"></view> <view class="shuxian"></view>
<view class="" @tap="goNav('/pages/index/currentPoints')"> <view class="" @tap="goNav('/pages/index/currentPoints')">
<view class="" style="font-size: 22px;font-weight: bold;">{{ currentIntegral ? currentIntegral : 0 }} <view class="" style="font-size: 24px;font-weight: bold;">{{ currentIntegral ? currentIntegral : 0 }}
</view> </view>
<view class="" style="font-size: 12px;" >当期积分</view> <view class="" style="font-size: 14px; margin-top: 5px;" >当期积分</view>
</view> </view>
</view> </view>
</view> </view>

48
pages/index/technicianLevel.vue
View File

@ -18,7 +18,7 @@
</view> </view>
<view class="header-right-bottom"> <view class="header-right-bottom">
<view class="djimg">{{ artificerData.grade }}</view> <view class="djimg">{{ artificerData.grade }}</view>
<view class="djimg-text">当期等级</view> <!---<view class="djimg-text">当期等级</view>-->
</view> </view>
</view> </view>
<view class="mian-view"> <view class="mian-view">
@ -101,22 +101,23 @@
top: 0; top: 0;
background: url(../../static/images/index/vip.png) no-repeat center; background: url(../../static/images/index/vip.png) no-repeat center;
background-size: cover; background-size: cover;
width: 76.39rpx; width: 96.39rpx;
height:54rpx; height:74rpx;
text-align: center; text-align: center;
line-height: 30px; line-height: 48px;
font-weight: bold; font-weight: bold;
font-size: 17rpx; font-size: 23rpx;
color: #FFFFFF; color: #FFFFFF;
} }
.mian-list-view span:nth-child(1){ .mian-list-view span:nth-child(1){
font-size: 23rpx; font-size: 36rpx;
color: #019D88; color: #019c88;
font-weight: bold;
} }
.mian-list-view span:nth-child(2){ .mian-list-view span:nth-child(2){
font-size: 18rpx; font-size: 22rpx;
color: #666666; color: #333;
margin-top: 5px; margin-top: 2px;
} }
.mian-list-view{ .mian-list-view{
width: 25%; width: 25%;
@ -131,6 +132,7 @@
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-top: 35rpx;
} }
.fencheng span{ .fencheng span{
font-size: 23rpx; font-size: 23rpx;
@ -142,6 +144,7 @@
color: #FE912A; color: #FE912A;
margin-top: 2px; margin-top: 2px;
margin-left: 5px; margin-left: 5px;
font-weight: bold;
} }
.fencheng{ .fencheng{
display: flex; display: flex;
@ -168,7 +171,7 @@
border-radius: 14rpx; border-radius: 14rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 10px; padding: 15px;
margin-bottom: 10px; margin-bottom: 10px;
position: relative; position: relative;
} }
@ -193,13 +196,14 @@
background: url(../../static/images/index/vip.png) no-repeat center; background: url(../../static/images/index/vip.png) no-repeat center;
background-size: cover; background-size: cover;
width: 198rpx; width: 198rpx;
height: 70px; height: 80px;
text-align: center; text-align: center;
line-height: 84px; line-height: 96px;
font-weight: normal; font-weight: normal;
font-size: 30rpx; font-size: 40rpx;
color: #FEFEFE; color: #FEFEFE;
font-style: italic; font-style: italic;
font-weight: bold;
} }
.header-right-bottom{ .header-right-bottom{
width: 30%; width: 30%;
@ -207,12 +211,12 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: space-evenly; justify-content: space-evenly;
margin-top: 42px; margin-top: 20px;
margin-right: 8px; margin-right: 6px;
} }
.header-right-text{ .header-right-text{
margin-top: 10px; margin-top: 6px;
font-size: 18rpx; font-size: 22rpx;
color: #FFFFFF; color: #FFFFFF;
} }
.header-right-top span:nth-child(1){ .header-right-top span:nth-child(1){
@ -220,13 +224,13 @@
height: 34rpx; height: 34rpx;
text-align: center; text-align: center;
line-height: 34rpx; line-height: 34rpx;
font-size: 22rpx; font-size: 24rpx;
color: #843200; color: #843200;
background: linear-gradient(-36deg, #FFE45A, #FFBB46); background: linear-gradient(-36deg, #FFE45A, #FFBB46);
border-radius: 15rpx 0rpx 15rpx 0rpx; border-radius: 15rpx 0rpx 15rpx 0rpx;
} }
.header-right-top span:nth-child(2){ .header-right-top span:nth-child(2){
font-size: 22rpx; font-size: 26rpx;
color: #FFF5BC; color: #FFF5BC;
margin-left: 5px; margin-left: 5px;
} }
@ -235,7 +239,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
margin-top: 15px; margin-top: 20px;
} }
.header-right{ .header-right{
width: 65%; width: 65%;
@ -246,7 +250,7 @@
.header{ .header{
width: 100%; width: 100%;
padding: 10px; padding: 13px 23px;
height: 263rpx; height: 263rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;

2
pages/my/mangshi.vue
View File

@ -256,6 +256,6 @@
margin: 30rpx 10rpx; margin: 30rpx 10rpx;
color: #FFFFFF; color: #FFFFFF;
font-size: 30rpx; font-size: 30rpx;
background: linear-gradient(to right, #223845, #00a85b); background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
} }
</style> </style>

18
pages/order/index.vue
View File

@ -65,16 +65,16 @@
<view class="bgwhite radius margin-bottom-sm padding-bottom-sm" v-for="(item, index) in goods" :key='index' <view class="bgwhite radius margin-bottom-sm padding-bottom-sm" v-for="(item, index) in goods" :key='index'
@click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)"> @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
<view class="flex justify-between padding-sm"> <view class="flex justify-between padding-sm">
<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 == 3">已完成</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 == 5">待评价</view>
<view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view>
<view v-if="item.overTimeOrders == 1" style="color: red;font-size: 26rpx">(订单已超时)</view> <view v-if="item.overTimeOrders == 1" style="color: red;font-size: 26rpx">(订单已超时)</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 == 3">已完成待评价</view>
<!-- <view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</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 ==9">确认接单</view>
<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</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 class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->

2
pages/public/login.vue
View File

@ -40,7 +40,7 @@
<!-- #endif --> <!-- #endif -->
<!-- #ifndef MP-WEIXIN --> <!-- #ifndef MP-WEIXIN -->
<view style="text-align: center;"> <view style="text-align: center;">
<view style="font-size: 48upx;margin-top: 32upx;color: #333333;margin-top: 100rpx;">欢迎登录盛安到家</view> <view style="font-size: 40upx;margin-top: 32upx;color: #333333;margin-top: 100rpx;">欢迎登录盛安到家</view>
<image style="width: 300upx;height: 300upx;margin-top: 200upx;margin-bottom:100rpx;border-radius:20upx" <image style="width: 300upx;height: 300upx;margin-top: 200upx;margin-bottom:100rpx;border-radius:20upx"
src="../../static/logo.png"></image> src="../../static/logo.png"></image>
<button v-if="weixinLogin" class="confirm-btn" @click="weixinLo">微信登录</button> <button v-if="weixinLogin" class="confirm-btn" @click="weixinLo">微信登录</button>