Skip to content

C
CFFP-HB
Commit 4a34dc18 by yuzhenWang
Options

去除h5返回键

parent bf12032e
Showing with 277 additions and 124 deletions
components/courseItem/courseItem.vue
<template> <template>
<view class="itemContent"> <view class="itemContent">
<view class="thumbnailBox"> <view class="thumbnailBox">
<image :src="thumbnailPath" alt="" mode="widthFix"></image> <image :src="thumbnailPath" alt="" mode="widthFix" ></image>
</view> </view>
<view class="courseDetailBox"> <view class="courseDetailBox">
<view class="title"> <view class="title">
<view style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{title}}</view> <view style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{title}}</view>
<!-- <text class="detailBtn" @click="viewDetail()" v-if="isNeedViewDetail">订单详情></text> --> <!-- <text class="iconfont icon-youjiantou " v-if="showDetail"></text> -->
</view> </view>
<view class="summaryBox" v-if="summaryBox"> <view class="summaryBox" v-if="summaryBox">
<view class="text-wrap">{{summaryBox}}</view> <view class="text-wrap">{{summaryBox}}</view>
</view> </view>
<view class="dataBox" v-if="dataList"> <view class="dataBox" v-if="dataList">
<view class="price" v-if="dataList.coursePrice != 0" >￥{{dataList.coursePrice}}</view> <view class="price" v-if="dataList.coursePrice != 0" >￥{{Number(dataList.coursePrice).toFixed(2)}}</view>
<!-- <text v-if="dataList.coursePrice == 0">免费</text> --> <text v-if="dataList.coursePrice != 0 && dataList.salesNumber">{{dataList.salesNumber}}人购买</text>
<text v-if="dataList.coursePrice != 0">{{dataList.salesNumber}}人购买</text>
</view> </view>
<!-- <view class="tagListBox" v-if="tagList || fileLecturerId">
<template v-if="tagList">
<view class="tagItem" v-for="tagItem in tagConcat(tagList.v1,tagList.v2)">{{tagItem}}</view>
</template>
<template v-else-if="_tagList">
<view class="tagItem" v-for="tagItem in tagConcat(_tagList.v1,_tagList.v2)">{{tagItem}}</view>
</template>
</view> -->
</view> </view>
</view> </view>
</template> </template>
...@@ -61,7 +51,11 @@ ...@@ -61,7 +51,11 @@
}, },
fileId: { fileId: {
type: Number type: Number
} },
showDetail: { //展示详情箭头
type: Boolean,
default:false
},
}, },
data() { data() {
return { return {
...@@ -134,6 +128,8 @@ ...@@ -134,6 +128,8 @@
.title { .title {
// flex: 1; // flex: 1;
display: flex; display: flex;
align-items: center;
justify-content: space-between;
// max-width: 260rpx; // max-width: 260rpx;
// width: 0; // width: 0;
// flex-basis: 100rpx; // flex-basis: 100rpx;
......
pages.json
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
}, { }, {
"path": "pages/application-process/basic-info", "path": "pages/application-process/basic-info",
"style": { "style": {
"navigationBarTitleText": "基本资料", "navigationBarTitleText": "申请加盟-基本资料",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"app-plus": { "app-plus": {
"softinputMode": "adjustPan" "softinputMode": "adjustPan"
......
pages/afterSales/afterSales.vue
<template> <template>
<view class="container"> <view class="container">
<!-- #ifdef APP -->
<view class="top"> <view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<text style="font-size: 30rpx;">我的售后</text> <text style="font-size: 30rpx;">我的售后</text>
</view> </view>
<!-- #endif -->
<h4 class="noListTip" v-if="userCourses.length <=0 ">暂无售后</h4> <h4 class="noListTip" v-if="userCourses.length <=0 ">暂无售后</h4>
<view class="ulBox" v-if="userCourses.length > 0"> <view class="ulBox" v-if="userCourses.length > 0">
<view class="conent">
<view class="liBox" v-for="item in userCourses" :key="item.orderId"> <view class="liBox" v-for="item in userCourses" :key="item.orderId">
<course-item :thumbnailPath="item.displayImage" :title="item.fileTitle" :summaryBox="item.fileSynopsis" :dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}" :fileLecturerId="item.fileLecturerId"></course-item> <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"> <view class="statusBox">
...@@ -14,6 +17,8 @@ ...@@ -14,6 +17,8 @@
</view> </view>
</view> </view>
</view> </view>
</view>
</view> </view>
</template> </template>
...@@ -79,13 +84,15 @@ ...@@ -79,13 +84,15 @@
} }
} }
.ulBox{ .ulBox{
margin-top: 20rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 20rpx 20rpx 5rpx 20rpx;
.conent{
border-radius: 10rpx;
}
.liBox{ .liBox{
background-color: #fff; background-color: #fff;
margin-bottom: 20rpx; margin-bottom: 20rpx;
padding: 36rpx 30rpx; padding: 36rpx 30rpx;
margin: 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
.statusBox{ .statusBox{
display: flex; display: flex;
......
pages/application-process/applyCommon.scss
.container { .container {
font-size: 36rpx; font-size: 36rpx;
// background: #fff;
// min-height: 100%;
overflow: auto; overflow: auto;
// padding-bottom: 80rpx;
.wrapper{ .wrapper{
background: #fff; background: #fff;
} }
......
pages/application-process/bank-card.vue
<template> <template>
<view class="container" style="height: 1000rpx;"> <view class="container" style="height: 1000rpx;">
<view > <view >
<!-- #ifdef APP -->
<view class="top"> <view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<text>申请加盟</text> <text>申请加盟</text>
</view> </view>
<!-- #endif -->
<view class="page"> <view class="page">
<text class="num actived pass">1</text> <text class="num actived pass">1</text>
<text class="line line_pass"></text> <text class="line line_pass"></text>
......
pages/application-process/basic-info.vue
<template> <template>
<view class="container"> <view class="container">
<!-- #ifdef APP -->
<view class="top"> <view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<text>申请加盟</text> <text>申请加盟</text>
</view> </view>
<!-- #endif -->
<view class="page"> <view class="page">
<text class="num actived">1</text> <text class="num actived">1</text>
<text class="line"></text> <text class="line"></text>
......
pages/application-process/contract.vue
<template> <template>
<view class="container"> <view class="container">
<!-- #ifdef APP -->
<view class="top"> <view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<text>申请加盟</text> <text>申请加盟</text>
</view> </view>
<!-- #endif -->
<view class="page"> <view class="page">
<text class="num actived pass">1</text> <text class="num actived pass">1</text>
<text class="line line_pass"></text> <text class="line line_pass"></text>
......
pages/application-process/id-card.vue
<template> <template>
<view class="container"> <view class="container">
<!-- #ifdef APP -->
<view class="top"> <view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<text>申请加盟</text> <text>申请加盟</text>
</view> </view>
<!-- #endif -->
<view class="page"> <view class="page">
<text class="num actived pass">1</text> <text class="num actived pass">1</text>
<text class="line line_pass"></text> <text class="line line_pass"></text>
...@@ -18,8 +21,6 @@ ...@@ -18,8 +21,6 @@
<text class="num">6</text> <text class="num">6</text>
<text class="line"></text> <text class="line"></text>
<text class="num">7</text> <text class="num">7</text>
<!-- <text class="line"></text>
<text class="num">8</text> -->
</view> </view>
<view class="wrapper"> <view class="wrapper">
<view class="title"> <view class="title">
......
pages/application-process/personal-statement.vue
<template> <template>
<view class="container"> <view class="container">
<!-- #ifdef APP -->
<view class="top"> <view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<text>申请加盟</text> <text>申请加盟</text>
</view> </view>
<!-- #endif -->
<view class="page"> <view class="page">
<text class="num actived pass">1</text> <text class="num actived pass">1</text>
<text class="line line_pass"></text> <text class="line line_pass"></text>
......
pages/application-process/signature.vue
<template class="sign"> <template class="sign">
<view class="container" style="margin-bottom: 0;" > <view class="container" style="margin-bottom: 0;" >
<!-- #ifdef APP -->
<view class="top"> <view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<text>申请加盟</text> <text>申请加盟</text>
</view> </view>
<view class="page"> <!-- #endif -->
<view class="page" >
<text class="num actived pass">1</text> <text class="num actived pass">1</text>
<text class="line line_pass"></text> <text class="line line_pass"></text>
<text class="num actived pass">2</text> <text class="num actived pass">2</text>
......
pages/commonDetail/commonDetail.vue
<template> <template>
<view> <view>
<!-- #ifdef APP -->
<text class="iconfont icon-youjiantou zuojiantou" style="top: 20rpx;" @click="goBack()" ></text> <text class="iconfont icon-youjiantou zuojiantou" style="top: 20rpx;" @click="goBack()" ></text>
<!-- #endif -->
<template v-if="title"> <template v-if="title">
<view style="padding-top: 50rpx;"><my-list-item :title="title" :lists="lists"></my-list-item></view> <view style="padding-top: 50rpx;"><my-list-item :title="title" :lists="lists"></my-list-item></view>
<view v-if="lists.length<=0" style="text-align: center;margin-top: 40rpx;">暂无{{typeName}}记录</view> <view v-if="lists.length<=0" style="text-align: center;margin-top: 40rpx;">暂无{{typeName}}记录</view>
......
pages/courseDetail/courseDetail.vue
<template> <template>
<view class="container"> <view class="container">
<view class="shareheader" style="" v-if="coursesharing != 1 || deviceType==3"> <view class="shareheader" style="" v-if="coursesharing != 1 || deviceType==3">
<view class="iconfont icon-youjiantou" style="margin-left: 30rpx;" @click="goBack()"> <!-- #ifdef APP -->
</view> <view class="iconfont icon-youjiantou" style="margin-left: 30rpx;" @click="goBack()"></view>
<!-- #endif -->
<view class="share-entrance"> <view class="share-entrance">
<view style="z-index: 99999;"> <view style="z-index: 99999;">
<uni-popup ref="share" type="top" safeArea backgroundColor="#F4F2F3" :maskClick='true' <uni-popup ref="share" type="top" safeArea backgroundColor="#F4F2F3" :maskClick='true'
...@@ -1107,7 +1110,12 @@ ...@@ -1107,7 +1110,12 @@
.shareheader { .shareheader {
background-color: #fff; background-color: #fff;
display: flex; display: flex;
/* #ifdef H5 */
justify-content: flex-end;
/* #endif */
/* #ifdef APP */
justify-content: space-between; justify-content: space-between;
/* #endif */
align-items: center; align-items: center;
height: 100rpx; height: 100rpx;
......
pages/inviteJoin/inviteJoin.vue
<template> <template>
<view class="padding-top container"> <view class="padding-top container">
<!-- #ifdef APP -->
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 20rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 20rpx;"></text>
<!-- #endif -->
<view class="tabTitle"> <view class="tabTitle">
<text :class="{'actived': tabType===1}" @click="switchTab(1)">基本信息</text> <text :class="{'actived': tabType===1}" @click="switchTab(1)">基本信息</text>
......
pages/myShare/myShare.vue
<template> <template>
<view class="container"> <view class="container">
<view class="">
<!-- 时间选择 --> <!-- 时间选择 -->
<view class="timeSelectContent"> <view class="timeSelectContent">
<!-- #ifdef APP -->
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<!-- #endif -->
<CommonTimePicker <CommonTimePicker
:timeData="startDate" :timeData="startDate"
:visible="showTime1" :visible="showTime1"
...@@ -39,8 +42,11 @@ ...@@ -39,8 +42,11 @@
<text>累计分享(节)</text> <text>累计分享(节)</text>
</view> </view>
</view> </view>
</view>
<!-- 分享明细 --> <!-- 分享明细 -->
<view class="shareDetailContent"> <view class="shareDetailContent">
<view class="shareBox">
<h3 class="shareTitle">分享明细</h3> <h3 class="shareTitle">分享明细</h3>
<template v-if="userShareCourses && userShareCourses.length > 0"> <template v-if="userShareCourses && userShareCourses.length > 0">
<view class="shareOrderInfoItem" v-for="item in userShareCourses" :key="item.fileId"> <view class="shareOrderInfoItem" v-for="item in userShareCourses" :key="item.fileId">
...@@ -72,6 +78,8 @@ ...@@ -72,6 +78,8 @@
</template> </template>
<h4 class="noListTip" v-else>暂无分享记录！</h4> <h4 class="noListTip" v-else>暂无分享记录！</h4>
</view> </view>
</view>
</view> </view>
</template> </template>
...@@ -186,7 +194,9 @@ ...@@ -186,7 +194,9 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.container { .container {
padding-bottom: 30rpx; padding-bottom: 20rpx;
display: flex;
flex-direction: column;
.timeSelectContent { .timeSelectContent {
background-color: #fff; background-color: #fff;
padding: 20rpx 0; padding: 20rpx 0;
...@@ -240,35 +250,29 @@ ...@@ -240,35 +250,29 @@
} }
.shareDetailContent { .shareDetailContent {
margin-bottom: 50rpx; flex: 1;
.shareTitle { box-sizing: border-box;
margin: 20rpx 20rpx 0 20rpx; background-color: #fff;
margin: 0rpx 20rpx;
padding: 20rpx; padding: 20rpx;
border-radius: 10rpx;
.shareTitle {
// margin: 20rpx 20rpx 0 20rpx;
// padding: 20rpx;
border-bottom: 1rpx solid #F2F2F2; border-bottom: 1rpx solid #F2F2F2;
color: #333; color: #333;
font-size: 36rpx; font-size: 36rpx;
position: relative; position: relative;
background-color: #fff; background-color: #fff;
border-radius: 10rpx 10rpx 0rpx 0rpx; 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 { .shareOrderInfoItem {
margin: 0 20rpx; // margin: 0 20rpx;
background-color: #fff; background-color: #fff;
box-sizing: border-box; box-sizing: border-box;
padding: 20rpx; padding: 20rpx 10rpx;
.timeBox { .timeBox {
font-size: 28rpx; font-size: 28rpx;
color: #999; color: #999;
......
pages/orderConfirm/orderConfirm.vue
<template> <template>
<view class="container"> <view class="container">
<view style="flex: 1;"> <view style="flex: 1;">
<!-- #ifdef APP -->
<view class="backArrow">
<text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
</view>
<!-- #endif -->
<!-- 课程详情 --> <!-- 课程详情 -->
<template v-if="courseInfoItem"> <template v-if="courseInfoItem">
<view class="courseItemBox" style="padding-top:80rpx"> <view class="courseItemBox" >
<view class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top:18rpx">
</view>
<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle" <course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle"
:summaryBox="courseInfoItem.fileSynopsis" :summaryBox="courseInfoItem.fileSynopsis"
:dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}" :dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}"
...@@ -543,10 +547,29 @@ ...@@ -543,10 +547,29 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.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;
text:nth-child(2){
width: 100%;
text-align: center;
position: absolute;
}
}
.txtFont{ .txtFont{
font-size: 27rpx; font-size: 27rpx;
} }
.courseItemBox { .courseItemBox {
margin: 20rpx;
border-radius: 10rpx;
padding: 20rpx 30rpx; padding: 20rpx 30rpx;
background-color: #fff; background-color: #fff;
} }
...@@ -700,7 +723,7 @@ ...@@ -700,7 +723,7 @@
.paymentMethodContent, .paymentMethodContent,
.totalContent { .totalContent {
background-color: #fff; background-color: #fff;
margin: 0 10rpx; margin: 0 20rpx;
padding: 20rpx; padding: 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
} }
......
pages/orderDetail/orderDetail.vue
<template> <template>
<view class="container" > <view class="container" >
<!-- <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 16rpx;"></text> --> <!-- #ifdef APP -->
<view class="backArrow"> <view class="backArrow">
<text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
<text style="font-size: 30rpx;">订单详情</text> <text style="font-size: 30rpx;">订单详情</text>
</view> </view>
<!-- #endif -->
<view class="orderInfoContent"> <view class="orderInfoContent">
<view class="ulBox"> <view class="ulBox">
<view class="conent">
<view v-for="item in orderInfoList.filter(item=>item.pageArea===1)" :key="item.id" class="liBox"> <view v-for="item in orderInfoList.filter(item=>item.pageArea===1)" :key="item.id" class="liBox">
<text>{{item.name}}:</text> <text>{{item.name}}:</text>
<text <text
:style="{color:item.color ? item.color : '#666'}">{{item.type==='currency' && item.value ? '￥' : ''}}{{item.value ? item.value : '/'}}</text> :style="{color:item.color ? item.color : '#666'}">{{item.type==='currency' && item.value ? '￥' : ''}}{{item.value ? item.value : '/'}}</text>
</view> </view>
</view> </view>
</view>
<view class="ulBox"> <view class="ulBox">
<view class="conent">
<view v-for="item in orderInfoList.filter(item=>item.pageArea===2)" :key="item.id" class="liBox"> <view v-for="item in orderInfoList.filter(item=>item.pageArea===2)" :key="item.id" class="liBox">
<text>{{item.name}}:</text> <text>{{item.name}}:</text>
<text <text
...@@ -23,9 +29,9 @@ ...@@ -23,9 +29,9 @@
</text> </text>
</view> </view>
</view> </view>
<!-- 退课 -->
</view>
<view class="dropClassBox" v-if="Withdrawal=='1' && orderDetail.isRefund == '1'&& type == 'drop'"> <view class="dropClassBox" v-if="Withdrawal=='1' && orderDetail.isRefund == '1'&& type == 'drop'">
<!-- <view class="dropClassBox" v-if="Withdrawal=='1' && orderDetail.operationStatus == '1'&& type == 'drop'"> -->
<view class="dropBtn" @click="dropClasses()">退款</view> <view class="dropBtn" @click="dropClasses()">退款</view>
</view> </view>
</view> </view>
...@@ -247,7 +253,6 @@ ...@@ -247,7 +253,6 @@
margin-bottom: 10rpx; margin-bottom: 10rpx;
color: #333333; color: #333333;
background-color: #fff; background-color: #fff;
// margin-top: 20rpx;
text:nth-child(2){ text:nth-child(2){
width: 100%; width: 100%;
text-align: center; text-align: center;
...@@ -256,10 +261,13 @@ ...@@ -256,10 +261,13 @@
} }
.orderInfoContent { .orderInfoContent {
.ulBox { .ulBox {
box-sizing: border-box;
padding: 20rpx 20rpx 5rpx 20rpx;
.conent{
padding: 20rpx ;
background-color: #fff; background-color: #fff;
margin: 20rpx 20rpx;
padding: 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
}
.liBox { .liBox {
margin-bottom: 20rpx; margin-bottom: 20rpx;
display: flex; display: flex;
......
pages/personalCenter/helpCenter.vue
<template> <template>
<view class="container"> <view class="container">
<!-- #ifdef APP -->
<view class="backArrow"> <view class="backArrow">
<text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
<text style="font-size: 30rpx;">帮助中心</text> <text style="font-size: 30rpx;">帮助中心</text>
</view> </view>
<!-- #endif -->
<view class="filterBox"> <view class="filterBox">
<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120"> <scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120">
<view <view
......
pages/personalCenter/myTeam.vue
<template> <template>
<view class="container"> <view class="container">
<view class="myHeader"> <view class="myHeader">
<!-- #ifdef APP -->
<view class="backArrow"> <view class="backArrow">
<text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
<text style="font-size: 30rpx;">我的团队</text> <text style="font-size: 30rpx;">我的团队</text>
</view> </view>
<!-- #endif -->
<view class="timeBox" v-if="currentBtn == '2'" @click="showTime1 = true"> <view class="timeBox" v-if="currentBtn == '2'" @click="showTime1 = true">
<CommonTimePicker <CommonTimePicker
:timeData="startDate" :timeData="startDate"
...@@ -14,7 +17,7 @@ ...@@ -14,7 +17,7 @@
@closeTime="showTime1=false" @closeTime="showTime1=false"
/> />
</view> </view>
<view class="renshu"> <view class="renshu" :style="{marginTop}">
<view class="top"> <view class="top">
<view class="left"> <view class="left">
<text v-if="currentBtn == '1'">团队有效人数</text> <text v-if="currentBtn == '1'">团队有效人数</text>
...@@ -97,7 +100,7 @@ ...@@ -97,7 +100,7 @@
<span class="content-box-title cell">{{pointItem.referrer}}</span> <span class="content-box-title cell">{{pointItem.referrer}}</span>
</view> </view>
</view> </view>
<view v-else-if="currentBtn == '2'&&myTeamAchievementList.length>0"> <view v-else-if="currentBtn == '2'&&currentFilterBtn!=='3'&& myTeamAchievementList.length>0">
<view class="content-sam-box" v-for="(pointItem,index) in myTeamAchievementList" :key="index"> <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.name}}</span>
<span class="content-box-title cell">{{pointItem.orderNum}}</span> <span class="content-box-title cell">{{pointItem.orderNum}}</span>
...@@ -105,6 +108,14 @@ ...@@ -105,6 +108,14 @@
<span class="content-box-title cell" >￥{{pointItem.monthStandardSales || '0.00'}}</span> <span class="content-box-title cell" >￥{{pointItem.monthStandardSales || '0.00'}}</span>
</view> </view>
</view> </view>
<view v-else-if="currentBtn == '2'&& currentFilterBtn=='3'&& 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.monthStandardSales || '0.00'}}</span>
</view>
</view>
<view class="empty" v-else> <view class="empty" v-else>
暂无数据 暂无数据
</view> </view>
...@@ -162,7 +173,8 @@ ...@@ -162,7 +173,8 @@
totalOrder: '0', //总单数 totalOrder: '0', //总单数
totalCoursePrice: '0.00', // 总销售额 totalCoursePrice: '0.00', // 总销售额
monthStandardSales:'0.00',//本月团队标准销售额 monthStandardSales:'0.00',//本月团队标准销售额
myTeamAchievementList:[],//我的业绩数据列表 myTeamAchievementList:[],//我的业绩数据列表,
marginTop:'30rpx'
} }
}, },
watch: { watch: {
...@@ -176,6 +188,9 @@ ...@@ -176,6 +188,9 @@
{title:'职级',id:'3'}, {title:'职级',id:'3'},
{title:'关系',id:'4'}, {title:'关系',id:'4'},
] ]
// #ifdef H5
this.marginTop = '30rpx'
// #endif
this.getmyseatem() this.getmyseatem()
return return
} }
...@@ -187,6 +202,9 @@ ...@@ -187,6 +202,9 @@
{title:'标准销售额',id:'4'}, {title:'标准销售额',id:'4'},
] ]
this.getqueryTeamAchievement() this.getqueryTeamAchievement()
// #ifdef H5
this.marginTop = '0rpx'
// #endif
return return
} }
} }
...@@ -214,10 +232,32 @@ ...@@ -214,10 +232,32 @@
this.myTeamList.push( ...this.myTeamData['directList']) this.myTeamList.push( ...this.myTeamData['directList'])
} }
} }
console.log();
} }
}, },
currentFilterBtn: {
deep: true,
handler(newVal) {
if(newVal == '3'&&this.currentBtn=='2') {
this.tableHeaderList = [
{title:'销售日期',id:'1'},
{title:'单数',id:'2'},
{title:'销售额',id:'3'},
{title:'标准销售额',id:'4'},
]
this.getqueryTeamAchievement()
return
}else {
this.tableHeaderList = [
{title:'成员',id:'1'},
{title:'单数',id:'2'},
{title:'销售额',id:'3'},
{title:'标准销售额',id:'4'},
]
this.getqueryTeamAchievement()
return
}
}
},
}, },
onLoad(){ onLoad(){
this.getmyseatem() this.getmyseatem()
...@@ -352,6 +392,7 @@ ...@@ -352,6 +392,7 @@
} }
} }
.timeBox{ .timeBox{
margin-top: 30rpx;
padding-left: 25rpx; padding-left: 25rpx;
width: 50%; width: 50%;
} }
......
pages/personalCenter/myTeamIncubate.vue
<template> <template>
<view class="container"> <view class="container">
<view class="myHeader"> <view class="myHeader">
<!-- #ifdef APP -->
<view class="backArrow"> <view class="backArrow">
<text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
<text style="font-size: 30rpx;">育成团队</text> <text style="font-size: 30rpx;">育成团队</text>
</view> </view>
<!-- #endif -->
<view class="timeBox" v-if="currentBtn == '2'" @click="showTime1 = true"> <view class="timeBox" v-if="currentBtn == '2'" @click="showTime1 = true">
<CommonTimePicker <CommonTimePicker
:timeData="startDate" :timeData="startDate"
...@@ -14,7 +17,7 @@ ...@@ -14,7 +17,7 @@
@closeTime="showTime1=false" @closeTime="showTime1=false"
/> />
</view> </view>
<view class="renshu"> <view class="renshu" :style="{marginTop}">
<view class="top"> <view class="top">
<view class="left"> <view class="left">
<text v-if="currentBtn == '1'">育成部长数</text> <text v-if="currentBtn == '1'">育成部长数</text>
...@@ -108,8 +111,6 @@ ...@@ -108,8 +111,6 @@
暂无数据 暂无数据
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
...@@ -164,6 +165,7 @@ ...@@ -164,6 +165,7 @@
totalCoursePrice: '0.00', // 总销售额 totalCoursePrice: '0.00', // 总销售额
monthStandardSales:'0.00',//本月团队标准销售额 monthStandardSales:'0.00',//本月团队标准销售额
myTeamAchievementList:[],//我的业绩数据列表 myTeamAchievementList:[],//我的业绩数据列表
marginTop:'30rpx'
} }
}, },
watch: { watch: {
...@@ -177,6 +179,9 @@ ...@@ -177,6 +179,9 @@
{title:'标准销售额',id:'3'}, {title:'标准销售额',id:'3'},
] ]
this.getmyseatem() this.getmyseatem()
// #ifdef H5
this.marginTop = '30rpx'
// #endif
return return
} }
if(newVal == '2') { if(newVal == '2') {
...@@ -187,11 +192,37 @@ ...@@ -187,11 +192,37 @@
{title:'标准销售额',id:'4'}, {title:'标准销售额',id:'4'},
] ]
this.getqueryTeamAchievement() this.getqueryTeamAchievement()
// #ifdef H5
this.marginTop = '0rpx'
// #endif
return return
} }
} }
}, },
// currentFilterBtn: {
// deep: true,
// handler(newVal) {
// if(newVal == '3'&&this.currentBtn=='2') {
// this.tableHeaderList = [
// {title:'销售日期',id:'1'},
// {title:'单数',id:'2'},
// {title:'销售额',id:'3'},
// {title:'标准销售额',id:'4'},
// ]
// this.getqueryTeamAchievement()
// return
// }else {
// this.tableHeaderList = [
// {title:'成员',id:'1'},
// {title:'单数',id:'2'},
// {title:'销售额',id:'3'},
// {title:'标准销售额',id:'4'},
// ]
// this.getqueryTeamAchievement()
// return
// }
// }
// },
}, },
onLoad(){ onLoad(){
...@@ -316,6 +347,7 @@ ...@@ -316,6 +347,7 @@
} }
} }
.timeBox{ .timeBox{
margin-top: 30rpx;
padding-left: 25rpx; padding-left: 25rpx;
width: 50%; width: 50%;
} }
......
pages/pointsExchange/pointsExchange.vue
<template> <template>
<view class="container" :style="cffpFortuneDateList.length>6?'height:auto':'height:100vh'"> <view class="container" :style="cffpFortuneDateList.length>6?'height:auto':'height:100vh'">
<!-- #ifdef APP -->
<view class="backArrow"> <view class="backArrow">
<text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
<text style="font-size: 30rpx;">佣金</text> <text style="font-size: 30rpx;">佣金</text>
</view> </view>
<view class="" style="padding: 10rpx 20rpx 0 20rpx;"> <!-- #endif -->
<view class="listBox" >
<view class="first"> <view class="first">
<view class="top"> <view class="top">
<view class="left"> <view class="left">
...@@ -120,54 +123,7 @@ ...@@ -120,54 +123,7 @@
<uni-popup ref="timePopup" type="bottom" > <uni-popup ref="timePopup" type="bottom" >
<customDatePop @closePop="closePop" @comfirm="comfirm" :dateParts="dateParts" :currentItem="currentItem" :childData="childData"></customDatePop> <customDatePop @closePop="closePop" @comfirm="comfirm" :dateParts="dateParts" :currentItem="currentItem" :childData="childData"></customDatePop>
</uni-popup> </uni-popup>
<!-- <CustomDatePop ref="customDatePop"></CustomDatePop> -->
<!-- <view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 20rpx;"></text>
<view>
{{yesExchangeFortune?yesExchangeFortune:0}}
</view>
<view>
可兑换积分
</view>
</view>
<view class="content_wrapper">
<view class="item">
<text>A.可兑换</text>
<text>{{yesExchangeFortune?yesExchangeFortune:0}}积分</text>
</view>
<view class="item">
<text>B.待兑换</text>
<text>{{notExchangeFortune?notExchangeFortune:0}}积分</text>
</view>
<view class="item">
<text>C.兑换中</text>
<text>{{inExchangeFortune?inExchangeFortune:0}}积分</text>
</view>
<view class="item">
<text>D.已兑换</text>
<text>{{alreadyExchangeFortune?alreadyExchangeFortune:0}}积分</text>
</view>
<view class="item">
<text>E.已退款</text>
<text style="color: #0A2F99;" @click="viewDropLists()">{{returnFortune?returnFortune:0}}积分<i class="iconfont icon-youjiantou" style="margin-right: 10rpx;"></i></text>
</view>
</view>
<view class="total">
<view class="description">
<text>总积分：</text>
<text>(A+B+C+D+E)</text>
</view>
<view class="">
{{totalFortune?totalFortune:0}}积分
</view>
</view>
<view class="record" @click="toRecord()">
兑换记录
</view>
<view class="btn" @click="toWithdrawal()" style="bottom: 30rpx;">
去提现
</view> -->
</view> </view>
</template> </template>
...@@ -409,7 +365,11 @@ ...@@ -409,7 +365,11 @@
} }
.container{ .container{
box-sizing: border-box; box-sizing: border-box;
padding-bottom: 50rpx; /* #ifdef H5 */
padding-top: 15rpx;
/* #endif */
padding-bottom: 20rpx;
.backArrow{ .backArrow{
background-color: #fff; background-color: #fff;
box-sizing: border-box; box-sizing: border-box;
...@@ -426,6 +386,10 @@ ...@@ -426,6 +386,10 @@
position: absolute; position: absolute;
} }
} }
.listBox{
padding: 10rpx 20rpx 0rpx 20rpx;
}
.first{ .first{
color: rgba(244, 239, 212, 1); color: rgba(244, 239, 212, 1);
......
pages/saleCourseLists/saleCourseLists.vue
<template> <template>
<view class="container"> <view class="container">
<view>
<!-- 时间选择 --> <!-- 时间选择 -->
<view class="top"> <view class="top">
<!-- #ifdef APP -->
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
<!-- #endif -->
<view class="timeSelectContent" @click="showTime1=true"> <view class="timeSelectContent" @click="showTime1=true">
<CommonTimePicker <CommonTimePicker
:timeData="startDate" :timeData="startDate"
...@@ -40,8 +43,10 @@ ...@@ -40,8 +43,10 @@
<text>本月单数</text> <text>本月单数</text>
</view> </view>
</view> </view>
</view>
<!-- 分享明细 --> <!-- 分享明细 -->
<view class="saleDetailContent"> <view class="saleDetailContent" :style="{flex:userCourses.length<=0 || userShareCourseOrders.length <=0 ?'1':''}">
<view class="courseTab"> <view class="courseTab">
<text :class="{'actived':tabType===1}" @click="switchTab(1)">我的订单</text> <text :class="{'actived':tabType===1}" @click="switchTab(1)">我的订单</text>
<text :class="{'actived':tabType===2}" @click="switchTab(2)">分享订单</text> <text :class="{'actived':tabType===2}" @click="switchTab(2)">分享订单</text>
...@@ -50,17 +55,27 @@ ...@@ -50,17 +55,27 @@
<h4 class="noListTip" v-if="!userCourses || userCourses.length<=0 && tabType===1">暂无购买记录！</h4> <h4 class="noListTip" v-if="!userCourses || userCourses.length<=0 && tabType===1">暂无购买记录！</h4>
<h4 class="noListTip" v-if="!userShareCourseOrders || userShareCourseOrders.length <=0 && tabType===2">暂无分享记录！</h4> <h4 class="noListTip" v-if="!userShareCourseOrders || userShareCourseOrders.length <=0 && tabType===2">暂无分享记录！</h4>
<template v-if="userCourses && tabType===1"> <template v-if="userCourses && tabType===1">
<view class="saleOrderInfoItem" v-for="item in userCourses" :key="item.fileId"> <view class="saleOrderInfoItem" v-for="item in userCourses" :key="item.fileId" >
<view class="courseInfoContent" style="display: flex;justify-content: space-between;"> <view class="courseInfoContent" style="display: flex;justify-content: space-between;">
<view class="" @click="curriculumDetail(item)"> <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> <course-item
</view> :thumbnailPath="item.displayImage"
<view > :fileId="item.fileId"
<text class="detailBtn" @click="viewDetail(item)" >订单详情</text> :title="item.fileTitle"
:summaryBox="item.fileSynopsis"
:dataList="{coursePrice:item.coursePrice}"
:fileLecturerId="item.fileLecturerId"
:orderId="item.orderId"
:showDetail="true"
></course-item>
</view> </view>
</view> </view>
<view class="countsContent"> <view class="countsContent">
<text>实际支付：￥{{parseFloat(item.paymentAmount).toFixed(2)}}</text> <text>实际支付：￥{{parseFloat(item.paymentAmount).toFixed(2)}}</text>
<view class="arrowBox" @click="viewDetail(item)">
<text class="detailBtn" >订单详情</text>
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -198,7 +213,9 @@ ...@@ -198,7 +213,9 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.container{ .container{
padding-bottom: 50rpx; // padding-bottom: 50rpx;
display: flex;
flex-direction: column;
.top{ .top{
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -261,10 +278,15 @@ ...@@ -261,10 +278,15 @@
box-sizing: border-box; box-sizing: border-box;
padding: 20rpx 40rpx 0rpx 20rpx; padding: 20rpx 40rpx 0rpx 20rpx;
background-color: #fff; background-color: #fff;
margin: 0 20rpx; margin: 0rpx 20rpx 20rpx 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
.noListTip{ .noListTip{
font-size: 30rpx; font-size: 30rpx;
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
} }
.saleOrderInfoItem{ .saleOrderInfoItem{
padding: 18rpx 0rpx 18rpx 10rpx; padding: 18rpx 0rpx 18rpx 10rpx;
...@@ -273,12 +295,19 @@ ...@@ -273,12 +295,19 @@
border-bottom: 1rpx solid #F2F2F2; border-bottom: 1rpx solid #F2F2F2;
margin-bottom: 10rpx; margin-bottom: 10rpx;
.countsContent{ .countsContent{
display: flex;
align-items: center;
justify-content: space-between;
text-align: right; text-align: right;
color: #333; color: #333;
font-size: 32rpx; font-size: 32rpx;
margin-top: 20rpx; margin-top: 20rpx;
} }
.arrowBox{
display: flex;
align-items: center;
justify-content: center;
.detailBtn{ .detailBtn{
font-size: 24rpx; font-size: 24rpx;
color:#fff; color:#fff;
...@@ -286,9 +315,10 @@ ...@@ -286,9 +315,10 @@
background-color: #20269B; background-color: #20269B;
padding: 10rpx 20rpx; padding: 10rpx 20rpx;
border-radius: 40rpx; border-radius: 40rpx;
} }
} }
}
.saleOrderInfoItem:last-child{ .saleOrderInfoItem:last-child{
border: none; border: none;
} }
......
pages/systemMsg/system_msg.vue
<template> <template>
<view class="container"> <view class="container">
<view class="top"> <view class="top">
<view class="iconfont icon-youjiantou zuojiantou" @click="goBack()"> <!-- #ifdef APP -->
</view> <view class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></view>
<view class="commonTitle" style="width: 60%;text-align: right;"> <view class="commonTitle" style="width: 60%;text-align: right;">
消息列表 消息列表
</view> </view>
<!-- #endif -->
<view class="clear" @click="oneKeyRead()" > <view class="clear" @click="oneKeyRead()" >
<text class="iconfont icon-saoba myIcon" ></text> <text class="iconfont icon-saoba myIcon" ></text>
<text>一键已读</text> <text>一键已读</text>
...@@ -131,7 +133,12 @@ ...@@ -131,7 +133,12 @@
.top{ .top{
display: flex; display: flex;
height: 100rpx; height: 100rpx;
/* #ifdef APP */
justify-content: space-between; justify-content: space-between;
/* #endif */
/* #ifdef H5 */
justify-content: flex-end;
/* #endif */
align-items: center; align-items: center;
position: relative; position: relative;
background: #fff; background: #fff;
......
pages/systemMsg/system_msg_detail.vue
<template> <template>
<!-- #ifdef APP -->
<view class="top"> <view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<text class="commonTitle">消息详情</text> <text class="commonTitle">消息详情</text>
</view> </view>
<!-- #endif -->
<view class="announcement_detail_wrapper container"> <view class="announcement_detail_wrapper container">
<view class="content"> <view class="content">
<view class="title"> <view class="title">
...@@ -84,10 +87,11 @@ ...@@ -84,10 +87,11 @@
font-size: 24rpx; font-size: 24rpx;
} }
.content{ .content{
margin-top: 20rpx; // margin-top: 20rpx;
padding: 20rpx; padding: 20rpx;
background: #fff; background: #fff;
word-break: break-word; word-break: break-word;
border-radius: 10rpx;
} }
} }
</style> </style>
\ No newline at end of file
sfp/childEdu/childEdu.vue
<template> <template>
<view> <view>
<view class="wrapper"> <view class="wrapper">
<!-- #ifdef APP -->
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 30rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 30rpx;"></text>
<!-- #endif -->
<view class="banner"> <view class="banner">
<!--头部技术支持组件--> <!--头部技术支持组件-->
<!-- <commonHead></commonHead> --> <!-- <commonHead></commonHead> -->
......
sfp/housePurchase/housePurchase.vue
<template> <template>
<view class="wrapper"> <view class="wrapper">
<!-- #ifdef APP -->
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 30rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 30rpx;"></text>
<!-- #endif -->
<view class="banner"> <view class="banner">
<!--头部技术支持组件--> <!--头部技术支持组件-->
<!-- <commonHead></commonHead> --> <!-- <commonHead></commonHead> -->
......
sfp/index/index.vue
<template> <template>
<!-- 已关注公众号用户 --> <!-- 已关注公众号用户 -->
<view class="content"> <view class="content">
<!-- #ifdef APP -->
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 30rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 30rpx;"></text>
<!-- #endif -->
<view class="banner"> <view class="banner">
<image src="/static/images/policyIrrBanner.png" mode="widthFix"></image> <image src="/static/images/policyIrrBanner.png" mode="widthFix"></image>
<!-- 使用说明 --> <!-- 使用说明 -->
......
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