Commit 6b8f91d4 by yuzhenWang

合并到dev分支

parents c728e320 080ade46
......@@ -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;
......
......@@ -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;
}
......
......@@ -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
......
......@@ -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;">
......
<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;
......
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',
......
......@@ -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": "分享数据",
......
......@@ -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;
......
......@@ -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;
}
}
......
......@@ -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;
......
......@@ -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;
......
......@@ -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 {
......
......@@ -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>
<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;
......
......@@ -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;
......
<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
......@@ -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: '',
......
......@@ -78,6 +78,7 @@
<style lang="scss" scoped>
.container{
padding: 0 20rpx;
background-color: #f7f7f7;
}
.top{
display: flex;
......
......@@ -91,6 +91,7 @@
.content-box-title {
flex: 1;
font-size: 28rpx;
text-align: center;
}
.content-sam-box{
background-color: #fff;
......
......@@ -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
......
......@@ -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;
......
......@@ -141,7 +141,6 @@
<style lang="scss" scoped>
.container{
box-sizing:border-box;
background-color: #f7f7f7;
height: 92.9vh;
padding: 30rpx;
.kuaiBox{
......
......@@ -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{
......
......@@ -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>
......
@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";
}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -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",
......
......@@ -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;
}
......
## 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目录规范
<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>
<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>
<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>
<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>
<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>
<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>
{
"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"
}
{
"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"
}
{
"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"
}
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
}
{
"filter-dropdown.reset": "重置",
"filter-dropdown.search": "搜索",
"filter-dropdown.submit": "确定",
"filter-dropdown.filter": "筛选",
"filter-dropdown.gt": "大于等于",
"filter-dropdown.lt": "小于等于",
"filter-dropdown.date": "日期范围"
}
{
"filter-dropdown.reset": "重置",
"filter-dropdown.search": "搜索",
"filter-dropdown.submit": "確定",
"filter-dropdown.filter": "篩選",
"filter-dropdown.gt": "大於等於",
"filter-dropdown.lt": "小於等於",
"filter-dropdown.date": "日期範圍"
}
{
"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"
}
}
}
}
}
## Table 表单
> 组件名:``uni-table``,代码块: `uTable`。
用于展示多条结构类似的数据
### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-table)
#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839
......@@ -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
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
......@@ -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