Skip to content

C
CFFP-HB
Commit 6b8f91d4 by yuzhenWang
Options

合并到dev分支

parents c728e320 080ade46
Showing with 5131 additions and 693 deletions
App.vue
......@@ -203,7 +203,7 @@
width: 100%!important;
}
.container{
background-color: #FBFBFB;
background-color: rgba(235, 239, 247, 1);
min-height: 100vh; /* 使用视口高度 */
height: auto !important;
height: 100vh;
......
components/clause/clause.vue
......@@ -322,10 +322,7 @@
<style lang="scss" scoped>
.container{
padding: 30rpx;
// padding-top: 40rpx;
letter-spacing: 1px;
background-color:#fff;
margin-bottom: 50rpx;
background-color: #f7f7f7;
}
.privacy-policy {
padding: 20rpx 30rpx;
......@@ -387,8 +384,6 @@
}
.agreement-container {
padding: 20rpx;
background-color: #fff;
// height: 100vh;
margin-bottom: 50rpx;
}
......
components/commonTimePicker/commonTimePicker.vue
......@@ -3,7 +3,7 @@
<view class="timeTitle">
<view class="" v-if="initDate">
<text style="font-size: 30rpx;">{{initDate}}</text>
<text v-if="iconDirection== 'down'" class="iconfont icon-xiajiantou iconStyle"></text>
<text v-if="iconDirection== 'down'" class="iconfont icon-xiajiantou iconStyle" :style="{color:iconColor?iconColor:''}"></text>
<text v-if="iconDirection== 'right'" class="iconfont icon-youjiantou iconStyle"></text>
</view>
<view class="emptyTxt" v-else>
......@@ -64,6 +64,10 @@
type: String,
default: 'down'
},
iconColor:{
type: String,
default: '#000'
},
visible: { //显示组件
type: Boolean,
default: false
......
components/myteam/lazy-tree.vue
......@@ -18,40 +18,7 @@
<view class="d-td">
<view class="" style="display: flex;text-align: center;">
<!-- <view class="d-td" v-if="item.levelCode == 'B1'&& item.itemType == '1'"
@click="open(item, i)" :style="{'margin-left':(item.level * 20)+'rpx'}">
<view class="" style="display: flex;">
<text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx; ">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png"
mode="widthFix"></image>
</view>
</view>
</view> -->
<!-- <view class="d-td" @click="open(item, i)"
v-else-if="item.levelCode == 'C3'&& item.itemType == '1'"
:style="{'margin-left':(item.level * 20)+'rpx'}">
<view class="" style="display: flex;">
<text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx; ">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png"
mode="widthFix"></image>
</view>
</view>
</view> -->
<!-- <view class="d-td" @click="open(item, i)"
v-else-if="item.levelCode == 'C2'&& item.itemType == '1'"
:style="{'margin-left':(item.level * 20)+'rpx'}">
<view class="" style="display: flex;">
<text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx;">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png"
mode="widthFix"></image>
</view>
</view>
</view> -->
<!-- @click="open(item, i)" -->
<view class="d-td" :style="{'margin-left':(item.level * 20)+'rpx'}">
<text v-if="dataShowType == 1">{{item.parentName}}</text>
<view v-if="dataShowType == 2" style="text-align:center;">
......
components/search/search.vue
<template>
<view class="search">
<text class="iconfont icon-sousuo" @click="searchBtn()"></text>
<input
class="searchInput"
type="text"
......@@ -9,9 +10,6 @@
@confirm="searchBtn()"
@input="handleInput"
/>
<text class="iconfont icon-sousuo" @click="searchBtn()"></text>
<!-- <text class="iconfont icon-xiaoxi"></text>
<text class="system_msg" @click="jumpToSystemMsg()">{{messageUnreadCount}}</text> -->
</view>
</template>
......@@ -105,23 +103,25 @@
}
</script>
<style lang="scss">
<style lang="scss" scoped>
.search{
display: flex;
margin: 30rpx auto;
align-items: center;
justify-content: space-between;
background: linear-gradient(to right,#E6F5FC,#FDE9F2);
border-radius: 60rpx;
background-color: rgba(255, 255, 255, 0.5);
border-radius: 15rpx;
padding: 0 15rpx;
.searchInput{
margin-right: 20rpx;
margin-left: 20rpx;
width: 85%;
padding: 15rpx;
color: #fff;
font-size: 26rpx;
}
.icon-sousuo{
font-size: 50rpx;
margin-right: 10rpx;
opacity: .7;
color: #fff;
}
.icon-xiaoxi{
font-size: 50rpx;
......
environments/environment.ts
const dev = {
// base_url:'https://mstage.zuihuibi.cn',
// api_url:'https://mstage.zuihuibi.cn/cffpApi',
// cffp_url:'https://mstage.zuihuibi.cn/cffpApi/cffp',
// share_url:'https://mstage.zuihuibi.cn/cffp',
base_url:'https://mdev.anjibao.cn',
api_url:'https://mdev.anjibao.cn/cffpApi',
cffp_url:'https://mdev.anjibao.cn/cffpApi/cffp',
......
pages.json
......@@ -145,6 +145,22 @@
},
{
"path": "pages/personalCenter/myTeamIncubate",
"style": {
"navigationBarTitleText": "育成团队",
"enablePullDownRefresh": false
}
},
{
"path": "pages/personalCenter/helpCenter",
"style": {
"navigationBarTitleText": "帮助中心",
"enablePullDownRefresh": false
}
},
{
"path": "pages/myShare/myShare",
"style": {
"navigationBarTitleText": "分享数据",
......
pages/afterSaleDetail/afterSaleDetail.vue
......@@ -142,6 +142,7 @@
<style lang="scss" scoped>
.container{
height:100%;
padding-bottom: 50rpx;
.top{
display: flex;
height: 80rpx;
......@@ -160,7 +161,8 @@
.returnCountsContainer,.returnProcessContainer,.returnDetailContainer{
background-color: #fff;
padding: 20rpx 40rpx;
margin: 10rpx auto;
margin: 20rpx 20rpx;
border-radius: 10rpx;
h4{
font-size: 32rpx;
color: #333;
......
pages/afterSales/afterSales.vue
......@@ -10,7 +10,7 @@
<course-item :thumbnailPath="item.displayImage" :title="item.fileTitle" :summaryBox="item.fileSynopsis" :dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}" :fileLecturerId="item.fileLecturerId"></course-item>
<view class="statusBox">
<text>{{item.orderStatusName}}</text>
<text @click="goDetail(item)">查看详情></text>
<text @click="goDetail(item)">查看详情</text>
</view>
</view>
</view>
......@@ -80,18 +80,25 @@
}
.ulBox{
margin-top: 20rpx;
box-sizing: border-box;
.liBox{
background-color: #fff;
margin-bottom: 20rpx;
padding: 36rpx 30rpx;
margin: 20rpx;
border-radius: 10rpx;
.statusBox{
display: flex;
justify-content: space-between;
align-items: center;
text{
color: #333;
font-size: 32rpx;
&:last-child{
color: #666;
background-color: #2A36AD;
padding: 10rpx 20rpx;
border-radius: 40rpx;
color: #fff;
font-size: 28rpx;
}
}
......
pages/applyDropClass/applyDropClass.vue
......@@ -218,7 +218,7 @@
<style lang="scss" scoped>
.container{
padding: 10rpx 20rpx;
// padding: 10rpx 0;
height: 100%;
position: relative;
.commonTitle{
......@@ -235,7 +235,7 @@
padding: 30rpx 14rpx 14rpx 20rpx;
margin-bottom: 10rpx;
background-color: #fff;
border-radius: 10rpx;
// border-radius: 10rpx;
view{
margin-top: 22rpx;
display: flex;
......@@ -251,9 +251,6 @@
}
.submitApply{
margin-top: 30rpx;
// position: fixed;
// bottom: 0rpx;
// left: 0;
width: 100%;
text{
display: flex;
......@@ -295,7 +292,7 @@
align-items: baseline;
background-color: #fff;
padding: 20rpx;
border-radius: 10rpx;
// border-radius: 10rpx;
box-sizing: border-box;
.pickerBox{
display: flex;
......
pages/courseDetail/courseDetail.vue
......@@ -414,7 +414,6 @@
}
},
goBack() {
console.log('返回');
uni.navigateBack({
delta: 1
});
......@@ -1018,10 +1017,10 @@
<style lang="scss" scoped>
.container{
// background-color: #f7f7f7;
width: 100%;
height: auto;
box-sizing: border-box;
// padding: 20rpx;
}
page {
padding: 0;
......@@ -1043,11 +1042,6 @@
}
.swiperBox {
height: 930rpx;
image {
border-radius: 12rpx;
}
padding: 0 40rpx;
margin-top: 0rpx;
}
.swiper-box {
height: 930rpx;
......@@ -1108,18 +1102,17 @@
align-items: center;
border-top-left-radius: 30rpx;
border-bottom-left-radius: 30rpx;
// padding-left: 10rpx;
color: #fff;
height: 60rpx;
background: #20269B;
}
.shareheader {
// padding-top: 60rpx;
background-color: #fff;
display: flex;
justify-content: space-between;
align-items: center;
height: 80rpx;
height: 100rpx;
.icon-youjiantou {
display: inline-block;
......
pages/courselist/courselist.vue
<template>
<view class="pad">
<view class="container">
<view class="homeHeader">
<view class="one">
<text style="font-size: 80rpx;">01</text>
<view class="titleTxt">
<text >分享商品</text>
<text class="iconfont icon-shuangyoujiantou iconOne" ></text>
</view>
</view>
<view class="two">
<text>02</text>
<view class="titleTxt">
<text >好友购买</text>
<text class="iconfont icon-shuangyoujiantou iconOne" ></text>
</view>
</view>
<view class="three">
<text>03</text>
<view class="titleTxt lastTxt">
<text>个人中心</text>
<text>查看收益</text>
</view>
</view>
</view>
<view class="productBox">
<view class="productList">
<view class="productItem" v-for="item in cffpCourseInfos" :key="item.fileId" >
<view class="top" @click="goDetail(item)">
<view class="left">
<image class="productImg" :src="item.displayImage" alt="" mode="widthFix"></image>
</view>
<view class="right">
<view class="one">
{{item.fileTitle}}
</view>
<view class="two">
{{item.fileSynopsis}}
</view>
<view class="three">
<text style="font-size: 28rpx;color: rgba(32, 39, 155, 1);">￥{{Number(item.coursePrice).toFixed(2)}}</text>
</view>
</view>
</view>
<view class="bottom">
<view class="bottomCon">
<view class="left" >
最高可赚￥{{item.income || '0.00'}}
</view>
<view class="right" @click="gotoShare(item)">
去分享
</view>
</view>
</view>
</view>
</view>
</view>
<uni-popup ref="popup" type="center" background-color="#fff">
<view class="descriptionBox">
<view class="imageBox">
<text>关注公众号</text>
<text class="subTit">通知实时提醒，及时接收下单和提现通知</text>
</view>
<view class="codeBox">
<image v-if="sourceType == '1'" src="@/static/cffpCode.jpg" mode="widthFix" style="width:250rpx !important;"></image>
<image v-if="sourceType == '4'" src="@/static/ydCode.jpg" mode="widthFix" style="width:250rpx !important;"></image>
<image v-if="sourceType == '3'" src="@/static/ydHomeOfficeCode.jpg" mode="widthFix" style="width:250rpx !important;"></image>
</view>
<view class="description">
扫一扫，关注公众号
</view>
</view>
</uni-popup>
<uni-share-wx ref="sharewx"></uni-share-wx>
<view class="markBox" @click="shareTipsFlag=false" v-if="shareTipsFlag">
<view class="guideImgBox">
<image src="../../static/Group132.png" mode="widthFix"></image>
<view class="tips">
<view style="margin-bottom:30rpx">请点击右上角菜单</view>
<view>分享给朋友</view>
</view>
</view>
</view>
<!--搜索组件-->
<search
<!-- <search
:isSearch="1"
:userId = "userId"
@send="getCourseList"
:initialQuery="queryName"
></search>
></search> -->
<!--轮播组件-->
<view class="banner">
<!-- <view class="banner">
<view class="uni-margin-wrap">
<carousel :carouselList="fileUploadItemCFFPList"></carousel>
</view>
</view>
<h4 v-if="cffpCourseInfos.length<=0" class="noListTip">暂无产品列表</h4>
</view> -->
<!-- <h4 v-if="cffpCourseInfos.length<=0" class="noListTip">暂无产品列表</h4>
<view class="ulBox" v-if="cffpCourseInfos.length>0">
<view class="liBox" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)">
<!-- :tagList="{v1:item.fileLecturerRanks,v2:item.fileLecturerName}" -->
<course-item
:thumbnailPath="item.displayImage"
:title="item.fileTitle"
......@@ -25,7 +106,7 @@
></course-item>
</view>
</view>
</view> -->
</view>
<!-- <tabBar :currentPage="currentPage" v-if="onlyShowList!=0"></tabBar> -->
</template>
......@@ -36,9 +117,16 @@
import tabBar from '../../components/tabBar/tabBar.vue';
import carousel from '@/components/carousel/carousel.vue';
import search from '@/components/search/search.vue';
import {companyInfo} from "@/environments/environment";
import {baseURL,apiURL,cffpURL,companyInfo,shareURL} from "@/environments/environment";
import dataHandling from "@/util/dataHandling";
import {hshare} from '@/util/fiveshare';
import UniShareWx from "@/uni_modules/uni-share-wx/index.vue";
import {nanoid} from 'nanoid';
export default{
props:['tagIds'],
components: {
UniShareWx,
},
data(){
return{
cffpCourseInfos:[],
......@@ -46,6 +134,9 @@
fileUploadItemCFFPList:[],
queryName:null,
userId: uni.getStorageSync('cffp_userId'),
runEnv:dataHandling.getRuntimeEnv(), //运行的环境 browser、app、h5
shareTipsFlag:false,
sourceType:'1',//根据来源展示二维码 默认是cffp
}
},
name:'courselist',
......@@ -58,12 +149,96 @@
onLoad() {
this.queryName = uni.getStorageSync('queryName') || '';
this.sourceType = uni.getStorageSync('addSystemType') || '1';
},
onShow() {
this.queryName = uni.getStorageSync('queryName') || '';
this.courseList();
this.sourceType = uni.getStorageSync('addSystemType') || '1';
},
methods:{
gotoShare(item){
if(this.runEnv == 'browser'){
this.$refs.popup.open()
return
}else if(this.runEnv == 'app' || this.runEnv == 'wechat-h5'){
const shareCode = nanoid() + this.userId
const jumptime = Date.parse(new Date()) / 1000
//app分享
// #ifdef APP-PLUS
let dataWXform = {
href: shareURL + "/pages/courseDetail/courseDetail?fileId=" + item.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime + "&",
title: item.fileTitle,
// summary: `加入我们开启学习之旅`,
summary: item.fileSynopsis,
imageUrl: item.displayImage,
fileId: item.fileId,
shareCode: shareCode
}
this.$refs.sharewx.open(dataWXform)
// #endif
//#ifdef H5
this.shareTipsFlag = true;
this.getshareData2(shareCode,jumptime,item)
// #endif
}
},
getshareData2(shareCode,jumptime,item) {
let data = {
title: item.fileTitle,
// desc: '加入我们开启学习之旅',
desc:item.fileSynopsis,
link: shareURL + "/pages/courseDetail/courseDetail?fileId=" + item.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime+ "&", //分享链接
imgUrl: item.displayImage, //图片
}
//安卓机型获取当前页面路径
let url = window.location.href.split('#')[0];
//ios机型获取当前页面路径
let ua = navigator.userAgent.toLowerCase();
let isWeixin = ua.indexOf('micromessenger') !== -1;
if (isWeixin) {
let isiOS = /(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent); //ios终端
if (isiOS && window.sessionStorage.getItem('firstEntryUrl')) {
url = window.sessionStorage.getItem('firstEntryUrl').split('#')[0];
}
}
// let url = window.location.href.split('#')[0]
hshare(data, url)
this.submitsuessc(shareCode,jumptime,item)
},
submitsuessc(shareCode,jumptime,item){
let platform = uni.getSystemInfoSync().platform
let UserShareRequestVO = {
systemType: platform == 'ios'? '1': '0',
userId: uni.getStorageSync('cffp_userId'),
businessType: '1', // 分享类型
businessId:item.fileId, // 课程Id
shareUrl: shareURL + "/pages/courseDetail/courseDetail?fileId=" + item.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime + "&", // 分享链接
shareType: '2', // 分享类型(1:图片分享; 2:链接分享)
shareToWhere: 3, //分享到哪儿（1好友 2朋友圈）
shareCode: shareCode
}
api.userShare(UserShareRequestVO).then(res => {
if (res['success']) {
// uni.showToast({
// title: '分享成功',
// duration: 2000
// });
}
})
},
goDetail(item){
uni.navigateTo({
url: `/pages/courseDetail/courseDetail?fileId=${item.fileId}`
......@@ -128,6 +303,220 @@
</script>
<style lang="scss" scoped>
::v-deep .uni-popup .uni-popup__wrapper{
margin: 0 !important;
border-radius: 30rpx;
}
.container{
background-color: rgba(235, 239, 247, 1);
display: flex;
flex-direction: column;
.homeHeader{
box-sizing: border-box;
width: 100%;
background: linear-gradient(225deg, rgba(65, 69, 188, 1) 0%, rgba(29, 30, 125, 1) 100%);
padding: 30rpx 0 100rpx 0;
color: rgba(255,255,255,.3);
display: flex;
align-items: center;
justify-content: space-between;
font-size: 80rpx;
height: 300rpx;
view{
width: 33%;
display: flex;
align-items: center;
justify-content: center;
position: relative;
.titleTxt{
box-sizing: border-box;
position: absolute;
width: 100%;
left: 50%;
transform: translate(-50%);
bottom: 3%;
font-size: 28rpx;
color: #fff;
.icon-shuangyoujiantou{
font-size: 26rpx;
position: absolute;
right:0;
}
}
.lastTxt{
display: flex;
align-items: center;
flex-direction: column;
bottom: -15%;
line-height: 1.3;
}
}
}
.productBox{
flex: 1;
width: 100%;
padding: 0rpx 15rpx;
box-sizing: border-box;
.productList{
width: 100%;
box-sizing: border-box;
margin-top: -5%;
background-color: #fff;
padding: 20rpx;
border-radius: 10rpx;
margin-bottom: 150rpx;
.productItem{
padding-bottom: 15rpx;
border-bottom: 1rpx solid rgba(238, 238, 240, 1);
margin-bottom: 20rpx;
.top{
display: flex;
justify-content: flex-start;
.left {
width: 220rpx;
flex-shrink: 0; /* 防止左侧被压缩 */
margin-right: 20rpx;
.productImg {
border-radius: 20rpx;
width: 100%;
height: 180rpx; /* 固定图片高度 */
display: block;
}
}
.right{
flex: 1; /* 右侧占据剩余空间 */
min-width: 0; /* 允许文本截断 */
display: flex;
flex-direction: column;
.one{
font-size: 30rpx;
font-weight: 500;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; /* 确保不会换行 */
}
.two{
font-size: 24rpx;
margin: 10rpx 0;
}
.three{
font-size: 28rpx;
color: rgba(32, 39, 155, 1);
margin-top: auto; /* 关键代码：自动顶部边距，推到底部 */
}
}
}
.bottom{
box-sizing: border-box;
margin: 10rpx 0;
width: 100%;
padding-left: 240rpx;
.bottomCon{
box-sizing: border-box;
width: 100%;
background: rgba(54, 57, 169, 0.05);
border-radius: 10rpx;
display: flex;
align-items: center;
justify-content: space-between;
.left{
padding: 15rpx 0rpx 15rpx 20rpx;
font-size: 26rpx;
color: rgba(34, 35, 133, 1);
}
.right{
// display: flex;
// align-items: center;
padding: 15rpx 10rpx 15rpx 15rpx;
background: rgba(36, 37, 137, 1);
width: 20%;
font-size: 27rpx;
color: #fff;
border-radius: 0 10rpx 10rpx 0rpx; /* 左上 右上 右下 左下 */
}
}
}
}
.productItem:last-child{
border: none;
}
}
}
.descriptionBox {
width: 510rpx;
padding: 40rpx;
.popupClose{
display: flex;
align-items: center;
justify-content: flex-end;
.icon-guanbi{
font-size: 28rpx;
}
}
.imageBox{
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
font-size: 32rpx;
font-weight: 600;
.subTit{
font-size: 28rpx;
color: #919094;
margin: 15rpx 0;
font-weight: 400;
}
}
.codeBox{
display: flex;
align-items: center;
justify-content: center;
height: 250rpx;
}
.description{
color: rgba(56, 56, 56, 1);
font-size: 28rpx;
display: flex;
align-items: center;
justify-content: center;
}
}
.markBox {
position: fixed;
left: 0;
top: 0;
bottom: 0;
right: 0;
width: 100%;
height: 100%;
color: #fff;
display: flex;
justify-content: flex-end;
z-index: 100000;
background: rgba(0, 0, 0, 0.8);
.guideImgBox {
margin: 20px auto;
uni-image {
width: 25% !important;
position: absolute;
right: 0;
top: 0;
}
}
.tips {
margin-top: 30%;
padding: 0 30px;
}
}
}
.ulBox,.liBox{
padding-bottom: 30rpx;
display: flex;
......
pages/index/index.vue
<template>
<view class="container">
<view class="homeHeader">
<view class="top">
<view class="one">
<search
ref="searchRef"
:isSearch="1"
:userId="userId"
:initialQuery.sync="searchQuery"
@send="getCourseList"
v-if="showSearch"
></search>
</view>
<view class="two">
<text class="iconfont icon-gongsi" @click="getIntroduce('center')"></text>
</view>
</view>
<view class="bottom">
<view class="content">
<view class="featureContent">
<view class="nav_wrapper">
<view class="nav_content" v-for="featureItem in featureLists" :key="featureItem.key"
@click="featureSelect(featureItem)">
<view class="imgbox">
<view class="iconfont iconSize" :class="`${featureItem.icon}`"></view>
</view>
<view style="font-size: 26rpx;color: #fff;">{{featureItem.name}}</view>
</view>
</view>
</view>
</view>
</view>
</view>
<!-- <view class="carouselBox">
<view class="swiperBox">
<swiper
style="height:250rpx;"
circular
:indicator-dots="true"
:autoplay="true"
:interval="3000"
:duration="1000"
>
<swiper-item v-for="(bannerItem,index) in cffpUserInfo.fileUploadItemList" :key="index">
<view class="swiperItemBox">
<view class="swiperBtn" @click="jumpUrl(bannerItem.destinationAddress)">
立即查看
</view>
<image class="swiperImg" :src="bannerItem.filePath" mode="widthFix" ></image>
</view>
</swiper-item>
</swiper>
</view>
</view> -->
<!-- 产品区域 -->
<view class="productBox">
<view class="productTitle">
<view class="titleTxt">
<text style="font-size: 30rpx;font-weight: 500;">推荐产品</text>
<text class="more" @click="goToCourselist()">更多 <text class="iconfont icon-youjiantou"></text> </text>
</view>
</view>
<view class="productList" v-if="cffpCourseInfos.length>0">
<view class="productListBox">
<view class="productListItem" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)">
<view class="top">
<image class="productImg" :src="item.displayImage" alt="" mode="widthFix"></image>
<view class="productDesBox">
{{item.fileSynopsis}}
</view>
</view>
<view class="bottom" style="text-align: left !important;">
<view class="one">
{{item.fileTitle}}
</view>
<view class="two">
<text style="font-size: 28rpx;color: rgba(32, 39, 155, 1);">￥{{item.coursePrice}}</text>
<text v-if="Number(item.salesNumber)>0" style="font-size: 24rpx;color: rgba(166, 166, 166, 1);">已售{{item.salesNumber}}</text>
</view>
</view>
</view>
</view>
</view>
<view class="productEmpty" v-else>
暂无数据
</view>
</view>
<uni-popup ref="joinPopup" type="center" background-color="#fff">
<view class="joinContent">
<view class="joinHeader">
<view class="iconfont icon-hezuo" style="font-size: 35rpx;color: #fff;"></view>
</view>
<view class="joinCon">
<view class="one">
您还未加盟为合伙人
</view>
<view class="two">
成为合伙人后，分享商品，好友购物得收益
</view>
</view>
<view class="joinFotter" @click="gotoApply">
去加盟拿收益
</view>
</view>
</uni-popup>
<!-- 以前的代码 -->
<view class="top">
<view class="compony">
<!-- <view class="compony">
<image src="@/static/logo1.png" mode="widthFix" style="width: 120rpx !important;"></image>
<text class="name">{{cffpUserInfo.name}}</text>
<text class="iconfont icon-31tishi" @click="getIntroduce('center')"></text>
</view>
<!--搜索组件-->
<!-- <search
:isSearch="0"
:userId="userId"
></search> -->
<search
</view> -->
<!-- <search
ref="searchRef"
:isSearch="0"
:userId="userId"
:initialQuery.sync="searchQuery"
v-if="showSearch"
></search>
></search> -->
<!--轮播组件-->
<view class="banner" style="overflow: none;">
<!-- <view class="banner" style="overflow: none;">
<view class="uni-margin-wrap">
<carousel :carouselList="cffpUserInfo.fileUploadItemList" ></carousel>
</view>
</view>
</view> -->
</view>
<view class="message" @click="jumpToAnnouncement()">
<!-- <view class="message" @click="jumpToAnnouncement()">
<view style="display: flex;align-items: center;">
<text class="iconfont icon-gonggao"></text>
<text style="font-size: 27rpx;">{{announcementInfo}}</text>
</view>
<text class="iconfont icon-youjiantou iconStyle"></text>
</view>
<view class="content">
</view> -->
<!-- <view class="content">
<view class="featureContent">
<!-- 模块导航 -->
<view class="nav_wrapper">
<view class="nav_content" v-for="featureItem in featureLists" :key="featureItem.key"
@click="featureSelect(featureItem)">
<!-- <view style="width: 120rpx;text-align: center;">
<image :src="'/static/moduleIcon/'+featureItem.icon + '.png'" alt="" srcset=""
mode="widthFix"></image>
</view> -->
<view class="imgbox">
<view class="iconfont iconSize" :class="`${featureItem.icon}`"></view>
</view>
......@@ -50,32 +147,39 @@
</view>
</view>
</view>
</view>
<view class="course_content">
</view> -->
<!-- <view class="course_content">
<view class="tag">
<h4>推荐产品</h4>
<view @click="goToCourselist()" style="font-size: 30rpx;">更多<text class="iconfont icon-youjiantou iconStyle"></text></view>
</view>
<!-- <courselist :onlyShowList="0"></courselist> -->
<view class="ulBox" v-if="cffpCourseInfos.length>0">
<view class="liBox" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)">
<!-- :tagList="{v1:item.fileLecturerRanks,v2:item.fileLecturerName}" -->
<course-item :thumbnailPath="item.displayImage" :title="item.fileTitle"
:summaryBox="item.fileSynopsis"
:dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}"
></course-item>
</view>
</view>
</view>
<view class="" style="text-align: center;color: #666666;font-size: 24rpx;margin-top: 20rpx;">
</view> -->
<!-- <view class="" style="text-align: center;color: #666666;font-size: 24rpx;margin-top: 20rpx;">
由{{companyFullName}}提供
</view>
</view> -->
<!-- <tabBar :currentPage="currentPage"></tabBar> -->
</view>
<uni-popup ref="popup" type="top" background-color="#fff">
<view class="description">
{{cffpUserInfo.description}}
<view class="descriptionBox">
<view class="popupClose">
<text class="iconfont icon-guanbi" @click="$refs.popup.close()"></text>
</view>
<view class="imageBox">
<image src="@/static/logo1.png" mode="widthFix" style="width: 120rpx !important;"></image>
</view>
<view class="description">
{{cffpUserInfo.description}}
</view>
</view>
</uni-popup>
</template>
......@@ -112,7 +216,8 @@
name: '佣金',
icon: 'icon-yongjin',
link: '/pages/pointsExchange/pointsExchange',
isOpen: true
isOpen: true,
isJoin: true
},
{
key: '02',
......@@ -215,7 +320,24 @@
uni.$off('loginUpdate', this.queryAreaCenterInfo);
},
methods: {
gotoApply(){
uni.navigateTo({
url: '/pages/application-process/basic-info'
})
this.$refs.joinPopup.close()
},
jumpUrl(url) {
if (!url) {
return false
} else {
const match = url.match(/fileId=([^&]*)/);
const fileId = match ? match[1] : null;
uni.navigateTo({
url: `/pages/courseDetail/courseDetail?fileId=${fileId}`
})
}
},
init() {
if (uni.getStorageSync('isLogin')) {
let loginType = uni.getStorageSync('loginType')
......@@ -282,6 +404,11 @@
url: `/pages/courseDetail/courseDetail?fileId=${item.fileId}`
});
},
getCourseList(res){
console.log('res',res);
this.queryName = res;
this.courseList()
},
courseList() {
const param = {
queryName: this.queryName
......@@ -289,6 +416,11 @@
api.courseList(param).then(res => {
if (res['success']) {
this.cffpCourseInfos = res['data']['data'];
if(this.cffpCourseInfos.length>0){
this.cffpCourseInfos.forEach(item=>{
item.coursePrice =Number(item.coursePrice).toFixed(2) || '0.00'
})
}
}
})
},
......@@ -331,12 +463,13 @@
return false
}
}
if (this.cffpUserInfo.partnerType == null && featureItem.name == '邀请加盟') {
uni.showToast({
title: "您本人尚未加盟，您加盟后可邀请加盟",
duration: 2000,
icon: 'none'
});
if (this.cffpUserInfo.partnerType == null && featureItem.isJoin) {
this.$refs.joinPopup.open()
// uni.showToast({
// title: "您本人尚未加盟，您加盟后可邀请加盟",
// duration: 2000,
// icon: 'none'
// });
return false
} else if (featureItem.isOpen && featureItem.link) {
if (featureItem.key == '07') {
......@@ -407,41 +540,281 @@
</script>
<style lang="scss" scoped>
::v-deep .uni-popup .uni-popup__wrapper{
margin: 0 !important;
border-radius: 30rpx;
}
.container {
padding: 30rpx 30rpx 20rpx;
height: auto;
overflow-y: auto; /* 关键属性 */
-webkit-overflow-scrolling: touch; /* 优化移动端滚动 */
.top {
.compony {
overflow-y: auto; /* 关键属性 */
-webkit-overflow-scrolling: touch; /* 优化移动端滚动 */
background-color: rgba(235, 239, 247, 1);
.homeHeader{
box-sizing: border-box;
width: 100%;
background: linear-gradient(225deg, rgba(65, 69, 188, 1) 0%, rgba(29, 30, 125, 1) 100%);
padding: 15rpx 30rpx;
.top{
width: 100%;
display: flex;
align-items: center;
// max-height: 150rpx;
// overflow: hidden;
.name {
font-size: 36rpx;
justify-content: space-between;
.one{
width: 80%;
}
image {
margin-right: 40rpx;
.two{
.icon-gongsi{
font-size: 40rpx;
color: #fff;
}
}
}
.bottom{
.content {
overflow: hidden;
position: relative;
.featureContent {
box-sizing: border-box;
padding: 30rpx 0;
.nav_wrapper {
display: flex;
align-items: center;
justify-content: space-around;
flex-wrap: wrap;
width: 100%;
box-sizing: border-box;
.nav_content {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
flex: 0 0 20%;
font-size: 14px;
color: rgba(51, 51, 51, 1);
image {
max-width: 80%;
}
.imgbox{
margin-bottom: 10rpx;
.iconSize{
font-size: 40rpx;
color: #fff;
}
}
}
}
}
}
.icon-31tishi {
font-size: 40rpx;
}
}
.carouselBox{
width: 100%;
background-color: #fff;
padding: 15rpx;
box-sizing: border-box;
overflow: hidden;
.swiperBox{
.swiperItemBox{
position: relative;
.swiperBtn{
position: absolute;
left: 10%;
bottom: 20%;
padding: 15rpx 30rpx;
border-radius: 50rpx;
z-index: 2;
color: #fff;
font-size: 26rpx;
background: linear-gradient(180deg, rgba(111, 156, 255, 1) 0%, rgba(34, 96, 251, 1) 100%);
}
.swiperImg{
width: 100%;
height: 100%;
border-radius: 50rpx;
}
}
}
.banner {
border-radius: 20rpx;
overflow: hidden;
margin-bottom: 30rpx;
.swiper{
height:250rpx;
}
.productBox{
background-color: #fff;
margin-top: 15rpx;
box-sizing: border-box;
margin-bottom: 100rpx;
.productTitle{
border-bottom: 1rpx solid rgba(238, 238, 238, 1);
padding-bottom: 10rpx;
.titleTxt{
padding: 15rpx 30rpx;
display: flex;
justify-content: space-between;
align-items: center;
}
.more{
font-size: 26rpx;
color: rgba(84, 84, 84, 1);
.icon-youjiantou{
font-size: 26rpx;
}
}
}
.productList{
.productListBox{
padding: 30rpx 40rpx;
display: flex;
align-items: center;
justify-content: space-between;
flex-wrap: wrap;
.productListItem{
width: 48%;
margin-bottom: 20rpx;
display: flex;
align-items: center;
flex-direction: column;
overflow: hidden;
.top{
// background-color: pink;
width: 290rpx;
position: relative;
overflow: hidden;
.productDesBox{
padding: 5rpx 10rpx 10rpx 10rpx;
box-sizing: border-box;
position: absolute;
left: 0;
bottom: 0%;
background: rgba(0, 0, 0, 0.1);
width: 100%;
border-radius: 0 0 20rpx 20rpx; /* 左上 右上 右下 左下 */
font-size: 24rpx;
color: #fff;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; /* 确保不会换行 */
}
.productImg{
border-radius: 20rpx;
display: block;
}
}
.bottom{
box-sizing: border-box;
padding: 10rpx 15rpx;
text-align: left;
width: 100%;
.one{
font-size: 27rpx;
margin-bottom: 5rpx;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; /* 确保不会换行 */
}
.two{
display: flex;
align-items: center;
justify-content: space-between;
padding-right: 10rpx;
}
}
}
}
}
.productEmpty{
color: rgba(166, 166, 166, 1);
width: 100%;
display: flex;
align-items: center;
justify-content: center;
padding: 30rpx 0;
font-size: 28rpx;
}
}
.joinContent{
width: 500rpx;
// height: 300rpx;
border-radius: 30rpx;
background-color: #ffff;
padding: 30rpx;
box-sizing: border-box;
display: flex;
align-items: center;
flex-direction: column;
.joinHeader{
width: 60rpx;
height: 60rpx;
border-radius: 50%;
background: rgba(54, 57, 169, 1);
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 20rpx;
}
.joinCon{
// padding: 20rpx 0;
.one{
font-size: 30rpx;
color: rgba(38, 41, 44, 1);
font-weight: 600;
text-align: center;
}
.two{
color: rgba(145, 144, 148, 1);
font-size: 26rpx;
text-align: center;
margin-top: 10rpx;
margin-bottom: 20rpx;
}
}
.joinFotter{
width: 100%;
color: #fff;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
padding: 10rpx 0;
background: rgba(54, 57, 169, 1);
border-radius: 60rpx;
font-size: 28rpx;
}
}
// 之前的样式
// .top {
// .compony {
// display: flex;
// align-items: center;
// .name {
// font-size: 36rpx;
// }
// image {
// margin-right: 40rpx;
// }
// .icon-31tishi {
// font-size: 40rpx;
// }
// }
// .banner {
// border-radius: 20rpx;
// overflow: hidden;
// margin-bottom: 30rpx;
// .swiper{
// height:250rpx;
// }
// }
// }
.message {
display: flex;
......@@ -463,46 +836,46 @@
}
}
.content {
margin-bottom: 20rpx;
overflow: hidden;
background: #fff;
position: relative;
// .content {
// margin-bottom: 20rpx;
// overflow: hidden;
// background: #fff;
// position: relative;
.featureContent {
box-sizing: border-box;
padding: 30rpx 0;
.nav_wrapper {
display: flex;
align-items: center;
justify-content: space-around;
flex-wrap: wrap;
width: 100%;
box-sizing: border-box;
// padding: 10rpx;
.nav_content {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
flex: 0 0 20%;
font-size: 14px;
color: rgba(51, 51, 51, 1);
// margin: 10px 2%;
// .featureContent {
// box-sizing: border-box;
// padding: 30rpx 0;
// .nav_wrapper {
// display: flex;
// align-items: center;
// justify-content: space-around;
// flex-wrap: wrap;
// width: 100%;
// box-sizing: border-box;
// // padding: 10rpx;
// .nav_content {
// display: flex;
// flex-direction: column;
// align-items: center;
// justify-content: center;
// flex: 0 0 20%;
// font-size: 14px;
// color: rgba(51, 51, 51, 1);
// // margin: 10px 2%;
image {
max-width: 80%;
}
.imgbox{
margin-bottom: 10rpx;
.iconSize{
font-size: 40rpx;
}
}
}
}
}
}
// image {
// max-width: 80%;
// }
// .imgbox{
// margin-bottom: 10rpx;
// .iconSize{
// font-size: 40rpx;
// }
// }
// }
// }
// }
// }
.course_content {
position: relative;
......@@ -537,12 +910,34 @@
}
}
}
.descriptionBox {
width: 550rpx;
padding: 40rpx;
.popupClose{
display: flex;
align-items: center;
justify-content: flex-end;
.icon-guanbi{
font-size: 28rpx;
}
}
.imageBox{
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 20rpx;
}
.description{
color: rgba(56, 56, 56, 1);
font-size: 26rpx;
line-height: 1.5;
}
}
.ulBox {
flex-direction: column;
width: 100%;
box-sizing: border-box;
// background-color: #20279b;
}
.liBox {
......@@ -554,7 +949,5 @@
width: 100%;
}
.description {
padding: 40rpx;
}
</style>
\ No newline at end of file
pages/inviteJoin/inviteJoin.vue
......@@ -495,17 +495,17 @@
}
&.listUl::before {
display: block;
content: '';
position: absolute;
left: 10rpx;
top: 20rpx;
width: 8rpx;
height: 20rpx;
background-color: #FA882F;
border-radius: 8rpx;
}
// &.listUl::before {
// display: block;
// content: '';
// position: absolute;
// left: 10rpx;
// top: 20rpx;
// width: 8rpx;
// height: 20rpx;
// background-color: #FA882F;
// border-radius: 8rpx;
// }
}
.sendInvite {
......
pages/myShare/myShare.vue
......@@ -41,7 +41,7 @@
</view>
<!-- 分享明细 -->
<view class="shareDetailContent">
<h3>分享明细</h3>
<h3 class="shareTitle">分享明细</h3>
<template v-if="userShareCourses && userShareCourses.length > 0">
<view class="shareOrderInfoItem" v-for="item in userShareCourses" :key="item.fileId">
<view class="timeBox">{{item.shareDate}}</view>
......@@ -186,8 +186,7 @@
<style lang="scss" scoped>
.container {
height: 100%;
padding-bottom: 30rpx;
.timeSelectContent {
background-color: #fff;
padding: 20rpx 0;
......@@ -195,7 +194,6 @@
justify-content: center;
align-items: baseline;
color: #333;
.xiajiantou {
color: #999;
font-size: 24rpx;
......@@ -206,10 +204,11 @@
.shareStatisticalContent {
background-color: #fff;
margin: 10rpx 20rpx;
margin: 20rpx 20rpx;
padding: 20rpx 14rpx;
display: flex;
flex-wrap: wrap;
border-radius: 10rpx;
.statisticItem {
flex: 1;
......@@ -241,47 +240,51 @@
}
.shareDetailContent {
h3 {
margin-bottom: 50rpx;
.shareTitle {
margin: 20rpx 20rpx 0 20rpx;
padding: 20rpx;
border-bottom: 1rpx solid #F2F2F2;
color: #333;
font-size: 36rpx;
position: relative;
margin: 10rpx 0 10rpx 58rpx;
&::before {
content: '';
display: block;
position: absolute;
left: -5px;
top: 4px;
width: 2px;
height: 70%;
border-radius: 4rpx;
background-color: #FA882F;
}
background-color: #fff;
border-radius: 10rpx 10rpx 0rpx 0rpx;
// &::before {
// content: '';
// display: block;
// position: absolute;
// left: 2%;
// top: 50%;
// transform: translateY(-50%);
// width: 3rpx;
// height: 50%;
// border-radius: 4rpx;
// background-color: #3639A9;
// }
}
.shareOrderInfoItem {
margin: 0 20rpx;
background-color: #fff;
box-sizing: border-box;
padding: 20rpx;
.timeBox {
font-size: 28rpx;
color: #999;
margin: 10rpx 0 10rpx 50rpx;
margin-bottom: 10rpx;
}
.countsContent {
background-color: #fff;
display: flex;
border-bottom-left-radius: 20rpx;
border-bottom-right-radius: 20rpx;
padding: 10rpx 10rpx 20rpx 10rpx;
padding: 20rpx 0;
view {
flex: 1;
font-size: 24rpx;
display: flex;
align-items: center;
text {
color: #666;
......@@ -293,7 +296,12 @@
}
}
}
}
.shareOrderInfoItem:last-child{
border-radius: 0 0 10rpx 10rpx;
}
}
}
</style>
pages/orderDetail/orderDetail.vue
<template>
<view class="container" style="padding-top: 50rpx;">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 16rpx;"></text>
<view class="container" >
<!-- <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 16rpx;"></text> -->
<view class="backArrow">
<text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
<text style="font-size: 30rpx;">订单详情</text>
</view>
<view class="orderInfoContent">
<view class="ulBox">
<view v-for="item in orderInfoList.filter(item=>item.pageArea===1)" :key="item.id" class="liBox">
......@@ -232,13 +236,30 @@
<style lang="scss" scoped>
.container {
height: 100%;
.backArrow{
box-sizing: border-box;
display: flex;
height: 100rpx;
justify-content: space-between;
align-items: center;
position: relative;
width: 100%;
margin-bottom: 10rpx;
color: #333333;
background-color: #fff;
// margin-top: 20rpx;
text:nth-child(2){
width: 100%;
text-align: center;
position: absolute;
}
}
.orderInfoContent {
.ulBox {
background-color: #fff;
margin: 20rpx 22rpx;
margin: 20rpx 20rpx;
padding: 20rpx;
border-radius: 10rpx;
.liBox {
margin-bottom: 20rpx;
display: flex;
......
pages/orderStatus/orderStatus.vue
......@@ -4,7 +4,7 @@
<view class="successBox" v-if="orderStatus=='2'">
<i class="iconfont icon-dengdai"></i>
<text class="statusText">订单支付成功</text>
<text @click="viewDetail()" class="viewOrder">查看订单 ></text>
<text @click="viewDetail()" class="viewOrder">查看订单</text>
</view>
<view class="failBox" v-if="orderStatus=='1'">
<text style="color:#F04604"><i class="iconfont icon-guanbi"></i>订单支付失败</text>
......@@ -15,7 +15,7 @@
</view>
</view>
<!-- 精选课程 -->
<view class="courlistBox">
<!-- <view class="courlistBox">
<view class="course_content">
<view class="tag">
<h4>推荐产品</h4>
......@@ -27,6 +27,39 @@
</view>
</view>
</view>
</view> -->
<view class="productBox">
<view class="productTitle">
<view class="titleTxt">
<text style="font-size: 30rpx;font-weight: 500;">推荐产品</text>
<text class="more" @click="goToCourselist()">更多 <text class="iconfont icon-youjiantou"></text> </text>
</view>
</view>
<view class="productList" v-if="cffpCourseInfos.length>0">
<view class="productListBox">
<view class="productListItem" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)">
<view class="top">
<image class="productImg" :src="item.displayImage" alt="" mode="widthFix"></image>
<view class="productDesBox">
{{item.fileSynopsis}}
</view>
</view>
<view class="bottom" style="text-align: left !important;">
<view class="one">
{{item.fileTitle}}
</view>
<view class="two">
<text style="font-size: 28rpx;color: rgba(32, 39, 155, 1);">￥{{item.coursePrice}}</text>
<text v-if="Number(item.salesNumber)>0" style="font-size: 24rpx;color: rgba(166, 166, 166, 1);">已售{{item.salesNumber}}</text>
</view>
</view>
</view>
</view>
</view>
<view class="productEmpty" v-else>
暂无数据
</view>
</view>
<tabBar :currentPage="currentPage" :infoTotal="infoTotal"></tabBar>
</view>
......@@ -147,6 +180,109 @@
</script>
<style lang="scss" scoped>
.container{
padding-bottom: 50rpx;
.productBox{
background-color: #fff;
margin-top: 15rpx;
box-sizing: border-box;
margin-bottom: 100rpx;
.productTitle{
border-bottom: 1rpx solid rgba(238, 238, 238, 1);
padding-bottom: 10rpx;
.titleTxt{
padding: 15rpx 30rpx;
display: flex;
justify-content: space-between;
align-items: center;
}
.more{
font-size: 26rpx;
color: rgba(84, 84, 84, 1);
.icon-youjiantou{
font-size: 26rpx;
}
}
}
.productList{
.productListBox{
padding: 30rpx 40rpx;
display: flex;
align-items: center;
justify-content: space-between;
flex-wrap: wrap;
.productListItem{
width: 48%;
margin-bottom: 20rpx;
display: flex;
align-items: center;
flex-direction: column;
overflow: hidden;
.top{
// background-color: pink;
width: 290rpx;
position: relative;
overflow: hidden;
.productDesBox{
padding: 5rpx 10rpx 10rpx 10rpx;
box-sizing: border-box;
position: absolute;
left: 0;
bottom: 0%;
background: rgba(0, 0, 0, 0.1);
width: 100%;
border-radius: 0 0 20rpx 20rpx; /* 左上 右上 右下 左下 */
font-size: 24rpx;
color: #fff;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; /* 确保不会换行 */
}
.productImg{
border-radius: 20rpx;
display: block;
}
}
.bottom{
box-sizing: border-box;
padding: 10rpx 15rpx;
text-align: left;
width: 100%;
.one{
font-size: 27rpx;
margin-bottom: 5rpx;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; /* 确保不会换行 */
}
.two{
display: flex;
align-items: center;
justify-content: space-between;
padding-right: 10rpx;
}
}
}
}
}
.productEmpty{
color: rgba(166, 166, 166, 1);
width: 100%;
display: flex;
align-items: center;
justify-content: center;
padding: 30rpx 0;
font-size: 28rpx;
}
}
}
.ulBox{
flex-direction: column;
}
......@@ -169,9 +305,12 @@
font-size: 36rpx;
}
.viewOrder{
color: #666666;
color: #fff;
font-size: 30rpx;
margin-top: 30rpx;
background-color: #20279B;
padding: 10rpx 20rpx;
border-radius: 40rpx;
}
.iconfont{
margin-bottom: 30rpx;
......
pages/personalCenter/helpCenter.vue 0 → 100644
<template>
<view class="container">
<view class="backArrow">
<text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
<text style="font-size: 30rpx;">帮助中心</text>
</view>
<view class="filterBox">
<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120">
<view
class="scroll-view-item_H"
v-for="item in tabList"
:key="item.id"
:class="{active:item.id == currentTab }"
@click="changeTab(item)"
>
{{item.title}}
</view>
</scroll-view>
</view>
<view class="questionsBox">
<view class="questionItem" v-for="item in newQuestionData" :key="item.id">
<view class="" >
<view class="itemTit">
<text class="iconfont myIcon" :class="item.icon" ></text>
{{item.category}}
</view>
<view class="itemQuestion" v-for="(question, index) in item.questions" :key="index">
<view class="Q">
Q:{{question.Q}}
</view>
<view class="A" v-if="question.isMore">
<view class="">
A:
</view>
<view class="" v-for="(a, index1) in question.A" :key="index1">
{{a}}
</view>
</view>
<view class="A" v-else>
A:{{question.A}}
</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
import questionsData from "@/util/questions";
export default {
data() {
return {
tabList:[
{title:'关于团队',id: '1'},
{title:'关于订单',id: '2'},
{title:'关于佣金',id: '3'},
],
currentTab:'1',
// questionsData:[]
}
},
computed:{
newQuestionData(){
let result = questionsData.filter(item=>item.id==this.currentTab)
return result
}
},
methods:{
changeTab(item){
this.currentTab = item.id
},
goBack(){
uni.navigateBack({
delta: 1
});
},
},
}
</script>
<style lang="scss" scoped>
.container{
padding-bottom: 50rpx;
.backArrow{
box-sizing: border-box;
display: flex;
height: 100rpx;
justify-content: space-between;
align-items: center;
position: relative;
width: 100%;
color: #333333;
background-color: #fff;
text:nth-child(2){
width: 100%;
text-align: center;
position: absolute;
}
}
.filterBox{
box-sizing: border-box;
width: 100%;
background-color: #fff;
padding: 20rpx 60rpx 0 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 {
margin-bottom: 20rpx;
display: inline-block;
margin-right: 20rpx;
text-align: center;
font-size: 27rpx;
padding: 10rpx 20rpx;
color: rgba(46, 38, 29, 1);
&.active{
color: rgba(32, 39, 155, 1);
position: relative;
}
&.active::before{
display: block;
content: "";
position: absolute;
left: 50%;
transform: translate(-50%);
bottom: -3%;
width: 50%;
// height: 1rpx;
border: 1rpx solid rgba(32, 39, 155, 1);
border-radius: 5rpx;
}
}
.scroll-view-item_H:last-child{
margin-right: 0rpx;
}
.scrollBtn: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;
}
}
}
.questionsBox{
padding: 20rpx;
box-sizing: border-box;
.questionItem{
box-sizing: border-box;
margin-bottom: 20rpx;
width: 100%;
background-color: #fff;
border-radius: 10rpx;
padding: 20rpx;
.itemTit{
font-size: 30rpx;
font-weight: 500;
.myIcon{
font-size: 32rpx;
color: rgba(32, 39, 155, 1);
}
}
.itemQuestion{
padding: 20rpx 0;
border-bottom: 1rpx solid #f2f2f2;
.Q{
margin-bottom: 10rpx;
font-size: 28rpx;
}
.A{
font-size: 26rpx;
color: #666;
line-height: 1.5;
}
}
.itemQuestion:last-child{
border: none;
}
}
}
}
</style>
\ No newline at end of file
pages/personalCenter/myTeam.vue
<template>
<view class="container">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 20rpx;"></text>
<!-- <view v-for="item in minorMenuLists.filter(v=>v.isShow)" :key="item.title" @click="goteam(item)" class="liBox">
<view class="infoBox">
<view class="infoBoxtext">{{item.title}}</view>
<view class="myHeader">
<view class="backArrow">
<text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
<text style="font-size: 30rpx;">我的团队</text>
</view>
<view class="iconBox">
<i class="iconfont icon-youjiantou"></i>
<view class="timeBox" v-if="currentBtn == '2'" @click="showTime1 = true">
<CommonTimePicker
:timeData="startDate"
:visible="showTime1"
iconColor="#fff"
@confirmDate="changeStartTime"
@closeTime="showTime1=false"
/>
</view>
</view> -->
<view class="ulBox">
<view v-for="item in minorMenuLists.filter(v=>v.isShow)" :key="item.title" @click="goteam(item)"
class="liBox">
<view class="infoBox">
<text>{{item.title}}</text>
<view class="renshu">
<view class="top">
<view class="left">
<text v-if="currentBtn == '1'">团队有效人数</text>
<text v-if="currentBtn == '2'">团队标准销售额</text>
</view>
<view class="right" @click="changeCurrentBtn">
<text v-if="currentBtn == '1'">查看业绩</text>
<text v-if="currentBtn == '2'">查看团队</text>
</view>
</view>
<view class="bottom">
<text v-if="currentBtn == '1'">{{teamCount}}人</text>
<text v-if="currentBtn == '2'">￥{{monthStandardSales}}</text>
</view>
</view>
<view class="moneyBox">
<view class="one">
<view v-if="currentBtn == '1'" class="">
￥{{monthStandardSales}}
</view>
<view v-if="currentBtn == '2'" class="">
￥{{totalCoursePrice}}
</view>
<view style="margin-top: 5rpx;">
<text v-if="currentBtn == '1'">本月团队标准销售额</text>
<text v-if="currentBtn == '2'">总销售额</text>
</view>
</view>
<view class="two">
<view class="">
{{totalOrder}}
</view>
<view style="margin-top: 5rpx;">
<text>团队出单数</text>
</view>
</view>
</view>
</view>
<view
v-if="currentBtn == '2'"
class="filterBox"
style="background: none;margin: 10rpx 0;">
<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120">
<view
class="scrollBtn"
v-for="item in btnList"
:key="item.id"
:class="{active:item.id == currentFilterBtn }"
@click="sortswitch(item)"
>
{{item.title}}
</view>
</scroll-view>
</view>
<view class="filterBox" :style="{marginTop:currentBtn=='1'?'20rpx':''}">
<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120">
<view
class="scroll-view-item_H"
v-for="item in tabList"
:key="item.id"
:class="{active:item.id == currentTab }"
@click="changeTab(item)"
>
{{item.title}}
</view>
</scroll-view>
</view>
<view class="tableBox">
<view class="table">
<view class="content-box">
<view class="content-box-title" v-for="(item,index) in tableHeaderList" :key="index">
<text class="title">{{item.title}}</text>
</view>
</view>
<view v-if="currentBtn == '1'&&myTeamList.length>0">
<view class="content-sam-box" v-for="(pointItem,index) in myTeamList" :key="index">
<span class="content-box-title cell">{{pointItem.parentName}}</span>
<span class="content-box-title cell">{{pointItem.name}}</span>
<span class="content-box-title cell">{{pointItem.levelName}}</span>
<span class="content-box-title cell">{{pointItem.referrer}}</span>
</view>
</view>
<view class="iconBox">
<view class="" v-if="item.isType == 'text'">
<text>{{item.contentType}}</text>
<view v-else-if="currentBtn == '2'&&myTeamAchievementList.length>0">
<view class="content-sam-box" v-for="(pointItem,index) in myTeamAchievementList" :key="index">
<span class="content-box-title cell">{{pointItem.name}}</span>
<span class="content-box-title cell">{{pointItem.orderNum}}</span>
<span class="content-box-title cell">￥{{pointItem.coursePrice}}</span>
<span class="content-box-title cell" >￥{{pointItem.monthStandardSales || '0.00'}}</span>
</view>
<i v-else class="iconfont icon-youjiantou iconStyle"></i>
</view>
<view class="empty" v-else>
暂无数据
</view>
</view>
</view>
......@@ -27,16 +114,195 @@
</template>
<script>
import CommonTimePicker from '@/components/commonTimePicker/commonTimePicker.vue';
import dataHandling from "@/util/dataHandling";
import api from "@/api/api";
export default {
components: {
CommonTimePicker
},
data() {
return {
minorMenuLists:[
{title:'成员信息',icon:'shareEcode',link:'',isOpen:true,isShow:true,type: 1},
{title:'团队业绩',icon:'card',link:'',isOpen:true,isShow:true,type: 2},
]
showTime1:false,
startDate:{year:dataHandling.getDateParts().year,month:dataHandling.getDateParts().month},
tabList:[
{title:'全部',id: '1',type:4},
{title:'直辖团队',id: '2',type:1},
{title:'所辖团队',id: '3',type:2},
],
btnList:[
{title:'按标准销售额',id: '1',sortType:5},
{title:'按销售额',id: '2',sortType:2},
{title:'按销售日期',id: '3',sortType:4},
],
tableHeaderList:[
{title:'上级',id:'1'},
{title:'成员',id:'2'},
{title:'职级',id:'3'},
{title:'关系',id:'4'},
],
currentTab:'1',
currentBtn:'1', // 1代表团队 2代表业绩
currentFilterBtn:'1',
teamCount:0,//团队总人数，育成团队人数不算
userId: uni.getStorageSync('cffp_userId'),
otherList: null, // 直辖团队
directList: null, //所辖团队数组
myTeamList:[],//我的团队表格数据，
myTeamData:{},//我的团队总数据，
CffpOrgInfoReqVO: {
userId: uni.getStorageSync('cffp_userId'),
startDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
endDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
courseOrPolicy: '1',
type: '2',
sortType:5
},
totalOrder: '0', //总单数
totalCoursePrice: '0.00', // 总销售额
monthStandardSales:'0.00',//本月团队标准销售额
myTeamAchievementList:[],//我的业绩数据列表
}
},
watch: {
currentBtn: {
deep: true,
handler(newVal) {
if(newVal == '1') {
this.tableHeaderList = [
{title:'上级',id:'1'},
{title:'成员',id:'2'},
{title:'职级',id:'3'},
{title:'关系',id:'4'},
]
this.getmyseatem()
return
}
if(newVal == '2') {
this.tableHeaderList = [
{title:'成员',id:'1'},
{title:'单数',id:'2'},
{title:'销售额',id:'3'},
{title:'标准销售额',id:'4'},
]
this.getqueryTeamAchievement()
return
}
}
},
currentTab: {
deep: true,
handler(newVal) {
this.myTeamList = []
if(newVal == '1') {
if(this.myTeamData.other && this.myTeamData.other.length != 0 && this.myTeamData.other != null){
this.myTeamList.push(...this.myTeamData['other'])
}
if(this.myTeamData.directList && this.myTeamData.directList.length != 0 && this.myTeamData.directList != null){
this.myTeamList.push( ...this.myTeamData['directList'])
}
return
}
if(newVal == '2') {
if(this.myTeamData.other && this.myTeamData.other.length != 0 && this.myTeamData.other != null){
this.myTeamList.push(...this.myTeamData['other'])
}
}
if(newVal == '3'){
if(this.myTeamData.directList && this.myTeamData.directList.length != 0 && this.myTeamData.directList != null){
this.myTeamList.push( ...this.myTeamData['directList'])
}
}
console.log();
}
},
},
onLoad(){
this.getmyseatem()
this.getqueryTeamAchievement()
},
methods: {
sortswitch(obj) {
this.currentFilterBtn = obj.id
this.CffpOrgInfoReqVO.sortType = obj.sortType
this.getqueryTeamAchievement()
// if(obj.sortType == 4){
// this.CffpOrgInfoReqVO.sortType = obj.sortType
// this.getqueryTeamAchievement()
// }else{
// delete this.CffpOrgInfoReqVO.sortType
// this.getqueryTeamAchievement()
// }
},
changeTab(item){
this.currentTab = item.id
if(this.currentBtn == '2'){
this.getqueryTeamAchievement()
}
},
getqueryTeamAchievement() {
this.CffpOrgInfoReqVO.queryType = this.tabList.filter(item=>item.id == this.currentTab)[0].type
this.CffpOrgInfoReqVO.sortType = this.btnList.filter(item=>item.id == this.currentFilterBtn)[0].sortType
api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => {
if (res['success']) {
this.myTeamAchievementList = []
// this.listType = true
this.myTeamAchievementList = res.data.list || [];
if(this.myTeamAchievementList.length>0){
this.myTeamAchievementList.forEach(item=>{
item.saleDate = dataHandling.dateFormat2(item.saleDate,'yyyy-MM-dd')
item.coursePrice = Number(item.coursePrice).toFixed(2) || '0.00'
})
}
this.totalOrder = res.data.totalOrder ? res.data.totalOrder : '0';
this.totalCoursePrice = res.data.totalCoursePrice ? Number(res.data.totalCoursePrice).toFixed(2) : '0.00';
this.monthStandardSales = res.data.monthStandardSales ? Number(res.data.monthStandardSales).toFixed(2) : '0.00';
}
})
},
// 获取团队数据
getmyseatem() {
this.myTeamList = []
api.queryMyTeamInfo({
userId: this.userId,
type: '1'
}).then(res =>{
if(res['success']){
let data = res.data
this.myTeamData = res.data
if(data.orgInfo) {
this.teamCount = data.orgInfo.count
}
if(data.other && data.other.length != 0 && data.other != null){
this.myTeamList.push(...data['other'])
}
if(data.directList && data.directList.length != 0 && data.directList != null){
this.myTeamList.push( ...data['directList'])
}
}
})
},
changeStartTime(obj){
this.startDate = obj
this.CffpOrgInfoReqVO.startDate=`${obj.year}-${obj.month<10?`0${obj.month}`:obj.month}`
this.CffpOrgInfoReqVO.endDate=`${obj.year}-${obj.month<10?`0${obj.month}`:obj.month}`
this.getqueryTeamAchievement()
this.showTime1 = false
},
changeCurrentBtn(){
this.currentTab = '1'
this.currentFilterBtn = '1'
if(this.currentBtn == '1'){
this.currentBtn = '2'
return
}
if(this.currentBtn == '2'){
this.currentBtn = '1'
}
},
goBack(){
uni.navigateBack({
delta: 1
......@@ -54,55 +320,260 @@
}
},
},
onLoad() {
},
mounted() {
}
}
</script>
<style lang="scss" scoped>
.container{
height: 100%;
background: #FFFFFF;
padding-top: 50rpx;
}
.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 {
background-color: rgba(235, 239, 247, 1);
display: flex;
flex-direction: column;
box-sizing: border-box;
.myHeader{
color: #fff;
box-sizing: border-box;
background: linear-gradient(225deg, rgba(65, 69, 188, 1) 0%, rgba(29, 30, 125, 1) 100%);
.backArrow{
box-sizing: border-box;
display: flex;
height: 60rpx;
justify-content: space-between;
align-items: center;
font-size: 28rpx;
image {
width: 52rpx !important;
height: 52rpx;
position: relative;
width: 100%;
margin-bottom: 10rpx;
color: #fff;
margin-top: 20rpx;
text:nth-child(2){
width: 100%;
text-align: center;
position: absolute;
}
}
& > view:first-child{
position: relative;
&::after{
content:'';
.timeBox{
padding-left: 25rpx;
width: 50%;
}
.renshu{
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;
left: 0;
bottom: -6rpx;
background: linear-gradient(90deg,#FA882F, #D9D9D9);
border-radius: 4rpx;
height: 8rpx;
width: 80rpx;
top: 50%;
transform: translateY(-50%);
right: 0;
content: '';
height: 40rpx;
border: 1rpx dashed #fff;
}
.two{
font-size: 26rpx;
text-align: center;
width: 50%;
}
}
&:last-child {
border: none;
}
.filterBox{
box-sizing: border-box;
// margin: 20rpx 0;
width: 100%;
background-color: #fff;
padding: 20rpx 60rpx 0 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 {
margin-bottom: 20rpx;
display: inline-block;
margin-right: 20rpx;
text-align: center;
font-size: 27rpx;
padding: 10rpx 20rpx;
color: rgba(46, 38, 29, 1);
&.active{
color: rgba(32, 39, 155, 1);
position: relative;
}
&.active::before{
display: block;
content: "";
position: absolute;
left: 50%;
transform: translate(-50%);
bottom: -3%;
width: 50%;
// height: 1rpx;
border: 1rpx solid rgba(32, 39, 155, 1);
border-radius: 5rpx;
}
}
.scroll-view-item_H:last-child{
margin-right: 0rpx;
}
.scrollBtn {
display: inline-block;
margin-right: 20rpx;
text-align: center;
font-size: 27rpx;
padding: 10rpx 20rpx;
color: rgba(46, 38, 29, 1);
&.active{
color: rgba(32, 39, 155, 1);
}
}
.scrollBtn: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;
}
}
}
.tableBox{
// background-color: #fff;
padding: 20rpx;
width: 100%;
box-sizing: border-box;
border-radius: 20rpx;
.table{
background-color: #fff;
border-radius: 20rpx;
padding: 10rpx 0;
margin-bottom: 50rpx;
box-sizing: border-box;
.content-box {
display: flex;
font-weight: 600;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #F2F2F2;
padding: 20rpx 0;
}
.content-box-title {
flex: 1;
font-size: 28rpx;
text-align: center;
}
.content-sam-box{
background-color: #fff;
display: flex;
align-items: center;
font-size: 24rpx;
justify-content: space-between;
padding: 20rpx 0;
color: #333333;
border-bottom: 1px solid #F2F2F2;
.cell{
font-size: 24rpx;
}
}
.content-sam-box:last-child{
border: none;
}
.empty{
width: 100%;
display: flex;
align-items: center;
justify-content: center;
height: 200rpx;
font-size: 26rpx;
color: #333333;
}
}
}
}
// 之前的样式
// .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>
\ No newline at end of file
pages/personalCenter/myTeamIncubate.vue 0 → 100644
<template>
<view class="container">
<view class="myHeader">
<view class="backArrow">
<text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
<text style="font-size: 30rpx;">育成团队</text>
</view>
<view class="timeBox" v-if="currentBtn == '2'" @click="showTime1 = true">
<CommonTimePicker
:timeData="startDate"
:visible="showTime1"
iconColor="#fff"
@confirmDate="changeStartTime"
@closeTime="showTime1=false"
/>
</view>
<view class="renshu">
<view class="top">
<view class="left">
<text v-if="currentBtn == '1'">育成部长数</text>
<text v-if="currentBtn == '2'">团队标准销售额</text>
</view>
<view class="right" @click="changeCurrentBtn">
<text v-if="currentBtn == '1'">查看业绩</text>
<text v-if="currentBtn == '2'">查看团队</text>
</view>
</view>
<view class="bottom">
<text v-if="currentBtn == '1'">{{myTeamList.length}}人</text>
<text v-if="currentBtn == '2'">￥{{monthStandardSales}}</text>
</view>
</view>
<view class="moneyBox">
<view class="one">
<view v-if="currentBtn == '1'" class="">
￥{{monthStandardSales}}
</view>
<view v-if="currentBtn == '2'" class="">
￥{{totalCoursePrice}}
</view>
<view style="margin-top: 5rpx;">
<text v-if="currentBtn == '1'">本月团队标准销售额</text>
<text v-if="currentBtn == '2'">总销售额</text>
</view>
</view>
<view class="two">
<view class="">
{{totalOrder}}
</view>
<view style="margin-top: 5rpx;">
<text>团队出单数</text>
</view>
</view>
</view>
</view>
<view
v-if="currentBtn == '2'"
class="filterBox"
style="background: none;margin: 10rpx 0;">
<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120">
<view
class="scrollBtn"
v-for="item in btnList"
:key="item.id"
:class="{active:item.id == currentFilterBtn }"
@click="sortswitch(item)"
>
{{item.title}}
</view>
</scroll-view>
</view>
<!-- <view class="filterBox" :style="{marginTop:currentBtn=='1'?'20rpx':''}">
<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120">
<view
class="scroll-view-item_H"
v-for="item in tabList"
:key="item.id"
:class="{active:item.id == currentTab }"
@click="changeTab(item)"
>
{{item.title}}
</view>
</scroll-view>
</view> -->
<view class="tableBox">
<view class="table">
<view class="content-box">
<view class="content-box-title" v-for="(item,index) in tableHeaderList" :key="index">
<text class="title">{{item.title}}</text>
</view>
</view>
<view v-if="currentBtn == '1'&&myTeamList.length>0">
<view class="content-sam-box" v-for="(pointItem,index) in myTeamList" :key="index">
<span class="content-box-title cell">{{pointItem.raiseTeamLeder}}</span>
<span class="content-box-title cell">{{pointItem.raiseTime}}</span>
<span class="content-box-title cell">{{pointItem.standardSales}}</span>
</view>
</view>
<view v-else-if="currentBtn == '2'&&myTeamAchievementList.length>0">
<view class="content-sam-box" v-for="(pointItem,index) in myTeamAchievementList" :key="index">
<span class="content-box-title cell">{{pointItem.saleDate}}</span>
<span class="content-box-title cell">{{pointItem.orderNum}}</span>
<span class="content-box-title cell">￥{{pointItem.coursePrice}}</span>
<span class="content-box-title cell">￥{{pointItem.standardSales || '0.00'}}</span>
</view>
</view>
<view class="empty" v-else>
暂无数据
</view>
</view>
</view>
</view>
</template>
<script>
import CommonTimePicker from '@/components/commonTimePicker/commonTimePicker.vue';
import dataHandling from "@/util/dataHandling";
import api from "@/api/api";
export default {
components: {
CommonTimePicker
},
data() {
return {
showTime1:false,
startDate:{year:dataHandling.getDateParts().year,month:dataHandling.getDateParts().month},
tabList:[
{title:'全部',id: '1',type:'all'},
{title:'直辖团队',id: '2',type:1},
{title:'所辖团队',id: '3',type:2},
],
btnList:[
{title:'按标准销售额',id: '1',sortType:5},
{title:'按销售额',id: '2',sortType:2},
{title:'按销售日期',id: '3',sortType:4},
],
tableHeaderList:[
{title:'营业部部长',id:'1'},
{title:'育成时间',id:'2'},
{title:'标准销售额',id:'3'},
],
currentTab:'1',
currentBtn:'1', // 1代表团队 2代表业绩
currentFilterBtn:'1',
teamCount:0,//团队总人数，育成团队人数不算
userId: uni.getStorageSync('cffp_userId'),
otherList: null, // 直辖团队
directList: null, //所辖团队数组
myTeamList:[],//我的团队表格数据，
myTeamData:{},//我的团队总数据，
CffpOrgInfoReqVO: {
userId: uni.getStorageSync('cffp_userId'),
startDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
endDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
courseOrPolicy: '1',
type: '2',
queryType:3,
sortType:5
},
totalOrder: '0', //总单数
totalCoursePrice: '0.00', // 总销售额
monthStandardSales:'0.00',//本月团队标准销售额
myTeamAchievementList:[],//我的业绩数据列表
}
},
watch: {
currentBtn: {
deep: true,
handler(newVal) {
if(newVal == '1') {
this.tableHeaderList = [
{title:'营业部部长',id:'1'},
{title:'育成时间',id:'2'},
{title:'标准销售额',id:'3'},
]
this.getmyseatem()
return
}
if(newVal == '2') {
this.tableHeaderList = [
{title:'销售日期',id:'1'},
{title:'单数',id:'2'},
{title:'销售额',id:'3'},
{title:'标准销售额',id:'4'},
]
this.getqueryTeamAchievement()
return
}
}
},
},
onLoad(){
this.getmyseatem()
this.getqueryTeamAchievement()
},
methods: {
sortswitch(obj) {
this.currentFilterBtn = obj.id
this.getqueryTeamAchievement()
},
changeTab(item){
this.currentTab = item.id
if(this.currentBtn == '2'){
this.getqueryTeamAchievement()
}
},
getqueryTeamAchievement() {
this.CffpOrgInfoReqVO.sortType = this.btnList.filter(item=>item.id == this.currentFilterBtn)[0].sortType
console.log('this.CffpOrgInfoReqVO',this.CffpOrgInfoReqVO);
api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => {
if (res['success']) {
this.myTeamAchievementList = []
this.myTeamAchievementList = res.data.list || [];
if(this.myTeamAchievementList.length>0){
this.myTeamAchievementList.forEach(item=>{
item.saleDate = dataHandling.dateFormat2(item.saleDate,'yyyy-MM-dd')
item.coursePrice = Number(item.coursePrice).toFixed(2) || '0.00'
})
}
this.totalOrder = res.data.totalOrder ? res.data.totalOrder : '0';
this.totalCoursePrice = res.data.totalCoursePrice ? Number(res.data.totalCoursePrice).toFixed(2) : '0.00';
this.monthStandardSales = res.data.monthStandardSales ? Number(res.data.monthStandardSales).toFixed(2) : '0.00';
}
})
},
// 获取团队数据
getmyseatem() {
this.myTeamList = []
api.queryMyTeamInfo({
userId: this.userId,
type: '1'
}).then(res =>{
if(res['success']){
let data = res.data
this.myTeamData = res.data
if(data.raiseList && data.raiseList.length != 0 && data.raiseList != null){
this.myTeamList = data.raiseList
this.myTeamList.forEach(item=>{
item.raiseTime = dataHandling.dateFormat2(item.raiseTime,'yyyy-MM-dd')
})
}
console.log('this.myTeamList',this.myTeamList);
}
})
},
changeStartTime(obj){
this.startDate = obj
this.CffpOrgInfoReqVO.startDate=`${obj.year}-${obj.month<10?`0${obj.month}`:obj.month}`
this.CffpOrgInfoReqVO.endDate=`${obj.year}-${obj.month<10?`0${obj.month}`:obj.month}`
this.getqueryTeamAchievement()
this.showTime1 = false
},
changeCurrentBtn(){
this.currentTab = '1'
this.currentFilterBtn = '1'
if(this.currentBtn == '1'){
this.currentBtn = '2'
return
}
if(this.currentBtn == '2'){
this.currentBtn = '1'
}
},
goBack(){
uni.navigateBack({
delta: 1
});
},
goteam(item) {
if(item.type===1){
uni.navigateTo({
url:`/pages/personalCenter/teamMembers/teamMembers`,
})
}else{
uni.navigateTo({
url:`/pages/personalCenter/teamPerformance/teamPerformance`,
})
}
},
},
}
</script>
<style lang="scss" scoped>
.container{
background-color: rgba(235, 239, 247, 1);
display: flex;
flex-direction: column;
.myHeader{
color: #fff;
box-sizing: border-box;
background: linear-gradient(225deg, rgba(65, 69, 188, 1) 0%, rgba(29, 30, 125, 1) 100%);
.backArrow{
box-sizing: border-box;
display: flex;
height: 60rpx;
justify-content: space-between;
align-items: center;
position: relative;
width: 100%;
margin-bottom: 10rpx;
color: #fff;
margin-top: 20rpx;
text:nth-child(2){
width: 100%;
text-align: center;
position: absolute;
}
}
.timeBox{
padding-left: 25rpx;
width: 50%;
}
.renshu{
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 0 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 {
margin-bottom: 20rpx;
display: inline-block;
margin-right: 20rpx;
text-align: center;
font-size: 27rpx;
padding: 10rpx 20rpx;
color: rgba(46, 38, 29, 1);
&.active{
color: rgba(32, 39, 155, 1);
position: relative;
}
&.active::before{
display: block;
content: "";
position: absolute;
left: 50%;
transform: translate(-50%);
bottom: -3%;
width: 50%;
// height: 1rpx;
border: 1rpx solid rgba(32, 39, 155, 1);
border-radius: 5rpx;
}
}
.scroll-view-item_H:last-child{
margin-right: 0rpx;
}
.scrollBtn {
display: inline-block;
margin-right: 20rpx;
text-align: center;
font-size: 27rpx;
padding: 10rpx 20rpx;
color: rgba(46, 38, 29, 1);
&.active{
color: rgba(32, 39, 155, 1);
}
}
.scrollBtn: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;
}
}
}
.tableBox{
padding: 20rpx;
width: 100%;
box-sizing: border-box;
.table{
background-color: #fff;
border-radius: 20rpx;
padding: 10rpx 0;
margin-bottom: 50rpx;
.content-box {
background-color: #fff;
display: flex;
font-weight: 600;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #F2F2F2;
padding: 20rpx 0;
}
.content-box-title {
flex: 1;
font-size: 28rpx;
text-align: center;
}
.content-sam-box{
background-color: #fff;
display: flex;
align-items: center;
font-size: 24rpx;
justify-content: space-between;
padding: 20rpx 0;
color: #333333;
border-bottom: 1px solid #F2F2F2;
.cell{
font-size: 24rpx;
}
}
.content-sam-box:last-child{
border: none;
}
.empty{
width: 100%;
display: flex;
align-items: center;
justify-content: center;
height: 200rpx;
font-size: 26rpx;
color: #333333;
}
}
}
}
// 之前的样式
// .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>
\ No newline at end of file
pages/personalCenter/personalCenter.vue
......@@ -6,7 +6,6 @@
class="avatar"
:style="{backgroundImage: 'url(' + (customerBasicInfo.headPicture || companyLogo) + ')'}"
>
<!-- <image :src="customerBasicInfo.headPicture?customerBasicInfo.headPicture:companyLogo" alt="" mode="widthFix" ></image> -->
</view>
<view class="headerInfo">
<view class="headerTop">
......@@ -18,15 +17,16 @@
{{customerBasicInfo.partnerType}}
</view>
</view>
<view class="nickName">
<text v-if="loginType == 'codelogin' && customerBasicInfo.nickName">昵称：{{customerBasicInfo.nickName}}</text>
<text v-if="loginType == 'visitor'">昵称：游客</text>
</view>
<!-- <view class="nickName">
<text v-if="loginornot && customerBasicInfo.nickName">昵称：{{customerBasicInfo.nickName}}</text>
<text v-if="!loginornot">昵称：游客</text>
</view> -->
</view>
</view>
<view class="right" @click="goDetail(settingItem)">
<view class="iconfont icon-shezhi iconColor" style="font-size: 40rpx;"></view>
<view class="iconfont icon-shezhi " style="font-size: 40rpx;color: #fff;"></view>
</view>
</view>
<view class="myContent">
......@@ -64,74 +64,24 @@
</view>
</view>
</view>
<!-- 头部信息 -->
<!-- <view class="basicInfoBox">
<view class="avatar">
<image :src="customerBasicInfo.headPicture?customerBasicInfo.headPicture:companyLogo" alt="" srcset="" ></image>
</view>
<view class="infoBox">
<view class="firstLineBox">
<view>
<strong>{{loginornot == true ?customerBasicInfo.realName :'游客'}}</strong>
<text class="csTag" v-if="customerBasicInfo.partnerType">{{customerBasicInfo.partnerType}}</text>
</view>
<view class="personalInfoBtn" @click="userinfo()">
<text>个人资料</text>
<i class="iconfont icon-bianji"></i>
</view>
</view>
<view>昵称：{{loginornot == true ?customerBasicInfo.nickName :'游客'}}</view>
<view>{{customerBasicInfo.userDescription}}</view>
</view>
</view -->
<!-- 主要菜单 -->
<!-- <view class="mainMenuBox">
<view class="item" v-for="mainMenu in mainMenuLists" :key="mainMenu.id">
<h4>{{mainMenu.categoryName}}</h4>
<view class="menuItemBox">
<view class="mainMenuItem" v-for="menuItem in mainMenu.children.filter(v=>v.isShow)" :key="menuItem.title" @click="goDetail(menuItem)">
<image :src="'/static/moduleIcon/'+menuItem.icon+'.png'" alt="" srcset="" mode="widthFix"></image>
<text>{{menuItem.title}}</text>
</view>
<uni-popup ref="joinPopup" type="center" background-color="#fff">
<view class="joinContent">
<view class="joinHeader">
<view class="iconfont icon-hezuo" style="font-size: 35rpx;color: #fff;"></view>
</view>
</view>
</view> -->
<!-- 个人信息 -->
<!-- <view class="personalInfo">
<view class="ulBox">
<view v-for="item in minorMenuLists.filter(v=>v.isShow)" :key="item.title" @click="goDetail(item)" class="liBox">
<view class="infoBox">
<image :src="'/static/moduleIcon/'+item.icon+'.png'" alt="" srcset="" mode="widthFix"></image>
<text>{{item.title}}</text>
<view class="joinCon">
<view class="one">
您还未加盟为合伙人
</view>
<view class="iconBox">
<i class="iconfont icon-youjiantou"></i>
<view class="two">
成为合伙人后，分享商品，好友购物得收益
</view>
</view>
</view>
</view> -->
<!-- <tabBar :currentPage="currentPage"></tabBar> -->
<!-- 我的邀请码 -->
<!-- <view class="inviteQrcodeContainer">
<uni-popup ref="popup1" background-color="#fff">
<view class="popup1-content">
<view class="title">
<text></text>
<text>我的邀请码</text>
<i class="iconfont icon-guanbi" @click="closePopup()"></i>
</view>
<view class="content">
<view class="contentBox">
<h3>{{inviteEqrode}}</h3>
</view>
<view class="confirmBtn" @click="copy()">
一键复制
</view>
</view>
<view class="joinFotter" @click="gotoApply">
去加盟拿收益
</view>
</uni-popup>
</view> -->
</view>
</uni-popup>
</view>
</template>
......@@ -196,21 +146,22 @@
{id:'00',categoryName:'交易',
children:[
{title:'成交订单',icon:'icon-dingdan',link:'/pages/saleCourseLists/saleCourseLists',isOpen:true,isShow: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-yongjin',link:'/pages/pointsExchange/pointsExchange',isOpen:true,isShow:true,identity: 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-pinzhishangpinhuichang',link:'pages/courselist/courselist',isOpen:true,isShow:true,isTab:true},
],
},
{id:'01',categoryName:'团队',
children:[
{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-tuandui',link:'/pages/personalCenter/myTeam',isOpen:true,isShow:true},
{title:'我的团队',icon:'icon-tuandui',link:'/pages/personalCenter/myTeam',isOpen:true,isShow:true,identity: true},
{title:'育成团队',icon:'icon-tuandui',link:'/pages/personalCenter/myTeamIncubate',isOpen:true,isShow:true,identity: true},
],
},
{id:'02',categoryName:'帮助',
children:[
{title:'帮助中心',icon:'icon-wenhao1',link:'/pages/personalCenter/helpCenter',isOpen:true,isShow:true,islogin:true},
],
},
],
......@@ -260,6 +211,13 @@
},
methods: {
gotoApply(){
uni.navigateTo({
url: '/pages/application-process/basic-info'
})
this.$refs.joinPopup.close()
},
querySystemMessage(){
if(this.userId){
api.querySystemMessage({systemType:1,userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
......@@ -316,8 +274,13 @@
},
// 菜单跳转页面
goDetail(item){
console.log('item',item);
// 说明不需要登录就可以进
if(item.isLogin){
uni.navigateTo({
url: `${item.link}`
});
return
}
if(!this.loginornot&& !item.islogin){
this.isLogin()
return
......@@ -334,11 +297,12 @@
},
ckidentity(item){
if(item.identity == true && this.customerBasicInfo.partnerType ==null){
uni.showToast({
title: "您本人尚未加盟，您加盟后可邀请加盟",
duration: 2000,
icon: 'none'
});
this.$refs.joinPopup.open()
// uni.showToast({
// title: "您本人尚未加盟，您加盟后可邀请加盟",
// duration: 2000,
// icon: 'none'
// });
return false
}else if(item.title == '邀请加盟'){
uni.navigateTo({
......@@ -430,9 +394,13 @@
</script>
<style lang="scss" scoped>
::v-deep .uni-popup .uni-popup__wrapper{
margin: 0 !important;
border-radius: 30rpx;
}
.container{
box-sizing:border-box;
background-color: #f7f7f7;
// background-color: #f7f7f7;
min-height: 100vh; /* 使用视口高度 */
height: auto !important;
height: 100vh;
......@@ -444,9 +412,7 @@
box-sizing: border-box;
width: 100%;
height: 250rpx;
background-image: url('/static/mySelfBg.png');
background-size: cover;
background-repeat: no-repeat;
background: linear-gradient(225deg, rgba(65, 69, 188, 1) 0%, rgba(29, 30, 125, 1) 100%);
display: flex;
align-items: center;
justify-content: space-between;
......@@ -457,8 +423,8 @@
align-items: center;
.avatar{
flex-grow: 0;
width: 150rpx;
height: 150rpx;
width: 130rpx;
height: 130rpx;
border-radius: 50%;
overflow: hidden;
/* 背景图设置 */
......@@ -490,26 +456,14 @@
flex-direction: column;
justify-content: flex-start;
.headerTop{
display: flex;
align-items: center;
justify-content: flex-start;
color:#fff;
}
// .myName{
// // width: 200rpx;
// min-width: 0;
// white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
// font-size: 32rpx;
// }
.desBox{
border: 1px solid rgba(102, 102, 102, 1);
border-radius: 8rpx;
padding: 0 2rpx;
color: rgba(102, 102, 102, 1);
font-size: 23rpx;
font-size: 24rpx;
font-weight: normal;
text-align: center;
}
.nickName{
font-size: 27rpx;
......@@ -570,196 +524,92 @@
.kuaiTit{
font-size: 30rpx;
}
.kuaiCon{
margin-top: 30rpx;
display: flex;
align-items: center;
justify-content: flex-start;
flex-wrap: wrap;
width: 100%;
.kuaiItem{
display: flex;
align-items: center;
flex-direction: column;
margin-bottom: 40rpx;
font-size: 26rpx;
/* 关键修改：计算宽度时考虑间距 */
width: calc((100% - 40rpx * 2) / 3); /* 3个子项，左右各20rpx间距 */
margin-right: 40rpx; /* 右侧间距 */
.imgbox{
margin-bottom: 10rpx;
.iconSize{
font-size: 40rpx;
}
}
}
/* 每行第3个子项去掉右侧间距 */
.kuaiItem:nth-child(3n) {
margin-right: 0;
}
.kuaiCon {
margin-top: 30rpx;
display: flex;
align-items: center;
justify-content: space-between; /* 改为 space-between 或 space-evenly */
width: 100%;
}
}
.kuaiBox:last-child{
margin-bottom: 100rpx;
}
}
}
.avatar {
width: 90rpx;
height: 80rpx;
/* border: 1rpx solid aqua; */
margin-right: 17rpx;
border-radius: 50%;
}
.avatar image {
width: 100%;
height: 100%;
border-radius: 50%;
}
.loading{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.basicInfoBox{
display: flex;
padding: 67rpx 20rpx 60rpx 28rpx;
background:linear-gradient(26deg, #D8E2E5 0%, #F0E6DD 31%, #E7DBDF 100%);
// .avatar{
// width: 0;
// height: 80rpx;
// border-radius: 50%;
// margin-right: 17rpx;
// background-color: #fff;
// flex: 0 0 80rpx;
// }
.infoBox{
width:100%;
color: #666666;
strong{
color: #333;
}
view{
margin-bottom: 8rpx;
.csTag{
border-radius: 10rpx;
border:1rpx solid #666;
padding: 4rpx 10rpx;
margin-left: 10rpx;
font-size: 24rpx;
.kuaiItem {
display: flex;
align-items: center;
flex-direction: column;
margin-bottom: 40rpx;
font-size: 26rpx;
width: calc((100% - 25rpx * 3) / 4); /* 4个子项，3个间距 */
/* 或者使用 flex-grow 和 flex-basis */
/* flex-basis: calc(25% - 25rpx); */
/* flex-grow: 0; */
}
.personalInfoBtn{
border-radius: 10rpx;
background-color:#5359CD;
color: #fff;
text-align: center;
padding: 6rpx 7rpx;
font-size: 24rpx;
.iconfont{
font-size: 24rpx;
margin-left: 4rpx;
}
/* 每行第4个子项去掉右侧间距 */
.kuaiItem:nth-child(4n) {
margin-right: 0;
}
}
.firstLineBox{
display: flex;
justify-content: space-between;
align-items: center;
}
}
}
.mainMenuBox{
background-color: #fff;
width: 95%;
margin: -60rpx auto 30rpx;
border-radius: 10rpx;
padding: 12rpx 30rpx;
box-sizing: border-box;
h4{
font-size: 30rpx;
color: #333;
margin-bottom: 10rpx;
}
.item{
margin-bottom: 30rpx;
}
.menuItemBox{
display: flex;
flex-wrap: wrap;
.mainMenuItem{
display: flex;
flex-direction: column;
align-items: center;
max-width: 20%;
flex: 1;
uni-image{
width: 100rpx!important;
.imgbox {
margin-bottom: 10rpx;
}
text{
font-size: 28rpx;
color: #333;
.iconSize {
font-size: 40rpx;
}
}
}
}
.personalInfo{
background: #fff;
width: 95%;
margin: 6rpx auto 0;
.ulBox{
padding: 0 30rpx;
.liBox{
display: flex;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #E6E6E6;
height: 92rpx;
.infoBox{
display: flex;
align-items: center;
image{
width: 52rpx !important;
height: 52rpx;
}
}
&:last-child{
border:none;
}
.kuaiBox:last-child{
margin-bottom: 100rpx;
}
}
}
.inviteQrcodeContainer{
.popup1-content{
.title{
.joinContent{
width: 500rpx;
// height: 300rpx;
border-radius: 30rpx;
background-color: #ffff;
padding: 30rpx;
box-sizing: border-box;
display: flex;
align-items: center;
flex-direction: column;
.joinHeader{
width: 60rpx;
height: 60rpx;
border-radius: 50%;
background: rgba(54, 57, 169, 1);
display: flex;
justify-content: space-between;
align-items: center;
justify-content: center;
margin-bottom: 20rpx;
}
.content{
.contentBox{
.joinCon{
// padding: 20rpx 0;
.one{
font-size: 30rpx;
color: rgba(38, 41, 44, 1);
font-weight: 600;
text-align: center;
h3{
padding: 30rpx;
}
}
.two{
color: rgba(145, 144, 148, 1);
font-size: 26rpx;
text-align: center;
margin-top: 10rpx;
margin-bottom: 20rpx;
}
}
.confirmBtn{
border-radius: 80rpx;
height: 80rpx;
width: 60%;
background-color: #20269B;
.joinFotter{
width: 100%;
color: #fff;
margin: 64rpx auto 0;
display: flex;
justify-content: center;
align-items: center;
justify-content: center;
box-sizing: border-box;
padding: 10rpx 0;
background: rgba(54, 57, 169, 1);
border-radius: 60rpx;
font-size: 28rpx;
}
}
}
</style>
pages/personalCenter/system/accontsetting.vue
......@@ -29,15 +29,15 @@
isTips: false,
isType: 'text'
},
{
title: '重置密码',
icon: '',
link: '/pages/personalCenter/accountoperation/resetpassword',
isOpen: true,
isShow: true,
isTips: false,
isType: 'radio'
},
// {
// title: '重置密码',
// icon: '',
// link: '/pages/personalCenter/accountoperation/resetpassword',
// isOpen: true,
// isShow: true,
// isTips: false,
// isType: 'radio'
// },
{
title: '注销账号',
icon: '',
......
pages/personalCenter/system/cancellation.vue
......@@ -78,6 +78,7 @@
<style lang="scss" scoped>
.container{
padding: 0 20rpx;
background-color: #f7f7f7;
}
.top{
display: flex;
......
pages/personalCenter/teamMembers/otherteam.vue
......@@ -91,6 +91,7 @@
.content-box-title {
flex: 1;
font-size: 28rpx;
text-align: center;
}
.content-sam-box{
background-color: #fff;
......
pages/personalCenter/teamPerformance/teamPerformance.vue
......@@ -246,20 +246,6 @@
delete this.CffpOrgInfoReqVO.sortType
this.getqueryTeamAchievement()
}
// 以前的写法
// this.teListsort = !this.teListsort
// this.dataList.sort((a, b) => {
// //排序基于的数据
// if (this.teListsort == false) {
// return b.courseIncome - a.courseIncome;
// } else {
// return b.coursePrice - a.coursePrice;
// }
// })
// this.dataList.sort((a, b) => {
// return b.key - a.key;
// })
},
mountdchange(e) {
this.montdindex = e.detail.value
......
pages/pointsExchange/pointsExchange.vue
......@@ -4,115 +4,119 @@
<text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
<text style="font-size: 30rpx;">佣金</text>
</view>
<view class="first">
<view class="top">
<view class="left">
<view class="">
可兑换积分(1积分=1元)
<view class="" style="padding: 10rpx 20rpx 0 20rpx;">
<view class="first">
<view class="top">
<view class="left">
<view class="">
可兑换积分(1积分=1元)
</view>
<view style="font-size: 42rpx;font-family: 600;">
{{yesExchangeFortune?yesExchangeFortune:'0.00'}}
</view>
</view>
<view style="font-size: 42rpx;font-family: 600;">
{{yesExchangeFortune?yesExchangeFortune:'0.00'}}
<view class="right" @click="toWithdrawal()">
提现
</view>
</view>
<view class="right" @click="toWithdrawal()">
提现
</view>
</view>
<view class="bottom">
<view class="bottomItem" v-for="score in scoreList " :key="score.id">
<view class="one">
<view style="font-size:28rpx;color: rgba(199, 199, 199, 1);">
{{score.name}}
<view class="bottom">
<view class="bottomItem" v-for="score in scoreList " :key="score.id">
<view class="one">
<view style="font-size:28rpx;color: rgba(199, 199, 199, 1);">
{{score.name}}
</view>
<uni-tooltip class="item" :content="score.content" :placement="score.position">
<text class="iconfont icon-wenhao1" style="margin-left: 3rpx;color: rgba(199, 199, 199, 1);font-size: 28rpx;" ></text>
</uni-tooltip>
</view>
<view class="fotter">
{{score.value}}
</view>
<uni-tooltip class="item" :content="score.content" :placement="score.position">
<text class="iconfont icon-wenhao1" style="margin-left: 3rpx;color: rgba(199, 199, 199, 1);font-size: 28rpx;" ></text>
</uni-tooltip>
</view>
<view class="fotter">
{{score.value}}
</view>
</view>
</view>
</view>
<view class="two">
<view class="twoHeader">
订单收益明细
</view>
<view class="timeBox" @click="$refs.timePopup.open()">
<view style="margin-right: 5rpx;">
{{showTime}}
<view class="" style="padding: 0 20rpx;">
<view class="two" >
<view class="twoHeader">
订单收益明细
</view>
<text class="iconfont icon-xiajiantou iconStyle"></text>
</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 commissionTypeList"
:key="item.id"
:class="{active:item.id == currentFilter.id }"
@click="changeFilter(item)"
>
{{item.dropOptionName}}
<view class="timeBox" @click="$refs.timePopup.open()">
<view style="margin-right: 5rpx;">
{{showTime}}
</view>
</scroll-view>
</view>
<view class="totalBox">
<view class="totalItem">
<text style="margin-right: 10rpx;">合计</text> {{sumCommissionAmount}}
<text class="iconfont icon-xiajiantou iconStyle"></text>
</view>
<view class="totalSelect">
<uni-data-select
v-model="selectItem"
:localdata="selectList"
@change="getDetail()"
></uni-data-select>
</view>
</view>
<view class="detailBox" v-if="cffpFortuneDateList.length>0">
<view
class="detailItem"
v-for="(item,index) in cffpFortuneDateList"
:key="index"
@click="viewDetail(item)"
>
<view class="detailLeft">
<view class="txt">
{{item.productTypeName}}
</view>
<view class="date">
{{item.orderDate}}
<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 commissionTypeList"
:key="item.id"
:class="{active:item.id == currentFilter.id }"
@click="changeFilter(item)"
>
{{item.dropOptionName}}
</view>
</scroll-view>
</view>
<view class="totalBox">
<view class="totalItem">
<text style="margin-right: 10rpx;">合计</text> {{sumCommissionAmount}}
</view>
<view class="detailRight">
<view class="">
<view class="money">
<text v-if="item.commissionAmount&&item.commissionAmount>0">+{{item.commissionAmount}}</text>
<text v-if="item.commissionAmount&&item.commissionAmount<0" style="color: rgba(212, 48, 48, 1);">{{item.commissionAmount}}</text>
<view class="totalSelect">
<uni-data-select
v-model="selectItem"
:localdata="selectList"
@change="getDetail()"
></uni-data-select>
</view>
</view>
<view class="detailBox" v-if="cffpFortuneDateList.length>0">
<view
class="detailItem"
v-for="(item,index) in cffpFortuneDateList"
:key="index"
@click="viewDetail(item)"
>
<view class="detailLeft">
<view class="txt">
{{item.productTypeName}}
</view>
<view style="font-weight: normal;font-size: 26rpx;color: rgba(56, 56, 56, 1);">
{{item.exchangeStatus&&item.exchangeStatus=='1'?'待结算'
:item.exchangeStatus=='2'?'可兑换'
:item.exchangeStatus=='3'?'已兑换'
:item.exchangeStatus=='4'?'兑换中'
:item.exchangeStatus=='5'?'已失效'
:item.exchangeStatus
}}
<view class="date">
{{item.orderDate}}
</view>
</view>
<view class="arrow">
<text class="iconfont icon-youjiantou iconStyle"></text>
<view class="detailRight">
<view class="">
<view class="money">
<text v-if="item.commissionAmount&&item.commissionAmount>0">+{{item.commissionAmount}}</text>
<text v-if="item.commissionAmount&&item.commissionAmount<0" style="color: rgba(212, 48, 48, 1);">{{item.commissionAmount}}</text>
</view>
<view style="font-weight: normal;font-size: 26rpx;color: rgba(56, 56, 56, 1);">
{{item.exchangeStatus&&item.exchangeStatus=='1'?'待结算'
:item.exchangeStatus=='2'?'可兑换'
:item.exchangeStatus=='3'?'已兑换'
:item.exchangeStatus=='4'?'兑换中'
:item.exchangeStatus=='5'?'已失效'
:item.exchangeStatus
}}
</view>
</view>
<view class="arrow">
<text class="iconfont icon-youjiantou iconStyle"></text>
</view>
</view>
</view>
</view>
</view>
<view class="detailBox" v-else style="background:#fff">
<view class="emptyBox">
暂无数据！
<view class="detailBox" v-else style="background:#fff">
<view class="emptyBox">
暂无数据！
</view>
</view>
</view>
</view>
<uni-popup ref="timePopup" type="bottom" >
<customDatePop @closePop="closePop" @comfirm="comfirm" :dateParts="dateParts" :currentItem="currentItem" :childData="childData"></customDatePop>
</uni-popup>
......@@ -405,12 +409,12 @@
}
.container{
box-sizing: border-box;
padding: 20rpx;
background-color: #f7f7f7;
padding-bottom: 50rpx;
.backArrow{
background-color: #fff;
box-sizing: border-box;
display: flex;
height: 60rpx;
height: 100rpx;
justify-content: space-between;
align-items: center;
position: relative;
......@@ -423,6 +427,7 @@
}
}
.first{
color: rgba(244, 239, 212, 1);
box-sizing: border-box;
background: #2a2927;
......
pages/product/product.vue
......@@ -141,7 +141,6 @@
<style lang="scss" scoped>
.container{
box-sizing:border-box;
background-color: #f7f7f7;
height: 92.9vh;
padding: 30rpx;
.kuaiBox{
......
pages/saleCourseLists/saleCourseLists.vue
......@@ -55,8 +55,8 @@
<view class="" @click="curriculumDetail(item)">
<course-item :thumbnailPath="item.displayImage" :fileId="item.fileId" :title="item.fileTitle" :summaryBox="item.fileSynopsis" :dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}" :fileLecturerId="item.fileLecturerId" :orderId="item.orderId"></course-item>
</view>
<view class="detailBtn">
<text class="detailBtn" @click="viewDetail(item)" style="color: #000;">订单详情></text>
<view >
<text class="detailBtn" @click="viewDetail(item)" >订单详情</text>
</view>
</view>
<view class="countsContent">
......@@ -70,8 +70,7 @@
<view><text>产品名称</text><text>{{item.fileTitle}}</text></view>
<view><text>购买人</text><text>{{item.userName}}</text></view>
<view class="orderDetailLine">
<text></text>
<text @click="viewDetail(item)">订单详情></text>
<text class="infoBtn" @click="viewDetail(item)">订单详情</text>
</view>
</view>
</template>
......@@ -199,7 +198,7 @@
<style lang="scss" scoped>
.container{
height: 100%;
padding-bottom: 50rpx;
.top{
display: flex;
align-items: center;
......@@ -227,8 +226,9 @@
}
}
.saleStatisticalContent{
margin: 20rpx;
border-radius: 10rpx;
background-color: #fff;
margin: 10rpx 0;
padding: 20rpx 14rpx;
display: flex;
flex-wrap: wrap;
......@@ -258,7 +258,11 @@
}
}
.saleDetailContent{
margin: 10rpx 20rpx;
box-sizing: border-box;
padding: 20rpx 40rpx 0rpx 20rpx;
background-color: #fff;
margin: 0 20rpx;
border-radius: 10rpx;
.noListTip{
font-size: 30rpx;
}
......@@ -266,6 +270,8 @@
padding: 18rpx 0rpx 18rpx 10rpx;
border-radius: 20rpx;
background-color: #fff;
border-bottom: 1rpx solid #F2F2F2;
margin-bottom: 10rpx;
.countsContent{
text-align: right;
color: #333;
......@@ -275,10 +281,17 @@
}
.detailBtn{
font-size: 24rpx;
color: #4A4A4A;
color:#fff;
white-space: nowrap;
background-color: #20269B;
padding: 10rpx 20rpx;
border-radius: 40rpx;
}
}
.saleOrderInfoItem:last-child{
border: none;
}
.orderItemDetailBox{
padding: 10rpx 20rpx 10rpx 40rpx;
background-color: #fff;
......@@ -286,6 +299,7 @@
color: #4a4a4a;
margin-bottom: 20rpx;
font-size: 28rpx;
border-bottom: 1rpx solid #F2F2F2;
view{
position: relative;
margin-bottom: 20rpx;
......@@ -306,14 +320,23 @@
width: 8rpx;
height: 60%;
border-radius:8rpx;
background-color: #FA882F;
background-color: #20269B;
}
&.orderDetailLine{
justify-content: flex-end;
font-size: 28rpx;
.infoBtn{
padding: 10rpx 20rpx;
color: #fff;
border-radius: 40rpx;
background-color: #20269B;
}
}
}
}
.orderItemDetailBox:last-child{
border: none;
}
.courseTab{
margin-top: 20rpx;
text{
......
static/font1/demo_index.html
......@@ -55,6 +55,42 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xecc0;</span>
<div class="name">双右箭头</div>
<div class="code-name">&amp;#xecc0;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe641;</span>
<div class="name">雷电</div>
<div class="code-name">&amp;#xe641;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe610;</span>
<div class="name">信息</div>
<div class="code-name">&amp;#xe610;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe759;</span>
<div class="name">搜索</div>
<div class="code-name">&amp;#xe759;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6be;</span>
<div class="name">使用教程</div>
<div class="code-name">&amp;#xe6be;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe65e;</span>
<div class="name">公司</div>
<div class="code-name">&amp;#xe65e;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe115;</span>
<div class="name">下箭头</div>
<div class="code-name">&amp;#xe115;</div>
......@@ -228,9 +264,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1749031328434') format('woff2'),
url('iconfont.woff?t=1749031328434') format('woff'),
url('iconfont.ttf?t=1749031328434') format('truetype');
src: url('iconfont.woff2?t=1750144165277') format('woff2'),
url('iconfont.woff?t=1750144165277') format('woff'),
url('iconfont.ttf?t=1750144165277') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -257,6 +293,60 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-shuangyoujiantou"></span>
<div class="name">
双右箭头
</div>
<div class="code-name">.icon-shuangyoujiantou
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-leidian"></span>
<div class="name">
雷电
</div>
<div class="code-name">.icon-leidian
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-xinxi"></span>
<div class="name">
信息
</div>
<div class="code-name">.icon-xinxi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-sousuo"></span>
<div class="name">
搜索
</div>
<div class="code-name">.icon-sousuo
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-shiyongjiaocheng"></span>
<div class="name">
使用教程
</div>
<div class="code-name">.icon-shiyongjiaocheng
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-gongsi"></span>
<div class="name">
公司
</div>
<div class="code-name">.icon-gongsi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-xiajiantou"></span>
<div class="name">
下箭头
......@@ -519,6 +609,54 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shuangyoujiantou"></use>
</svg>
<div class="name">双右箭头</div>
<div class="code-name">#icon-shuangyoujiantou</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-leidian"></use>
</svg>
<div class="name">雷电</div>
<div class="code-name">#icon-leidian</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-xinxi"></use>
</svg>
<div class="name">信息</div>
<div class="code-name">#icon-xinxi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-sousuo"></use>
</svg>
<div class="name">搜索</div>
<div class="code-name">#icon-sousuo</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shiyongjiaocheng"></use>
</svg>
<div class="name">使用教程</div>
<div class="code-name">#icon-shiyongjiaocheng</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-gongsi"></use>
</svg>
<div class="name">公司</div>
<div class="code-name">#icon-gongsi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-xiajiantou"></use>
</svg>
<div class="name">下箭头</div>
......
static/font1/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 4933433 */
src: url('iconfont.woff2?t=1749031328434') format('woff2'),
url('iconfont.woff?t=1749031328434') format('woff'),
url('iconfont.ttf?t=1749031328434') format('truetype');
src: url('iconfont.woff2?t=1750144165277') format('woff2'),
url('iconfont.woff?t=1750144165277') format('woff'),
url('iconfont.ttf?t=1750144165277') format('truetype');
}
.iconfont {
......@@ -13,6 +13,30 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-shuangyoujiantou:before {
content: "\ecc0";
}
.icon-leidian:before {
content: "\e641";
}
.icon-xinxi:before {
content: "\e610";
}
.icon-sousuo:before {
content: "\e759";
}
.icon-shiyongjiaocheng:before {
content: "\e6be";
}
.icon-gongsi:before {
content: "\e65e";
}
.icon-xiajiantou:before {
content: "\e115";
}
......
static/font1/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
static/font1/iconfont.json
......@@ -6,6 +6,48 @@
"description": "",
"glyphs": [
{
"icon_id": "6999657",
"name": "双右箭头",
"font_class": "shuangyoujiantou",
"unicode": "ecc0",
"unicode_decimal": 60608
},
{
"icon_id": "39934155",
"name": "雷电",
"font_class": "leidian",
"unicode": "e641",
"unicode_decimal": 58945
},
{
"icon_id": "4550364",
"name": "信息",
"font_class": "xinxi",
"unicode": "e610",
"unicode_decimal": 58896
},
{
"icon_id": "4933408",
"name": "搜索",
"font_class": "sousuo",
"unicode": "e759",
"unicode_decimal": 59225
},
{
"icon_id": "29085756",
"name": "使用教程",
"font_class": "shiyongjiaocheng",
"unicode": "e6be",
"unicode_decimal": 59070
},
{
"icon_id": "29941060",
"name": "公司",
"font_class": "gongsi",
"unicode": "e65e",
"unicode_decimal": 58974
},
{
"icon_id": "9021520",
"name": "下箭头",
"font_class": "xiajiantou",
......
uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
......@@ -117,8 +117,8 @@
</script>
<style lang="scss" >
.uni-popup-share {
background-color: #F4F2F3;
// background-color: #fff;
// background-color: #F4F2F3;
background-color: #fff;
border-top-left-radius: 11rpx;
border-top-right-radius: 11rpx;
}
......
uni_modules/uni-table/changelog.md 0 → 100644
## 1.2.9（2025-04-14）
- 修复： 下拉筛选中 toISOString() 引发的时区问题
## 1.2.8（2024-10-15）
- 修复 运行到抖音小程序上出现的问题
## 1.2.7（2024-10-15）
- 修复 微信小程序中的getSystemInfo警告
## 1.2.4（2023-12-19）
- 修复 uni-tr只有一列时minWidth计算错误，列变化实时计算更新
## 1.2.3（2023-03-28）
- 修复 在vue3模式下可能会出现错误的问题
## 1.2.2（2022-11-29）
- 优化 主题样式
## 1.2.1（2022-06-06）
- 修复 微信小程序存在无使用组件的问题
## 1.2.0（2021-11-19）
- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-table](https://uniapp.dcloud.io/component/uniui/uni-table)
## 1.1.0（2021-07-30）
- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
## 1.0.7（2021-07-08）
- 新增 uni-th 支持 date 日期筛选范围
## 1.0.6（2021-07-05）
- 新增 uni-th 支持 range 筛选范围
## 1.0.5（2021-06-28）
- 新增 uni-th 筛选功能
## 1.0.4（2021-05-12）
- 新增 示例地址
- 修复 示例项目缺少组件的Bug
## 1.0.3（2021-04-16）
- 新增 sortable 属性，是否开启单列排序
- 优化 表格多选逻辑
## 1.0.2（2021-03-22）
- uni-tr 添加 disabled 属性，用于 type=selection 时，设置某行是否可由全选按钮控制
## 1.0.1（2021-02-05）
- 调整为uni_modules目录规范
uni_modules/uni-table/components/uni-table/uni-table.vue 0 → 100644
<template>
<view class="uni-table-scroll" :class="{ 'table--border': border, 'border-none': !noData }">
<!-- #ifdef H5 -->
<table class="uni-table" border="0" cellpadding="0" cellspacing="0" :class="{ 'table--stripe': stripe }" :style="{ 'min-width': minWidth + 'px' }">
<slot></slot>
<tr v-if="noData" class="uni-table-loading">
<td class="uni-table-text" :class="{ 'empty-border': border }">{{ emptyText }}</td>
</tr>
<view v-if="loading" class="uni-table-mask" :class="{ 'empty-border': border }"><div class="uni-table--loader"></div></view>
</table>
<!-- #endif -->
<!-- #ifndef H5 -->
<view class="uni-table" :style="{ 'min-width': minWidth + 'px' }" :class="{ 'table--stripe': stripe }">
<slot></slot>
<view v-if="noData" class="uni-table-loading">
<view class="uni-table-text" :class="{ 'empty-border': border }">{{ emptyText }}</view>
</view>
<view v-if="loading" class="uni-table-mask" :class="{ 'empty-border': border }"><div class="uni-table--loader"></div></view>
</view>
<!-- #endif -->
</view>
</template>
<script>
/**
* Table 表格
* @description 用于展示多条结构类似的数据
* @tutorial https://ext.dcloud.net.cn/plugin?id=3270
* @property {Boolean} border 是否带有纵向边框
* @property {Boolean} stripe 是否显示斑马线
* @property {Boolean} type 是否开启多选
* @property {String} emptyText 空数据时显示的文本内容
* @property {Boolean} loading 显示加载中
* @event {Function} selection-change 开启多选时，当选择项发生变化时会触发该事件
*/
export default {
name: 'uniTable',
options: {
// #ifdef MP-TOUTIAO
virtualHost: false,
// #endif
// #ifndef MP-TOUTIAO
virtualHost: true
// #endif
},
emits:['selection-change'],
props: {
data: {
type: Array,
default() {
return []
}
},
// 是否有竖线
border: {
type: Boolean,
default: false
},
// 是否显示斑马线
stripe: {
type: Boolean,
default: false
},
// 多选
type: {
type: String,
default: ''
},
// 没有更多数据
emptyText: {
type: String,
default: '没有更多数据'
},
loading: {
type: Boolean,
default: false
},
rowKey: {
type: String,
default: ''
}
},
data() {
return {
noData: true,
minWidth: 0,
multiTableHeads: []
}
},
watch: {
loading(val) {},
data(newVal) {
let theadChildren = this.theadChildren
let rowspan = 1
if (this.theadChildren) {
rowspan = this.theadChildren.rowspan
}
// this.trChildren.length - rowspan
this.noData = false
// this.noData = newVal.length === 0
}
},
created() {
// 定义tr的实例数组
this.trChildren = []
this.thChildren = []
this.theadChildren = null
this.backData = []
this.backIndexData = []
},
methods: {
isNodata() {
let theadChildren = this.theadChildren
let rowspan = 1
if (this.theadChildren) {
rowspan = this.theadChildren.rowspan
}
this.noData = this.trChildren.length - rowspan <= 0
},
/**
* 选中所有
*/
selectionAll() {
let startIndex = 1
let theadChildren = this.theadChildren
if (!this.theadChildren) {
theadChildren = this.trChildren[0]
} else {
startIndex = theadChildren.rowspan - 1
}
let isHaveData = this.data && this.data.length > 0
theadChildren.checked = true
theadChildren.indeterminate = false
this.trChildren.forEach((item, index) => {
if (!item.disabled) {
item.checked = true
if (isHaveData && item.keyValue) {
const row = this.data.find(v => v[this.rowKey] === item.keyValue)
if (!this.backData.find(v => v[this.rowKey] === row[this.rowKey])) {
this.backData.push(row)
}
}
if (index > (startIndex - 1) && this.backIndexData.indexOf(index - startIndex) === -1) {
this.backIndexData.push(index - startIndex)
}
}
})
// this.backData = JSON.parse(JSON.stringify(this.data))
this.$emit('selection-change', {
detail: {
value: this.backData,
index: this.backIndexData
}
})
},
/**
* 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
*/
toggleRowSelection(row, selected) {
// if (!this.theadChildren) return
row = [].concat(row)
this.trChildren.forEach((item, index) => {
// if (item.keyValue) {
const select = row.findIndex(v => {
//
if (typeof v === 'number') {
return v === index - 1
} else {
return v[this.rowKey] === item.keyValue
}
})
let ischeck = item.checked
if (select !== -1) {
if (typeof selected === 'boolean') {
item.checked = selected
} else {
item.checked = !item.checked
}
if (ischeck !== item.checked) {
this.check(item.rowData||item, item.checked, item.rowData?item.keyValue:null, true)
}
}
// }
})
this.$emit('selection-change', {
detail: {
value: this.backData,
index:this.backIndexData
}
})
},
/**
* 用于多选表格，清空用户的选择
*/
clearSelection() {
let theadChildren = this.theadChildren
if (!this.theadChildren) {
theadChildren = this.trChildren[0]
}
// if (!this.theadChildren) return
theadChildren.checked = false
theadChildren.indeterminate = false
this.trChildren.forEach(item => {
// if (item.keyValue) {
item.checked = false
// }
})
this.backData = []
this.backIndexData = []
this.$emit('selection-change', {
detail: {
value: [],
index: []
}
})
},
/**
* 用于多选表格，切换所有行的选中状态
*/
toggleAllSelection() {
let list = []
let startIndex = 1
let theadChildren = this.theadChildren
if (!this.theadChildren) {
theadChildren = this.trChildren[0]
} else {
startIndex = theadChildren.rowspan - 1
}
this.trChildren.forEach((item, index) => {
if (!item.disabled) {
if (index > (startIndex - 1) ) {
list.push(index-startIndex)
}
}
})
this.toggleRowSelection(list)
},
/**
* 选中\取消选中
* @param {Object} child
* @param {Object} check
* @param {Object} rowValue
*/
check(child, check, keyValue, emit) {
let theadChildren = this.theadChildren
if (!this.theadChildren) {
theadChildren = this.trChildren[0]
}
let childDomIndex = this.trChildren.findIndex((item, index) => child === item)
if(childDomIndex < 0){
childDomIndex = this.data.findIndex(v=>v[this.rowKey] === keyValue) + 1
}
const dataLen = this.trChildren.filter(v => !v.disabled && v.keyValue).length
if (childDomIndex === 0) {
check ? this.selectionAll() : this.clearSelection()
return
}
if (check) {
if (keyValue) {
this.backData.push(child)
}
this.backIndexData.push(childDomIndex - 1)
} else {
const index = this.backData.findIndex(v => v[this.rowKey] === keyValue)
const idx = this.backIndexData.findIndex(item => item === childDomIndex - 1)
if (keyValue) {
this.backData.splice(index, 1)
}
this.backIndexData.splice(idx, 1)
}
const domCheckAll = this.trChildren.find((item, index) => index > 0 && !item.checked && !item.disabled)
if (!domCheckAll) {
theadChildren.indeterminate = false
theadChildren.checked = true
} else {
theadChildren.indeterminate = true
theadChildren.checked = false
}
if (this.backIndexData.length === 0) {
theadChildren.indeterminate = false
}
if (!emit) {
this.$emit('selection-change', {
detail: {
value: this.backData,
index: this.backIndexData
}
})
}
}
}
}
</script>
<style lang="scss">
$border-color: #ebeef5;
.uni-table-scroll {
width: 100%;
/* #ifndef APP-NVUE */
overflow-x: auto;
/* #endif */
}
.uni-table {
position: relative;
width: 100%;
border-radius: 5px;
// box-shadow: 0px 0px 3px 1px rgba(0, 0, 0, 0.1);
background-color: #fff;
/* #ifndef APP-NVUE */
box-sizing: border-box;
display: table;
overflow-x: auto;
::v-deep .uni-table-tr:nth-child(n + 2) {
&:hover {
background-color: #f5f7fa;
}
}
::v-deep .uni-table-thead {
.uni-table-tr {
// background-color: #f5f7fa;
&:hover {
background-color:#fafafa;
}
}
}
/* #endif */
}
.table--border {
border: 1px $border-color solid;
border-right: none;
}
.border-none {
/* #ifndef APP-NVUE */
border-bottom: none;
/* #endif */
}
.table--stripe {
/* #ifndef APP-NVUE */
::v-deep .uni-table-tr:nth-child(2n + 3) {
background-color: #fafafa;
}
/* #endif */
}
/* 表格加载、无数据样式 */
.uni-table-loading {
position: relative;
/* #ifndef APP-NVUE */
display: table-row;
/* #endif */
height: 50px;
line-height: 50px;
overflow: hidden;
box-sizing: border-box;
}
.empty-border {
border-right: 1px $border-color solid;
}
.uni-table-text {
position: absolute;
right: 0;
left: 0;
text-align: center;
font-size: 14px;
color: #999;
}
.uni-table-mask {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
background-color: rgba(255, 255, 255, 0.8);
z-index: 99;
/* #ifndef APP-NVUE */
display: flex;
margin: auto;
transition: all 0.5s;
/* #endif */
justify-content: center;
align-items: center;
}
.uni-table--loader {
width: 30px;
height: 30px;
border: 2px solid #aaa;
// border-bottom-color: transparent;
border-radius: 50%;
/* #ifndef APP-NVUE */
animation: 2s uni-table--loader linear infinite;
/* #endif */
position: relative;
}
@keyframes uni-table--loader {
0% {
transform: rotate(360deg);
}
10% {
border-left-color: transparent;
}
20% {
border-bottom-color: transparent;
}
30% {
border-right-color: transparent;
}
40% {
border-top-color: transparent;
}
50% {
transform: rotate(0deg);
}
60% {
border-top-color: transparent;
}
70% {
border-left-color: transparent;
}
80% {
border-bottom-color: transparent;
}
90% {
border-right-color: transparent;
}
100% {
transform: rotate(-360deg);
}
}
</style>
uni_modules/uni-table/components/uni-tbody/uni-tbody.vue 0 → 100644
<template>
<!-- #ifdef H5 -->
<tbody>
<slot></slot>
</tbody>
<!-- #endif -->
<!-- #ifndef H5 -->
<view><slot></slot></view>
<!-- #endif -->
</template>
<script>
export default {
name: 'uniBody',
options: {
// #ifdef MP-TOUTIAO
virtualHost: false,
// #endif
// #ifndef MP-TOUTIAO
virtualHost: true
// #endif
},
data() {
return {
}
},
created() {},
methods: {}
}
</script>
<style>
</style>
uni_modules/uni-table/components/uni-td/uni-td.vue 0 → 100644
<template>
<!-- #ifdef H5 -->
<td class="uni-table-td" :rowspan="rowspan" :colspan="colspan" :class="{'table--border':border}" :style="{width:width + 'px','text-align':align}">
<slot></slot>
</td>
<!-- #endif -->
<!-- #ifndef H5 -->
<!-- :class="{'table--border':border}" -->
<view class="uni-table-td" :class="{'table--border':border}" :style="{width:width + 'px','text-align':align}">
<slot></slot>
</view>
<!-- #endif -->
</template>
<script>
/**
* Td 单元格
* @description 表格中的标准单元格组件
* @tutorial https://ext.dcloud.net.cn/plugin?id=3270
* @property {Number} align = [left|center|right] 单元格对齐方式
*/
export default {
name: 'uniTd',
options: {
// #ifdef MP-TOUTIAO
virtualHost: false,
// #endif
// #ifndef MP-TOUTIAO
virtualHost: true
// #endif
},
props: {
width: {
type: [String, Number],
default: ''
},
align: {
type: String,
default: 'left'
},
rowspan: {
type: [Number,String],
default: 1
},
colspan: {
type: [Number,String],
default: 1
}
},
data() {
return {
border: false
};
},
created() {
this.root = this.getTable()
this.border = this.root.border
},
methods: {
/**
* 获取父元素实例
*/
getTable() {
let parent = this.$parent;
let parentName = parent.$options.name;
while (parentName !== 'uniTable') {
parent = parent.$parent;
if (!parent) return false;
parentName = parent.$options.name;
}
return parent;
},
}
}
</script>
<style lang="scss">
$border-color:#EBEEF5;
.uni-table-td {
display: table-cell;
padding: 8px 10px;
font-size: 14px;
border-bottom: 1px $border-color solid;
font-weight: 400;
color: #606266;
line-height: 23px;
box-sizing: border-box;
}
.table--border {
border-right: 1px $border-color solid;
}
</style>
uni_modules/uni-table/components/uni-th/filter-dropdown.vue 0 → 100644
<template>
<view class="uni-filter-dropdown">
<view class="dropdown-btn" @click="onDropdown">
<view class="icon-select" :class="{active: canReset}" v-if="isSelect || isRange"></view>
<view class="icon-search" :class="{active: canReset}" v-if="isSearch">
<view class="icon-search-0"></view>
<view class="icon-search-1"></view>
</view>
<view class="icon-calendar" :class="{active: canReset}" v-if="isDate">
<view class="icon-calendar-0"></view>
<view class="icon-calendar-1"></view>
</view>
</view>
<view class="uni-dropdown-cover" v-if="isOpened" @click="handleClose"></view>
<view class="dropdown-popup dropdown-popup-right" v-if="isOpened" @click.stop>
<!-- select-->
<view v-if="isSelect" class="list">
<label class="flex-r a-i-c list-item" v-for="(item,index) in dataList" :key="index"
@click="onItemClick($event, index)">
<check-box class="check" :checked="item.checked" />
<view class="checklist-content">
<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
</view>
</label>
</view>
<view v-if="isSelect" class="flex-r opera-area">
<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleSelectReset">
{{resource.reset}}</view>
<view class="flex-f btn btn-submit" @click="handleSelectSubmit">{{resource.submit}}</view>
</view>
<!-- search -->
<view v-if="isSearch" class="search-area">
<input class="search-input" v-model="filterValue" />
</view>
<view v-if="isSearch" class="flex-r opera-area">
<view class="flex-f btn btn-submit" @click="handleSearchSubmit">{{resource.search}}</view>
<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleSearchReset">
{{resource.reset}}</view>
</view>
<!-- range -->
<view v-if="isRange">
<view class="input-label">{{resource.gt}}</view>
<input class="input" v-model="gtValue" />
<view class="input-label">{{resource.lt}}</view>
<input class="input" v-model="ltValue" />
</view>
<view v-if="isRange" class="flex-r opera-area">
<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleRangeReset">
{{resource.reset}}</view>
<view class="flex-f btn btn-submit" @click="handleRangeSubmit">{{resource.submit}}</view>
</view>
<!-- date -->
<view v-if="isDate">
<uni-datetime-picker ref="datetimepicker" :value="dateRange" type="datetimerange" return-type="timestamp" @change="datetimechange" @maskClick="timepickerclose">
<view></view>
</uni-datetime-picker>
</view>
</view>
</view>
</template>
<script>
import checkBox from '../uni-tr/table-checkbox.vue'
const resource = {
"reset": "重置",
"search": "搜索",
"submit": "确定",
"filter": "筛选",
"gt": "大于等于",
"lt": "小于等于",
"date": "日期范围"
}
const DropdownType = {
Select: "select",
Search: "search",
Range: "range",
Date: "date",
Timestamp: "timestamp"
}
export default {
name: 'FilterDropdown',
emits:['change'],
components: {
checkBox
},
options: {
virtualHost: true
},
props: {
filterType: {
type: String,
default: DropdownType.Select
},
filterData: {
type: Array,
default () {
return []
}
},
mode: {
type: String,
default: 'default'
},
map: {
type: Object,
default () {
return {
text: 'text',
value: 'value'
}
}
},
filterDefaultValue: {
type: [Array,String],
default () {
return ""
}
}
},
computed: {
canReset() {
if (this.isSearch) {
return this.filterValue.length > 0
}
if (this.isSelect) {
return this.checkedValues.length > 0
}
if (this.isRange) {
return (this.gtValue.length > 0 && this.ltValue.length > 0)
}
if (this.isDate) {
return this.dateSelect.length > 0
}
return false
},
isSelect() {
return this.filterType === DropdownType.Select
},
isSearch() {
return this.filterType === DropdownType.Search
},
isRange() {
return this.filterType === DropdownType.Range
},
isDate() {
return (this.filterType === DropdownType.Date || this.filterType === DropdownType.Timestamp)
}
},
watch: {
filterData(newVal) {
this._copyFilters()
},
indeterminate(newVal) {
this.isIndeterminate = newVal
}
},
data() {
return {
resource,
enabled: true,
isOpened: false,
dataList: [],
filterValue: this.filterDefaultValue,
checkedValues: [],
gtValue: '',
ltValue: '',
dateRange: [],
dateSelect: []
};
},
created() {
this._copyFilters()
},
methods: {
_copyFilters() {
let dl = JSON.parse(JSON.stringify(this.filterData))
for (let i = 0; i < dl.length; i++) {
if (dl[i].checked === undefined) {
dl[i].checked = false
}
}
this.dataList = dl
},
openPopup() {
this.isOpened = true
if (this.isDate) {
this.$nextTick(() => {
if (!this.dateRange.length) {
this.resetDate()
}
this.$refs.datetimepicker.show()
})
}
},
closePopup() {
this.isOpened = false
},
handleClose(e) {
this.closePopup()
},
resetDate() {
let date = new Date()
let dateText = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`
this.dateRange = [dateText + ' 0:00:00', dateText + ' 23:59:59']
},
onDropdown(e) {
this.openPopup()
},
onItemClick(e, index) {
let items = this.dataList
let listItem = items[index]
if (listItem.checked === undefined) {
items[index].checked = true
} else {
items[index].checked = !listItem.checked
}
let checkvalues = []
for (let i = 0; i < items.length; i++) {
const item = items[i]
if (item.checked) {
checkvalues.push(item.value)
}
}
this.checkedValues = checkvalues
},
datetimechange(e) {
this.closePopup()
this.dateRange = e
this.dateSelect = e
this.$emit('change', {
filterType: this.filterType,
filter: e
})
},
timepickerclose(e) {
this.closePopup()
},
handleSelectSubmit() {
this.closePopup()
this.$emit('change', {
filterType: this.filterType,
filter: this.checkedValues
})
},
handleSelectReset() {
if (!this.canReset) {
return;
}
var items = this.dataList
for (let i = 0; i < items.length; i++) {
let item = items[i]
this.$set(item, 'checked', false)
}
this.checkedValues = []
this.handleSelectSubmit()
},
handleSearchSubmit() {
this.closePopup()
this.$emit('change', {
filterType: this.filterType,
filter: this.filterValue
})
},
handleSearchReset() {
if (!this.canReset) {
return;
}
this.filterValue = ''
this.handleSearchSubmit()
},
handleRangeSubmit(isReset) {
this.closePopup()
this.$emit('change', {
filterType: this.filterType,
filter: isReset === true ? [] : [parseInt(this.gtValue), parseInt(this.ltValue)]
})
},
handleRangeReset() {
if (!this.canReset) {
return;
}
this.gtValue = ''
this.ltValue = ''
this.handleRangeSubmit(true)
}
}
}
</script>
<style lang="scss">
$uni-primary: #1890ff !default;
.flex-r {
display: flex;
flex-direction: row;
}
.flex-f {
flex: 1;
}
.a-i-c {
align-items: center;
}
.j-c-c {
justify-content: center;
}
.icon-select {
width: 14px;
height: 16px;
border: solid 6px transparent;
border-top: solid 6px #ddd;
border-bottom: none;
background-color: #ddd;
background-clip: content-box;
box-sizing: border-box;
}
.icon-select.active {
background-color: $uni-primary;
border-top-color: $uni-primary;
}
.icon-search {
width: 12px;
height: 16px;
position: relative;
}
.icon-search-0 {
border: 2px solid #ddd;
border-radius: 8px;
width: 7px;
height: 7px;
}
.icon-search-1 {
position: absolute;
top: 8px;
right: 0;
width: 1px;
height: 7px;
background-color: #ddd;
transform: rotate(-45deg);
}
.icon-search.active .icon-search-0 {
border-color: $uni-primary;
}
.icon-search.active .icon-search-1 {
background-color: $uni-primary;
}
.icon-calendar {
color: #ddd;
width: 14px;
height: 16px;
}
.icon-calendar-0 {
height: 4px;
margin-top: 3px;
margin-bottom: 1px;
background-color: #ddd;
border-radius: 2px 2px 1px 1px;
position: relative;
}
.icon-calendar-0:before, .icon-calendar-0:after {
content: '';
position: absolute;
top: -3px;
width: 4px;
height: 3px;
border-radius: 1px;
background-color: #ddd;
}
.icon-calendar-0:before {
left: 2px;
}
.icon-calendar-0:after {
right: 2px;
}
.icon-calendar-1 {
height: 9px;
background-color: #ddd;
border-radius: 1px 1px 2px 2px;
}
.icon-calendar.active {
color: $uni-primary;
}
.icon-calendar.active .icon-calendar-0,
.icon-calendar.active .icon-calendar-1,
.icon-calendar.active .icon-calendar-0:before,
.icon-calendar.active .icon-calendar-0:after {
background-color: $uni-primary;
}
.uni-filter-dropdown {
position: relative;
font-weight: normal;
}
.dropdown-popup {
position: absolute;
top: 100%;
background-color: #fff;
box-shadow: 0 3px 6px -4px #0000001f, 0 6px 16px #00000014, 0 9px 28px 8px #0000000d;
min-width: 150px;
z-index: 1000;
}
.dropdown-popup-left {
left: 0;
}
.dropdown-popup-right {
right: 0;
}
.uni-dropdown-cover {
position: fixed;
left: 0;
top: 0;
right: 0;
bottom: 0;
background-color: transparent;
z-index: 100;
}
.list {
margin-top: 5px;
margin-bottom: 5px;
}
.list-item {
padding: 5px 10px;
text-align: left;
}
.list-item:hover {
background-color: #f0f0f0;
}
.check {
margin-right: 5px;
}
.search-area {
padding: 10px;
}
.search-input {
font-size: 12px;
border: 1px solid #f0f0f0;
border-radius: 3px;
padding: 2px 5px;
min-width: 150px;
text-align: left;
}
.input-label {
margin: 10px 10px 5px 10px;
text-align: left;
}
.input {
font-size: 12px;
border: 1px solid #f0f0f0;
border-radius: 3px;
margin: 10px;
padding: 2px 5px;
min-width: 150px;
text-align: left;
}
.opera-area {
cursor: default;
border-top: 1px solid #ddd;
padding: 5px;
}
.opera-area .btn {
font-size: 12px;
border-radius: 3px;
margin: 5px;
padding: 4px 4px;
}
.btn-default {
border: 1px solid #ddd;
}
.btn-default.disable {
border-color: transparent;
}
.btn-submit {
background-color: $uni-primary;
color: #ffffff;
}
</style>
uni_modules/uni-table/components/uni-th/uni-th.vue 0 → 100644
<template>
<!-- #ifdef H5 -->
<th :rowspan="rowspan" :colspan="colspan" class="uni-table-th" :class="{ 'table--border': border }" :style="{ width: customWidth + 'px', 'text-align': align }">
<view class="uni-table-th-row">
<view class="uni-table-th-content" :style="{ 'justify-content': contentAlign }" @click="sort">
<slot></slot>
<view v-if="sortable" class="arrow-box">
<text class="arrow up" :class="{ active: ascending }" @click.stop="ascendingFn"></text>
<text class="arrow down" :class="{ active: descending }" @click.stop="descendingFn"></text>
</view>
</view>
<dropdown v-if="filterType || filterData.length" :filterDefaultValue="filterDefaultValue" :filterData="filterData" :filterType="filterType" @change="ondropdown"></dropdown>
</view>
</th>
<!-- #endif -->
<!-- #ifndef H5 -->
<view class="uni-table-th" :class="{ 'table--border': border }" :style="{ width: customWidth + 'px', 'text-align': align }"><slot></slot></view>
<!-- #endif -->
</template>
<script>
// #ifdef H5
import dropdown from './filter-dropdown.vue'
// #endif
/**
* Th 表头
* @description 表格内的表头单元格组件
* @tutorial https://ext.dcloud.net.cn/plugin?id=3270
* @property {Number | String} width 单元格宽度（支持纯数字、携带单位px或rpx）
* @property {Boolean} sortable 是否启用排序
* @property {Number} align = [left|center|right] 单元格对齐方式
* @value left 单元格文字左侧对齐
* @value center 单元格文字居中
* @value right 单元格文字右侧对齐
* @property {Array} filterData 筛选数据
* @property {String} filterType [search|select] 筛选类型
* @value search 关键字搜素
* @value select 条件选择
* @event {Function} sort-change 排序触发事件
*/
export default {
name: 'uniTh',
options: {
// #ifdef MP-TOUTIAO
virtualHost: false,
// #endif
// #ifndef MP-TOUTIAO
virtualHost: true
// #endif
},
components: {
// #ifdef H5
dropdown
// #endif
},
emits:['sort-change','filter-change'],
props: {
width: {
type: [String, Number],
default: ''
},
align: {
type: String,
default: 'left'
},
rowspan: {
type: [Number, String],
default: 1
},
colspan: {
type: [Number, String],
default: 1
},
sortable: {
type: Boolean,
default: false
},
filterType: {
type: String,
default: ""
},
filterData: {
type: Array,
default () {
return []
}
},
filterDefaultValue: {
type: [Array,String],
default () {
return ""
}
}
},
data() {
return {
border: false,
ascending: false,
descending: false
}
},
computed: {
// 根据props中的width属性 自动匹配当前th的宽度(px)
customWidth(){
if(typeof this.width === 'number'){
return this.width
} else if(typeof this.width === 'string') {
let regexHaveUnitPx = new RegExp(/^[1-9][0-9]*px$/g)
let regexHaveUnitRpx = new RegExp(/^[1-9][0-9]*rpx$/g)
let regexHaveNotUnit = new RegExp(/^[1-9][0-9]*$/g)
if (this.width.match(regexHaveUnitPx) !== null) { // 携带了 px
return this.width.replace('px', '')
} else if (this.width.match(regexHaveUnitRpx) !== null) { // 携带了 rpx
let numberRpx = Number(this.width.replace('rpx', ''))
// #ifdef MP-WEIXIN
let widthCoe = uni.getWindowInfo().screenWidth / 750
// #endif
// #ifndef MP-WEIXIN
let widthCoe = uni.getSystemInfoSync().screenWidth / 750
// #endif
return Math.round(numberRpx * widthCoe)
} else if (this.width.match(regexHaveNotUnit) !== null) { // 未携带 rpx或px 的纯数字 String
return this.width
} else { // 不符合格式
return ''
}
} else {
return ''
}
},
contentAlign() {
let align = 'left'
switch (this.align) {
case 'left':
align = 'flex-start'
break
case 'center':
align = 'center'
break
case 'right':
align = 'flex-end'
break
}
return align
}
},
created() {
this.root = this.getTable('uniTable')
this.rootTr = this.getTable('uniTr')
this.rootTr.minWidthUpdate(this.customWidth ? this.customWidth : 140)
this.border = this.root.border
this.root.thChildren.push(this)
},
methods: {
sort() {
if (!this.sortable) return
this.clearOther()
if (!this.ascending && !this.descending) {
this.ascending = true
this.$emit('sort-change', { order: 'ascending' })
return
}
if (this.ascending && !this.descending) {
this.ascending = false
this.descending = true
this.$emit('sort-change', { order: 'descending' })
return
}
if (!this.ascending && this.descending) {
this.ascending = false
this.descending = false
this.$emit('sort-change', { order: null })
}
},
ascendingFn() {
this.clearOther()
this.ascending = !this.ascending
this.descending = false
this.$emit('sort-change', { order: this.ascending ? 'ascending' : null })
},
descendingFn() {
this.clearOther()
this.descending = !this.descending
this.ascending = false
this.$emit('sort-change', { order: this.descending ? 'descending' : null })
},
clearOther() {
this.root.thChildren.map(item => {
if (item !== this) {
item.ascending = false
item.descending = false
}
return item
})
},
ondropdown(e) {
this.$emit("filter-change", e)
},
/**
* 获取父元素实例
*/
getTable(name) {
let parent = this.$parent
let parentName = parent.$options.name
while (parentName !== name) {
parent = parent.$parent
if (!parent) return false
parentName = parent.$options.name
}
return parent
}
}
}
</script>
<style lang="scss">
$border-color: #ebeef5;
$uni-primary: #007aff !default;
.uni-table-th {
padding: 12px 10px;
/* #ifndef APP-NVUE */
display: table-cell;
box-sizing: border-box;
/* #endif */
font-size: 14px;
font-weight: bold;
color: #909399;
border-bottom: 1px $border-color solid;
}
.uni-table-th-row {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
}
.table--border {
border-right: 1px $border-color solid;
}
.uni-table-th-content {
display: flex;
align-items: center;
flex: 1;
}
.arrow-box {
}
.arrow {
display: block;
position: relative;
width: 10px;
height: 8px;
// border: 1px red solid;
left: 5px;
overflow: hidden;
cursor: pointer;
}
.down {
top: 3px;
::after {
content: '';
width: 8px;
height: 8px;
position: absolute;
left: 2px;
top: -5px;
transform: rotate(45deg);
background-color: #ccc;
}
&.active {
::after {
background-color: $uni-primary;
}
}
}
.up {
::after {
content: '';
width: 8px;
height: 8px;
position: absolute;
left: 2px;
top: 5px;
transform: rotate(45deg);
background-color: #ccc;
}
&.active {
::after {
background-color: $uni-primary;
}
}
}
</style>
uni_modules/uni-table/components/uni-thead/uni-thead.vue 0 → 100644
<template>
<!-- #ifdef H5 -->
<thead class="uni-table-thead">
<tr class="uni-table-tr">
<th :rowspan="rowspan" colspan="1" class="checkbox" :class="{ 'tr-table--border': border }">
<table-checkbox :indeterminate="indeterminate" :checked="checked"
@checkboxSelected="checkboxSelected"></table-checkbox>
</th>
</tr>
<slot></slot>
</thead>
<!-- #endif -->
<!-- #ifndef H5 -->
<view class="uni-table-thead">
<slot></slot>
</view>
<!-- #endif -->
</template>
<script>
import tableCheckbox from '../uni-tr/table-checkbox.vue'
export default {
name: 'uniThead',
components: {
tableCheckbox
},
options: {
// #ifdef MP-TOUTIAO
virtualHost: false,
// #endif
// #ifndef MP-TOUTIAO
virtualHost: true
// #endif
},
data() {
return {
border: false,
selection: false,
rowspan: 1,
indeterminate: false,
checked: false
}
},
created() {
this.root = this.getTable()
// #ifdef H5
this.root.theadChildren = this
// #endif
this.border = this.root.border
this.selection = this.root.type
},
methods: {
init(self) {
this.rowspan++
},
checkboxSelected(e) {
this.indeterminate = false
const backIndexData = this.root.backIndexData
const data = this.root.trChildren.filter(v => !v.disabled && v.keyValue)
if (backIndexData.length === data.length) {
this.checked = false
this.root.clearSelection()
} else {
this.checked = true
this.root.selectionAll()
}
},
/**
* 获取父元素实例
*/
getTable(name = 'uniTable') {
let parent = this.$parent
let parentName = parent.$options.name
while (parentName !== name) {
parent = parent.$parent
if (!parent) return false
parentName = parent.$options.name
}
return parent
}
}
}
</script>
<style lang="scss">
$border-color: #ebeef5;
.uni-table-thead {
display: table-header-group;
}
.uni-table-tr {
/* #ifndef APP-NVUE */
display: table-row;
transition: all 0.3s;
box-sizing: border-box;
/* #endif */
border: 1px red solid;
background-color: #fafafa;
}
.checkbox {
padding: 0 8px;
width: 26px;
padding-left: 12px;
/* #ifndef APP-NVUE */
display: table-cell;
vertical-align: middle;
/* #endif */
color: #333;
font-weight: 500;
border-bottom: 1px $border-color solid;
font-size: 14px;
// text-align: center;
}
.tr-table--border {
border-right: 1px $border-color solid;
}
/* #ifndef APP-NVUE */
.uni-table-tr {
::v-deep .uni-table-th {
&.table--border:last-child {
// border-right: none;
}
}
::v-deep .uni-table-td {
&.table--border:last-child {
// border-right: none;
}
}
}
/* #endif */
</style>
uni_modules/uni-table/components/uni-tr/table-checkbox.vue 0 → 100644
<template>
<view class="uni-table-checkbox" @click="selected">
<view v-if="!indeterminate" class="checkbox__inner" :class="{'is-checked':isChecked,'is-disable':isDisabled}">
<view class="checkbox__inner-icon"></view>
</view>
<view v-else class="checkbox__inner checkbox--indeterminate">
<view class="checkbox__inner-icon"></view>
</view>
</view>
</template>
<script>
export default {
name: 'TableCheckbox',
emits:['checkboxSelected'],
props: {
indeterminate: {
type: Boolean,
default: false
},
checked: {
type: [Boolean,String],
default: false
},
disabled: {
type: Boolean,
default: false
},
index: {
type: Number,
default: -1
},
cellData: {
type: Object,
default () {
return {}
}
}
},
watch:{
checked(newVal){
if(typeof this.checked === 'boolean'){
this.isChecked = newVal
}else{
this.isChecked = true
}
},
indeterminate(newVal){
this.isIndeterminate = newVal
}
},
data() {
return {
isChecked: false,
isDisabled: false,
isIndeterminate:false
}
},
created() {
if(typeof this.checked === 'boolean'){
this.isChecked = this.checked
}
this.isDisabled = this.disabled
},
methods: {
selected() {
if (this.isDisabled) return
this.isIndeterminate = false
this.isChecked = !this.isChecked
this.$emit('checkboxSelected', {
checked: this.isChecked,
data: this.cellData
})
}
}
}
</script>
<style lang="scss">
$uni-primary: #007aff !default;
$border-color: #DCDFE6;
$disable:0.4;
.uni-table-checkbox {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
position: relative;
margin: 5px 0;
cursor: pointer;
// 多选样式
.checkbox__inner {
/* #ifndef APP-NVUE */
flex-shrink: 0;
box-sizing: border-box;
/* #endif */
position: relative;
width: 16px;
height: 16px;
border: 1px solid $border-color;
border-radius: 2px;
background-color: #fff;
z-index: 1;
.checkbox__inner-icon {
position: absolute;
/* #ifdef APP-NVUE */
top: 2px;
/* #endif */
/* #ifndef APP-NVUE */
top: 2px;
/* #endif */
left: 5px;
height: 7px;
width: 3px;
border: 1px solid #fff;
border-left: 0;
border-top: 0;
opacity: 0;
transform-origin: center;
transform: rotate(45deg);
box-sizing: content-box;
}
&.checkbox--indeterminate {
border-color: $uni-primary;
background-color: $uni-primary;
.checkbox__inner-icon {
position: absolute;
opacity: 1;
transform: rotate(0deg);
height: 2px;
top: 0;
bottom: 0;
margin: auto;
left: 0px;
right: 0px;
bottom: 0;
width: auto;
border: none;
border-radius: 2px;
transform: scale(0.5);
background-color: #fff;
}
}
&:hover{
border-color: $uni-primary;
}
// 禁用
&.is-disable {
/* #ifdef H5 */
cursor: not-allowed;
/* #endif */
background-color: #F2F6FC;
border-color: $border-color;
}
// 选中
&.is-checked {
border-color: $uni-primary;
background-color: $uni-primary;
.checkbox__inner-icon {
opacity: 1;
transform: rotate(45deg);
}
// 选中禁用
&.is-disable {
opacity: $disable;
}
}
}
}
</style>
uni_modules/uni-table/components/uni-tr/uni-tr.vue 0 → 100644
<template>
<!-- #ifdef H5 -->
<tr class="uni-table-tr">
<th v-if="selection === 'selection' && ishead" class="checkbox" :class="{ 'tr-table--border': border }">
<table-checkbox :checked="checked" :indeterminate="indeterminate" :disabled="disabled"
@checkboxSelected="checkboxSelected"></table-checkbox>
</th>
<slot></slot>
<!-- <uni-th class="th-fixed">123</uni-th> -->
</tr>
<!-- #endif -->
<!-- #ifndef H5 -->
<view class="uni-table-tr">
<view v-if="selection === 'selection' " class="checkbox" :class="{ 'tr-table--border': border }">
<table-checkbox :checked="checked" :indeterminate="indeterminate" :disabled="disabled"
@checkboxSelected="checkboxSelected"></table-checkbox>
</view>
<slot></slot>
</view>
<!-- #endif -->
</template>
<script>
import tableCheckbox from './table-checkbox.vue'
/**
* Tr 表格行组件
* @description 表格行组件 仅包含 th,td 组件
* @tutorial https://ext.dcloud.net.cn/plugin?id=
*/
export default {
name: 'uniTr',
components: {
tableCheckbox
},
props: {
disabled: {
type: Boolean,
default: false
},
keyValue: {
type: [String, Number],
default: ''
}
},
options: {
// #ifdef MP-TOUTIAO
virtualHost: false,
// #endif
// #ifndef MP-TOUTIAO
virtualHost: true
// #endif
},
data() {
return {
value: false,
border: false,
selection: false,
widthThArr: [],
ishead: true,
checked: false,
indeterminate: false
}
},
created() {
this.root = this.getTable()
this.head = this.getTable('uniThead')
if (this.head) {
this.ishead = false
this.head.init(this)
}
this.border = this.root.border
this.selection = this.root.type
this.root.trChildren.push(this)
const rowData = this.root.data.find(v => v[this.root.rowKey] === this.keyValue)
if (rowData) {
this.rowData = rowData
}
this.root.isNodata()
},
mounted() {
if (this.widthThArr.length > 0) {
const selectionWidth = this.selection === 'selection' ? 50 : 0
this.root.minWidth = Number(this.widthThArr.reduce((a, b) => Number(a) + Number(b))) + selectionWidth;
}
},
// #ifndef VUE3
destroyed() {
const index = this.root.trChildren.findIndex(i => i === this)
this.root.trChildren.splice(index, 1)
this.root.isNodata()
},
// #endif
// #ifdef VUE3
unmounted() {
const index = this.root.trChildren.findIndex(i => i === this)
this.root.trChildren.splice(index, 1)
this.root.isNodata()
},
// #endif
methods: {
minWidthUpdate(width) {
this.widthThArr.push(width)
if (this.widthThArr.length > 0) {
const selectionWidth = this.selection === 'selection' ? 50 : 0;
this.root.minWidth = Number(this.widthThArr.reduce((a, b) => Number(a) + Number(b))) + selectionWidth;
}
},
// 选中
checkboxSelected(e) {
let rootData = this.root.data.find(v => v[this.root.rowKey] === this.keyValue)
this.checked = e.checked
this.root.check(rootData || this, e.checked, rootData ? this.keyValue : null)
},
change(e) {
this.root.trChildren.forEach(item => {
if (item === this) {
this.root.check(this, e.detail.value.length > 0 ? true : false)
}
})
},
/**
* 获取父元素实例
*/
getTable(name = 'uniTable') {
let parent = this.$parent
let parentName = parent.$options.name
while (parentName !== name) {
parent = parent.$parent
if (!parent) return false
parentName = parent.$options.name
}
return parent
}
}
}
</script>
<style lang="scss">
$border-color: #ebeef5;
.uni-table-tr {
/* #ifndef APP-NVUE */
display: table-row;
transition: all 0.3s;
box-sizing: border-box;
/* #endif */
}
.checkbox {
padding: 0 8px;
width: 26px;
padding-left: 12px;
/* #ifndef APP-NVUE */
display: table-cell;
vertical-align: middle;
/* #endif */
color: #333;
font-weight: 500;
border-bottom: 1px $border-color solid;
font-size: 14px;
// text-align: center;
}
.tr-table--border {
border-right: 1px $border-color solid;
}
/* #ifndef APP-NVUE */
.uni-table-tr {
::v-deep .uni-table-th {
&.table--border:last-child {
// border-right: none;
}
}
::v-deep .uni-table-td {
&.table--border:last-child {
// border-right: none;
}
}
}
/* #endif */
</style>
uni_modules/uni-table/i18n/en.json 0 → 100644
{
"filter-dropdown.reset": "Reset",
"filter-dropdown.search": "Search",
"filter-dropdown.submit": "Submit",
"filter-dropdown.filter": "Filter",
"filter-dropdown.gt": "Greater or equal to",
"filter-dropdown.lt": "Less than or equal to",
"filter-dropdown.date": "Date"
}
uni_modules/uni-table/i18n/es.json 0 → 100644
{
"filter-dropdown.reset": "Reiniciar",
"filter-dropdown.search": "Búsqueda",
"filter-dropdown.submit": "Entregar",
"filter-dropdown.filter": "Filtrar",
"filter-dropdown.gt": "Mayor o igual a",
"filter-dropdown.lt": "Menos que o igual a",
"filter-dropdown.date": "Fecha"
}
uni_modules/uni-table/i18n/fr.json 0 → 100644
{
"filter-dropdown.reset": "Réinitialiser",
"filter-dropdown.search": "Chercher",
"filter-dropdown.submit": "Soumettre",
"filter-dropdown.filter": "Filtre",
"filter-dropdown.gt": "Supérieur ou égal à",
"filter-dropdown.lt": "Inférieur ou égal à",
"filter-dropdown.date": "Date"
}
uni_modules/uni-table/i18n/index.js 0 → 100644
import en from './en.json'
import es from './es.json'
import fr from './fr.json'
import zhHans from './zh-Hans.json'
import zhHant from './zh-Hant.json'
export default {
en,
es,
fr,
'zh-Hans': zhHans,
'zh-Hant': zhHant
}
uni_modules/uni-table/i18n/zh-Hans.json 0 → 100644
{
"filter-dropdown.reset": "重置",
"filter-dropdown.search": "搜索",
"filter-dropdown.submit": "确定",
"filter-dropdown.filter": "筛选",
"filter-dropdown.gt": "大于等于",
"filter-dropdown.lt": "小于等于",
"filter-dropdown.date": "日期范围"
}
uni_modules/uni-table/i18n/zh-Hant.json 0 → 100644
{
"filter-dropdown.reset": "重置",
"filter-dropdown.search": "搜索",
"filter-dropdown.submit": "確定",
"filter-dropdown.filter": "篩選",
"filter-dropdown.gt": "大於等於",
"filter-dropdown.lt": "小於等於",
"filter-dropdown.date": "日期範圍"
}
uni_modules/uni-table/package.json 0 → 100644
{
"id": "uni-table",
"displayName": "uni-table 表格",
"version": "1.2.9",
"description": "表格组件，多用于展示多条结构类似的数据，如",
"keywords": [
"uni-ui",
"uniui",
"table",
"表格"
],
"repository": "https://github.com/dcloudio/uni-ui",
"engines": {
"HBuilderX": ""
},
"directories": {
"example": "../../temps/example_temps"
},
"dcloudext": {
"sale": {
"regular": {
"price": "0.00"
},
"sourcecode": {
"price": "0.00"
}
},
"contact": {
"qq": ""
},
"declaration": {
"ads": "无",
"data": "无",
"permissions": "无"
},
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
"type": "component-vue"
},
"uni_modules": {
"dependencies": ["uni-scss","uni-datetime-picker"],
"encrypt": [],
"platforms": {
"cloud": {
"tcb": "y",
"aliyun": "y",
"alipay": "n"
},
"client": {
"App": {
"app-vue": "y",
"app-nvue": "n",
"app-harmony": "u",
"app-uvue": "u"
},
"H5-mobile": {
"Safari": "y",
"Android Browser": "y",
"微信浏览器(Android)": "y",
"QQ浏览器(Android)": "y"
},
"H5-pc": {
"Chrome": "y",
"IE": "y",
"Edge": "y",
"Firefox": "y",
"Safari": "y"
},
"小程序": {
"微信": "y",
"阿里": "y",
"百度": "y",
"字节跳动": "n",
"QQ": "y"
},
"快应用": {
"华为": "n",
"联盟": "n"
},
"Vue": {
"vue2": "y",
"vue3": "y"
}
}
}
}
}
uni_modules/uni-table/readme.md 0 → 100644
## Table 表单
> 组件名：``uni-table``，代码块： `uTable`。
用于展示多条结构类似的数据
### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-table)
#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
util/dataHandling.ts
......@@ -164,6 +164,7 @@ export default{
// 判断是否已满18岁
return eighteenYearsLater <= currentDate;
},
// 防抖函数
debounce(fn, delay = 200) {
let timer = null;
return function (...args) {
......@@ -172,5 +173,37 @@ export default{
fn.apply(this, args); // 延迟执行
}, delay);
};
},
/**
* 安全可靠的运行环境判断
* @returns {'app' | 'wechat-h5' | 'wechat-mp' | 'wechat-work' | 'browser' | 'unknown'}
*/
getRuntimeEnv() {
try {
// UniApp 环境判断
if (typeof uni !== 'undefined' && uni.getEnv) {
const uniEnv = uni.getEnv();
if (uniEnv === 'app-plus') return 'app';
if (uniEnv === 'mp-weixin') return 'wechat-mp';
}
// H5 环境判断
if (
typeof window !== 'undefined' &&
window.navigator &&
window.navigator.userAgent
) {
const ua = window.navigator.userAgent.toLowerCase();
if (/micromessenger/i.test(ua)) {
return /wxwork/i.test(ua) ? 'wechat-work' : 'wechat-h5';
}
return 'browser';
}
return 'unknown';
} catch (e) {
console.warn('环境判断失败:', e);
return 'unknown';
}
}
}
\ No newline at end of file
util/questions.js 0 → 100644
export default [
{
"category": "关于团队",
"id": "1",
"icon":"icon-tuandui",
"questions": [
{
"Q": "如何成为合伙人",
"A": "申请加盟→填写个人信息→等待资质审核→审核通过后，完成加盟",
"isActive": 1
},
{
"Q": "如何邀请朋友加入",
"A": "进入\"邀请加盟\"页面→填写被邀请人信息→发起邀请→通过右上角菜单分享给朋友→受邀方填写加盟资料完成申请",
"isActive": 1
},
{
"Q": "如何查看被邀请人是否加盟成功",
"A": "进入首页→点击\"邀请加盟\"→填写\"邀请信息\"→若邀请状态显示\"成功\"，即表示加盟成功",
"isActive": 1
},
{
"Q": "合伙人晋升条件",
"A": [
"见习合伙人：完成加盟申请",
"新锐合伙人：个人标准销售额≥799元",
"资深合伙人：个人标准销售额≥799元 + 团队有效人数≥5人 + 团队标准销售额≥5万元",
"精英合伙人：个人标准销售额≥799元 + 团队有效人数≥10人 + 团队标准销售额≥15万元",
"营业部部长：个人标准销售额≥799元 + 团队有效人数≥20人 + 团队标准销售额≥50万元"
],
"isActive": 1,
"isMore": true
}
]
},
{
"category": "关于订单",
"id": "2",
"icon":"icon-dingdan",
"questions": [
{
"Q": "如何查看商品订单？",
"A": "进入首页或\"我的\"页面→点击\"成交订单\"→点击我的订单→查看订单列表",
"isActive": 1
},
{
"Q": "如何分享产品",
"A": "进入产品中心→选择要分享的产品→点击\"去分享\"→发送给朋友",
"isActive": 1
},
{
"Q": "如何查看分享后成交的订单？",
"A": "进入首页或\"我的\"页面→点击\"成交订单\"→选择\"分享订单\"→查看订单列表",
"isActive": 1
},
{
"Q": "如何查看订单明细",
"A": "进入首页或\"我的\"页面→点击\"成交订单\"→选择\"分享订单\"或\"我的订单\"→点击具体订单，查看明细",
"isActive": 1
}
]
},
{
"category": "关于佣金",
"id": "3",
"icon":"icon-yongjin",
"questions": [
{
"Q": "如何获得佣金",
"A": [
"见习合伙人：自购或分享产品，他人购买后可获得销售收入",
"更高级别合伙人：可额外获得团队订单的一级/二级管理津贴",
"营业部部长：可享受部长津贴",
"育成营业部部长：可享受育成津贴",
"（以上收益可叠加）"
],
"isActive": 1,
"isMore": true
},
{
"Q": "如何查看佣金",
"A": "进入首页或\"我的\"页面→点击\"佣金\"→查看佣金明细",
"isActive": 1
},
{
"Q": "如何提现佣金",
"A": "进入首页或\"我的\"页面→点击\"佣金\"→点击\"提现\"按钮→发起提现申请",
"isActive": 1
},
{
"Q": "为什么佣金状态显示\"待结算\"？",
"A": "订单成交后需等待7天结算期，期间佣金状态为\"待结算\"。",
"isActive": 1
}
]
}
]
\ No newline at end of file
util/router.js
......@@ -8,6 +8,7 @@ const whiteList = [
'/pages/orderDetail/orderDetail',
'/pages/courseDetail/courseDetail',
'/pages/courselist/courselist',
'/pages/personalCenter/helpCenter?type=1',
'/pages/index/index'
]
export default function initApp(){
......
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