Skip to content

C
CFFP-HB
Commit 5d08ee5f by yuzhenWang
Options

画到我的团队了

parent 1ed67652
Showing with 261 additions and 94 deletions
pages/courselist/courselist.vue
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</view> </view>
<view class="productBox"> <view class="productBox">
<view class="productList"> <view class="productList">
<view class="productItem" v-for="item in cffpCourseInfos" :key="item.fileId"> <view class="productItem" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)">
<view class="top"> <view class="top">
<view class="left"> <view class="left">
<image class="productImg" :src="item.displayImage" alt="" mode="widthFix"></image> <image class="productImg" :src="item.displayImage" alt="" mode="widthFix"></image>
......
pages/index/index.vue
...@@ -215,7 +215,8 @@ ...@@ -215,7 +215,8 @@
name: '佣金', name: '佣金',
icon: 'icon-yongjin', icon: 'icon-yongjin',
link: '/pages/pointsExchange/pointsExchange', link: '/pages/pointsExchange/pointsExchange',
isOpen: true isOpen: true,
isJoin: true
}, },
{ {
key: '02', key: '02',
...@@ -452,7 +453,7 @@ ...@@ -452,7 +453,7 @@
return false return false
} }
} }
if (this.cffpUserInfo.partnerType == null && featureItem.name == '邀请加盟') { if (this.cffpUserInfo.partnerType == null && featureItem.isJoin) {
this.$refs.joinPopup.open() this.$refs.joinPopup.open()
// uni.showToast({ // uni.showToast({
// title: "您本人尚未加盟，您加盟后可邀请加盟", // title: "您本人尚未加盟，您加盟后可邀请加盟",
......
pages/personalCenter/myTeam.vue
<template> <template>
<view class="container"> <view class="container">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 20rpx;"></text> <view class="myHeader">
<!-- <view v-for="item in minorMenuLists.filter(v=>v.isShow)" :key="item.title" @click="goteam(item)" class="liBox"> <view class="backArrow">
<view class="infoBox"> <text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
<view class="infoBoxtext">{{item.title}}</view> <text style="font-size: 30rpx;">我的团队</text>
</view> </view>
<view class="iconBox"> <view class="renshu">
<i class="iconfont icon-youjiantou"></i> <view class="top">
<view class="left">
<text>团队有效人数</text>
</view>
<view class="right">
<text>查看业绩</text>
</view>
</view>
<view class="bottom">
<text>18人</text>
</view>
</view> </view>
</view> --> <view class="moneyBox">
<view class="ulBox"> <view class="one">
<view class="">
￥799,999
</view>
<view style="margin-top: 5rpx;">
<text>本月团队标准销售额</text>
</view>
</view>
<view class="two">
<view class="">
150
</view>
<view style="margin-top: 5rpx;">
<text>团队出单数</text>
</view>
</view>
</view>
</view>
<view class="filterBox">
<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120">
<view
class="scroll-view-item_H uni-bg-blue"
v-for="item in tabList"
:key="item.id"
:class="{active:item.id == currentFilter }"
@click="currentFilter = item.id"
>
{{item.title}}
</view>
</scroll-view>
</view>
<!-- 之前的代码 -->
<!-- <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 20rpx;"></text> -->
<!-- <view class="ulBox">
<view v-for="item in minorMenuLists.filter(v=>v.isShow)" :key="item.title" @click="goteam(item)" <view v-for="item in minorMenuLists.filter(v=>v.isShow)" :key="item.title" @click="goteam(item)"
class="liBox"> class="liBox">
<view class="infoBox"> <view class="infoBox">
...@@ -22,7 +67,7 @@ ...@@ -22,7 +67,7 @@
<i v-else class="iconfont icon-youjiantou iconStyle"></i> <i v-else class="iconfont icon-youjiantou iconStyle"></i>
</view> </view>
</view> </view>
</view> </view> -->
</view> </view>
</template> </template>
...@@ -30,10 +75,12 @@ ...@@ -30,10 +75,12 @@
export default { export default {
data() { data() {
return { return {
minorMenuLists:[ tabList:[
{title:'成员信息',icon:'shareEcode',link:'',isOpen:true,isShow:true,type: 1}, {title:'全部',id: '1'},
{title:'团队业绩',icon:'card',link:'',isOpen:true,isShow:true,type: 2}, {title:'直辖团队',id: '2'},
] {title:'所辖团队',id: '3'},
],
currentFilter:'1'
} }
}, },
methods: { methods: {
...@@ -64,45 +111,166 @@ ...@@ -64,45 +111,166 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.container{ .container{
height: 100%; background-color: rgba(235, 239, 247, 1);
background: #FFFFFF; display: flex;
padding-top: 50rpx; flex-direction: column;
} .myHeader{
.ulBox { color: #fff;
padding: 0 30rpx; box-sizing: border-box;
background: linear-gradient(225deg, rgba(65, 69, 188, 1) 0%, rgba(29, 30, 125, 1) 100%);
.liBox { .backArrow{
display: flex; box-sizing: border-box;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #E6E6E6;
height: 92rpx;
margin-top: 20rpx;
.infoBox {
display: flex; display: flex;
height: 60rpx;
justify-content: space-between;
align-items: center; align-items: center;
font-size: 28rpx;
image {
width: 52rpx !important;
height: 52rpx;
}
}
& > view:first-child{
position: relative; position: relative;
&::after{ width: 100%;
content:''; margin-bottom: 10rpx;
color: #fff;
margin-top: 20rpx;
text:nth-child(2){
width: 100%;
text-align: center;
position: absolute; position: absolute;
left: 0;
bottom: -6rpx;
background: linear-gradient(90deg,#FA882F, #D9D9D9);
border-radius: 4rpx;
height: 8rpx;
width: 80rpx;
} }
} }
&:last-child { .renshu{
border: none; padding: 10rpx 25rpx;
color: #fff;
.top{
display: flex;
align-items: center;
justify-content: space-between;
font-size: 26rpx;
.right{
padding: 10rpx 15rpx;
background-color: #fff;
border-radius: 30rpx;
color: rgba(32, 39, 155, 1);
font-size: 25rpx;
}
}
.bottom{
font-size: 34rpx;
font-weight: 500;
}
}
.moneyBox{
box-sizing: border-box;
width: 100%;
background-color: rgba(255,255,255,.15);
padding:15rpx 20rpx;
display: flex;
align-items: center;
justify-content: space-around;
.one{
font-size: 26rpx;
text-align: center;
width: 50%;
position: relative;
}
.one::after{
position: absolute;
top: 50%;
transform: translateY(-50%);
right: 0;
content: '';
height: 40rpx;
border: 1rpx dashed #fff;
}
.two{
font-size: 26rpx;
text-align: center;
width: 50%;
}
} }
} }
.filterBox{
box-sizing: border-box;
margin: 20rpx 0;
width: 100%;
background-color: #fff;
padding: 20rpx 60rpx;
display: flex;
align-items: center;
justify-content: space-between;
.scroll-view_H {
white-space: nowrap;
width: 100%;
box-sizing: border-box;
}
.scroll-view-item {
text-align: center;
font-size: 36rpx;
}
.scroll-view-item_H {
display: inline-block;
margin-right: 20rpx;
text-align: center;
background: #f7f7f7;
font-size: 27rpx;
padding: 10rpx 20rpx;
color: rgba(46, 38, 29, 1);
border-radius: 8rpx;
&.active{
background: rgba(32, 39, 155, 1);
color: #fff;
}
}
.scroll-view-item_H:last-child{
margin-right: 0rpx;
}
.filterItem{
background: #f7f7f7;
font-size: 27rpx;
padding: 10rpx;
color: rgba(46, 38, 29, 1);
border-radius: 8rpx;
&.active{
background: rgba(32, 39, 155, 1);
color: #fff;
}
}
}
} }
// 之前的样式
// .ulBox {
// padding: 0 30rpx;
// .liBox {
// display: flex;
// align-items: center;
// justify-content: space-between;
// border-bottom: 1px solid #E6E6E6;
// height: 92rpx;
// margin-top: 20rpx;
// .infoBox {
// display: flex;
// align-items: center;
// font-size: 28rpx;
// image {
// width: 52rpx !important;
// height: 52rpx;
// }
// }
// & > view:first-child{
// position: relative;
// &::after{
// content:'';
// position: absolute;
// left: 0;
// bottom: -6rpx;
// background: linear-gradient(90deg,#FA882F, #D9D9D9);
// border-radius: 4rpx;
// height: 8rpx;
// width: 80rpx;
// }
// }
// &:last-child {
// border: none;
// }
// }
// }
</style> </style>
\ No newline at end of file
pages/personalCenter/personalCenter.vue
...@@ -143,21 +143,16 @@ ...@@ -143,21 +143,16 @@
{id:'00',categoryName:'交易', {id:'00',categoryName:'交易',
children:[ children:[
{title:'成交订单',icon:'icon-dingdan',link:'/pages/saleCourseLists/saleCourseLists',isOpen:true,isShow:true}, {title:'成交订单',icon:'icon-dingdan',link:'/pages/saleCourseLists/saleCourseLists',isOpen:true,isShow:true},
// 原本是我的积分 {title:'佣金',icon:'icon-yongjin',link:'/pages/pointsExchange/pointsExchange',isOpen:true,isShow:true,identity: true},
// {title:'我的积分',icon:'money',link:'/pages/myPoints/myPoints',isOpen:true,isShow:true},
// 原本是积分兑换
{title:'佣金',icon:'icon-yongjin',link:'/pages/pointsExchange/pointsExchange',isOpen:true,isShow:true},
{title:'我的售后',icon:'icon-shouhoufuwu',link:'/pages/afterSales/afterSales',isOpen:true,isShow:true}, {title:'我的售后',icon:'icon-shouhoufuwu',link:'/pages/afterSales/afterSales',isOpen:true,isShow:true},
{title:'分享数据',icon:'icon-shujufenxi',link:'/pages/myShare/myShare',isOpen:true,isShow:true}, {title:'分享数据',icon:'icon-shujufenxi',link:'/pages/myShare/myShare',isOpen:true,isShow:true},
{title:'产品中心',icon:'icon-pinzhishangpinhuichang',link:'pages/courselist/courselist',isOpen:true,isShow:true,isTab:true},
], ],
}, },
{id:'01',categoryName:'团队', {id:'01',categoryName:'团队',
children:[ children:[
{title:'申请加盟',icon:'icon-hezuo',link:'/pages/application-process/basic-info',isOpen:true,isShow:true}, {title:'申请加盟',icon:'icon-hezuo',link:'/pages/application-process/basic-info',isOpen:true,isShow:true},
{title:'邀请加盟',icon:'icon-yaoqing',link:'/pages/inviteJoin/inviteJoin',isOpen:true,isShow:true,identity: true}, {title:'邀请加盟',icon:'icon-yaoqing',link:'/pages/inviteJoin/inviteJoin',isOpen:true,isShow:true,identity: true},
{title:'我的团队',icon:'icon-tuandui',link:'/pages/personalCenter/myTeam',isOpen:true,isShow:true}, {title:'我的团队',icon:'icon-tuandui',link:'/pages/personalCenter/myTeam',isOpen:true,isShow:true,identity: true},
], ],
}, },
], ],
...@@ -509,35 +504,38 @@ ...@@ -509,35 +504,38 @@
.kuaiTit{ .kuaiTit{
font-size: 30rpx; font-size: 30rpx;
} }
.kuaiCon{ .kuaiCon {
margin-top: 30rpx; margin-top: 30rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-start; justify-content: space-between; /* 改为 space-between 或 space-evenly */
flex-wrap: wrap; flex-wrap: wrap;
width: 100%; width: 100%;
}
.kuaiItem{
display: flex; .kuaiItem {
align-items: center; display: flex;
flex-direction: column; align-items: center;
margin-bottom: 40rpx; flex-direction: column;
font-size: 26rpx; margin-bottom: 40rpx;
/* 关键修改：计算宽度时考虑间距 */ font-size: 26rpx;
width: calc((100% - 40rpx * 2) / 3); /* 3个子项，左右各20rpx间距 */ width: calc((100% - 25rpx * 3) / 4); /* 4个子项，3个间距 */
margin-right: 40rpx; /* 右侧间距 */ /* 或者使用 flex-grow 和 flex-basis */
.imgbox{ /* flex-basis: calc(25% - 25rpx); */
margin-bottom: 10rpx; /* flex-grow: 0; */
.iconSize{ }
font-size: 40rpx;
} /* 每行第4个子项去掉右侧间距 */
} .kuaiItem:nth-child(4n) {
} margin-right: 0;
/* 每行第3个子项去掉右侧间距 */ }
.kuaiItem:nth-child(3n) {
margin-right: 0; .imgbox {
} margin-bottom: 10rpx;
}
.iconSize {
font-size: 40rpx;
} }
} }
.kuaiBox:last-child{ .kuaiBox:last-child{
......
pages/personalCenter/system/accontsetting.vue
...@@ -29,15 +29,15 @@ ...@@ -29,15 +29,15 @@
isTips: false, isTips: false,
isType: 'text' isType: 'text'
}, },
{ // {
title: '重置密码', // title: '重置密码',
icon: '', // icon: '',
link: '/pages/personalCenter/accountoperation/resetpassword', // link: '/pages/personalCenter/accountoperation/resetpassword',
isOpen: true, // isOpen: true,
isShow: true, // isShow: true,
isTips: false, // isTips: false,
isType: 'radio' // isType: 'radio'
}, // },
{ {
title: '注销账号', title: '注销账号',
icon: '', icon: '',
......
pages/pointsExchange/pointsExchange.vue
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
{{item.dropOptionName}} {{item.dropOptionName}}
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<view class="totalBox"> <view class="totalBox">
<view class="totalItem"> <view class="totalItem">
......
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