huoran
/
FE_occupationlab_miniProgram
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
master
yujialong 4 months ago
parent 63ad31bb3c
commit d4dc133ef0
14 changed files with 157 additions and 179 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      apis/modules/course.js
  2. 2
      apis/modules/user.js
  3. 3
      components/empty/empty.vue
  4. 5
      components/realName/realName.vue
  5. 63
      course/courseDetail/courseDetail.vue
  6. 16
      pages.json
  7. 15
      pages/achievement/achievement.vue
  8. 66
      pages/index/index.vue
  9. 50
      pages/login/login.vue
  10. 9
      pages/person/person.vue
  11. 17
      styles/common.scss
  12. 9
      user/info/info.vue
  13. 69
      user/reg/reg.vue
  14. 4
      user/selectAccount/selectAccount.vue

8
apis/modules/course.js
Unescape View File

@ -21,8 +21,8 @@ export const queryChaptersAndSubsections = data => {
return get('nakadai/nakadai/curriculum/chapter/queryChaptersAndSubsections', data) return get('nakadai/nakadai/curriculum/chapter/queryChaptersAndSubsections', data)
} }
export const curriculumDetail = (cid, mallId) => { export const detailsOfGoods = data => {
return post(`nakadai/nakadai/curriculum/curriculumDetail?cid=${cid}&mallId=${mallId}`) return get(`nakadai/mall/detailsOfGoods`, data)
} }
export const queryPracticeByStudent = data => { export const queryPracticeByStudent = data => {
@ -47,4 +47,8 @@ export const getSchoolEffectiveCourse = () => {
export const exportExamPaperReport = data => { export const exportExamPaperReport = data => {
return get('exam/exam/paper/exportExamPaperReport', data) return get('exam/exam/paper/exportExamPaperReport', data)
}
export const playRecordSave = data => {
return post('occupationlab/occupationlab/playRecord/save', data)
} }

2
apis/modules/user.js
Unescape View File

@ -49,7 +49,7 @@ export const courseProfessional = data => {
} }
export const updateAvatars = url => { export const updateAvatars = url => {
return post(`users/users/user/updateAvatars?url=` + url) return post(`users/users/user/updateAvatars?platformId=1&url=` + url)
} }
export const userBinding = (data) => { export const userBinding = (data) => {

3
components/empty/empty.vue
Unescape View File

@ -29,8 +29,7 @@
padding: 100rpx 0; padding: 100rpx 0;
text-align: center; text-align: center;
.pic { .pic {
width: 400rpx; width: 200rpx;
// margin-bottom: 52rpx;
} }
.text { .text {
font-size: 28rpx; font-size: 28rpx;

5
components/realName/realName.vue
Unescape View File

@ -29,14 +29,14 @@
}, },
mounted() { mounted() {
console.log('realname:') console.log('realname:')
this.handleRealName() // this.handleRealName()
}, },
methods: { methods: {
// 提示填写姓名（登录后调用一次） // 提示填写姓名（登录后调用一次）
async handleRealName () { async handleRealName () {
const res = await checkUserNameOrWorkNumber() const res = await checkUserNameOrWorkNumber()
// 如果没有真实姓名，则弹框提示填写 // 如果没有真实姓名，则弹框提示填写
if (!res.hasName) this.$refs.alertDialog.open() this.$refs.alertDialog[res.hasName ? 'close' : 'open']()
}, },
// 真实姓名提交 // 真实姓名提交
async realNameSubmit() { async realNameSubmit() {
@ -46,6 +46,7 @@
userName: form.userName, userName: form.userName,
workNumber: form.workNumber workNumber: form.workNumber
}) })
this.$refs.alertDialog.close()
}, },
} }
} }

63
course/courseDetail/courseDetail.vue
Unescape View File

