Commit fc7ba355 by sunchao

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

parent 2e7a2bf8
<template> <template>
<view class="wrapper"> <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>
<view class="content"> <view class="content">
...@@ -48,6 +49,16 @@ ...@@ -48,6 +49,16 @@
}, },
methods:{ methods:{
goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({
delta: 1
});
}else{
history.back();
}
},
selectType(item){ selectType(item){
this.queryType = item.id; this.queryType = item.id;
for(let i=0;i<this.authenticationList.length;i++){ for(let i=0;i<this.authenticationList.length;i++){
...@@ -98,12 +109,12 @@ ...@@ -98,12 +109,12 @@
<style lang="scss"> <style lang="scss">
.wrapper{ .wrapper{
padding: 30rpx; padding: 60rpx 30rpx;
.content{ .content{
.item{ .item{
border:2rpx solid #E4E4E4; border:2rpx solid #E4E4E4;
border-radius: 10rpx; border-radius: 10rpx;
margin: 20rpx; margin: 20rpx 0;
padding: 30rpx; padding: 30rpx;
display:flex; display:flex;
align-items: center; align-items: center;
......
<template> <template>
<view class="container"> <view class="container">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top:-10rpx;left: 20rpx;"></text>
<view class="others" v-if="queryType == 2"> <view class="others" v-if="queryType == 2">
<text>身份信息</text> <text>身份信息</text>
<view class="others_item"> <view class="others_item">
...@@ -47,6 +48,16 @@ ...@@ -47,6 +48,16 @@
this.getResult(); this.getResult();
}, },
methods:{ methods:{
goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({
delta: 1
});
}else{
history.back();
}
},
getResult(){ getResult(){
const param = { const param = {
queryType:(this.queryType=='null' || this.queryType=='undefined')?undefined:this.queryType, queryType:(this.queryType=='null' || this.queryType=='undefined')?undefined:this.queryType,
...@@ -75,6 +86,7 @@ ...@@ -75,6 +86,7 @@
<style lang="scss"> <style lang="scss">
.others{ .others{
padding:30rpx; padding:30rpx;
margin-top: 30rpx;
.others_item{ .others_item{
display: flex; display: flex;
margin-bottom: 20rpx; margin-bottom: 20rpx;
......
<template> <template>
<view class="container"> <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="certifyIntro" v-html="certificateInfo.cerIntroduce"></view>
<view class="certifySignInfo"> <view class="certifySignInfo">
<view class="ulBox"> <view class="ulBox">
...@@ -98,6 +99,16 @@ ...@@ -98,6 +99,16 @@
this.queryCertificateInfo(options.certificateId,this.userSignupId) this.queryCertificateInfo(options.certificateId,this.userSignupId)
}, },
methods:{ methods:{
goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({
delta: 1
});
}else{
history.back();
}
},
queryCertificateInfo(certificateId,userSignupId){ queryCertificateInfo(certificateId,userSignupId){
const params = { const params = {
certificateId:certificateId!='null'?certificateId:null, certificateId:certificateId!='null'?certificateId:null,
...@@ -161,6 +172,7 @@ ...@@ -161,6 +172,7 @@
<style lang="scss"> <style lang="scss">
.container{ .container{
padding-top: 40rpx;
.certifyIntro{ .certifyIntro{
padding: 20rpx 30rpx; padding: 20rpx 30rpx;
text-indent: 60rpx; text-indent: 60rpx;
......
...@@ -217,7 +217,14 @@ ...@@ -217,7 +217,14 @@
} }
}, },
goBack() { goBack() {
uni.navigateBack(1) let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({
delta: 1
});
}else{
history.back();
}
}, },
// 监听空白关闭 // 监听空白关闭
maskClick(val) { maskClick(val) {
...@@ -643,7 +650,7 @@ ...@@ -643,7 +650,7 @@
} }
.shareheader { .shareheader {
padding-top: 60rpx; // padding-top: 60rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
......
<template> <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="record_wrapper" v-if="cffpFortuneDeductionList.length > 0">
<view class="recordContent" v-for="(item,index) in cffpFortuneDeductionList" :key="index"> <view class="recordContent" v-for="(item,index) in cffpFortuneDeductionList" :key="index">
<image :src="item.deductionUrl" mode="widthFix"></image> <image :src="item.deductionUrl" mode="widthFix"></image>
...@@ -47,6 +48,16 @@ ...@@ -47,6 +48,16 @@
url:`/pages/withdrawal/withdrawalDetail?partnerTradeNo=${item.partnerTradeNo}` 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 @@ ...@@ -54,6 +65,7 @@
<style lang="scss"> <style lang="scss">
.record_wrapper{ .record_wrapper{
margin-top: 30rpx;
.recordContent{ .recordContent{
display: flex; display: flex;
margin-bottom: 20rpx; margin-bottom: 20rpx;
......
<template> <template>
<view class="padding-top container"> <view class="padding-top container">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 40rpx;;left: 20rpx;"></text>
<!-- tab选项 --> <!-- tab选项 -->
<view class="tabTitle"> <view class="tabTitle">
<text :class="{'actived': tabType===1}" @click="switchTab(1)">基本信息</text> <text :class="{'actived': tabType===1}" @click="switchTab(1)">基本信息</text>
...@@ -169,6 +170,16 @@ ...@@ -169,6 +170,16 @@
this.invitationCode = dataForm.invitationCode this.invitationCode = dataForm.invitationCode
}, },
methods: { methods: {
goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({
delta: 1
});
}else{
history.back();
}
},
// 暂时废弃 // 暂时废弃
// blueInput(name) { // blueInput(name) {
// console.log(name, 1251515) // console.log(name, 1251515)
...@@ -336,7 +347,6 @@ ...@@ -336,7 +347,6 @@
align-items: center; align-items: center;
justify-content: space-around; justify-content: space-around;
padding: 30rpx 60rpx 0; padding: 30rpx 60rpx 0;
text { text {
&.actived { &.actived {
color: #333; color: #333;
......
<template> <template>
<view class="container"> <view class="container">
<view class="top"> <view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
<image src="../../static/certifyProcess/learnCertifyBanner.png" mode="widthFix"></image> <image src="../../static/certifyProcess/learnCertifyBanner.png" mode="widthFix"></image>
</view> </view>
<view class="certify_content"> <view class="certify_content">
...@@ -87,6 +88,16 @@ ...@@ -87,6 +88,16 @@
this.getLearnCertifyList(); this.getLearnCertifyList();
}, },
methods:{ methods:{
goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({
delta: 1
});
}else{
history.back();
}
},
getLearnCertifyList(){ getLearnCertifyList(){
api.queryCertificateList({userId: this.userId}).then((res)=>{ api.queryCertificateList({userId: this.userId}).then((res)=>{
console.log(res) console.log(res)
......
<template> <template>
<view class="container"> <view class="container">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
<!-- tab选项 --> <!-- tab选项 -->
<view class="tabTitle"> <view class="tabTitle">
<text :class="{'actived': tabType===1}" @click="switchTab(1)">报名项目</text> <text :class="{'actived': tabType===1}" @click="switchTab(1)">报名项目</text>
...@@ -62,6 +63,16 @@ ...@@ -62,6 +63,16 @@
}; };
}, },
methods:{ methods:{
goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({
delta: 1
});
}else{
history.back();
}
},
switchTab(type){ switchTab(type){
this.tabType = type; this.tabType = type;
if(type===1){ if(type===1){
......
<template> <template>
<view class="container"> <view class="container">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
<!-- tab选项 --> <!-- tab选项 -->
<view class="tabTitle"> <view class="tabTitle">
<text :class="{'actived': tabType===1}" @click="switchTab(1)">学习记录</text> <text :class="{'actived': tabType===1}" @click="switchTab(1)">学习记录</text>
...@@ -56,6 +57,16 @@ ...@@ -56,6 +57,16 @@
} }
}, },
methods: { methods: {
goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({
delta: 1
});
}else{
history.back();
}
},
userStudyList(){ userStudyList(){
api.userStudyList({userId:this.userId}).then(res=>{ api.userStudyList({userId:this.userId}).then(res=>{
if(res['success']){ if(res['success']){
......
...@@ -155,9 +155,14 @@ ...@@ -155,9 +155,14 @@
}) })
}, },
goBack(){ goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({ uni.navigateBack({
delta:1 delta: 1
}) });
}else{
history.back();
}
} }
} }
} }
......
...@@ -92,9 +92,14 @@ ...@@ -92,9 +92,14 @@
}, },
methods:{ methods:{
goBack(){ goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({ uni.navigateBack({
delta:1 delta: 1
}) });
}else{
history.back();
}
}, },
bindDateChange: function(e) { bindDateChange: function(e) {
this.fortuneDate = e.detail.value; this.fortuneDate = e.detail.value;
......
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
<view class="container"> <view class="container">
<!-- 时间选择 --> <!-- 时间选择 -->
<view class="timeSelectContent"> <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"> <picker mode="date" :value="queryDate" :end="maxDate" fields="month" @change="bindDateChange">
<view class="uni-input">{{queryDate}}</view> <view class="uni-input">{{queryDate}}</view>
</picker> </picker>
<i class="iconfont icon-youjiantou"></i> <i class="iconfont icon-youjiantou xiajiantou"></i>
</view> </view>
<!-- 分享统计 --> <!-- 分享统计 -->
<view class="shareStatisticalContent"> <view class="shareStatisticalContent">
...@@ -91,6 +92,16 @@ ...@@ -91,6 +92,16 @@
} }
}, },
methods: { methods: {
goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({
delta: 1
});
}else{
history.back();
}
},
bindDateChange: function(e) { bindDateChange: function(e) {
this.queryDate = e.detail.value; this.queryDate = e.detail.value;
this.userShareCount(); this.userShareCount();
...@@ -166,12 +177,12 @@ ...@@ -166,12 +177,12 @@
height: 100%; height: 100%;
.timeSelectContent{ .timeSelectContent{
background-color: #fff; background-color: #fff;
padding: 10rpx 0; padding: 20rpx 0;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: baseline; align-items: baseline;
color: #333; color: #333;
.iconfont{ .xiajiantou{
color: #999; color: #999;
font-size: 24rpx; font-size: 24rpx;
transform: rotate(90deg); transform: rotate(90deg);
......
<template> <template>
<view class="container"> <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 v-for="item in minorMenuLists.filter(v=>v.isShow)" :key="item.title" @click="goteam(item)" class="liBox">
<view class="infoBox"> <view class="infoBox">
<!-- <image :src="'/static/moduleIcon/'+item.icon+'.png'" alt="" srcset="" mode="widthFix"></image> --> <!-- <image :src="'/static/moduleIcon/'+item.icon+'.png'" alt="" srcset="" mode="widthFix"></image> -->
...@@ -23,6 +24,16 @@ ...@@ -23,6 +24,16 @@
} }
}, },
methods: { methods: {
goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({
delta: 1
});
}else{
history.back();
}
},
goteam(item) { goteam(item) {
console.log(item) console.log(item)
if(item.type===1){ if(item.type===1){
...@@ -48,6 +59,7 @@ ...@@ -48,6 +59,7 @@
.container{ .container{
height: 100%; height: 100%;
background: #FFFFFF; background: #FFFFFF;
padding-top: 20rpx;
} }
.liBox{ .liBox{
display: flex; display: flex;
......
<template> <template>
<view class="container"> <view class="container">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
<!-- tab选项 --> <!-- tab选项 -->
<view class="tabTitle"> <view class="tabTitle">
<text :class="{'actived': tabType===1}" @click="switchTab(1)">直属团队</text> <text :class="{'actived': tabType===1}" @click="switchTab(1)">直属团队</text>
...@@ -61,6 +62,16 @@ ...@@ -61,6 +62,16 @@
this.getmyseatem() this.getmyseatem()
}, },
methods:{ methods:{
goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({
delta: 1
});
}else{
history.back();
}
},
getmyseatem() { getmyseatem() {
api.queryMyTeamInfo({ api.queryMyTeamInfo({
userId: this.userId userId: this.userId
...@@ -117,7 +128,6 @@ ...@@ -117,7 +128,6 @@
height: 100%; height: 100%;
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
padding-top: 50px;
background: #FFFFFF; background: #FFFFFF;
.tabTitle { .tabTitle {
...@@ -127,7 +137,7 @@ ...@@ -127,7 +137,7 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
// justify-content: space-around; // justify-content: space-around;
padding: 30rpx 60rpx 0; padding: 80rpx 30rpx 0;
font-size: 28rpx; font-size: 28rpx;
text { text {
......
<template> <template>
<view class="content"> <view class="content">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
<view class="header"> <view class="header">
<view class="headportrait" @click="uploadAvatar()"> <view class="headportrait" @click="uploadAvatar()">
<image :src="optionForm.headPicture ? optionForm.headPicture :'../../static/myteam/Group1633.png'" <image :src="optionForm.headPicture ? optionForm.headPicture :'../../static/myteam/Group1633.png'"
...@@ -51,6 +52,16 @@ ...@@ -51,6 +52,16 @@
this.optionForm = JSON.parse(options.customerBasicInfo) this.optionForm = JSON.parse(options.customerBasicInfo)
}, },
methods: { methods: {
goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({
delta: 1
});
}else{
history.back();
}
},
uploadAvatar(event) { uploadAvatar(event) {
let that = this; let that = this;
CommonUpload(that.dataForm).then(res => { CommonUpload(that.dataForm).then(res => {
......
...@@ -69,9 +69,14 @@ ...@@ -69,9 +69,14 @@
}, },
methods:{ methods:{
goBack(){ goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({ uni.navigateBack({
delta:1 delta: 1
}) });
}else{
history.back();
}
}, },
queryByUserIdFortuneStatistic(){ queryByUserIdFortuneStatistic(){
api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{ api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
......
...@@ -63,9 +63,14 @@ ...@@ -63,9 +63,14 @@
}, },
methods:{ methods:{
goBack(){ goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({ uni.navigateBack({
delta:1 delta: 1
}) });
}else{
history.back();
}
}, },
queryByUserIdFortuneStatistic(){ queryByUserIdFortuneStatistic(){
api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{ api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="container"> <view class="container">
<!-- 时间选择 --> <!-- 时间选择 -->
<view class="top"> <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"> <view class="timeSelectContent">
<picker mode="date" :value="queryDate" :end="maxDate" fields="month" @change="bindDateChange"> <picker mode="date" :value="queryDate" :end="maxDate" fields="month" @change="bindDateChange">
<view class="uni-input">{{queryDate}}</view> <view class="uni-input">{{queryDate}}</view>
...@@ -98,9 +98,14 @@ ...@@ -98,9 +98,14 @@
}, },
methods: { methods: {
goBack(){ goBack(){
let back = getCurrentPages();
if(back && back.length>1) {
uni.navigateBack({ uni.navigateBack({
delta:1 delta: 1
}) });
}else{
history.back();
}
}, },
curriculumDetail(item){ curriculumDetail(item){
uni.navigateTo({ uni.navigateTo({
......
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
margin: 12rpx auto; margin: 12rpx auto;
width: 100%; width: 100%;
} }
.listContent view.planGradeRange > view:last-child text{ .listContent view.planGradeRange > view:last-child >text{
position: relative; /* position: relative; */
width: 80rpx; width: 80rpx;
height: 1px; height: 1px;
background-color: #E4E4E4; background-color: #E4E4E4;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<view class="wrapper"> <view class="wrapper">
<view class="banner"> <view class="banner">
<!--头部技术支持组件--> <!--头部技术支持组件-->
<commonHead></commonHead> <!-- <commonHead></commonHead> -->
<image src="../../static/images/childEduBanner.jpg" mode="widthFix"></image> <image src="../../static/images/childEduBanner.jpg" mode="widthFix"></image>
</view> </view>
<scroll-view scroll-y="true" class="formInfoContainer" id="formInfoContainer"> <scroll-view scroll-y="true" class="formInfoContainer" id="formInfoContainer">
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
</scroll-view> </scroll-view>
</view> </view>
<!--底部技术支持组件--> <!--底部技术支持组件-->
<foot></foot> <!-- <foot></foot> -->
<!-- 逐年设定弹窗 --> <!-- 逐年设定弹窗 -->
<view class="dialogContainer" v-if="settingYBYFlag"> <view class="dialogContainer" v-if="settingYBYFlag">
<view class="dialogContent"> <view class="dialogContent">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="wrapper"> <view class="wrapper">
<view class="banner"> <view class="banner">
<!--头部技术支持组件--> <!--头部技术支持组件-->
<commonHead></commonHead> <!-- <commonHead></commonHead> -->
<image src="../../static/images/banner.png" mode="widthFix"></image> <image src="../../static/images/banner.png" mode="widthFix"></image>
</view> </view>
<scroll-view scroll-y="true" class="formInfoContainer" id="formInfoContainer"> <scroll-view scroll-y="true" class="formInfoContainer" id="formInfoContainer">
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</view> </view>
</scroll-view> </scroll-view>
<!--底部技术支持组件--> <!--底部技术支持组件-->
<foot></foot> <!-- <foot></foot> -->
</view> </view>
<view class="mask" v-if="dialogIsShow"> <view class="mask" v-if="dialogIsShow">
<view class="content"> <view class="content">
......
...@@ -154,6 +154,7 @@ ...@@ -154,6 +154,7 @@
</script> </script>
<style lang="scss"> <style lang="scss">
@import url("../sfpCommon.css");
.paramsContainer{ .paramsContainer{
background-color: #fff; background-color: #fff;
padding: 0 20rpx 44rpx; padding: 0 20rpx 44rpx;
...@@ -231,7 +232,7 @@ ...@@ -231,7 +232,7 @@
position: absolute; position: absolute;
right: 0; right: 0;
bottom: 0; bottom: 0;
span{ text{
color: #CEB07D; color: #CEB07D;
background-image:linear-gradient(to bottom right,#CEB07D,#FED597); background-image:linear-gradient(to bottom right,#CEB07D,#FED597);
background-clip:text; background-clip:text;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<image src="/static/images/policyIrrBanner.png" mode="widthFix"></image> <image src="/static/images/policyIrrBanner.png" mode="widthFix"></image>
<!-- 使用说明 --> <!-- 使用说明 -->
<text @click="instructionForUse()">使用说明</text> <text @click="instructionForUse()">使用说明</text>
<commonHead></commonHead> <!-- <commonHead></commonHead> -->
</view> </view>
<scroll-view scroll-y="true" class="formInfoContainer" id="formInfoContainer"> <scroll-view scroll-y="true" class="formInfoContainer" id="formInfoContainer">
<view class="tabTitle"> <view class="tabTitle">
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
</view> </view>
</view> </view>
<foot></foot> <!-- <foot></foot> -->
<!-- 操作 --> <!-- 操作 -->
<view class="optionContent"> <view class="optionContent">
<button type="default" plain="true" form-type="reset" <button type="default" plain="true" form-type="reset"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
z-index: 2; z-index: 2;
border-top-right-radius: 30rpx; border-top-right-radius: 30rpx;
border-top-left-radius: 30rpx; border-top-left-radius: 30rpx;
padding: 30rpx; padding: 30rpx 30rpx 130rpx 30rpx;
box-sizing: border-box; box-sizing: border-box;
font-size: 30rpx; font-size: 30rpx;
color: #333333; color: #333333;
......
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