Skip to content

S
study
Commit 8b9a0d18 authored by Damon's avatar Damon
Browse files
Options

Merge branch 'dev-v1.0.0' of git.banshouhui.com:wuzhenzhe/study into dev-v1.0.0

parents 59203b55 32ec109f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1149 additions and 581 deletions
.env.dev.js
View file @ 8b9a0d18
const UNI_APP = { const UNI_APP = {
apiUrl: 'http://192.168.0.204:8760', apiUrl: 'http://192.168.1.22:8760',
qn_base_url: 'https://qn-static.banshouhui.com/study/', qn_base_url: 'https://qn-static.banshouhui.com/study/',
qn_asset_url: 'http://deudn.c.pp.cc/', qn_asset_url: 'https://img2.banshouhui.com/',
uCenterUrl: 'http://192.168.0.5:8093/', //'http://rest-u.yunya.com/' uCenterUrl: 'http://192.168.0.5:8093/', //'http://rest-u.yunya.com/'
argoDebugMode: 1, argoDebugMode: 1,
version: 'v1.0.0', version: 'v1.0.0',
......
src/api/learn.js
View file @ 8b9a0d18
...@@ -89,6 +89,13 @@ let learnApiFun = function(vm) { ...@@ -89,6 +89,13 @@ let learnApiFun = function(vm) {
// 检查是否具有体验资格 // 检查是否具有体验资格
let checkGetQuestion = async (questionWarehouseId) => let checkGetQuestion = async (questionWarehouseId) =>
await vm.$u.get('/rest/question/checkGetQuestion/' + questionWarehouseId) await vm.$u.get('/rest/question/checkGetQuestion/' + questionWarehouseId)
// 每日一练统计
let everyTaskList = async (questionWarehouseId, params = {}) =>
await vm.$u.get(
'/rest/question/query/everyTaskList/' + questionWarehouseId,
params
)
const learnApi = { const learnApi = {
getQuestion, getQuestion,
getQuestionTotal, getQuestionTotal,
...@@ -111,6 +118,7 @@ let learnApiFun = function(vm) { ...@@ -111,6 +118,7 @@ let learnApiFun = function(vm) {
bindCard, bindCard,
searchQuestion, searchQuestion,
checkGetQuestion, checkGetQuestion,
everyTaskList,
} }
return learnApi return learnApi
} }
......
src/api/user.js
View file @ 8b9a0d18
...@@ -14,21 +14,29 @@ let userApiFun = function(vm) { ...@@ -14,21 +14,29 @@ let userApiFun = function(vm) {
//验证身份证反面 //验证身份证反面
let checkIdCardBack = async (params = {}) => let checkIdCardBack = async (params = {}) =>
await vm.$u.post(uCenterUrl + 'v1/settled/card-back', params) await vm.$u.post(uCenterUrl + 'v1/settled/card-back', params)
//获取国家证列表
let getCountryCertList = async (params = {}) => let getCountryCertList = async (params = {}) =>
await vm.$u.post(apiUrl + '/rest/certificate/query', params) await vm.$u.post(apiUrl + '/rest/certificate/query', params)
//获取学时证列表
let getlearnCertList = async (params = {}) => let getlearnCertList = async (params = {}) =>
await vm.$u.get(apiUrl + '/rest/question/getSchoolCertificate', params) await vm.$u.get(apiUrl + '/rest/question/getSchoolCertificate', params)
//获取学时证详情
let getlearnCertDetail = async (questionWarehouseId, params = {}) => let getlearnCertDetail = async (questionWarehouseId) =>
await vm.$u.get( await vm.$u.get(
apiUrl + '/rest/question/getSchoolCertificate/' + questionWarehouseId, apiUrl + '/rest/question/getSchoolCertificate/' + questionWarehouseId
params
) )
//证书查询结果
let getCertFromOut = async (params = {}) => let getCertFromOut = async (params = {}) =>
await vm.$u.get(apiUrl + '/rest/certificate/national', params) await vm.$u.get(apiUrl + '/rest/certificate/national', params)
//身份证识别
let getCertifyInfoByType = async (type, params = {}) =>
await vm.$u.get(apiUrl + '/student/get/idCard/' + type, params)
//获取学员题库列表
let getUserQuestionWareHouse = async (params = {}) =>
await vm.$u.get(
apiUrl + '/rest/question/query/allStudentQuestionWarehouse',
params
)
const userApi = { const userApi = {
updateUserInfo, updateUserInfo,
...@@ -39,6 +47,8 @@ let userApiFun = function(vm) { ...@@ -39,6 +47,8 @@ let userApiFun = function(vm) {
getlearnCertList, getlearnCertList,
getlearnCertDetail, getlearnCertDetail,
getCertFromOut, getCertFromOut,
getCertifyInfoByType,
getUserQuestionWareHouse,
} }
return userApi return userApi
} }
......
src/components/calendar/index.vue 0 → 100644
View file @ 8b9a0d18
This diff is collapsed.
src/components/record-cell/index.vue
View file @ 8b9a0d18
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
<view <view
v-if="key == 'result'" v-if="key == 'result'"
:class="['result-text', { passed: passed }]" :class="['result-text', { passed: passed }]"
>{{ resultText }}</view >{{ data[key] }}</view
> >
<view v-else class="content-text">{{ info[key] }}</view> <view v-else class="content-text">{{ data[key] }}</view>
<view class="unit-text">{{ units[key] }}</view> <view v-if="units[key]" class="unit-text">{{ units[key] }}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -32,26 +32,48 @@ export default { ...@@ -32,26 +32,48 @@ export default {
return {} return {}
}, },
computed: { computed: {
data() {
return {
take: this.take,
point: this.info.point,
result: this.resultText,
}
},
take() {
if (this.info.startDatetime && this.info.endDatetime) {
let timesStart = new Date(
this.info.startDatetime.replace(/\-/g, '/')
).getTime()
let timesEnd = new Date(
this.info.endDatetime.replace(/\-/g, '/')
).getTime()
return Math.ceil((timesEnd - timesStart) / 1000 / 60)
}
return 0
},
timeText() { timeText() {
return this.$u.timeFormat(this.info.date, 'yyyy.mm.dd') return this.info.endDatetime
? this.info.endDatetime.split(' ')[0].replace(/\-/g, '.')
: this.$u.timeFormat(new Date().getTime(), 'yyyy.mm.dd')
}, },
labels() { labels() {
return { return {
time: '模考用时', take: '模考用时',
score: '模考成绩', point: '模考成绩',
result: '是否及格', result: '是否及格',
} }
}, },
units() { units() {
return { return {
time: '分钟', take: '分钟',
score: '分', point: '分',
result: '', result: '',
} }
}, },
passed() { passed() {
// 及格、不及格 // 及格、不及格
return this.info.score >= 60 return this.info.point >= 60
}, },
resultText() { resultText() {
return this.passed ? '及格' : '不及格' return this.passed ? '及格' : '不及格'
...@@ -83,6 +105,7 @@ export default { ...@@ -83,6 +105,7 @@ export default {
padding-top: 16rpx; padding-top: 16rpx;
display: flex; display: flex;
align-items: flex-end; align-items: flex-end;
justify-content: center;
.result-text { .result-text {
font-size: 44rpx; font-size: 44rpx;
color: #fa5a49; color: #fa5a49;
...@@ -103,7 +126,7 @@ export default { ...@@ -103,7 +126,7 @@ export default {
.unit-text { .unit-text {
padding-left: 14rpx; padding-left: 14rpx;
font-weight: 400; font-weight: 400;
margin-bottom: 11rpx; margin-bottom: 12rpx;
} }
} }
} }
......
src/pages.json
View file @ 8b9a0d18
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
"style": { "style": {
"navigationBarTitleText": "证书", "navigationBarTitleText": "证书",
"navigationStyle": "custom", "navigationStyle": "custom",
"disableScroll": false "disableScroll": true
} }
}, },
{ {
......
src/pages/cert/detail.vue
View file @ 8b9a0d18
...@@ -14,15 +14,11 @@ ...@@ -14,15 +14,11 @@
<u-image :src="topImage" height="116rpx" width="100%"></u-image> <u-image :src="topImage" height="116rpx" width="100%"></u-image>
</view> </view>
<view class="table-list"> <view class="table-list">
<view v-if="type == 'country'" class="item"> <view class="item" v-for="(data, k) in dataList">
<view class="name">{{ certName }}</view> <view class="name">{{ certName[k] }}</view>
<view class="table"> <view class="table">
<u-table border-color="#9EA5BB"> <u-table border-color="#9EA5BB">
<u-tr <u-tr v-for="(item, i) in data" :key="i" class="u-tr">
v-for="(item, i) in data.certificateTextContent"
:key="i"
class="u-tr"
>
<u-td <u-td
v-for="(val, name, index) in item" v-for="(val, name, index) in item"
:key="index" :key="index"
...@@ -48,16 +44,13 @@ ...@@ -48,16 +44,13 @@
export default { export default {
data() { data() {
return { return {
data: { dataList: [],
certificateTextContent: [],
},
learnData: {}, learnData: {},
type: null, certName: [],
certName: '',
topImage: process.uniEnv.qn_base_url + 'tezhongzuoyepingtai@2x.png', topImage: process.uniEnv.qn_base_url + 'tezhongzuoyepingtai@2x.png',
} }
}, },
onShow: function() { onLoad: function() {
this.formatDataByType() this.formatDataByType()
}, },
computed: { computed: {
...@@ -111,39 +104,33 @@ export default { ...@@ -111,39 +104,33 @@ export default {
return return
} }
let certData = getApp().globalData.certItemData let certData = getApp().globalData.certItemData
this.certName = certData.certificateName let countryData = []
if (certData.type == 'country') { let certName = []
console.log('ok') let count, list
this.type = 'country' for (let k in certData) {
this.certName = certData.certificateName countryData[k] = []
let countryData = [] count = certData[k].data.count || 2
let count = certData.data.count || 2 certName[k] = certData[k].certificateName.replace('作业', '证')
let list //格式化表格数据为json
console.log('data is', certData.data) if (!certData[k].data.certificateTextContent) {
if (!certData.data.certificateTextContent) {
list = JSON.parse( list = JSON.parse(
JSON.parse(JSON.stringify(certData.data.certificateContent)) JSON.parse(JSON.stringify(certData[k].data.certificateContent))
) )
console.log('list is', list)
} else { } else {
list = certData.data.certificateTextContent list = certData[k].data.certificateTextContent
} }
//组合表格数据
for (let key in list) { for (let key in list) {
countryData[key] = [] countryData[k][key] = []
for (let i = 1; i <= count; i++) { for (let i = 1; i <= count; i++) {
countryData[key].push(list[key]['filedName_' + i]) countryData[k][key].push(list[key]['filedName_' + i])
countryData[key].push(list[key]['filedValue_' + i]) countryData[k][key].push(list[key]['filedValue_' + i])
} }
} }
console.log('data countryData', countryData)
certData.data.certificateTextContent = countryData
this.data = certData.data
console.log('data log', this.data)
} else if (certData.type == 'learn') {
this.type = 'learn'
this.learnData = certData.data
} }
this.certName = certName
this.dataList = countryData
console.log('data redo log', this.dataList)
}, },
}, },
} }
...@@ -156,13 +143,15 @@ export default { ...@@ -156,13 +143,15 @@ export default {
color: transparent; color: transparent;
display: none; display: none;
} }
page {
background-color: #2953ff;
}
.begin-answer { .begin-answer {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: #2953ff;
background-size: 100% 920rpx; background-size: 100% 920rpx;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 120vh; height: 100vh;
position: absolute; position: absolute;
top: 0; top: 0;
width: 100%; width: 100%;
...@@ -173,7 +162,7 @@ export default { ...@@ -173,7 +162,7 @@ export default {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 30rpx 24rpx 0rpx 24rpx; padding: 30rpx 24rpx 50rpx 24rpx;
} }
.cert-body { .cert-body {
......
src/pages/cert/detailLearn.vue
View file @ 8b9a0d18
...@@ -85,16 +85,24 @@ export default { ...@@ -85,16 +85,24 @@ export default {
type: null, type: null,
certName: '', certName: '',
topImage: process.uniEnv.qn_base_url + 'xueshitoubu@2x.png', topImage: process.uniEnv.qn_base_url + 'xueshitoubu@2x.png',
workPlace: ''
} }
}, },
onLoad(){
this.$u.api.getUserInfo().then((res) => {
this.workPlace =
res && res.workUnit || null
})
},
onShow: function() { onShow: function() {
this.formatDataByType() this.formatDataByType()
}, },
computed: { computed: {
nowDate(){ nowDate(){
var Today=new Date(); var Today=new Date();
let m = (Today.getMonth()+1) let m = String(Today.getMonth()+1)
let d = Today.getDate() let d = String(Today.getDate())
console.log('d length', d.length)
return (Today.getFullYear() + '.' + (m.length > 1 ? m : '0' + m) + '.' + (d.length > 1 ? d : '0' + d)) return (Today.getFullYear() + '.' + (m.length > 1 ? m : '0' + m) + '.' + (d.length > 1 ? d : '0' + d))
}, },
headPhoto(){ headPhoto(){
...@@ -113,7 +121,7 @@ export default { ...@@ -113,7 +121,7 @@ export default {
return this.learnData.idCard || ' ' return this.learnData.idCard || ' '
}, },
company() { company() {
return this.learnData.company || ' ' return this.workPlace
}, },
subjectName() { subjectName() {
return this.learnData.subjectName || ' ' return this.learnData.subjectName || ' '
...@@ -122,13 +130,13 @@ export default { ...@@ -122,13 +130,13 @@ export default {
return this.learnData.institutionName || '模考大师' return this.learnData.institutionName || '模考大师'
}, },
maxpoint() { maxpoint() {
return this.learnData.maxPoint || 0 return this.learnData.maxPoint > 0 && this.learnData.maxPoint || ''
}, },
learnTime() { learnTime() {
return this.learnData.time || 0 return this.learnData.maxPoint > 0 && this.learnData.time || ''
}, },
resultForTest() { resultForTest() {
return (this.learnData.maxPoint > 80 && '合格') || '不合格' return this.learnData.maxPoint > 0 && ((this.learnData.maxPoint > 80 && '合格') || '不合格') || ''
}, },
}, },
methods: { methods: {
......
src/pages/index/cert.vue
View file @ 8b9a0d18
This diff is collapsed.
src/pages/index/index.vue
View file @ 8b9a0d18
...@@ -413,8 +413,10 @@ export default { ...@@ -413,8 +413,10 @@ export default {
if (this.info.id) { if (this.info.id) {
// 跳转到学练记录 // 跳转到学练记录
this.$u.route({ this.$u.route({
url: 'pages/learn/record?part=', url: 'pages/learn/record?key=',
key, params: {
key: key,
},
}) })
} else { } else {
this.$refs.uToast.show({ this.$refs.uToast.show({
......
src/pages/learn/record.vue
View file @ 8b9a0d18
...@@ -16,78 +16,103 @@ ...@@ -16,78 +16,103 @@
<image class="xunzhang-image" :src="xunzhangImage"></image> <image class="xunzhang-image" :src="xunzhangImage"></image>
</view> </view>
<view class="body-view"> <view class="body-view">
<view class="date-view"> <scroll-view
<view class="content-title" id="part-days">每日一练</view> scroll-y="true"
<view class="date-content"></view> class="scroll-view"
</view> @scrolltolower="reachBottom"
<view class="charts-view"> scroll-anchoring
<view class="content-title" id="part-total">练习分析</view> enable-back-to-top
<view class="range-view"> :scroll-into-view="scrollId"
<view class="range-title">日期范围</view> >
<view <view class="date-view">
v-for="(item, index) in items" <view class="content-title" id="part-days">每日一练</view>
:key="index" <view class="date-content">
:class="['range-item', { selected: item.selected }]" <Calendar
@click="handleClickRange(index)" :initialDays="days"
>{{ item.title }}</view @change="handleChangeMonth"
> ></Calendar>
</view>
</view> </view>
<view v-if="showSelect" class="days-select-view"> <view class="charts-view">
<picker <view class="content-title" id="part-total">练习分析</view>
mode="date" <view class="range-view">
:value="rangeDay0" <view class="range-title">日期范围</view>
:end="rangeDay1" <view
@change="handleConform($event, 0)" v-for="(item, index) in items"
> :key="index"
<view class="date-picker-content" hover-class="hover-class"> :class="['range-item', { selected: item.selected }]"
<view class="input-view">{{ rangeDay0 }}</view> @click="handleClickRange(index)"
<u-icon name="arrow-down"></u-icon> >{{ item.title }}</view
</view> >
</picker> </view>
<view class="line-view">-</view> <view v-if="showSelect" class="days-select-view">
<picker <picker
mode="date" mode="date"
:value="rangeDay1" :value="rangeDay0"
:start="rangeDay0" :end="rangeDay1"
:end="getDate()" @change="handleConform($event, 0)"
@change="handleConform($event, 1)" >
> <view class="date-picker-content" hover-class="hover-class">
<view class="date-picker-content" hover-class="hover-class"> <view class="input-view">{{ rangeDay0 }}</view>
<view class="input-view">{{ rangeDay1 }}</view> <u-icon name="arrow-down"></u-icon>
<u-icon name="arrow-down"></u-icon> </view>
</view> </picker>
</picker> <view class="line-view">-</view>
<picker
mode="date"
:value="rangeDay1"
:start="rangeDay0"
:end="getDate()"
@change="handleConform($event, 1)"
>
<view class="date-picker-content" hover-class="hover-class">
<view class="input-view">{{ rangeDay1 }}</view>
<u-icon name="arrow-down"></u-icon>
</view>
</picker>
</view>
<view class="charts-content"> </view>
</view> </view>
<view class="charts-content"> </view> <view class="list-view">
</view> <view class="content-title" id="part-today">模考成绩</view>
<view class="list-view"> <view class="list-content">
<view class="content-title" id="part-today">模考成绩</view> <RecordCell
<view class="list-content"> v-for="(item, index) in lists"
<RecordCell :key="index"
v-for="(item, index) in showedList" :info="item"
:key="index" ></RecordCell>
:info="item"
></RecordCell> <!-- <view class="show-more" @click="showAll = true" v-if="!showAll">
<view class="show-more" @click="showAll = true" v-if="!showAll"> <u-icon name="arrow-down"></u-icon>
<u-icon name="arrow-down"></u-icon> <text>查看更多</text>
<text>查看更多</text> </view> -->
</view> </view>
<u-loadmore
v-show="
(recordParams.current == 1 && loaded) || recordParams.current > 1
"
:status="currentLoadStatus"
></u-loadmore>
</view> </view>
</view> </scroll-view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import RecordCell from '@/components/record-cell' import RecordCell from '@/components/record-cell'
import Calendar from '@/components/calendar'
export default { export default {
components: { RecordCell }, components: { RecordCell, Calendar },
data() { data() {
return { return {
lists: [], lists: [],
days: [],
showSelect: false, showSelect: false,
showAll: false, showAll: false,
scrollId: null, scrollId: null,
loaded: false,
items: [ items: [
{ {
title: '近7天', title: '近7天',
...@@ -102,9 +127,13 @@ export default { ...@@ -102,9 +127,13 @@ export default {
selected: false, selected: false,
}, },
], ],
currentLoadStatus: 'loading',
rangeDay0: this.getDate(), // 自定义开始日期 rangeDay0: this.getDate(), // 自定义开始日期
rangeDay1: this.getDate(), // 自定义结束日期 rangeDay1: this.getDate(), // 自定义结束日期
recordParams: {
current: 0,
size: 15,
},
} }
}, },
...@@ -119,23 +148,74 @@ export default { ...@@ -119,23 +148,74 @@ export default {
day: true, day: true,
} }
}, },
showedList() {
return this.showAll ? this.lists : this.lists.slice(0, 2)
},
}, },
onLoad(e) { onLoad(e) {
if (e && e.key) { if (e && e.key) {
this.$nextTick(() => { this.$nextTick(() => {
this.scrollId = 'part-' + e.key setTimeout(() => {
this.scrollId = 'part-' + e.key
}, 500)
}) })
} }
this.lists = [ this.queryExamRecord()
{ time: 36, score: 80, date: new Date().getTime },
{ time: 100, score: 40, date: new Date().getTime },
{ time: 40, score: 60, date: new Date().getTime },
]
}, },
methods: { methods: {
// 每日一练统计
everyTaskList(year, month) {
var params = {
startDate: this.$u.timeFormat(
new Date(year, month - 1, 1).getTime(),
'yyyy-mm-dd'
),
endDate: this.$u.timeFormat(
new Date(year, month, 0).getTime(),
'yyyy-mm-dd'
),
}
this.$u.api
.everyTaskList(this.questionWarehouseId, params)
.then((res) => {
this.days = []
for (var item of res) {
this.days.push(item.time.replace(/\-0/g, '\-'))
}
})
.catch((err) => {
console.log(err)
})
},
// 模考记录
queryExamRecord() {
this.recordParams.current += 1
;(this.recordParams.model = {
questionWarehouseId: this.questionWarehouseId,
}),
this.$u.api
.queryExamRecord(this.recordParams)
.then((res) => {
this.loaded = true
if (this.recordParams.current == 1) {
this.lists = []
}
if ((res.records || []).length > 0) {
this.lists.push(...res.records)
}
this.currentLoadStatus =
res.total > this.lists.length &&
(res.records || []).length == this.recordParams.size
? 'loadmore'
: 'nomore'
})
.catch((err) => {
this.loaded = true
console.log(err)
})
},
handleChangeMonth(e) {
this.everyTaskList(e.year, e.month)
},
handleClick() {}, handleClick() {},
handleClickRange(index) { handleClickRange(index) {
for (var item of this.items) { for (var item of this.items) {
...@@ -158,17 +238,16 @@ export default { ...@@ -158,17 +238,16 @@ export default {
getDate() { getDate() {
return this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd') return this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
}, },
reachBottom() {
if (this.currentLoadStatus != 'loadmore') return
this.currentLoadStatus == 'loading'
this.queryExamRecord()
},
}, },
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::-webkit-scrollbar {
width: 0;
height: 0;
color: transparent;
display: none;
}
.record-view { .record-view {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -207,26 +286,34 @@ export default { ...@@ -207,26 +286,34 @@ export default {
} }
} }
.body-view { .body-view {
::-webkit-scrollbar {
width: 0;
height: 0;
color: transparent;
display: none;
}
border-radius: 24rpx 24rpx 0 0; border-radius: 24rpx 24rpx 0 0;
background-color: #ffffff; background-color: #ffffff;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
padding: 24rpx 30rpx 44rpx 30rpx; .scroll-view {
height: 100%;
}
.date-view { .date-view {
.date-content { .date-content {
min-height: 648rpx; min-height: 650rpx;
} }
} }
.content-title { .content-title {
font-size: 32rpx; font-size: 32rpx;
color: #191c27; color: #191c27;
font-weight: bold; font-weight: bold;
padding: 24rpx 30rpx 0rpx 30rpx;
} }
.charts-view { .charts-view {
.range-view { .range-view {
display: flex; display: flex;
margin-top: 40rpx; margin: 40rpx 30rpx 40rpx 30rpx;
margin-bottom: 40rpx;
.range-title { .range-title {
font-size: 28rpx; font-size: 28rpx;
color: #9ea5bb; color: #9ea5bb;
...@@ -248,7 +335,7 @@ export default { ...@@ -248,7 +335,7 @@ export default {
} }
} }
.days-select-view { .days-select-view {
margin-left: 154rpx; margin-left: 168rpx;
display: flex; display: flex;
align-items: center; align-items: center;
color: #9ea5bb; color: #9ea5bb;
...@@ -275,7 +362,10 @@ export default { ...@@ -275,7 +362,10 @@ export default {
} }
} }
.list-view { .list-view {
padding-bottom: 20rpx;
.list-content { .list-content {
padding: 0 30rpx 20rpx 30rpx;
.show-more { .show-more {
display: flex; display: flex;
justify-content: center; justify-content: center;
......
src/pages/mine/bank.vue
View file @ 8b9a0d18
...@@ -50,176 +50,7 @@ export default { ...@@ -50,176 +50,7 @@ export default {
}, },
onLoad() { onLoad() {
this.$u.api.getUserQuestionWareHouse().then((res) => { this.$u.api.getUserQuestionWareHouse().then((res) => {
res = [ console.log('tiku list', res)
{
id: '1415266126815821824',
createTime: '2021-07-14 19:05:14',
createdBy: '1415215255998431232',
updateTime: '2021-07-14 19:05:14',
updatedBy: '1415215255998431232',
echoMap: {
studentId: {
id: '1414459877807357952',
createTime: '2021-07-12 13:41:29',
createdBy: '3',
updateTime: '2021-07-20 20:41:13',
updatedBy: '1414459877807357952',
echoMap: {},
cardCount: null,
consumeAmount: null,
loginTime: null,
unionid: '',
nickname: '',
name: '',
phoneNumber: '11111111111',
avatarPath: '',
identityNumber: '',
identityFrontPath: '',
identityBackPath: '',
certificatePhotoPath: '',
certificateValidityDate: null,
workUnit: '',
address: '',
},
questionWarehouseId: {
id: '1414854649273384960',
createTime: '2021-07-13 15:50:10',
createdBy: '1413688964405002240',
updateTime: '2021-07-22 19:21:00',
updatedBy: '1413688964405002240',
echoMap: {},
institutionId: '1',
subjectId: '1418169087225233408',
title: '测试题库',
subtitle: '大狼狗',
description: 'sad',
effectiveTime: '0',
provinceId: '470715',
cityId: '475286',
type: '1',
price: '100.00',
realPrice: '60.00',
state: true,
remark: '',
version: '0',
},
cardId: {
id: '1416278788987158528',
createTime: '2021-07-17 14:09:11',
createdBy: '1410776147574128640',
updateTime: '2021-07-17 14:09:11',
updatedBy: '1410776147574128640',
echoMap: {},
unitPrice: null,
buyTime: null,
subjectNames: null,
instrtutionId: '1',
studentId: null,
questionWarehouseId: '1',
cardType: '02',
cardNumber: '621001200010719',
cardSecret: '9923sibv',
cardStatus: 5,
isEnable: 1,
effectiveDay: 30,
bindingTime: null,
activationTime: null,
sourceType: {
code: 'INSTRTUTION_SEND',
desc: '机构发卡',
},
sourceOrderId: '1416278788521590784',
},
},
questionWarehouseId: '1414854649273384960',
studentId: '1414459877807357952',
cardId: '1416278788987158528',
},
{
id: '1415602594134360064',
createTime: '2021-07-15 17:41:51',
createdBy: '1415215255998431232',
updateTime: '2021-07-15 17:41:51',
updatedBy: null,
echoMap: {
studentId: {
id: '1414459877807357952',
createTime: '2021-07-12 13:41:29',
createdBy: '3',
updateTime: '2021-07-20 20:41:13',
updatedBy: '1414459877807357952',
echoMap: {},
cardCount: null,
consumeAmount: null,
loginTime: null,
unionid: '',
nickname: '',
name: '',
phoneNumber: '11111111111',
avatarPath: '',
identityNumber: '',
identityFrontPath: '',
identityBackPath: '',
certificatePhotoPath: '',
certificateValidityDate: null,
workUnit: '',
address: '',
},
questionWarehouseId: {
id: '1',
createTime: '2021-07-12 16:33:20',
createdBy: null,
updateTime: '2021-07-21 14:40:44',
updatedBy: '1413688964405002240',
echoMap: {},
institutionId: '1',
subjectId: '1413687160678121472',
title: '测试1',
subtitle: '侧首',
description: '哈哈哈哈',
effectiveTime: '1',
provinceId: '470715',
cityId: '475286',
type: '1',
price: '100.00',
realPrice: '50.00',
state: true,
remark: '123231',
version: null,
},
cardId: {
id: '1416278788987158528',
createTime: '2021-07-17 14:09:11',
createdBy: '1410776147574128640',
updateTime: '2021-07-17 14:09:11',
updatedBy: '1410776147574128640',
echoMap: {},
unitPrice: null,
buyTime: null,
subjectNames: null,
instrtutionId: '1',
studentId: null,
questionWarehouseId: '1',
cardType: '02',
cardNumber: '621001200010719',
cardSecret: '9923sibv',
cardStatus: 15,
isEnable: 1,
effectiveDay: 30,
bindingTime: null,
activationTime: null,
sourceType: {
code: 'INSTRTUTION_SEND',
desc: '机构发卡',
},
sourceOrderId: '1416278788521590784',
},
},
questionWarehouseId: '1',
studentId: '1414459877807357952',
cardId: '1416278788987158528',
},
]
let length = res.length let length = res.length
if (res.length <= 0) { if (res.length <= 0) {
this.lists = [] this.lists = []
...@@ -237,7 +68,6 @@ export default { ...@@ -237,7 +68,6 @@ export default {
//绑卡或支付时间 //绑卡或支付时间
data[i].title = res[i].echoMap.questionWarehouseId.title data[i].title = res[i].echoMap.questionWarehouseId.title
data[i].subtitle = res[i].echoMap.questionWarehouseId.subtitle
data[i].time = data[i].time =
res[i].echoMap.cardId.bindingTime || res[i].echoMap.cardId.bindingTime ||
res[i].echoMap.cardId.buyTime || res[i].echoMap.cardId.buyTime ||
...@@ -247,18 +77,28 @@ export default { ...@@ -247,18 +77,28 @@ export default {
case 0: case 0:
status = '未绑定' status = '未绑定'
data[i].statusStyle = { color: '#9EA5BB' } data[i].statusStyle = { color: '#9EA5BB' }
data[i].subtitle = '请前往绑定'
break break
case 5: case 5:
status = '已绑定' status = '已绑定'
data[i].statusStyle = { color: '#2953FF' } data[i].statusStyle = { color: '#2953FF' }
data[i].subtitle = '请前往首页答题联系吧'
break break
case 10: case 10:
status = '已激活' status = '已激活'
data[i].statusStyle = { color: '#2953FF' } data[i].statusStyle = { color: '#2953FF' }
let leaveDay = 0
if (res[i].echoMap.cardId && res[i].echoMap.cardId.activationTime) {
let diff = this.datedifference(sDate1, sDate2)
leaveDay = res[i].echoMap.cardId.effectiveDay - diff
leaveDay = leaveDay > 0 ? leaveDay : 0
}
data[i].subtitle = '题库将于' + leaveDay + '天后到期'
break break
case 15: case 15:
status = '已失效' status = '已失效'
data[i].statusStyle = { color: '#9EA5BB' } data[i].statusStyle = { color: '#9EA5BB' }
data[i].subtitle = '题库已失效'
break break
default: default:
break break
...@@ -266,9 +106,21 @@ export default { ...@@ -266,9 +106,21 @@ export default {
data[i].status = status data[i].status = status
} }
this.lists = data this.lists = data
console.log(data) console.log('tiku data', data)
}) })
}, },
methods: {
datedifference(sDate1, sDate2) {
//2021-01-01,2020-02-01,31
var dateSpan, tempDate, iDays
sDate1 = Date.parse(sDate1)
sDate2 = Date.parse(sDate2)
dateSpan = sDate2 - sDate1
dateSpan = Math.abs(dateSpan)
iDays = Math.floor(dateSpan / (24 * 3600 * 1000))
return iDays
},
},
} }
</script> </script>
......
src/pages/mine/certify.vue
View file @ 8b9a0d18
...@@ -150,15 +150,16 @@ export default { ...@@ -150,15 +150,16 @@ export default {
upload.getPhoto(1, this.token).then((res) => { upload.getPhoto(1, this.token).then((res) => {
this.student.identityFrontPath = res.key this.student.identityFrontPath = res.key
this.$u.api this.$u.api
.checkIdCardFront({ id_card_front: res.key }) .getCertifyInfoByType('front', {
.then(() => {}) url: process.uniEnv.qn_asset_url + res.key,
})
.then((res) => {
console.log('识别结果', res)
this.student.name = res.name
this.student.identityNumber = res.number
})
.catch((data) => { .catch((data) => {
if (data.errMsg == 'request:ok') { this.$u.toast('识别身份证信息错误')
this.student.name = data.data.id_card_name
this.student.identityNumber = data.data.id_card_number
} else {
this.$u.toast('识别身份证信息错误')
}
}) })
}) })
}, },
...@@ -167,14 +168,15 @@ export default { ...@@ -167,14 +168,15 @@ export default {
upload.getPhoto(1, this.token).then((res) => { upload.getPhoto(1, this.token).then((res) => {
this.student.identityBackPath = res.key this.student.identityBackPath = res.key
this.$u.api this.$u.api
.checkIdCardBack({ id_card_back: res.key }) .getCertifyInfoByType('back', {
.then(() => {}) url: process.uniEnv.qn_asset_url + res.key,
})
.then((res) => {
console.log('识别结果', res)
this.student.certificateValidityDate = res.expire
})
.catch((data) => { .catch((data) => {
if (data.errMsg == 'request:ok') { this.$u.toast('识别身份证信息错误')
this.student.certificateValidityDate = data.data.id_card_expire
} else {
this.$u.toast('识别身份证信息错误')
}
}) })
}) })
}, },
......
src/pages/mine/company.vue
View file @ 8b9a0d18
...@@ -47,10 +47,6 @@ export default { ...@@ -47,10 +47,6 @@ export default {
}, },
methods: { methods: {
submit() { submit() {
if (this.student.workUnit == '') {
this.$u.toast('请输入工作单位名称')
return
}
this.$u.api this.$u.api
.updateUserInfo({ .updateUserInfo({
workUnit: this.student.workUnit, workUnit: this.student.workUnit,
......
src/pages/mine/info.vue
View file @ 8b9a0d18
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
> >
<view slot="right-icon"> <view slot="right-icon">
<u-image <u-image
v-if="isupLoadCertPhoto" v-if="headCertPhoto"
width="92rpx" width="92rpx"
height="120rpx" height="120rpx"
:src="headCertPhoto" :src="headCertPhoto"
...@@ -82,7 +82,9 @@ import login from '@/common/login' ...@@ -82,7 +82,9 @@ import login from '@/common/login'
export default { export default {
data() { data() {
return { return {
student: {}, student: {
isCertify: false,
},
token: null, token: null,
code: '', code: '',
} }
...@@ -94,13 +96,11 @@ export default { ...@@ -94,13 +96,11 @@ export default {
) )
}, },
headCertPhoto() { headCertPhoto() {
return ( console.log(
(this.student && this.student.certificatePhotoPath) || 'touxiang bianle',
process.uniEnv.qn_base_url + 'xitongtouxiang.png' this.student ? this.student.certificatePhotoPath : 'kong'
) )
}, return (this.student && this.student.certificatePhotoPath) || false
isupLoadCertPhoto() {
return (this.student && this.student.identityNumber) || false
}, },
getMobile() { getMobile() {
return ( return (
...@@ -115,20 +115,24 @@ export default { ...@@ -115,20 +115,24 @@ export default {
return (this.student && this.student.workUnit) || '去填写' return (this.student && this.student.workUnit) || '去填写'
}, },
getCertifyStatus() { getCertifyStatus() {
return this.student && this.student.isCertify ? '已认证' : '去认证' console.log('is cert', this.student.isCertify)
return this.student.isCertify ? '已认证' : '去认证'
}, },
}, },
onLoad() { onLoad() {
this.$u.api this.$u.api
.getQiNiuToken({ bucketName: 'banshou-userprofile' }) .getQiNiuToken({ bucketName: 'banshou-userprofile' })
.then((res) => { .then((res) => {
this.token = data.data.token //token为七牛云的token一般由后台接口提供 console.log('chushihua token', res)
getApp().globalData.qiNiuToken = data.data.token this.token = res //token为七牛云的token一般由后台接口提供
getApp().globalData.qiNiuToken = res
}) })
this.$u.api.getUserInfo().then((res) => { this.$u.api.getUserInfo().then((res) => {
if (res && res.identityNumber) { console.log('huoqu userinfo', res)
this.student.isCertify = true res.isCertify =
} res && res.identityNumber && res.identityNumber.length > 5
? true
: false
this.student = res this.student = res
}) })
}, },
......
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