Skip to content

C
CFFP-HB
Commit fa1cc160 by kyle
Options

Merge branch 'dev' of http://139.224.139.2:9091/chaosun/CFFP into dev

parents 96418549 eab5f212
Showing with 118 additions and 87 deletions
components/myteam/myteam-table.vue
......@@ -8,24 +8,26 @@
<!-- // 一级循环 -->
<view class="content-sam-box">
<view class="" v-for="(pointItem,index) in dataList" :key="index">
<view class="" style="display: flex;border-bottom: 1px solid #F2F2F2; " v-if="felTyle == 'achievement'">
<view class="content-box-title">
<view :class="index == 0 ?'cornermarker': index == 1 ? 'cornermarkertwo' : index == 2 ? 'cornermarkerthree' : 'cornermarkerother'">
<text style="font-size: 8px;">{{index + 1}}</text>
<view class="content-sa" style=" " v-if="felTyle == 'achievement'">
<view class="content-box-title" style="display: flex;align-items: center;">
<view style="" :class="index == 0 ?'cornermarker': index == 1 ? 'cornermarkertwo' : index == 2 ? 'cornermarkerthree' : 'cornermarkerother'">
<text style="font-size: 8rpx;line-height: 20rpx;">{{index + 1}}</text>
</view>
<span>{{pointItem.name }}</span>
<view>{{pointItem.name }}</view>
</view>
<view class="content-box-title" style="margin-top: 10px;">
<span>{{pointItem.areaCenterName }}</span>
<view class="content-box-title">
<span style="text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;">{{pointItem.areaCenterName }}</span>
</view>
<view class="content-box-title" style="margin-top: 10px;">
<span>{{pointItem.orderNum }}</span>
<view class="content-box-title" >
<span style="color:#FF0000;">{{pointItem.orderNum }}</span>
</view>
<view class="content-box-title" style="margin-top: 10px;">
<span>{{pointItem.coursePrice}}</span>
<view class="content-box-title" >
<span style="color:#FF0000;">￥{{pointItem.coursePrice}}</span>
</view>
<view class="content-box-title" style="margin-top: 10px;">
<span>{{pointItem.courseIncome}}</span>
<view class="content-box-title" >
<span style="color:#FF0000;">￥{{pointItem.courseIncome}}</span>
</view>
</view>
</view>
......@@ -168,95 +170,82 @@
align-items: center;
justify-content: space-between;
}
.content-sa{
display: flex;
}
.content-box-title {
padding: 5px 0;
padding: 5rpx 0;
flex: 1;
justify-content: space-between;
align-items: center;
text-align: center;
}
.content-box-title-two {
padding: 5px 0;
flex: 1;
}
.content-sam-box {
/* background-color: #fff;
display: flex;
align-items: center;
justify-content: space-between;
padding: 10px 0;
padding: 10rpx 0;
color: #333333;
border-bottom: 1px solid #F2F2F2;; */
font-size: 13px;
border-bottom: 1rpx solid #F2F2F2;; */
font-size: 13rpx;
}
.cornermarker {
width: 10px;
width: 30rpx;height: 30rpx;
color: #FFFFFF;
height: 10px;
background: #C50021;
margin: 0 10rpx 0 auto;
text-align: center;
line-height: 10px;
border-radius: 50%;
}
.cornermarkertwo {
width: 10px;
height: 10px;
width: 30rpx;height: 30rpx;
color: #FFFFFF;
background: #FBB03B;
margin: 0 10rpx 0 auto;
text-align: center;
line-height: 10px;
border-radius: 50%;
}
.cornermarkerthree {
width: 10px;
width: 30rpx;height: 30rpx;
color: #FFFFFF;
height: 10px;
background: #3161A8;
margin: 0 10rpx 0 auto;
text-align: center;
line-height: 10px;
border-radius: 50%;
}
.cornermarkerother {
width: 10px;
width: 10rpx;
color: #FFFFFF;
height: 10px;
height: 10rpx;
background: #D5DDE9;
margin: 0 10rpx 0 auto;
margin: 0 10rrpx 0 auto;
text-align: center;
line-height: 10px;
line-height: 10rpx;
border-radius: 50%;
}
.concent-footer {
margin: 0 5px;
margin: 0 5rpx;
}
.content-box-title-a {
/* padding: 5px 0; */
/* padding: 5rpx 0; */
flex: 1;
color: #FFFFFF;
/* margin: 0 10px; */
/* margin: 0 10rpx; */
background: #3F52B7;
background: url('../../static/myteam/Group1660.png');
background-size: 100%;
border-radius: 5px;
border: 1px solid #fff;
border-radius: 5rpx;
border: 1rpx solid #fff;
}
/* .content-box-title-b{
padding: 5px 0;
padding: 5rpx 0;
flex: 1;
margin: 0 10px;
margin: 0 10rpx;
background: url('../../static/myteam/Group1662.png');
background-size: auto 100%;
border-radius: 5px;
border: 1px solid #fff;
border-radius: 5rpx;
border: 1rpx solid #fff;
} */
</style>
components/myteam/time-picker.vue
......@@ -4,7 +4,7 @@
<picker mode="date" :value="queryDate" :end="maxDate" :fields="fields" @change="bindDateChange">
<view class="uni-input">{{queryDate}}</view>
</picker>
<i class="iconfont icon-youjiantou"></i>
<i v-if="icon == true" class="iconfont icon-youjiantou"></i>
</view>
</view>
</template>
......@@ -14,6 +14,9 @@
props:{
fields:{
type: String,
},
icon: {
type: Boolean
}
},
name: "time-picker",
......
pages/personalCenter/teamPerformance/teamPerformance.vue
<template>
<view class="content">
<view class="header">
<view>
<time-picker @change="change" fields="month" icon="false">
</time-picker>
</view>
<view class="timeSelectContent">
<time-picker @change="change" fields="month">
<text>至</text>
</view>
<view>
<time-picker @change="changetimeend" fields="month" icon="false">
</time-picker>
</view>
<!-- <view class="timeSelectContent">
......@@ -101,7 +108,8 @@
],
CffpOrgInfoReqVO: {
userId: '1',
queryDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
startDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
endDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
queryType: '',
courseOrPolicy: '1'
},
......@@ -134,6 +142,14 @@
// 获取列表数据
getqueryTeamAchievement() {
if(this.CffpOrgInfoReqVO.endDate < this.CffpOrgInfoReqVO.startDate) {
uni.showToast({
title: '截止日期不能小于起始日期',
duration: 1000,
icon: 'none'
});
return
}
this.CffpOrgInfoReqVO.queryType = this.teamtype + 1
api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => {
if (res) {
......@@ -171,8 +187,14 @@
},
// 这个是时间组件返回的时间值
change(time) {
this.queryDate = time
console.log(time, 88)
this.CffpOrgInfoReqVO.startDate = time
this.getqueryTeamAchievement()
},
changetimeend(timeend) {
this.CffpOrgInfoReqVO.endDate = timeend
this.getqueryTeamAchievement()
}
}
}
</script>
......@@ -185,21 +207,24 @@
.header {
display: flex;
justify-content: space-between;
margin: 0 20px;
// justify-content: space-between;
margin: 0 40rpx;
.timeSelectContent{
margin: 0 40rpx;
}
}
.content-btn {
display: flex;
justify-content: space-between;
margin: 20px;
margin: 40rpx;
}
.content-btn_under-Check {
width: 100px;
height: 40px;
width: 200rpx;
height: 80rpx;
background: #20279B;
border-radius: 5px 5px 5px 5px;
border-radius: 10rpx;
display: flex;
justify-content: center;
align-items: center;
......@@ -207,93 +232,107 @@
}
.content-btn_under {
width: 100px;
height: 40px;
border-radius: 5px 5px 5px 5px;
width: 200rpx;
height: 80rpx;
border-radius: 10rpx;
display: flex;
justify-content: center;
align-items: center;
border: 1px solid #20279B;
border: 2rpx solid #20279B;
opacity: 1;
}
.content-btn_under-text-Check {
text-align: center;
width: 64px;
height: 24px;
font-size: 16px;
width: 128rpx;
height: 48rpx;
font-size: 32rpx;
font-weight: 500;
color: #FFFFFF;
line-height: 19px;
line-height: 48rpx;
}
.content-btn_under-text {
text-align: center;
width: 64px;
height: 24px;
font-size: 16px;
width: 128rpx;
height: 48rpx;
font-size: 32rpx;
font-weight: 500;
color: #20279B;
line-height: 19px;
line-height: 48rpx;
}
.classtotal {
height: 80px;
height: 160rpx;
display: flex;
justify-content: space-between;
}
.classtotal-box {
flex: 1;
padding-top: 20px;
padding-top: 40rpx;
text-align: center;
// border: 1px solid #20279B;
// border: 1rpx solid #20279B;
p {
margin-top: 8px;
margin-top: 16rpx;
color: #666666;
}
}
.totalsingular {
width: 35px;
height: 30px;
font-size: 20px;
width: 70rpx;
height: 60rpx;
font-size: 40rpx;
font-weight: 500;
line-height: 23px;
line-height: 46rpx;
}
.team {
display: flex;
justify-content: space-between;
align-items: center;
margin: 20px 10px;
margin: 40rpx 20rpx;
}
.team-a {
width: 2px;
margin-right: 5px;
width: 4rpx;
margin-right: 10rpx;
background: #FA882F;
border-radius: 2px 2px 2px 2px;
border-radius: 4rpx;
opacity: 1;
}
.team-b {
background: #FBFBFB;
border-radius: 0px 0px 0px 0px;
border-radius: 0rpx 0rpx 0rpx 0rpx;
}
.team-c {
height: 20px;
font-size: 14px;
height: 40rpx;
font-size: 28rpx;
text-align: center;
color: #FFFFFF;
background: #20269B;
border-radius: 5px 5px 5px 5px;
border-radius: 5rpx;
opacity: 1;
}
.title {
margin: auto;
}
.box-title{
display: flex;
justify-content: space-between;
text-align: center;
}
.box-content{
display: flex;
justify-content: space-between;
text-align: center;
}
.box-title-flex{
flex: 1;
font-size: 26rpx;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment