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