Skip to content

C
CFFP-HB
Commit 7de33871 by sunchao
Options

重置密码页面重构&一些返回键样式调整&切换账号缓存&我的分享详情页日期&课程列表页轮播图不显示

parent 41cc903e
Showing with 173 additions and 98 deletions
components/carousel/carousel.vue
<template> <template>
<view class="banner">
<view class="uni-margin-wrap">
<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" <swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval"
:duration="duration"> :duration="duration">
<swiper-item v-for="bannerItem in carouselList"> <swiper-item v-for="bannerItem in carouselList">
...@@ -9,8 +7,6 @@ ...@@ -9,8 +7,6 @@
</uni-link> </uni-link>
</swiper-item> </swiper-item>
</swiper> </swiper>
</view>
</view>
</template> </template>
<script> <script>
...@@ -37,6 +33,6 @@ ...@@ -37,6 +33,6 @@
<style lang="scss"> <style lang="scss">
.swiper{ .swiper{
height:238rpx; height:228rpx;
} }
</style> </style>
\ No newline at end of file
components/menuList/menuList.vue
...@@ -69,10 +69,10 @@ ...@@ -69,10 +69,10 @@
.personalInfo { .personalInfo {
background: #fff; background: #fff;
width: 95%; width: 95%;
margin: 20rpx auto 0; margin: 50rpx auto 0;
.ulBox { .ulBox {
padding: 0 30rpx; padding: 0 20rpx;
.liBox { .liBox {
display: flex; display: flex;
......
pages/announcement/announcement.vue
...@@ -57,8 +57,8 @@ ...@@ -57,8 +57,8 @@
}) })
}, },
goBack(){ goBack(){
uni.navigateBack({ uni.switchTab({
delta:1 url:`/pages/index/index`
}) })
} }
} }
......
pages/certifyDetail/certifyDetail.vue
<template> <template>
<view class="container"> <view class="container">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: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">
...@@ -100,14 +100,9 @@ ...@@ -100,14 +100,9 @@
}, },
methods:{ methods:{
goBack(){ goBack(){
let back = getCurrentPages(); uni.navigateBack({
if(back && back.length>1) { delta: 1
uni.navigateBack({ });
delta: 1
});
}else{
history.back();
}
}, },
queryCertificateInfo(certificateId,userSignupId){ queryCertificateInfo(certificateId,userSignupId){
const params = { const params = {
...@@ -185,9 +180,9 @@ ...@@ -185,9 +180,9 @@
<style lang="scss"> <style lang="scss">
.container{ .container{
padding-top: 40rpx; // padding-top: 40rpx;
.certifyIntro{ .certifyIntro{
padding: 20rpx 30rpx; padding:60rpx 30rpx 20rpx;
text-indent: 60rpx; text-indent: 60rpx;
line-height: 1.5; line-height: 1.5;
border-bottom: 1px solid #e4e4e4; border-bottom: 1px solid #e4e4e4;
......
pages/certifyDetail/uploadinformation.vue
<template> <template>
<view class="content"> <view class="content">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top:20rpx"></text>
<view class="band"> <view class="band">
<view class="contentItem"> <view class="contentItem">
<text>姓名:</text> <text>姓名:</text>
...@@ -41,9 +42,7 @@ ...@@ -41,9 +42,7 @@
</view> </view>
<view class="uploadpdf"> <view class="uploadpdf">
<view class="uploadimg"> <view class="uploadimg">
<view class="" style="width: 50px;"> <text class="iconfont icon-weibiaoti553"></text>
<image class="image" src="../../static/myteam/Group1646.png"></image>
</view>
<p>点击添加计划书</p> <p>点击添加计划书</p>
<view class="uploadFileBox" v-if="status != 3"> <view class="uploadFileBox" v-if="status != 3">
<uploadFile :deformats="formats" :opacity="0" ref="uploadRef" :widt="'100%'" :height="'320rpx'" :instantly="'true'" :requestVO="JSON.stringify(dataForm)" @sendPath="getPath"></uploadFile> <uploadFile :deformats="formats" :opacity="0" ref="uploadRef" :widt="'100%'" :height="'320rpx'" :instantly="'true'" :requestVO="JSON.stringify(dataForm)" @sendPath="getPath"></uploadFile>
...@@ -104,6 +103,11 @@ ...@@ -104,6 +103,11 @@
}, },
methods: { methods: {
goBack(){
uni.navigateBack({
delta: 1
});
},
// 上传成功回调方法 // 上传成功回调方法
getPath(e,a){ getPath(e,a){
const param = JSON.parse(JSON.parse(e)); const param = JSON.parse(JSON.parse(e));
...@@ -182,6 +186,7 @@ ...@@ -182,6 +186,7 @@
<style lang="scss"> <style lang="scss">
.content { .content {
width: 100vw; width: 100vw;
padding-top: 80rpx;
} }
.signfile { .signfile {
...@@ -197,9 +202,10 @@ ...@@ -197,9 +202,10 @@
.user-input { .user-input {
text-align: right; text-align: right;
} }
.icon-weibiaoti553{
font-size: 120rpx;
color: #627AB5;
}
.uploadimg { .uploadimg {
position: relative; position: relative;
height: 100%; height: 100%;
...@@ -257,7 +263,7 @@ ...@@ -257,7 +263,7 @@
} }
.contentItem { .contentItem {
margin-top: 20rpx; margin-bottom: 20rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 2rpx solid #E4E4E4; border-bottom: 2rpx solid #E4E4E4;
......
pages/commonDetail/commonDetail.vue
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
userId: uni.getStorageSync('cffp_userId'), userId: uni.getStorageSync('cffp_userId'),
typeName:'', typeName:'',
shareId:'', shareId:'',
readId:'' readId:'',
queryDate:''
} }
}, },
methods: { methods: {
...@@ -32,7 +33,8 @@ ...@@ -32,7 +33,8 @@
userId:this.userId, userId:this.userId,
fileId:this.fileId, fileId:this.fileId,
shareId:this.shareId?this.shareId:undefined, shareId:this.shareId?this.shareId:undefined,
readId:this.readId?this.readId:undefined readId:this.readId?this.readId:undefined,
queryDate:this.queryDate?this.queryDate:undefined
} }
api[obj.req](params).then(res=>{ api[obj.req](params).then(res=>{
if(res['success']){ if(res['success']){
...@@ -62,6 +64,7 @@ ...@@ -62,6 +64,7 @@
this.type = option.type; this.type = option.type;
this.shareId = option.shareId; this.shareId = option.shareId;
this.readId = option.readId; this.readId = option.readId;
this.queryDate = option.queryDate;
}, },
mounted() { mounted() {
console.log('mounted') console.log('mounted')
......
pages/courselist/courselist.vue
...@@ -3,7 +3,11 @@ ...@@ -3,7 +3,11 @@
<!--搜索组件--> <!--搜索组件-->
<search :isSearch="1" @send="getCourseList"></search> <search :isSearch="1" @send="getCourseList"></search>
<!--轮播组件--> <!--轮播组件-->
<carousel :carouselList="fileUploadItemCFFPList"></carousel> <view class="banner">
<view class="uni-margin-wrap">
<carousel :carouselList="fileUploadItemCFFPList"></carousel>
</view>
</view>
<h4 v-if="cffpCourseInfos.length<=0" class="noListTip">暂无课程列表</h4> <h4 v-if="cffpCourseInfos.length<=0" class="noListTip">暂无课程列表</h4>
<view class="ulBox" v-if="cffpCourseInfos.length>0"> <view class="ulBox" v-if="cffpCourseInfos.length>0">
<view class="liBox" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)"> <view class="liBox" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)">
...@@ -38,7 +42,6 @@ ...@@ -38,7 +42,6 @@
search search
}, },
onLoad(){ onLoad(){
this.fileUploadItemCFFPList = uni.getStorageSync('fileUploadItemCFFPList');
this.queryName = uni.getStorageSync('queryName'); this.queryName = uni.getStorageSync('queryName');
}, },
methods:{ methods:{
...@@ -77,6 +80,7 @@ ...@@ -77,6 +80,7 @@
} }
}, },
mounted() { mounted() {
this.fileUploadItemCFFPList = uni.getStorageSync('fileUploadItemCFFPList');
this.courseList(); this.courseList();
}, },
onHide() { onHide() {
...@@ -102,5 +106,12 @@ ...@@ -102,5 +106,12 @@
} }
.pad{ .pad{
padding:0 30rpx 20rpx 30rpx; padding:0 30rpx 20rpx 30rpx;
.banner {
border-radius: 20rpx;
overflow: hidden;
.swiper{
height: 200rpx;
}
}
} }
</style> </style>
\ No newline at end of file
pages/index/index.vue
...@@ -17,7 +17,11 @@ ...@@ -17,7 +17,11 @@
<!--搜索组件--> <!--搜索组件-->
<search :isSearch="0"></search> <search :isSearch="0"></search>
<!--轮播组件--> <!--轮播组件-->
<carousel :carouselList="cffpUserInfo.fileUploadItemList"></carousel> <view class="banner">
<view class="uni-margin-wrap">
<carousel :carouselList="cffpUserInfo.fileUploadItemList"></carousel>
</view>
</view>
</view> </view>
<view class="message" @click="jumpToAnnouncement()"> <view class="message" @click="jumpToAnnouncement()">
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
...@@ -340,7 +344,6 @@ ...@@ -340,7 +344,6 @@
font-size: 40rpx; font-size: 40rpx;
} }
} }
.banner { .banner {
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
......
pages/learnCertify/learnCertify.vue
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
.isAdopt { .isAdopt {
position: absolute; position: absolute;
border: 2rpx solid #06A632; border: 2rpx dashed #06A632;
text-align: center; text-align: center;
color: #06A632; color: #06A632;
transform: rotate(-45deg); transform: rotate(-45deg);
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
.isUnder { .isUnder {
position: absolute; position: absolute;
border: 2rpx solid #3671F4; border: 2rpx dashed #3671F4;
text-align: center; text-align: center;
color: #3671F4; color: #3671F4;
transform: rotate(-45deg); transform: rotate(-45deg);
......
pages/myCertify/myCertify.vue
<template> <template>
<view class="container"> <view class="container">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 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>
......
pages/myLearning/myLearning.vue
<template> <template>
<view class="container"> <view class="container">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 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>
......
pages/myPoints/myPoints.vue
<template> <template>
<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="top: 20rpx;"></text>
<view class="exchange_wrapper"> <view class="exchange_wrapper">
<navigator url="../pointsExchange/pointsStatus">可兑换积分 <text style="color: #FF7704;">{{yesExchangeFortune}}积分 > </text></navigator> <navigator url="../pointsExchange/pointsStatus">可兑换积分 <text style="color: #FF7704;">{{yesExchangeFortune}}积分 > </text></navigator>
<navigator url="../pointsExchange/pointsExchange" style="color:#C85E04;text-decoration: underline;">可兑换提现{{yesExchangeFortune}} > </navigator> <navigator url="../pointsExchange/pointsExchange" style="color:#C85E04;text-decoration: underline;">可兑换提现{{yesExchangeFortune}} > </navigator>
...@@ -182,14 +182,6 @@ ...@@ -182,14 +182,6 @@
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
padding-top: 60rpx; padding-top: 60rpx;
.zuojiantou{
display: inline-block;
transform: rotate(180deg);
font-size: 30rpx;
z-index: 1;
position: absolute;
top: 30rpx;
}
.exchange_wrapper{ .exchange_wrapper{
width: 60%; width: 60%;
margin-right: 10%; margin-right: 10%;
......
pages/myShare/myShare.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="container"> <view class="container">
<!-- 时间选择 --> <!-- 时间选择 -->
<view class="timeSelectContent"> <view class="timeSelectContent">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></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>
...@@ -100,14 +100,9 @@ ...@@ -100,14 +100,9 @@
}, },
methods: { methods: {
goBack() { goBack() {
let back = getCurrentPages(); uni.navigateBack({
if (back && back.length > 1) { delta: 1
uni.navigateBack({ });
delta: 1
});
} else {
history.back();
}
}, },
bindDateChange: function(e) { bindDateChange: function(e) {
this.queryDate = e.detail.value; this.queryDate = e.detail.value;
...@@ -159,7 +154,7 @@ ...@@ -159,7 +154,7 @@
// 查看详情 // 查看详情
goDetail(val, type) { goDetail(val, type) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/commonDetail/commonDetail?fileId=${val}&type=${type}` url: `/pages/commonDetail/commonDetail?fileId=${val}&type=${type}&queryDate=${this.queryDate}`
}) })
}, },
// 查看积分 // 查看积分
......
pages/personalCenter/accountoperation/confirmResetpassword.vue
...@@ -5,16 +5,17 @@ ...@@ -5,16 +5,17 @@
<text>重置密码</text> <text>重置密码</text>
</view> </view>
<view class="input-row"> <view class="input-row">
<input type="text" placeholder="6-20位数字字母组合"/> <input class="uni-input" password type="text" placeholder="密码(6-20位字母数字组合)" v-model="form.password"/>
<input type="text" placeholder="再次确认"/> <input class="uni-input" password type="text" placeholder="再次确认" v-model="confirmPassword" />
</view>
<view class="forgetpsd" @click="resetPassword()">
保存
</view> </view>
<view class="forgetpsd">
<button class="primary log-btn" @click="resetPassword()">修改密码</button>
</view>
</view> </view>
</template> </template>
<script> <script>
import common from '../../../common/common';
import api from "@/api/api"; import api from "@/api/api";
export default{ export default{
data(){ data(){
...@@ -24,13 +25,19 @@ ...@@ -24,13 +25,19 @@
code:'', code:'',
password:'', password:'',
}, },
confirmPassword:''
} }
}, },
components:{}, components:{},
onLoad(){ onLoad(options){
this.form.code = options.code;
}, },
methods:{ methods:{
goBack() {
uni.navigateBack({
delta: 1
});
},
resetPassword(){ resetPassword(){
const params = { const params = {
...this.form ...this.form
...@@ -39,6 +46,10 @@ ...@@ -39,6 +46,10 @@
common.errorDialog(2,'请输入6-12位数字字母组合'); common.errorDialog(2,'请输入6-12位数字字母组合');
return false; return false;
} }
if(this.form.password != this.confirmPassword){
common.errorDialog(2,'两次密码输入不一致');
return false;
}
api.resetPassword(params).then((res)=>{ api.resetPassword(params).then((res)=>{
if(res['success']){ if(res['success']){
uni.showToast({ uni.showToast({
...@@ -95,4 +106,31 @@ ...@@ -95,4 +106,31 @@
position: absolute; position: absolute;
} }
} }
.input-row{
.uni-input{
background: #F4F4F4;
margin: 20rpx auto;
height: 90rpx;
line-height: 90rpx;
width: 90%;
padding-left: 10rpx;
}
}
.forgetpsd {
width: 60%;
margin: 0 auto;
height: 80rpx;
line-height: 80rpx;
border-radius: 100rpx;
font-size: 34rpx;
color: #FFFFFF;
background: #20269B;
text-align: center;
position: absolute;
bottom: 30rpx;
left: 0;
right: 0;
}
</style> </style>
\ No newline at end of file
pages/personalCenter/accountoperation/resetpassword.vue
...@@ -61,9 +61,10 @@ ...@@ -61,9 +61,10 @@
methods: { methods: {
//验证码输入完成 //验证码输入完成
vcodeInput(val) { vcodeInput(val) {
this.code = val;
const param = { const param = {
mobile: this.usermobile, mobile: this.usermobile,
code: val code: this.code
} }
api.verification(param).then((res)=>{ api.verification(param).then((res)=>{
if(res['success']){ if(res['success']){
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
}, },
nextPage(){ nextPage(){
uni.navigateTo({ uni.navigateTo({
url:'/pages/personalCenter/accountoperation/confirmResetpassword' url:`/pages/personalCenter/accountoperation/confirmResetpassword?code=${this.code}`
}) })
}, },
sendCode() { sendCode() {
...@@ -205,16 +206,4 @@ ...@@ -205,16 +206,4 @@
padding-left: 20upx; padding-left: 20upx;
background: #FFFFFF; background: #FFFFFF;
} }
.forgetpsd {
margin: 40upx 20upx;
}
.log-btn {
border-radius: 10upx;
font-size: 34upx;
color: #FFFFFF;
background: #20269B;
box-shadow: 0px 16upx 32upx 0px rgba(2, 168, 244, 0.24);
}
</style> </style>
pages/personalCenter/myTeam.vue
<template> <template>
<view class="container"> <view class="container">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 20rpx;"></text>
<view v-for="item in minorMenuLists.filter(v=>v.isShow)" :key="item.title" @click="goteam(item)" class="liBox"> <!-- <view 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> -->
<view class="infoBoxtext">{{item.title}}</view> <view class="infoBoxtext">{{item.title}}</view>
</view> </view>
<view class="iconBox"> <view class="iconBox">
<i class="iconfont icon-youjiantou"></i> <i class="iconfont icon-youjiantou"></i>
</view> </view>
</view> -->
<view class="ulBox">
<view v-for="item in minorMenuLists.filter(v=>v.isShow)" :key="item.title" @click="goteam(item)"
class="liBox">
<view class="infoBox">
<text>{{item.title}}</text>
</view>
<view class="iconBox">
<view class="" v-if="item.isType == 'text'">
<text>{{item.contentType}}</text>
</view>
<i v-else class="iconfont icon-youjiantou"></i>
</view>
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -54,21 +67,43 @@ ...@@ -54,21 +67,43 @@
.container{ .container{
height: 100%; height: 100%;
background: #FFFFFF; background: #FFFFFF;
padding-top: 20rpx; padding-top: 50rpx;
}
.liBox{
display: flex;
margin: 50rpx 30rpx;
padding: 8rpx 0;
justify-content: space-between;
border-bottom: 1px solid #F2F2F2;
} }
.infoBoxtext{ .ulBox {
width: 64px; padding: 0 30rpx;
height: 24px;
font-size: 16px; .liBox {
font-weight: 400; display: flex;
border-bottom:3px transparent solid; align-items: center;
border-image:linear-gradient(to right,#FA882F,#FFCCCC) 0.5 10; justify-content: space-between;
border-bottom: 1px solid #E6E6E6;
height: 92rpx;
.infoBox {
display: flex;
align-items: center;
image {
width: 52rpx !important;
height: 52rpx;
}
}
& > view:first-child{
position: relative;
&::after{
content:'';
position: absolute;
left: 0;
bottom: -6rpx;
background: linear-gradient(90deg,#FA882F, #D9D9D9);
border-radius: 4rpx;
height: 8rpx;
width: 80rpx;
}
}
&:last-child {
border: none;
}
}
} }
</style> </style>
\ No newline at end of file
pages/personalCenter/personalCenter.vue
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
<style lang="scss"> <style lang="scss">
.container{ .container{
padding-bottom: 160rpx; // padding-bottom: 160rpx;
} }
.avatar { .avatar {
width: 90rpx; width: 90rpx;
......
pages/personalCenter/teamMembers/teamMembers.vue
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
font-size: 30rpx; font-size: 30rpx;
z-index: 1; z-index: 1;
position: absolute; position: absolute;
top: 30rpx; top: 20rpx;
} }
.tabTitle { .tabTitle {
color: #666666; color: #666666;
......
pages/product/finance-calculator.vue
<template> <template>
<view> <view style="position: relative;">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: -30rpx;"></text>
<menu-list v-if="menuList != 'undefined '" :menuList="minorMenuLists"></menu-list> <menu-list v-if="menuList != 'undefined '" :menuList="minorMenuLists"></menu-list>
</view> </view>
</template> </template>
...@@ -45,6 +46,13 @@ import MenuList from "@/components/menuList/menuList.vue" ...@@ -45,6 +46,13 @@ import MenuList from "@/components/menuList/menuList.vue"
}, },
] ]
} }
},
methods:{
goBack(){
uni.navigateBack({
delta: 1
});
}
} }
} }
</script> </script>
......
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