This commit is contained in:
kbing1981 2024-06-26 23:04:05 +08:00
commit 6ee237b79b
4 changed files with 388 additions and 258 deletions

View File

@ -14,6 +14,8 @@
<view class="header-text">当前收益</view> <view class="header-text">当前收益</view>
</view> </view>
</view> </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"> <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)">
@ -71,21 +73,24 @@
startTime:'', startTime:'',
endTime:'', endTime:'',
listData:[], listData:[],
wqlistData:[],
titleData:'', titleData:'',
page:1, page:1,
limit:10, limit:10,
shouyiMoeny:'', shouyiMoeny:'',
wqsyshow:false,
} }
}, },
onLoad(e) { onLoad(e) {
this.orderType=e.type; this.orderType=e.type;
this.shouyiMoeny=e.shouyiMoeny; // this.shouyiMoeny=e.shouyiMoeny;
this.userId = uni.getStorageSync("artificerId"); this.userId = uni.getStorageSync("artificerId");
this.getTime() this.getTime()
this.getData(); this.getData();
// this.getWangqiTime();
}, },
onPullDownRefresh: function() { onPullDownRefresh: function() {
this.page = 1; this.page = 1;
@ -128,6 +133,9 @@
this.startTime=year + '-' + monthJia + '-' + 21 this.startTime=year + '-' + monthJia + '-' + 21
this.endTime=year + '-' + monthJia + '-' + dayEnd; this.endTime=year + '-' + monthJia + '-' + dayEnd;
} }
if(!this.orderType){
this.orderType = 1;
}
}, },
getData(){ getData(){
var that=this; var that=this;
@ -143,14 +151,43 @@
if (res.code == 0) { if (res.code == 0) {
if (that.page == 1) that.listData = []; // if (that.page == 1) that.listData = []; //
that.listData = [...that.listData, ...res.data.list]; // that.listData = [...that.listData, ...res.data.list]; //
that.shouyiMoeny = res.earnings;//
} else { } else {
that.$queue.showToast(res.msg); that.$queue.showToast(res.msg);
} }
}); });
}, },
//
// getWangqiTime(){
// var that=this;
// let data = {
// userId:that.userId,
// }
// that.$Request.getT('/app/artificer/getZqhzList', data).then(res => {
// console.log('------>',res)
// if (res.code == 0) {
// that.wqlistData = res.data;
// } else {
// that.$queue.showToast(res.msg);
// }
// });
// },
//
// wqlistCallback(index){
// console.log("wqlistCallback-->",index)
// this.wqsyshow = false;
// var startAndEnd = this.wqlistData[index].label.split(" ");
// console.log("startAndEnd---->",startAndEnd)
// this.startTime = startAndEnd[0];
// this.endTime = startAndEnd[1];
// console.log("startTime>",this.startTime)
// console.log("endTime>",this.endTime)
// this.getData();
// },
wangqi(){// wangqi(){//
// this.wqsyshow = true;
uni.navigateTo({ uni.navigateTo({
url:'/pages/index/previousEarnings' url:'/pages/index/previousEarnings?orderType='+this.orderType
}) })
}, },
} }

View File

