修改样式及首页查询
This commit is contained in:
parent
0b00cafcf7
commit
23e6e10f36
|
|
@ -14,6 +14,8 @@
|
|||
<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)">
|
||||
|
|
@ -71,21 +73,24 @@
|
|||
startTime:'',
|
||||
endTime:'',
|
||||
listData:[],
|
||||
wqlistData:[],
|
||||
titleData:'',
|
||||
page:1,
|
||||
limit:10,
|
||||
shouyiMoeny:'',
|
||||
wqsyshow:false,
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
this.orderType=e.type;
|
||||
this.shouyiMoeny=e.shouyiMoeny;
|
||||
// this.shouyiMoeny=e.shouyiMoeny;
|
||||
|
||||
this.userId = uni.getStorageSync("artificerId");
|
||||
this.getTime()
|
||||
this.getData();
|
||||
// this.getWangqiTime();
|
||||
},
|
||||
onPullDownRefresh: function() {
|
||||
this.page = 1;
|
||||
|
|
@ -128,6 +133,9 @@
|
|||
this.startTime=year + '-' + monthJia + '-' + 21
|
||||
this.endTime=year + '-' + monthJia + '-' + dayEnd;
|
||||
}
|
||||
if(!this.orderType){
|
||||
this.orderType = 1;
|
||||
}
|
||||
},
|
||||
getData(){
|
||||
var that=this;
|
||||
|
|
@ -143,14 +151,43 @@
|
|||
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'
|
||||
url:'/pages/index/previousEarnings?orderType='+this.orderType
|
||||
})
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -804,15 +804,18 @@ export default {
|
|||
// 获取APP端首页物料记录数据
|
||||
getHomeMaterialPackageList() {
|
||||
let artificerId = uni.getStorageSync("artificerId");
|
||||
this.$Request.getXZX("/app/material/selectMaterialArtificer?artificerId=" + artificerId + "&page=" + (this
|
||||
.currentPage ? this
|
||||
.currentPage : '') + "&limit=" + (this.pageSize ? this.pageSize : '')).then((res) => {
|
||||
if (res && res.data && res.code === 0) {
|
||||
this.formatHomeMaterialPackageList = res?.data.slice(0, 3);
|
||||
// this.formatHomeMaterialPackageList = [];
|
||||
this.homeMaterialPackageList = res.data;
|
||||
}
|
||||
})
|
||||
if(artificerId){
|
||||
this.$Request.getXZX("/app/material/selectMaterialArtificer?artificerId=" + artificerId + "&page=" + (this
|
||||
.currentPage ? this
|
||||
.currentPage : '') + "&limit=" + (this.pageSize ? this.pageSize : '')).then((res) => {
|
||||
if (res && res.data && res.code === 0) {
|
||||
this.formatHomeMaterialPackageList = res?.data.slice(0, 3);
|
||||
// this.formatHomeMaterialPackageList = [];
|
||||
this.homeMaterialPackageList = res.data;
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
clickIcon(index) {
|
||||
console.log(index);
|
||||
|
|
|
|||
|
|
@ -1,173 +1,344 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<view class="header"></view>
|
||||
<table border="0" class="mian-table">
|
||||
<tr class="mian-table-top">
|
||||
<td>序号</td>
|
||||
<td>开始日期</td>
|
||||
<td>结束日期</td>
|
||||
<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 class="header">
|
||||
<view class="header-top">
|
||||
<view class="header-top-left">
|
||||
<image src="../../static/index/dangqian1.png" mode=""></image>
|
||||
<span class="header-text" style="margin-right: 5px;">当前周期</span>
|
||||
<span class="header-text">{{startTime}}~{{endTime}}</span>
|
||||
</view>
|
||||
<view class="header-top-btn" @click="wangqi">往期收益</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>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default{
|
||||
import empty from '@/components/empty.vue'
|
||||
import tRefresh from "@/components/t-refresh/t-refresh.vue"
|
||||
export default {
|
||||
components:{tRefresh,empty},
|
||||
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:{
|
||||
detailTd(){//详情 跳页
|
||||
goOder(item){
|
||||
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>
|
||||
|
||||
<style scoped>
|
||||
.mian-foot-btns{
|
||||
font-weight: 400;
|
||||
font-size: 25rpx;
|
||||
color: #11957C;
|
||||
/deep/.refresh-body .content{
|
||||
/* background-color: #f7f7f7; */
|
||||
}
|
||||
td{
|
||||
text-align: center;
|
||||
/deep/.refresh-body{
|
||||
height: 100% !important;
|
||||
border-top: 2px solid #f7f7f7;
|
||||
}
|
||||
.table-list td{
|
||||
border-bottom: 1px solid #E5E5E5;
|
||||
}
|
||||
.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;
|
||||
.mian-bottom{
|
||||
width: 100%;
|
||||
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;
|
||||
}
|
||||
.mian-foot-btn{
|
||||
width: 83rpx;
|
||||
height: 40rpx;
|
||||
line-height: 40rpx;
|
||||
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-title{
|
||||
font-weight: bold;
|
||||
font-size: 31rpx;
|
||||
color: #333333;
|
||||
}
|
||||
.mian-foot-view{
|
||||
width: 100%;
|
||||
border-bottom: 1px solid #E5E5E5;
|
||||
display: flex;
|
||||
padding: 10px 0px;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
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{
|
||||
width: 100%;
|
||||
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;
|
||||
align-items: center;
|
||||
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%;
|
||||
height: 967rpx;
|
||||
background: #FFFFFF;
|
||||
border-radius: 24rpx;
|
||||
overflow-y: scroll;
|
||||
background-color: #fff;
|
||||
padding: 10px;
|
||||
border-radius: 24rpx;
|
||||
display: flex;
|
||||
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{
|
||||
width: 100%;
|
||||
height: 228rpx;
|
||||
background: linear-gradient(-36deg, #11957C, #20A98F, #019C88, #029D88);
|
||||
height: 300rpx;
|
||||
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{
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
background-color: #f7f7f7;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
}
|
||||
</style>
|
||||
Loading…
Reference in New Issue