返回键&sfp子女教育规划阶段不显示

pages/authentication-query/authentication-query.vue

 <template>
 	<view class="wrapper">
-		<view class="">
+		<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
+		<view class="" style="margin-top: 20rpx;">
 			查询类型
 		</view>
 		<view class="content">
@@ -48,6 +49,16 @@
 			
 		},
 		methods:{
+			goBack(){
+				let back = getCurrentPages();  
+					if(back && back.length>1) {
+						uni.navigateBack({  
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
+			},
 			selectType(item){
 				this.queryType = item.id;
 				for(let i=0;i<this.authenticationList.length;i++){
@@ -98,12 +109,12 @@
 
 <style lang="scss">
 	.wrapper{
-		padding: 30rpx;
+		padding: 60rpx 30rpx;
 		.content{
 			.item{
 				border:2rpx solid #E4E4E4;
 				border-radius: 10rpx;
-				margin: 20rpx;
+				margin: 20rpx 0;
 				padding: 30rpx;
 				display:flex;
 				align-items: center;

pages/authentication-query/authentication-result.vue

 <template>
 	<view class="container">
+		<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top:-10rpx;left: 20rpx;"></text>
 		<view class="others" v-if="queryType == 2">
 			<text>身份信息</text>
 			<view class="others_item">
@@ -47,6 +48,16 @@
 			this.getResult();
 		},
 		methods:{
+			goBack(){
+				let back = getCurrentPages();  
+					if(back && back.length>1) {
+						uni.navigateBack({  
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
+			},
 			getResult(){
 				const  param = {
 					queryType:(this.queryType=='null' || this.queryType=='undefined')?undefined:this.queryType,
@@ -75,6 +86,7 @@
 <style lang="scss">
 	.others{
 		padding:30rpx;
+		margin-top: 30rpx;
 		.others_item{
 			display: flex;	
 			margin-bottom: 20rpx;

pages/certifyDetail/certifyDetail.vue

 <template>
 	<view class="container">
+		<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
 		<view class="certifyIntro" v-html="certificateInfo.cerIntroduce"></view>
 		<view class="certifySignInfo">
 			<view class="ulBox">
@@ -98,6 +99,16 @@
 			this.queryCertificateInfo(options.certificateId,this.userSignupId)
 		},
 		methods:{
+			goBack(){
+				let back = getCurrentPages();  
+					if(back && back.length>1) {
+						uni.navigateBack({  
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
+			},
 			queryCertificateInfo(certificateId,userSignupId){
 				const params = {
 					certificateId:certificateId!='null'?certificateId:null,
@@ -161,6 +172,7 @@
 
 <style lang="scss">
 	.container{
+		padding-top: 40rpx;
 		.certifyIntro{
 			padding: 20rpx 30rpx;
 			text-indent: 60rpx;

pages/courseDetail/courseDetail.vue

@@ -217,7 +217,14 @@
 				}
 			},
 			goBack() {
-				uni.navigateBack(1)
+				let back = getCurrentPages();
+					if(back && back.length>1) {
+						uni.navigateBack({  
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
 			},
 			// 监听空白关闭
 			maskClick(val) {
@@ -643,7 +650,7 @@
 	}
 
 	.shareheader {
-		padding-top: 60rpx;
+		// padding-top: 60rpx;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;

pages/exchangeRecord/exchangeRecord.vue

 <template>
-	<view class="container">
+	<view class="container" style="position: relative;">
+		<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top:0;left: 20rpx;"></text>
 		<view class="record_wrapper" v-if="cffpFortuneDeductionList.length > 0">
 			<view class="recordContent" v-for="(item,index) in cffpFortuneDeductionList" :key="index">
 				<image :src="item.deductionUrl" mode="widthFix"></image>
@@ -47,6 +48,16 @@
 						url:`/pages/withdrawal/withdrawalDetail?partnerTradeNo=${item.partnerTradeNo}`
 					})
 				}
+			},
+			goBack(){
+				let back = getCurrentPages();  
+					if(back && back.length>1) {
+						uni.navigateBack({  
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
 			}
 		}
 	}
@@ -54,6 +65,7 @@
 
 <style lang="scss">
 	.record_wrapper{
+		margin-top: 30rpx;
 		.recordContent{
 			display: flex;
 			margin-bottom: 20rpx;

pages/inviteJoin/inviteJoin.vue

 <template>
 	<view class="padding-top container">
+		<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 40rpx;;left: 20rpx;"></text>
 		<!-- tab选项 -->
 		<view class="tabTitle">
 			<text :class="{'actived': tabType===1}" @click="switchTab(1)">基本信息</text>
@@ -169,6 +170,16 @@
 			this.invitationCode = dataForm.invitationCode
 		},
 		methods: {
+			goBack(){
+				let back = getCurrentPages();  
+					if(back && back.length>1) {
+						uni.navigateBack({  
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
+			},
 			// 暂时废弃
 			// blueInput(name) {
 			// 	console.log(name, 1251515)
@@ -336,7 +347,6 @@
 			align-items: center;
 			justify-content: space-around;
 			padding: 30rpx 60rpx 0;
-
 			text {
 				&.actived {
 					color: #333;

pages/learnCertify/learnCertify.vue

 <template>
 	<view class="container">
 		<view class="top">
+			<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
 			<image src="../../static/certifyProcess/learnCertifyBanner.png" mode="widthFix"></image>
 		</view>
 		<view class="certify_content">
@@ -87,6 +88,16 @@
 			this.getLearnCertifyList();
 		},
 		methods:{
+			goBack(){
+				let back = getCurrentPages();  
+					if(back && back.length>1) {
+						uni.navigateBack({  
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
+			},
 			getLearnCertifyList(){
 				api.queryCertificateList({userId: this.userId}).then((res)=>{
 					console.log(res)

pages/myCertify/myCertify.vue

 <template>
 	<view class="container">
+		<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
 		<!-- tab选项 -->
 		<view class="tabTitle">
 			<text :class="{'actived': tabType===1}" @click="switchTab(1)">报名项目</text>
@@ -62,6 +63,16 @@
 			};
 		},
 		methods:{
+			goBack(){
+				let back = getCurrentPages();  
+					if(back && back.length>1) {
+						uni.navigateBack({  
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
+			},
 			switchTab(type){
 				this.tabType = type;
 				if(type===1){

pages/myLearning/myLearning.vue

 <template>
 	<view class="container">
+		<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
 		<!-- tab选项 -->
 		<view class="tabTitle">
 			<text :class="{'actived': tabType===1}" @click="switchTab(1)">学习记录</text>
@@ -56,6 +57,16 @@
 			}
 		},
 		methods: {
+			goBack(){
+				let back = getCurrentPages();  
+					if(back && back.length>1) {
+						uni.navigateBack({  
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
+			},
 			userStudyList(){
 				api.userStudyList({userId:this.userId}).then(res=>{
 					if(res['success']){

pages/myPoints/myPoints.vue

@@ -155,9 +155,14 @@
 				})
 			},
 			goBack(){
+				let back = getCurrentPages();
+					if(back && back.length>1) {
 						uni.navigateBack({  
-					delta:1
-				})
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
 			}
 		}
 	}

pages/myPoints/pointsDetail.vue

@@ -92,9 +92,14 @@
 		},
 		methods:{
 			goBack(){
+				let back = getCurrentPages();
+					if(back && back.length>1) {
 						uni.navigateBack({  
-					delta:1
-				})
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
 			},
 			bindDateChange: function(e) {
 				this.fortuneDate = e.detail.value;

pages/myShare/myShare.vue

@@ -2,10 +2,11 @@
 	<view class="container">
 		<!-- 时间选择 -->
 		<view class="timeSelectContent">
+			<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
 			<picker mode="date" :value="queryDate" :end="maxDate" fields="month" @change="bindDateChange">
 				<view class="uni-input">{{queryDate}}</view>
 			</picker>
-			<i class="iconfont icon-youjiantou"></i>
+			<i class="iconfont icon-youjiantou xiajiantou"></i>
 		</view>
 		<!-- 分享统计 -->
 		<view class="shareStatisticalContent">
@@ -91,6 +92,16 @@
 			}
 		},
 		methods: {
+			goBack(){
+				let back = getCurrentPages();  
+					if(back && back.length>1) {
+						uni.navigateBack({  
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
+			},
 		   bindDateChange: function(e) {
 				this.queryDate = e.detail.value;
 				this.userShareCount();
@@ -166,12 +177,12 @@
 		height: 100%;
 		.timeSelectContent{
 			background-color: #fff;
-			padding: 10rpx 0;
+			padding: 20rpx 0;
 			display: flex;
 			justify-content: center;
 			align-items: baseline;
 			color: #333;
-			.iconfont{
+			.xiajiantou{
 				color: #999;
 				font-size: 24rpx;
 				transform: rotate(90deg);

pages/personalCenter/myTeam.vue

 <template>
 	<view class="container">
+		<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
 		<view v-for="item in minorMenuLists.filter(v=>v.isShow)" :key="item.title" @click="goteam(item)" class="liBox">
 			<view class="infoBox">
 				<!-- <image :src="'/static/moduleIcon/'+item.icon+'.png'" alt="" srcset="" mode="widthFix"></image> -->
@@ -23,6 +24,16 @@
 			}
 		},
 		methods: {
+			goBack(){
+				let back = getCurrentPages();  
+					if(back && back.length>1) {
+						uni.navigateBack({  
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
+			},
 			goteam(item) {
 				console.log(item)
 				if(item.type===1){
@@ -48,6 +59,7 @@
 	.container{
 		height: 100%;
 		background: #FFFFFF;
+		padding-top: 20rpx;
 	}
 	.liBox{
 		display: flex;

pages/personalCenter/teamMembers/teamMembers.vue

 <template>
 	<view class="container">
+		<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
 		<!-- tab选项 -->
 		<view class="tabTitle">
 			<text :class="{'actived': tabType===1}" @click="switchTab(1)">直属团队</text>
@@ -61,6 +62,16 @@
 			this.getmyseatem()
 		},
 		methods:{
+			goBack(){
+				let back = getCurrentPages();  
+					if(back && back.length>1) {
+						uni.navigateBack({  
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
+			},
 			getmyseatem() {
 				api.queryMyTeamInfo({
 					userId: this.userId
@@ -117,7 +128,6 @@
 		height: 100%;
 		text-align: center;
 		margin-bottom: 20px;
-		padding-top: 50px;
 		background: #FFFFFF;
 
 		.tabTitle {
@@ -127,7 +137,7 @@
 			align-items: center;
 			justify-content: space-between;
 			// justify-content: space-around;
-			padding: 30rpx 60rpx 0;
+			padding: 80rpx 30rpx 0;
 			font-size: 28rpx;
 
 			text {

pages/personalCenter/user-information.vue

 <template>
 	<view class="content">
+		<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
 		<view class="header">
 			<view class="headportrait" @click="uploadAvatar()">
 				<image :src="optionForm.headPicture ? optionForm.headPicture  :'../../static/myteam/Group1633.png'"
@@ -51,6 +52,16 @@
 			this.optionForm = JSON.parse(options.customerBasicInfo)
 		},
 		methods: {
+			goBack(){
+				let back = getCurrentPages();  
+					if(back && back.length>1) {
+						uni.navigateBack({  
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
+			},
 			uploadAvatar(event) {
 				let that = this;
 				CommonUpload(that.dataForm).then(res => {

pages/pointsExchange/pointsExchange.vue

@@ -69,9 +69,14 @@
 		},
 		methods:{
 			goBack(){
+				let back = getCurrentPages();
+					if(back && back.length>1) {
 						uni.navigateBack({  
-					delta:1
-				})
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
 			},
 			queryByUserIdFortuneStatistic(){
 				api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{

pages/pointsExchange/pointsStatus.vue

@@ -63,9 +63,14 @@
 		},
 		methods:{
 			goBack(){
+				let back = getCurrentPages();
+					if(back && back.length>1) {
 						uni.navigateBack({  
-					delta:1
-				})
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
 			},
 			queryByUserIdFortuneStatistic(){
 				api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{

pages/saleCourseLists/saleCourseLists.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<!-- 时间选择 -->
 		<view class="top">
-			<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
+			<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
 			<view class="timeSelectContent">
 				<picker mode="date" :value="queryDate" :end="maxDate" fields="month" @change="bindDateChange">
 					<view class="uni-input">{{queryDate}}</view>
@@ -98,9 +98,14 @@
 		},
 		methods: {
 			goBack(){
+				let back = getCurrentPages();
+					if(back && back.length>1) {
 						uni.navigateBack({  
-					delta:1
-				})
+						delta: 1  
+						});
+					}else{
+						history.back();  
+				}
 			},
 			curriculumDetail(item){
 				uni.navigateTo({

sfp/childEdu/childEdu.css

@@ -69,8 +69,8 @@
 	margin: 12rpx auto;
 	width: 100%;
 }
-.listContent view.planGradeRange > view:last-child text{
-	position: relative;
+.listContent view.planGradeRange > view:last-child >text{
+	/* position: relative; */
 	width: 80rpx;
 	height: 1px;
 	background-color: #E4E4E4;

sfp/childEdu/childEdu.vue

@@ -3,7 +3,7 @@
 		<view class="wrapper">
 			<view class="banner">
 				<!--头部技术支持组件-->
-				<commonHead></commonHead>
+				<!-- <commonHead></commonHead> -->
 				<image src="../../static/images/childEduBanner.jpg" mode="widthFix"></image>
 			</view>	
 			<scroll-view scroll-y="true" class="formInfoContainer" id="formInfoContainer">
@@ -135,7 +135,7 @@
 			</scroll-view>
 		</view>
 		<!--底部技术支持组件-->
-		<foot></foot>
+		<!-- <foot></foot> -->
 		<!-- 逐年设定弹窗 -->
 		<view class="dialogContainer" v-if="settingYBYFlag">
 			<view class="dialogContent">

sfp/housePurchase/housePurchase.vue

@@ -2,7 +2,7 @@
 	<view class="wrapper">
 		<view class="banner">
 			<!--头部技术支持组件-->
-			<commonHead></commonHead>
+			<!-- <commonHead></commonHead> -->
 			<image src="../../static/images/banner.png" mode="widthFix"></image>
 		</view>	
 		<scroll-view scroll-y="true" class="formInfoContainer" id="formInfoContainer">
@@ -235,7 +235,7 @@
 			</view>
 		</scroll-view>
 		<!--底部技术支持组件-->
-		<foot></foot>
+		<!-- <foot></foot> -->
 	</view>
 	<view class="mask" v-if="dialogIsShow">
 		<view class="content">

sfp/housePurchase/planningParameters.vue

@@ -154,6 +154,7 @@
 </script>
 
 <style lang="scss">
+	@import url("../sfpCommon.css");
 	.paramsContainer{
 		background-color: #fff;
 		padding: 0 20rpx 44rpx;
@@ -231,7 +232,7 @@
 					position: absolute;
 					right: 0;
 					bottom: 0;
-					span{
+					text{
 						color: #CEB07D;
 						background-image:linear-gradient(to bottom right,#CEB07D,#FED597);
 						background-clip:text;

sfp/index/index.vue

@@ -5,7 +5,7 @@
 				<image src="/static/images/policyIrrBanner.png" mode="widthFix"></image>
 				<!-- 使用说明 -->
 				<text @click="instructionForUse()">使用说明</text>
-				<commonHead></commonHead>
+				<!-- <commonHead></commonHead> -->
 			</view>
 			<scroll-view scroll-y="true" class="formInfoContainer" id="formInfoContainer">
 				<view class="tabTitle">
@@ -170,7 +170,7 @@
 						</view>
 					</view>
 
-					<foot></foot>
+					<!-- <foot></foot> -->
 					<!-- 操作 -->
 					<view class="optionContent">
 						<button type="default" plain="true" form-type="reset"

sfp/sfpCommon.css

@@ -23,7 +23,7 @@
 		z-index: 2;
 		border-top-right-radius: 30rpx;
 		border-top-left-radius: 30rpx;
-		padding: 30rpx;
+		padding: 30rpx 30rpx 130rpx 30rpx;
 		box-sizing: border-box;
 		font-size: 30rpx;
 		color: #333333;