@ -804,15 +804,18 @@ export default {
// APP // APP
getHomeMaterialPackageList() { getHomeMaterialPackageList() {
let artificerId = uni.getStorageSync("artificerId"); let artificerId = uni.getStorageSync("artificerId");
this.$Request.getXZX("/app/material/selectMaterialArtificer?artificerId=" + artificerId + "&page=" + (this if(artificerId){
.currentPage ? this this.$Request.getXZX("/app/material/selectMaterialArtificer?artificerId=" + artificerId + "&page=" + (this
.currentPage : '') + "&limit=" + (this.pageSize ? this.pageSize : '')).then((res) => { .currentPage ? this
if (res && res.data && res.code === 0) { .currentPage : '') + "&limit=" + (this.pageSize ? this.pageSize : '')).then((res) => {
this.formatHomeMaterialPackageList = res?.data.slice(0, 3); if (res && res.data && res.code === 0) {
// this.formatHomeMaterialPackageList = []; this.formatHomeMaterialPackageList = res?.data.slice(0, 3);
this.homeMaterialPackageList = res.data; // this.formatHomeMaterialPackageList = [];
} this.homeMaterialPackageList = res.data;
}) }
})
}
}, },
clickIcon(index) { clickIcon(index) {
console.log(index); console.log(index);

View File

@ -1,173 +1,344 @@
<template> <template>
<view class="content"> <view class="content">
<view class="header"></view> <view class="header">
<table border="0" class="mian-table"> <view class="header-top">
<tr class="mian-table-top"> <view class="header-top-left">
<td>序号</td> <image src="../../static/index/dangqian1.png" mode=""></image>
<td>开始日期</td> <span class="header-text" style="margin-right: 5px;">当前周期</span>
<td>结束日期</td> <span class="header-text">{{startTime}}~{{endTime}}</span>
<td>金额</td>
<td>操作</td>
</tr>
<tr class="table-list">
<td>01</td>
<td>2024.01.01</td>
<td>2024.01.01</td>
<td>653.40</td>
<td class="mian-foot-btns" @click="detailTd">
详情
</td>
</tr>
</table>
<!-- <view class="mian">
<view class="mian-nav">
<view class="mian-nav-list xuhao">序号</view>
<view class="mian-nav-list riqi">开始日期</view>
<view class="mian-nav-list riqi">结束日期</view>
<view class="mian-nav-list jie">金额</view>
<view class="mian-nav-list caozuo">操作</view>
</view>
<view class="mian-foot">
<view class="mian-foot-view">
<view class="mian-foot-list xuhao">01</view>
<view class="mian-foot-list riqi">2024.01.01</view>
<view class="mian-foot-list riqi">2024.01.01</view>
<view class="mian-foot-list jie">653.40</view>
<view class="mian-foot-btn caozuo">详情</view>
</view> </view>
<view class="header-top-btn" @click="wangqi">往期收益</view>
</view> </view>
</view> --> <view class="header-bottom">
<view class="header-bottom-money">{{shouyiMoeny}}</view>
<view class="header-text">当前收益</view>
</view>
</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">
<template slot="content">
<view class="mian-view" v-for="(item,index) in listData" :key="index" @click="goOder(item)">
<view class="mian-head">
<view class="mian-head-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
<view class="mian-head-time">
<span class="shouyi-text">预约时间: </span>
<span>{{item.serveTime}}</span>
</view>
</view>
<view class="mian-foot">
<view class="mian-foot-img">
<image src="../../my/static/bg6.png" mode=""></image>
</view>
<view class="mian-foot-list">
<view class="mian-foot-view">
<view class="mian-title">{{item.entryName}}</view>
<view class="mian-dingwei">
<image src="../../static/index/dangqian2.png" mode=""></image>
<span class="shouyi-text">0.8km</span>
</view>
</view>
<view class="mian-foot-dan shouyi-text">
订单编号 : {{item.ordersNo}}
</view>
<view class="mian-foot-adder shouyi-text">
服务地址 : {{item.address}}
</view>
<view class="mian-bottom">
<view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.price}}</view>
<view class="mian-bottom-shou">
<span class="shouyi-text">本单收益: </span>
<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoney}}</span>
</view>
</view>
</view>
</view>
</view>
</template>
</t-refresh>
<empty v-if="listData.length==0"></empty>
</view> </view>
</template> </template>
<script> <script>
export default{ import empty from '@/components/empty.vue'
import tRefresh from "@/components/t-refresh/t-refresh.vue"
export default {
components:{tRefresh,empty},
data(){ data(){
return{} return{
loadingType:0,
orderType:'',
userId:'',
startTime:'',
endTime:'',
listData:[],
wqlistData:[],
titleData:'',
page:1,
limit:10,
shouyiMoeny:'',
wqsyshow:true,
}
},
onLoad(e) {
this.orderType=e.orderType;
// this.shouyiMoeny=e.shouyiMoeny;
this.userId = uni.getStorageSync("artificerId");
// this.getData();
this.getWangqiTime();
},
onPullDownRefresh: function() {
this.page = 1;
this.getData();
}, },
methods:{ methods:{
detailTd(){// goOder(item){
uni.navigateTo({ uni.navigateTo({
url:'/pages/index/revenueDetails' url:'/my/order/revenueDetails?ordersId='+item.ordersId
}) })
} },
//
loadMore: async function() {
//loadingType: 0. 1. 2.
if(this.loadingType==0){
this.loadingType=2
//
setTimeout(()=>{
this.page++;
this.loadingType=0;
this.getData()
},1000)
}
},
getData(){
var that=this;
let data = {
userId:that.userId,
orderType:that.orderType,
startTime:that.startTime,
endTime:that.endTime,
page: that.page,
limit: that.limit,
}
that.$Request.getT('/app/artificer/getOrderTypeList', data).then(res => {
if (res.code == 0) {
if (that.page == 1) that.listData = []; //
that.listData = [...that.listData, ...res.data.list]; //
that.shouyiMoeny = res.earnings;//
} else {
that.$queue.showToast(res.msg);
}
});
},
//
getWangqiTime(){
var that=this;
let data = {
userId:that.userId,
}
that.$Request.getT('/app/artificer/getZqhzList', data).then(res => {
console.log('------>',res)
if (res.code == 0) {
that.wqlistData = res.data;
} else {
that.$queue.showToast(res.msg);
}
});
},
//
wqlistCallback(index){
console.log("wqlistCallback-->",index)
this.wqsyshow = false;
var startAndEnd = this.wqlistData[index].label.split(" 至 ");
console.log("startAndEnd---->",startAndEnd)
this.startTime = startAndEnd[0];
this.endTime = startAndEnd[1];
console.log("startTime>",this.startTime)
console.log("endTime>",this.endTime)
this.getData();
},
wangqi(){//
this.wqsyshow = true;
// uni.navigateTo({
// url:'/pages/index/previousEarnings'
// })
},
} }
} }
</script> </script>
<style scoped> <style scoped>
.mian-foot-btns{ /deep/.refresh-body .content{
font-weight: 400; /* background-color: #f7f7f7; */
font-size: 25rpx;
color: #11957C;
} }
td{ /deep/.refresh-body{
text-align: center; height: 100% !important;
border-top: 2px solid #f7f7f7;
} }
.table-list td{ .mian-bottom{
border-bottom: 1px solid #E5E5E5; width: 100%;
}
.table-list{
height: 40px;
}
.mian-table-top{
height: 49rpx;
background: #EFEFEF;
border-radius: 14rpx;
border: 1px solid #EFEFEF;
opacity: 0.62;
}
.mian-table{
width: 95%;
background-color: #fff;
border-radius: 24rpx;
padding: 10px;
border-spacing: inherit;
position: absolute;
top: 0;
margin-top: 30px;
}
.xuhao{
width: 10%;
}
.mian-nav-list{
height: 100%;
text-align: center;
font-weight: 400;
font-size: 26rpx;
color: #333333;
display: flex; display: flex;
justify-content: center; flex-direction: row;
align-items: center;
justify-content: space-between;
}
.mian-foot-adder{
margin: 2px 0px;
}
.mian-dingwei image{
width: 18.75rpx;
height:21.53rpx;
margin-right: 5px;
}
.mian-dingwei,.mian-bottom-shou{
display: flex;
flex-direction: row;
align-items: center; align-items: center;
} }
.mian-foot-btn{ .mian-title{
width: 83rpx; font-weight: bold;
height: 40rpx; font-size: 31rpx;
line-height: 40rpx; color: #333333;
text-align: center;
font-weight: 400;
font-size: 25rpx;
color: #11957C;
border-radius: 14rpx;
border: 1px solid #007B6A;
}
.mian-foot-list{
width: 25%;
height: 100%;
text-align: center;
font-weight: 400;
font-size: 25rpx;
color: #666666;
} }
.mian-foot-view{ .mian-foot-view{
width: 100%; width: 100%;
border-bottom: 1px solid #E5E5E5;
display: flex; display: flex;
padding: 10px 0px;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-bottom: 5px;
} }
.mian-foot-list{
width: 75%;
display: flex;
flex-direction: column;
}
.mian-foot-img image{
width: 100%;
height: 100%;
}
.mian-foot-img{
width: 158rpx;
height: 188rpx;
background: #E6E6E6;
border-radius: 14rpx;
}
.mian-foot{ .mian-foot{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column;
}
.mian-nav{
width: 100%;
height: 49rpx;
background-color: rgba(239, 239, 239, 0.62);
border-radius: 14rpx;
display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.mian{ .shouyi-text{
color: #7D7D7D;
font-size: 22rpx;
}
.mian-head-time span:nth-child(2){
color: #11957C;
margin-top: 1px;
}
.mian-head-time{
display: flex;
flex-direction: row;
align-items: center;
font-weight: 400;
font-size: 25rpx;
}
.mian-head-biao{
width: 130rpx;
height: 47rpx;
line-height: 47rpx;
color: #fff;
font-size: 25rpx;
text-align: center;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-top-left-radius: 21rpx;
border-bottom-right-radius: 21rpx;
}
.mian-head{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #E5E5E5;
padding-bottom: 5px;
margin-bottom: 10px;
}
.mian-view{
width: 95%; width: 95%;
height: 967rpx; background-color: #fff;
background: #FFFFFF;
border-radius: 24rpx;
overflow-y: scroll;
padding: 10px; padding: 10px;
border-radius: 24rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: 10px;
}
.mian{
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
}
.header-bottom-money{
font-weight: bold;
font-size: 49rpx;
color: #FFFFFF;
margin-bottom: 3px;
}
.header-top-btn{
width: 174rpx;
height: 49rpx;
line-height: 49rpx;
text-align: center;
font-size: 21rpx;
color: #333333;
background: #FFFFFF;
border-radius: 24rpx;
}
.header-text{
font-weight: 400;
font-size: 22rpx;
color: #FFFFFF;
margin-top: 2px;
}
.header-top-left image{
width: 24.31rpx;
height:22.92rpx;
margin-right: 2px;
margin-top: 3px;
}
.header-top-left{
display: flex;
flex-direction: row;
align-items: center;
}
.header-top{
width: 100%;
display: flex;
flex-direction: row;
justify-content: space-between;
} }
.header{ .header{
width: 100%; width: 100%;
height: 228rpx; height: 300rpx;
background: linear-gradient(-36deg, #11957C, #20A98F, #019C88, #029D88); padding: 15px;
background-image: url('../../static/index/fun_banner4.png');
background-repeat: no-repeat;
background-size: 100% 100%;
display: flex;
flex-direction: column;
justify-content: space-around;
} }
.content{ .content{
width: 100%; width: 100%;
height: 100vh; height: 100vh;
background-color: #f7f7f7; background-color: #f7f7f7;
display: flex;
flex-direction: column;
align-items: center;
position: relative;
} }
</style> </style>

View File

@ -10,157 +10,41 @@
<view class="header-right"> <view class="header-right">
<view class="header-right-top"> <view class="header-right-top">
<span>当前周期</span> <span>当前周期</span>
<span>2024.01.01~2024.01.10</span> <span>{{ artificerData.beginTime }}~{{ artificerData.finishTime }}</span>
</view> </view>
<view class="header-right-text"> <view class="header-right-text">
备注: 本期等级是根据根据技师上个同期的业绩最终计算得出 备注: 本期等级是根据根据技师上个同期的业绩最终计算得出
</view> </view>
</view> </view>
<view class="header-right-bottom"> <view class="header-right-bottom">
<view class="djimg">A0</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">
<view class="mian-list"> <view class="mian-list" v-for="(item, index) in ArtificerLevelList" :key="item.id">
<view class="mian-list-top"> <view class="mian-list-top">
<view class="xinren">新人扶持</view> <view class="xinren">{{ item.grade }}</view>
<view class="fencheng"> <view class="fencheng">
<span>分成比例 </span> <span>分成比例 </span>
<span>65%</span> <span>{{ item.proportionalSharing*100 }}%</span>
</view> </view>
</view> </view>
<view class="mian-list-bottom"> <view class="mian-list-bottom">
<view class="mian-list-view"> <view class="mian-list-view">
<span>无需求</span> <span>{{ item.outstandingAchievement }}</span>
<span>最低等级</span> <span>最低业绩</span>
</view> </view>
<view class="mian-list-view"> <view class="mian-list-view">
<span>50 h</span> <span>{{ item.durationOnline }} H</span>
<span>在线时长</span> <span>在线时长</span>
</view> </view>
<view class="mian-list-view"> <view class="mian-list-view">
<span>无需求</span> <span>{{ item.clockRate }}</span>
<span>加钟率</span> <span>加钟率</span>
</view> </view>
<view class="mian-list-view"> <view class="mian-list-view">
<span>0</span> <span>{{ item.integral }}</span>
<span>积分</span>
</view>
</view>
</view>
<view class="mian-list">
<view class="mian-list-top">
<view>
<view class="djimg-s">A1</view>
</view>
<view class="fencheng">
<span>分成比例 </span>
<span>65%</span>
</view>
</view>
<view class="mian-list-bottom">
<view class="mian-list-view">
<span>无需求</span>
<span>最低等级</span>
</view>
<view class="mian-list-view">
<span>50 h</span>
<span>在线时长</span>
</view>
<view class="mian-list-view">
<span>无需求</span>
<span>加钟率</span>
</view>
<view class="mian-list-view">
<span>0</span>
<span>积分</span>
</view>
</view>
</view>
<view class="mian-list">
<view class="mian-list-top">
<view>
<view class="djimg-s">A2</view>
</view>
<view class="fencheng">
<span>分成比例 </span>
<span>65%</span>
</view>
</view>
<view class="mian-list-bottom">
<view class="mian-list-view">
<span>无需求</span>
<span>最低等级</span>
</view>
<view class="mian-list-view">
<span>50 h</span>
<span>在线时长</span>
</view>
<view class="mian-list-view">
<span>无需求</span>
<span>加钟率</span>
</view>
<view class="mian-list-view">
<span>0</span>
<span>积分</span>
</view>
</view>
</view>
<view class="mian-list">
<view class="mian-list-top">
<view>
<view class="djimg-s">A3</view>
</view>
<view class="fencheng">
<span>分成比例 </span>
<span>65%</span>
</view>
</view>
<view class="mian-list-bottom">
<view class="mian-list-view">
<span>无需求</span>
<span>最低等级</span>
</view>
<view class="mian-list-view">
<span>50 h</span>
<span>在线时长</span>
</view>
<view class="mian-list-view">
<span>无需求</span>
<span>加钟率</span>
</view>
<view class="mian-list-view">
<span>0</span>
<span>积分</span>
</view>
</view>
</view>
<view class="mian-list">
<view class="mian-list-top">
<view>
<view class="djimg-s">A4</view>
</view>
<view class="fencheng">
<span>分成比例 </span>
<span>65%</span>
</view>
</view>
<view class="mian-list-bottom">
<view class="mian-list-view">
<span>无需求</span>
<span>最低等级</span>
</view>
<view class="mian-list-view">
<span>50 h</span>
<span>在线时长</span>
</view>
<view class="mian-list-view">
<span>无需求</span>
<span>加钟率</span>
</view>
<view class="mian-list-view">
<span>0</span>
<span>积分</span> <span>积分</span>
</view> </view>
</view> </view>
@ -172,6 +56,41 @@
</template> </template>
<script> <script>
import empty from '@/components/empty.vue'
export default {
components: {
empty
},
data() {
return {
userId: 0,
page: 1,
limit: 10,
artificerData: {},
ArtificerLevelList: []
}
},
onLoad(e) {
this.getArtificerLevels();
},
methods: {
getArtificerLevels() {
let artificerId = uni.getStorageSync("artificerId");
let data = {
page: 1,
limit: 100,
artificerId: artificerId
}
this.$Request.get("/app/artificer/integral/getArtificerLevels",data).then((res) => {
if (res && res.code === 0) {
console.log(res);
this.artificerData = res.artificerData;
this.ArtificerLevelList = res.levelData.records;
}
})
}
}
}
</script> </script>
<style scoped> <style scoped>