@ -21,13 +21,13 @@
<cover-view class="chapterName">{{ item.name }}</cover-view> <cover-view class="chapterName">{{ item.name }}</cover-view>
<cover-view class="section" v-if="item.subsectionList.length"> <cover-view class="section" v-if="item.subsectionList.length">
<cover-view v-for="(section, j) in item.subsectionList" :key="j"class="sectionName" :class="{ active: curRow.id === section.id }" @click="secClick(section, item)"> <cover-view v-for="(section, j) in item.subsectionList" :key="j"class="sectionName" :class="{ active: curRow.id === section.id }" @click="secClick(section, item)">
<cover-image v-if="section.fileType === 'pptx'" class="ext" src="https://izhixinyun.com/images/exts/ppt.png" alt="" mode="widthFix" /> <cover-image v-if="section.fileType === 'pptx'" class="ext" src="https://eduvessel.com/images/occupationlab/exts/ppt.png" alt="" mode="widthFix" />
<cover-image v-else-if="section.fileType === 'mp4'" class="ext" src="https://izhixinyun.com/images/exts/video.png" alt="" mode="widthFix" /> <cover-image v-else-if="section.fileType === 'mp4'" class="ext" src="https://eduvessel.com/images/occupationlab/exts/video.png" alt="" mode="widthFix" />
<cover-image v-else-if="section.fileType === 'doc' || section.fileType === 'docx'" class="ext" <cover-image v-else-if="section.fileType === 'doc' || section.fileType === 'docx'" class="ext"
src="https://izhixinyun.com/images/exts/word.png" alt="" mode="widthFix" /> src="https://eduvessel.com/images/occupationlab/exts/word.png" alt="" mode="widthFix" />
<cover-image v-else-if="section.fileType === 'txt'" class="ext" src="https://izhixinyun.com/images/exts/txt.png" alt="" mode="widthFix" /> <cover-image v-else-if="section.fileType === 'txt'" class="ext" src="https://eduvessel.com/images/occupationlab/exts/txt.png" alt="" mode="widthFix" />
<cover-image v-else-if="section.fileType === 'pdf'" class="ext" src="https://izhixinyun.com/images/exts/pdf.png" alt="" mode="widthFix" /> <cover-image v-else-if="section.fileType === 'pdf'" class="ext" src="https://eduvessel.com/images/occupationlab/exts/pdf.png" alt="" mode="widthFix" />
<cover-image v-else class="ext" src="https://izhixinyun.com/images/exts/pic.png" alt="" mode="widthFix" /> <cover-image v-else class="ext" src="https://eduvessel.com/images/occupationlab/exts/pic.png" alt="" mode="widthFix" />
<cover-view class="text">{{ section.name }}</cover-view> <cover-view class="text">{{ section.name }}</cover-view>
</cover-view> </cover-view>
</cover-view> </cover-view>
@ -49,8 +49,6 @@
<!-- 课程目录 --> <!-- 课程目录 -->
<view v-show="curTab === 1"> <view v-show="curTab === 1">
<uni-search-bar class="search" radius="30" placeholder="请输入章节名称" v-model="keyword" clearButton="auto" cancelButton="none" />
<view v-if="chapterList.length" class="chapters"> <view v-if="chapterList.length" class="chapters">
<view class="chapter" v-for="(item, i) in chapterList" :key="i"> <view class="chapter" v-for="(item, i) in chapterList" :key="i">
<view class="chapterName"> <view class="chapterName">
@ -59,13 +57,13 @@
</view> </view>
<view :class="['section', {shrink: item.shrink}]" v-if="item.subsectionList.length"> <view :class="['section', {shrink: item.shrink}]" v-if="item.subsectionList.length">
<view v-for="(section, j) in item.subsectionList" :key="j"class="sectionName" :class="{ active: curRow.id === section.id }" @click="secClick(section, item)"> <view v-for="(section, j) in item.subsectionList" :key="j"class="sectionName" :class="{ active: curRow.id === section.id }" @click="secClick(section, item)">
<image v-if="section.fileType === 'pptx'" class="ext" src="https://izhixinyun.com/images/exts/ppt.png" alt=""> <image v-if="section.fileType === 'pptx'" class="ext" src="https://eduvessel.com/images/occupationlab/exts/ppt.png" alt="">
<image v-else-if="section.fileType === 'mp4'" class="ext" src="https://izhixinyun.com/images/exts/video.png" alt=""> <image v-else-if="section.fileType === 'mp4'" class="ext" src="https://eduvessel.com/images/occupationlab/exts/video.png" alt="">
<image v-else-if="section.fileType === 'doc' || section.fileType === 'docx'" class="ext" <image v-else-if="section.fileType === 'doc' || section.fileType === 'docx'" class="ext"
src="https://izhixinyun.com/images/exts/word.png" alt=""> src="https://eduvessel.com/images/occupationlab/exts/word.png" alt="">
<image v-else-if="section.fileType === 'txt'" class="ext" src="https://izhixinyun.com/images/exts/txt.png" alt=""> <image v-else-if="section.fileType === 'txt'" class="ext" src="https://eduvessel.com/images/occupationlab/exts/txt.png" alt="">
<image v-else-if="section.fileType === 'pdf'" class="ext" src="https://izhixinyun.com/images/exts/pdf.png" alt=""> <image v-else-if="section.fileType === 'pdf'" class="ext" src="https://eduvessel.com/images/occupationlab/exts/pdf.png" alt="">
<image v-else class="ext" src="https://izhixinyun.com/images/exts/pic.png" alt=""> <image v-else class="ext" src="https://eduvessel.com/images/occupationlab/exts/pic.png" alt="">
{{ section.name }} {{ section.name }}
</view> </view>
</view> </view>
@ -106,12 +104,13 @@
</template> </template>
<script> <script>
import { queryChaptersAndSubsections, curriculumDetail, queryPracticeByStudent, queryAssessmentByStudent, getPlayAuth } from '@/apis/modules/course.js' import { queryChaptersAndSubsections, detailsOfGoods, queryPracticeByStudent, queryAssessmentByStudent, getPlayAuth, playRecordSave } from '@/apis/modules/course.js'
export default { export default {
data() { data() {
return { return {
cid: '', cid: '',
mallId: '', mallId: '',
startTime: Date.now(), // 页面进来的时间
curTab: 1, curTab: 1,
tabs: [ tabs: [
{ {
@ -209,6 +208,17 @@
} }
} }
}, },
onUnload () {
console.log('hide fn')
// 记录播放时长
if (this.cid) {
playRecordSave({
courseId: this.cid,
courseType: 0,
playTime: Math.ceil((Date.now() - this.startTime) / 1000 / 60)
})
}
},
onShow() { onShow() {
const pages = getCurrentPages() const pages = getCurrentPages()
const { options } = pages[pages.length - 1] const { options } = pages[pages.length - 1]
@ -223,20 +233,20 @@
if (this.cid) { if (this.cid) {
const res = await queryChaptersAndSubsections({ const res = await queryChaptersAndSubsections({
keyword: this.keyword, keyword: this.keyword,
courseId: this.courseId, courseId: this.cid,
}) })
this.chapterList = res.chapterList this.chapterList = res.chapterList
// if (this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length && !this.commentId) {
// this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name, 1);
// }
} }
}, },
// 获取介绍 // 获取介绍
async getInfo () { async getInfo () {
if (this.cid && this.mallId) { if (this.mallId) {
const { data } = await curriculumDetail(this.cid, this.mallId) const res = await detailsOfGoods({
this.coverUrl = data.coverUrl mallId: this.mallId
this.briefIntroduction = data.briefIntroduction })
const e = res.orderDetails.mall
this.coverUrl = e.coverDrawing
this.briefIntroduction = e.detailedIntroduction
} }
}, },
// 练习成绩 // 练习成绩
@ -389,6 +399,9 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
page {
background-color: #fff;
}
.file-wrap { .file-wrap {
position: relative; position: relative;
.pic, .video { .pic, .video {
@ -556,7 +569,9 @@
.item { .item {
position: relative; position: relative;
padding: 20rpx 0; padding: 20rpx 0;
border-bottom: 1px solid #e6e6e6; &:not(:last-child) {
border-bottom: 1px solid #e6e6e6;
}
} }
.c-name { .c-name {
font-size: 32rpx; font-size: 32rpx;

16
pages.json
Unescape View File

@ -52,6 +52,22 @@
"navigationBarTitleText": "练习情况", "navigationBarTitleText": "练习情况",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
},
{
"path" : "serviceAgreement/serviceAgreement",
"style" :
{
"navigationBarTitleText" : "用户服务协议",
"enablePullDownRefresh" : false
}
},
{
"path" : "privacyAgreement/privacyAgreement",
"style" :
{
"navigationBarTitleText" : "用户隐私协议",
"enablePullDownRefresh" : false
}
} }
] ]
}, },

15
pages/achievement/achievement.vue
Unescape View File

@ -47,7 +47,7 @@
<view class="c-name">{{ item.projectName }}</view> <view class="c-name">{{ item.projectName }}</view>
<view class="line">最高分：{{ item.hightScore }}&emsp;&emsp;练习次数：{{ item.practiceNum }}</view> <view class="line">最高分：{{ item.hightScore }}&emsp;&emsp;练习次数：{{ item.practiceNum }}</view>
<view class="line">累计练习时长（小时）：{{ item.hightScore }}</view> <view class="line">累计练习时长（小时）：{{ item.hightScore }}</view>
<view class="line">最近练习时间：{{ item.lastTime }}</view> <view class="line">最近练习时间：{{ item.duration }}</view>
<view class="btn">练习情况</view> <view class="btn">练习情况</view>
</view> </view>
</view> </view>
@ -69,7 +69,7 @@
</template> </template>
</view> </view>
<realName /> <realName ref="realName" />
</view> </view>
</template> </template>
@ -102,6 +102,7 @@
onShow() { onShow() {
this.getOverview() this.getOverview()
this.getCourse() this.getCourse()
this.$refs.realName.handleRealName()
}, },
methods: { methods: {
// 获取概览 // 获取概览
@ -182,12 +183,10 @@
.tab-wrap { .tab-wrap {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center;
margin-bottom: 20rpx; margin-bottom: 20rpx;
/deep/.select { /deep/.picker-input {
width: 60%; max-width: 70%;
.uni-select {
border: 0;
}
} }
} }
.tabs { .tabs {
@ -242,7 +241,7 @@
} }
.item { .item {
width: calc(50% - 16rpx); width: calc(50% - 18rpx);
padding: 30rpx; padding: 30rpx;
border-radius: 8rpx; border-radius: 8rpx;
box-sizing: border-box; box-sizing: border-box;

66
pages/index/index.vue
Unescape View File

@ -1,36 +1,32 @@
<template> <template>
<view> <view>
<view class="filter"> <view class="top">
<uni-search-bar class="search" radius="30" placeholder="请输入课程名称" v-model="keyword" clearButton="auto" cancelButton="none" /> <uni-search-bar class="search" radius="30" placeholder="请输入课程名称" v-model="keyword" clearButton="auto" cancelButton="none" />
</view>
<scroll-view scroll-x :scroll-left="scrollLeft" class="tabs">
<ul class="tab-wrap"> <view v-for="(tab, i) in tabs" :key="i" :class="['item', {active: curTab === tab.classificationId}]" @click="tabChange(tab.classificationId)">{{ tab.classificationName }}</view>
<scroll-view scroll-x :scroll-left="scrollLeft" class="tab tab-scroll">
<li v-for="(tab, i) in tabs" :key="i" :class="{active: curTab === tab.classificationId}" @click="tabChange(tab.classificationId)">{{ tab.classificationName }}</li>
</scroll-view> </scroll-view>
</ul> </view>
<ul v-if="list.length" class="list"> <ul v-if="list.length" class="list">
<li v-for="(item, i) in list" :key="i" @click="toDetail(item)"> <li v-for="(item, i) in list" :key="i" @click="toDetail(item)">
<image class="cover" :src="item.coverUrl"></image> <image class="cover" :src="item.coverUrl"></image>
<view class="name">{{ item.goodsName }}</view> <view class="name">{{ item.goodsName }}</view>
<view class="entry">进入课程</view> <view class="entry">{{ !item.isInEffect ? '续费' : '进入课程' }}</view>
</li> </li>
</ul> </ul>
<empty v-else /> <empty v-else />
<realName /> <realName ref="realName" />
</view> </view>
</template> </template>
<script> <script>
import { schoolCourse, recentUse, getSchoolCourseAuthority } from '@/apis/modules/course.js' import { schoolCourse, recentUse, getSchoolCourseAuthority } from '@/apis/modules/course.js'
// import RealName from '@/components/realName/realName.vue'
export default { export default {
// components: { RealName },
data() { data() {
return { return {
curTab: 0, curTab: -1,
tabs: [], tabs: [],
scrollLeft: 0, scrollLeft: 0,
reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据 reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
@ -61,6 +57,7 @@
}, },
onShow() { onShow() {
// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOjM5NTc2LCJyblN0ciI6ImtOaUd2TVI4dlA5eldNZTFlbUFKSmoycWRHMENaU1Q5IiwiYWNjb3VudElkIjozOTU3NiwidXNlcklkIjozOTU3NSwic2Nob29sSWQiOjI4NDYsInVzZXJOYW1lIjoiYWMiLCJwbGF0Zm9ybUlkIjoiMSJ9.JRcmjfyBUik35mG8UxtGTsD0hFGdQfY63cQKQMajq3I') // uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOjM5NTc2LCJyblN0ciI6ImtOaUd2TVI4dlA5eldNZTFlbUFKSmoycWRHMENaU1Q5IiwiYWNjb3VudElkIjozOTU3NiwidXNlcklkIjozOTU3NSwic2Nob29sSWQiOjI4NDYsInVzZXJOYW1lIjoiYWMiLCJwbGF0Zm9ybUlkIjoiMSJ9.JRcmjfyBUik35mG8UxtGTsD0hFGdQfY63cQKQMajq3I')
this.$refs.realName.handleRealName()
this.getTab() this.getTab()
}, },
methods: { methods: {
@ -91,14 +88,14 @@
async getTab () { async getTab () {
const { data } = await getSchoolCourseAuthority() const { data } = await getSchoolCourseAuthority()
this.tabs = [ this.tabs = [
{
classificationId: 0,
classificationName: '最近使用',
},
{ {
classificationId: -1, classificationId: -1,
classificationName: '全部', classificationName: '全部',
}, },
{
classificationId: 0,
classificationName: '最近使用',
},
...data, ...data,
] ]
this.getList() this.getList()
@ -110,26 +107,48 @@
}, },
// 跳转详情 // 跳转详情
toDetail(item) { toDetail(item) {
this.$util.to(`/course/courseDetail/courseDetail?cid=${item.cid}&mallId=${item.mallId}`) if (!item.isInEffect) {
this.$util.errMsg('课程已到期，请联系课程负责老师！')
} else {
this.$util.to(`/course/courseDetail/courseDetail?cid=${item.cid}&mallId=${item.mallId}`)
}
}, },
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.tab-wrap { .top {
display: flex; padding: 20rpx 20rpx 0;
.tab-scroll { margin-bottom: 20rpx;
background-color: #fff;
.tabs {
display: flex;
margin-top: 10rpx;
white-space: nowrap; white-space: nowrap;
li { .item {
position: relative;
display: inline-block; display: inline-block;
padding: 0 4rpx 8rpx;
text-align: center;
font-size: 28rpx;
color: #333;
&:not(:last-child) {
margin-right: 40rpx;
}
}
.active {
border-bottom: 4rpx solid #007EFF;
} }
} }
} }
.list { .list {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
max-height: calc(100vh - 262rpx);
padding: 40rpx 30rpx 30rpx; padding: 40rpx 30rpx 30rpx;
overflow: auto;
li { li {
width: calc(50% - 16rpx); width: calc(50% - 16rpx);
padding: 24rpx; padding: 24rpx;
@ -155,10 +174,9 @@
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
height: 64rpx; height: 64rpx;
margin: 10rpx 0; margin: 10rpx 0 16rpx;
font-size: 24rpx; font-size: 26rpx;
color: #333; color: #333;
} }
.entry { .entry {
font-size: 26rpx; font-size: 26rpx;

50
pages/login/login.vue
Unescape View File

@ -1,16 +1,10 @@
<template> <template>
<view class="page"> <view class="page">
<view class="wrap"> <view class="wrap">
<view class="logo"> <image class="logo" src="https://eduvessel.com/images/occupationlab/hjyz-logo.png" mode="widthFix"></image>
<image class="icon" src="https://izhixinyun.com/images/hjyz-logo.png" mode="widthFix"></image>
<view class="texts">
<view class="cn">慧教云舟</view>
<view class="en">EduVessel</view>
</view>
</view>
<template v-if="isLogin"> <template v-if="isLogin">
<button class="btn phone" open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber"> <button class="btn phone" open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber">
<image src="@/static/image/phone.png" mode="widthFix"></image> <!-- <image src="@/static/image/phone.png" mode="widthFix"></image> -->
{{ isReg ? '获取手机号' : '绑定手机'}} {{ isReg ? '获取手机号' : '绑定手机'}}
</button> </button>
</template> </template>
@ -61,6 +55,8 @@
} else { } else {
uni.clearStorageSync() uni.clearStorageSync()
this.isLogin = false this.isLogin = false
this.isReg = false
this.submiting = false
} }
}, },
// 授权用户信息 // 授权用户信息
@ -144,7 +140,7 @@
} }
}, },
toAgreement(id) { toAgreement(id) {
this.$util.to(id ? `/order/privacyAgreement/privacyAgreement` : `/order/serviceAgreement/serviceAgreement`) this.$util.to(id ? `/course/privacyAgreement/privacyAgreement` : `/course/serviceAgreement/serviceAgreement`)
}, },
// 跳转到首页 // 跳转到首页
toIndex() { toIndex() {
@ -169,37 +165,12 @@
height: 60vh; height: 60vh;
padding: 214rpx 74rpx 28rpx; padding: 214rpx 74rpx 28rpx;
margin: 0 61rpx; margin: 0 61rpx;
text-align: center;
background-color: #fff; background-color: #fff;
border-radius: 20rpx; border-radius: 20rpx;
.logo { .logo {
display: flex; width: 500rpx;
justify-content: center; margin-bottom: 80rpx;
align-items: center;
margin-bottom: 40rpx;
color: #333;
.icon {
width: 150rpx;
margin-right: 20rpx;
}
.cn {
margin-bottom: 10rpx;
font-size: 40rpx;
font-weight: 600;
}
.en {
font-size: 28rpx;
}
}
.hello {
margin: 36rpx 0;
font-size: 28rpx;
color: #333;
}
.tips {
margin-top: 30rpx;
font-size: 26rpx;
color: #adadad;
text-align: left;
} }
.btn { .btn {
display: flex; display: flex;
@ -207,6 +178,7 @@
align-items: center; align-items: center;
width: 100%; width: 100%;
height: 88rpx; height: 88rpx;
margin-bottom: 50rpx;
font-size: 32rpx; font-size: 32rpx;
border-radius: 10rpx; border-radius: 10rpx;
image { image {
@ -215,7 +187,6 @@
} }
} }
.wechat { .wechat {
margin-bottom: 38rpx;
color: #fff; color: #fff;
background-color: #007EFF; background-color: #007EFF;
} }
@ -233,9 +204,6 @@
text-align: right; text-align: right;
} }
.agree { .agree {
position: absolute;
bottom: 28rpx;
left: 0%;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;

9
pages/person/person.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<view class="page"> <view class="page">
<view class="status-bar"></view> <view class="status-bar"></view>
<image class="bg" src="@/static/image/person-bg.png"></image> <image class="bg" src="https://eduvessel.com/images/occupationlab/person-bg.png"></image>
<view class="wrap"> <view class="wrap">
<view class="info"> <view class="info">
<image class="avatar" :src="info.avatar" mode=""></image> <image class="avatar" :src="info.avatar" mode=""></image>
@ -54,7 +54,7 @@
</view> </view>
</uni-popup> </uni-popup>
<realName /> <realName ref="realName" />
</view> </view>
</template> </template>
@ -75,6 +75,7 @@
}, },
onShow() { onShow() {
this.getInfo() this.getInfo()
this.$refs.realName.handleRealName()
}, },
methods: { methods: {
// 获取个人信息 // 获取个人信息
@ -160,9 +161,9 @@
color: #333; color: #333;
} }
.tag { .tag {
padding: 8rpx 16rpx; padding: 2rpx 10rpx;
margin-left: 10rpx; margin-left: 10rpx;
font-size: 24rpx; font-size: 20rpx;
color: #333; color: #333;
white-space: nowrap; white-space: nowrap;
border-radius: 20px; border-radius: 20px;

17
styles/common.scss
Unescape View File

@ -130,23 +130,6 @@ ul {
line-height: 1.4rem; line-height: 1.4rem;
} }
} }
.tab {
display: flex;
justify-content: space-around;
margin-bottom: 20rpx;
background-color: #fff;
li {
padding: 0 20rpx;
font-size: 28rpx;
white-space: nowrap;
line-height: 100rpx;
border-bottom: 3px solid transparent;
}
.active {
color: $uni-primary;
border-bottom-color: $uni-primary;
}
}
.btn-wrap { .btn-wrap {
z-index: 10; z-index: 10;
position: fixed; position: fixed;

9
user/info/info.vue
Unescape View File

@ -11,7 +11,7 @@
</button> </button>
<view class="line"> <view class="line">
<view class="name">学号</view> <view class="name">学号</view>
<view class="val">{{ userAccount.workNumber }}</view> <input type="text" placeholder="请输入学号" v-model="userAccount.workNumber" />
</view> </view>
<view class="line"> <view class="line">
<view class="name">手机号</view> <view class="name">手机号</view>
@ -111,7 +111,7 @@
<view class="name">专业</view> <view class="name">专业</view>
<uni-data-picker class="picker-input" placeholder="请选择专业" popup-title="请选择专业" preload :clear-icon="false" :localdata="archive.ProfessionalList" v-model="archive.professionalId" :readonly="!archive.professionalClassId"></uni-data-picker> <uni-data-picker class="picker-input" placeholder="请选择专业" popup-title="请选择专业" preload :clear-icon="false" :localdata="archive.ProfessionalList" v-model="archive.professionalId" :readonly="!archive.professionalClassId"></uni-data-picker>
</view> </view>
<uni-icons class="del" type="trash" size="20" color="#ccc" @click="delArchive(i)"></uni-icons> <uni-icons v-if="i" class="del" type="trash" size="20" color="#ccc" @click="delArchive(i)"></uni-icons>
</view> </view>
</view> </view>
<view class="fold" v-if="archivesList.length > 1"> <view class="fold" v-if="archivesList.length > 1">
@ -479,6 +479,11 @@
} }
updatePersonCenter(data) updatePersonCenter(data)
this.$util.sucMsg('保存成功') this.$util.sucMsg('保存成功')
setTimeout(() => {
uni.switchTab({
url: '/pages/person/person'
})
}, 1500)
}, },
} }
} }

69
user/reg/reg.vue
Unescape View File

@ -1,26 +1,10 @@
<template> <template>
<view class="page"> <view class="page">
<view class="logo">
<image class="icon" src="https://izhixinyun.com/images/hjyz-logo.png" mode="widthFix"></image>
<view class="texts">
<view class="cn">慧教云舟</view>
<view class="en">EduVessel</view>
</view>
</view>
<view class="wrap"> <view class="wrap">
<image class="logo" src="https://eduvessel.com/images/occupationlab/hjyz-logo.png" mode="widthFix"></image>
<uni-forms> <uni-forms>
<uni-forms-item> <input type="text" v-model.trim="form.account" placeholder="请输入账号" />
<uni-easyinput type="text" v-model.trim="form.account" placeholder="请输入账号" /> <input type="password" v-model.trim="form.password" placeholder="请输入密码" />
</uni-forms-item>
<uni-forms-item>
<uni-easyinput type="password" v-model.trim="form.password" placeholder="请输入密码" />
</uni-forms-item>
<uni-forms-item>
<view class="ver-code">
<uni-easyinput type="text" v-model.trim="form.code" placeholder="请输入验证码" />
<image class="ver-img" :src="verImg" mode="widthFix" @click="getVerImg"></image>
</view>
</uni-forms-item>
</uni-forms> </uni-forms>
<button class="btn" type="primary" @click="submit">登录</button> <button class="btn" type="primary" @click="submit">登录</button>
</view> </view>
@ -37,7 +21,6 @@
form: { form: {
account: '', account: '',
password: '', password: '',
code: '',
random: '', random: '',
}, },
verImg: '', verImg: '',
@ -60,7 +43,6 @@
const { form } = this const { form } = this
if (!form.account) return this.$util.errMsg('请输入账号！') if (!form.account) return this.$util.errMsg('请输入账号！')
if (!form.password) return this.$util.errMsg('请输入密码！') if (!form.password) return this.$util.errMsg('请输入密码！')
if (!form.code) return this.$util.errMsg('请输入验证码！')
const { data } = await weChatToken({ const { data } = await weChatToken({
...form, ...form,
openid: this.openid, openid: this.openid,
@ -78,31 +60,15 @@
<style scoped lang="scss"> <style scoped lang="scss">
.page { .page {
display: flex; padding-top: 300rpx;
flex-direction: column;
justify-content: center;
min-height: 100%; min-height: 100%;
text-align: center; text-align: center;
background: url(https://eduvessel.com/images/occupationlab/login1.png) 0 0/175rpx auto no-repeat, background: url(https://eduvessel.com/images/occupationlab/login1.png) 0 0/175rpx auto no-repeat,
url(https://eduvessel.com/images/occupationlab/login2.png) bottom right/123rpx auto no-repeat; url(https://eduvessel.com/images/occupationlab/login2.png) bottom right/123rpx auto no-repeat;
box-sizing: border-box;
.logo { .logo {
display: flex; width: 500rpx;
justify-content: center; margin-bottom: 80rpx;
align-items: center;
margin-bottom: 40rpx;
color: #333;
.icon {
width: 150rpx;
margin-right: 20rpx;
}
.cn {
margin-bottom: 10rpx;
font-size: 40rpx;
font-weight: 600;
}
.en {
font-size: 28rpx;
}
} }
} }
.wrap { .wrap {
@ -110,19 +76,22 @@
padding: 60rpx; padding: 60rpx;
margin: 0 61rpx; margin: 0 61rpx;
text-align: center; text-align: center;
border-radius: 8rpx; border-radius: 20rpx;
background-color: #fff; background-color: #fff;
input {
.ver-code { padding: 10rpx 16rpx;
display: flex; margin-bottom: 40rpx;
.ver-img { font-size: 28rpx;
width: 200rpx; text-align: left;
height: 80rpx; color: #333;
margin-left: 20rpx; border-bottom: 1px solid #e0e0e0;
}
} }
.btn { .btn {
width: 100%; width: 100%;
height: 80rpx;
margin-top: 50rpx;
font-size: 32rpx;
line-height: 80rpx;
} }
} }
</style> </style>

4
user/selectAccount/selectAccount.vue
Unescape View File

@ -83,12 +83,12 @@
border-radius: 50%; border-radius: 50%;
} }
.name { .name {
margin-bottom: 6rpx; margin-bottom: 8rpx;
font-size: 32rpx; font-size: 32rpx;
color: #333; color: #333;
} }
.org { .org {
font-size: 28rpx; font-size: 26rpx;
color: #333; color: #333;
} }
.btn { .btn {

Write Preview
Loading…
Cancel
Save