Skip to content

S
study
Commit 41417b8c 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 d10508f3 f936315a
Hide whitespace changes
Inline Side-by-side
Showing with 339 additions and 130 deletions
.env.js
View file @ 41417b8c
;(function() {
let NODE_ENV = 'prod' // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null
let VERSION = 'v1.0.0'
let VERSION = 'v1.0.2'
if (process.env.NODE_ENV === 'development') {
if (NODE_ENV === 'dev') {
ENV_VAR = require('./.env.dev.js')
......
src/pages/cert/detailLearn.vue
View file @ 41417b8c
......@@ -18,32 +18,32 @@
</view>
<view v-if="type == 'learn'" class="item" style="margin-top: 30rpx;">
<view class="table">
<u-table border-color="#9EA5BB">
<u-tr class="u-tr">
<u-td class="u-td bg-td">姓名</u-td>
<u-td class="u-td val-td">{{name}}</u-td>
</u-tr>
<u-tr class="u-tr">
<u-td class="u-td bg-td">身份证号</u-td></u-td>
<u-td class="u-td val-td">{{idCard}}</u-td>
</u-tr>
<u-tr class="u-tr">
<u-td class="u-td bg-td">工作单位</u-td>
<u-td class="u-td val-td">{{company}}</u-td>
</u-tr>
<u-tr class="u-tr">
<u-td class="u-td bg-td">资格类型</u-td>
<u-td class="u-td val-td">{{subjectName}}</u-td>
</u-tr>
<u-tr class="u-tr">
<u-td class="u-td bg-td">培训机构</u-td>
<u-td class="u-td val-td">{{institutionName}}</u-td>
</u-tr>
<u-tr class="u-tr">
<u-td class="u-td bg-td">培训日期</u-td>
<u-td class="u-td val-td">{{learnDate}}</u-td>
</u-tr>
</u-table>
<view style="width: 100%; border: 1px solid #444550;border-bottom: none !important;border-right: none !important;border-color: #9EA5BB;">
<view style="width: 100%;display: flex;">
<view class="j-td j-title">姓名</view>
<view class="j-td j-value">{{name}}</view>
</view>
<view style="width: 100%;display: flex;">
<view class="j-td j-title">身份证号</view>
<view class="j-td j-value">{{idCard}}</view>
</view>
<view style="width: 100%;display: flex;">
<view class="j-td j-title">工作单位</view>
<view class="j-td j-value">{{company}}</view>
</view>
<view style="width: 100%;display: flex;">
<view class="j-td j-title">资格类型</view>
<view class="j-td j-value">{{subjectName}}</view>
</view>
<view style="width: 100%;display: flex;">
<view class="j-td j-title" >培训机构</view>
<view class="j-td j-value">{{subjectName}}</view>
</view>
<view style="width: 100%;display: flex;">
<view class="j-td j-title">培训日期</view>
<view class="j-td j-value">{{learnDate}}</view>
</view>
</view>
</view>
<view class="table" style="margin-top: 30rpx;">
<u-table class="table" border-color="#9EA5BB">
......@@ -151,6 +151,25 @@ export default {
</script>
<style scoped lang="scss">
.j-value{
width: 75%;
color: #5A6073 !important;
}
.j-title{
width: 25%;
color: #191C27 !important;
}
.j-td{
border: 1px solid #444550;
border-top: none !important;
border-left: none !important;
border-color: #9EA5BB !important;
padding: 18rpx 0;
font-size: 22rpx !important;
font-weight: bold;
color: #191C27;
border-bottom-color: #9ea5bb !important;
}
::-webkit-scrollbar {
width: 0;
height: 0;
......@@ -213,20 +232,9 @@ export default {
text-align: left;
padding: 30rpx 0;
}
.table {
/* background-color: #2953ff; */
/* min-height: 200rpx; */
}
::v-deep .u-td{
height: 70rpx;
}
/* ::v-deep .u-td:nth-of-type(even){
flex: 2;
} */
.bg-td{
background-color: #E8EBF3;
font-weight: bold;
}
}
.cert-foot {
height: 100rpx;
......@@ -246,6 +254,13 @@ export default {
font-weight: bold;
color: #5A6073 !important;
}
.u-tr ::v-deep .bg-td {
background-color: #E8EBF3;
font-weight: bold;
.u-td{
color: #191C27 !important;
}
}
}
.foot {
height: 100rpx;
......
src/pages/index/cert.vue
View file @ 41417b8c
......@@ -211,14 +211,20 @@ export default {
})
return
}
let param = {
let params = {
personalCertNum: this.certId,
personalName: this.certName
}
uni.showLoading({
title: '查询中，请稍后',
})
this.$u.api.getCertFromOut(param).then((res) => {
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...params,
}
getApp().track('selectCertByIdAndName', trackParams)
this.$u.api.getCertFromOut(params).then((res) => {
uni.hideLoading()
if(!res){
this.$refs.uToast.show({
......
src/pages/learn/beginAnswer.vue
View file @ 41417b8c
......@@ -25,7 +25,9 @@
</view>
<view class="line-view"></view>
<view class="tip-view"
>温馨提示：模拟考试中不能修改答案，每做错1道题扣1分，合格标准为{{ info.passPoint }}分。</view
>温馨提示：模拟考试中不能修改答案，每做错1道题扣1分，合格标准为{{
info.passPoint
}}分。</view
>
<view class="bottom-view">
<u-button
......@@ -85,32 +87,50 @@ export default {
methods: {
init() {
uni.showLoading({
title: '加载中'
})
this.$u.api.getExamPaper({questionWarehouseId: this.questionWarehouseId}).then(res => {
uni.hideLoading()
this.info = {
id: res.id,
kemu: res.echoMap?.questionWarehouseId?.title,
tishu: `${res.totalPoint}题`,
totalPoint: res.totalPoint,
biaozhun: `${res.passPoint}分`,
passPoint: res.passPoint,
duration: `${res.duration}分钟`,
durationNumber: res.duration,
guize: '根据国家规定比例随机抽取'
}
title: '加载中',
})
// 埋点-模拟考试页面获取信息
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
questionWarehouseId: this.questionWarehouseId,
}
getApp().track('getExamPaper-beginAnswerPage', trackParams)
this.$u.api
.getExamPaper({ questionWarehouseId: this.questionWarehouseId })
.then((res) => {
uni.hideLoading()
this.info = {
id: res.id,
kemu: res.echoMap?.questionWarehouseId?.title,
tishu: `${res.totalPoint}题`,
totalPoint: res.totalPoint,
biaozhun: `${res.passPoint}分`,
passPoint: res.passPoint,
duration: `${res.duration}分钟`,
durationNumber: res.duration,
guize: '根据国家规定比例随机抽取',
}
})
},
handleClick() {
const params = {
questionWarehouseId: this.questionWarehouseId,
paperId: this.info.id
paperId: this.info.id,
}
uni.showLoading({
title: '载入试题中'
title: '载入试题中',
})
this.$u.api.applyExam(params).then(res => {
// 埋点-去模拟考试
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...params,
}
getApp().track('applyExam-beginAnswerPage', trackParams)
this.$u.api.applyExam(params).then((res) => {
uni.hideLoading()
if (res) {
this.$u.route({
......@@ -120,8 +140,8 @@ export default {
source: 3,
passPoint: this.info.passPoint,
totalPoint: this.info.totalPoint,
duration: this.info.durationNumber
}
duration: this.info.durationNumber,
},
})
}
})
......
src/pages/learn/boundQuestions.vue
View file @ 41417b8c
......@@ -95,6 +95,13 @@ export default {
},
methods: {
handleClick() {
// 埋点-扫码
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
}
getApp().track('scanCode-boundQuestionsPage', trackParams)
wx.scanCode({
onlyFromCamera: true,
success: (res) => {
......@@ -142,6 +149,14 @@ export default {
uni.showLoading({
title: '加载中',
})
// 埋点-购买
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...data,
}
getApp().track('payOrder-boundQuestionsPage', trackParams)
this.$u.api.payOrder(data).then((res) => {
uni.hideLoading()
this.pay(res)
......
src/pages/learn/boundTest.vue
View file @ 41417b8c
......@@ -74,6 +74,13 @@ export default {
methods: {
handleClick() {
this.loading = true
// 埋点-绑卡
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
}
getApp().track('bindCard-boundTestPage', trackParams)
this.$u.api
.bindCard(this.param)
.then((res) => {
......
src/pages/learn/detail.vue
View file @ 41417b8c
......@@ -178,6 +178,14 @@ export default {
},
methods: {
queryQuestionWarehouseById(id) {
// 埋点-获取题库信息
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
id: id,
}
getApp().track('queryQuestionWarehouseById-DetailPage', trackParams)
this.$u.api
.queryQuestionWarehouseById(id)
.then((res) => {
......@@ -213,6 +221,14 @@ export default {
uni.showLoading({
title: '加载中',
})
// 埋点-购买
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...data,
}
getApp().track('payOrder-DetailPage', trackParams)
this.$u.api.payOrder(data).then((res) => {
uni.hideLoading()
this.pay(res)
......
src/pages/learn/examSetting.vue
View file @ 41417b8c
......@@ -210,6 +210,14 @@ export default {
},
// 获取省份列表
async getProvinceList(id) {
// 埋点-获取省份
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
id: id,
}
getApp().track('getProvinceList-examSettingPage', trackParams)
let res = await this.$u.api.getProvinceList(id)
console.log(res)
this.range = res || []
......@@ -235,6 +243,14 @@ export default {
provinceId: this.range[this.index].id,
type: this.selectedTypeId,
}
// 埋点-获取题库信息
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...param,
}
getApp().track('getQuestionWarehouse-examSettingPage', trackParams)
// 获取科目对应的题库
this.$u.api
.getQuestionWarehouse(this.category.id, param)
......@@ -242,6 +258,14 @@ export default {
if (res && res.length > 0) {
let data = res[0]
// 埋点-添加题库
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
questionWarehouseId: data.id,
}
getApp().track('addQuestionWarehouse-examSettingPage', trackParams)
// 学员增加自己的题库
this.$u.api
.addQuestionWarehouse({
......
src/pages/learn/manualBinding.vue
View file @ 41417b8c
......@@ -130,6 +130,16 @@ export default {
}
this.loading = true
// 埋点-手动绑卡
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
cardNumber: this.code,
cardSecret: this.password,
questionWarehouseId: this.relationId,
}
getApp().track('bindCard-manualBindingPage', trackParams)
this.$u.api
.bindCard({
cardNumber: this.code,
......
src/pages/learn/record.vue
View file @ 41417b8c
......@@ -236,6 +236,16 @@ export default {
'yyyy-mm-dd'
),
}
// 埋点-每日一练统计
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
id: this.questionWarehouseId,
...params,
}
getApp().track('everyTaskList-recordPage', trackParams)
this.$u.api
.everyTaskList(this.questionWarehouseId, params)
.then((res) => {
......@@ -252,6 +262,14 @@ export default {
},
// 练习分析
studyRecord(params) {
// 埋点-练习分析
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...params,
}
getApp().track('studyRecord-recordPage', trackParams)
this.$u.api
.studyRecord(this.questionWarehouseId, params)
.then((res) => {
......@@ -278,31 +296,40 @@ export default {
// 模考记录
queryExamRecord() {
this.recordParams.current += 1
;(this.recordParams.model = {
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)
}
// 埋点-模考记录
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...this.recordParams,
}
getApp().track('queryExamRecord-recordPage', trackParams)
this.currentLoadStatus =
res.total > this.lists.length &&
(res.records || []).length == this.recordParams.size
? 'loadmore'
: 'nomore'
})
.catch((err) => {
this.loaded = true
console.log(err)
})
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)
......
src/pages/learn/selectCategory.vue
View file @ 41417b8c
......@@ -150,6 +150,14 @@ export default {
async loadLabel() {
this.tapLoading = true
let param = {}
// 埋点-获取科目列表
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
}
getApp().track('subjectList-selectCategoryPage', trackParams)
let res = await this.$u.api.subjectList(param)
this.tapLoading = false
this.result = res
......
src/pages/learn/selectedList.vue
View file @ 41417b8c
......@@ -89,6 +89,14 @@ export default {
loadList() {
this.loading = true
let param = {}
// 埋点-获取已选题库列表
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
}
getApp().track('getMyQuestionWarehouseList-selectedList', trackParams)
this.$u.api
.getMyQuestionWarehouseList(param)
.then((res) => {
......
src/pages/mine/certify.vue
View file @ 41417b8c
......@@ -137,27 +137,32 @@ export default {
})
return
}
this.$u.api
.updateUserInfo({
identityFrontPath: this.student.identityFrontPath,
identityBackPath: this.student.identityBackPath,
identityNumber: this.student.identityNumber,
certificateValidityDate: this.student.certificateValidityDate,
name: this.student.name,
let params = {
identityFrontPath: this.student.identityFrontPath,
identityBackPath: this.student.identityBackPath,
identityNumber: this.student.identityNumber,
certificateValidityDate: this.student.certificateValidityDate,
name: this.student.name,
}
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...params,
}
getApp().track('vertifyIdCard', trackParams)
this.$u.api.updateUserInfo(params).then((res) => {
this.$refs.uToast.show({
title: '认证成功',
type: 'success',
duration: 2000,
})
.then((res) => {
this.$refs.uToast.show({
title: '认证成功',
type: 'success',
duration: 2000,
this.student.isCertify = true
setTimeout(() => {
this.$u.route({
type: 'back',
})
this.student.isCertify = true
setTimeout(() => {
this.$u.route({
type: 'back',
})
}, 1500)
})
}, 1500)
})
},
getFront() {
let that = this
......@@ -167,10 +172,17 @@ export default {
uni.showLoading({
title: '识别中，请稍后',
})
let params = {
url: process.uniEnv.qn_asset_url + res.key,
}
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...params,
}
getApp().track('certFrontUpload', trackParams)
this.$u.api
.getCertifyInfoByType('front', {
url: process.uniEnv.qn_asset_url + res.key,
})
.getCertifyInfoByType('front', params)
.then((res) => {
uni.hideLoading()
this.student.name = res.name
......@@ -195,10 +207,17 @@ export default {
uni.showLoading({
title: '识别中，请稍后',
})
let params = {
url: process.uniEnv.qn_asset_url + res.key,
}
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...params,
}
getApp().track('certFrontUpload', trackParams)
this.$u.api
.getCertifyInfoByType('back', {
url: process.uniEnv.qn_asset_url + res.key,
})
.getCertifyInfoByType('back', params)
.then((res) => {
uni.hideLoading()
this.student.certificateValidityDate = res.expire
......
src/pages/mine/company.vue
View file @ 41417b8c
......@@ -49,23 +49,28 @@ export default {
},
methods: {
submit() {
this.$u.api
.updateUserInfo({
workUnit: this.student.workUnit,
let params = {
workUnit: this.student.workUnit,
}
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...params,
}
getApp().track('changeCompany', trackParams)
this.$u.api.updateUserInfo(params).then((res) => {
this.isNotSet = false
this.$refs.uToast.show({
title: '保存成功',
type: 'success',
duration: 2000,
})
.then((res) => {
this.isNotSet = false
this.$refs.uToast.show({
title: '保存成功',
type: 'success',
duration: 2000,
setTimeout(() => {
this.$u.route({
type: 'back',
})
setTimeout(() => {
this.$u.route({
type: 'back',
})
}, 1500)
})
}, 1500)
})
},
},
}
......
src/pages/mine/info.vue
View file @ 41417b8c
......@@ -174,6 +174,12 @@ export default {
})
return
}
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...params,
}
getApp().track('getPhonenumber', trackParams)
this.syncUserinfo(params)
},
syncUserinfo(params) {
......@@ -241,23 +247,36 @@ export default {
})
},
changeHead() {
//获取图片
//更换头像
upload.getPhoto(2, this.qiToken).then((res) => {
this.student.avatarPath = process.uniEnv.qn_asset_url + res.key
this.$u.api.updateUserInfo({
let params = {
avatarPath: this.student.avatarPath,
})
}
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...params,
}
getApp().track('changeAvatar', trackParams)
this.$u.api.updateUserInfo(params)
})
},
changeCertPhoto() {
//获取图片
//更换证件头像
upload.getPhoto(2, this.qiToken).then((res) => {
//显示
this.student.certificatePhotoPath =
process.uniEnv.qn_asset_url + res.key
this.$u.api.updateUserInfo({
let params = {
certificatePhotoPath: this.student.certificatePhotoPath,
})
}
let trackParams = {
openId: this.openId,
nickname: this.userInfo.nickName,
...params,
}
getApp().track('changeCertPhoto', trackParams)
this.$u.api.updateUserInfo(params)
})
},
toLogin() {
......
src/pages/mine/setting.vue
View file @ 41417b8c
......@@ -27,6 +27,11 @@ export default {
methods: {
upgrade: function() {
let that = this
let trackParams = {
openId: that.openId,
nickname: that.userInfo.nickName,
}
getApp().track('upgradeVersion', trackParams)
uni.showLoading({
title: '正在更新版本...',
})
......@@ -56,6 +61,11 @@ export default {
content: '确认退出当前账号',
success: function(res) {
if (res.confirm) {
let trackParams = {
openId: that.openId,
nickname: that.userInfo.nickName,
}
getApp().track('logout', trackParams)
that.$u.vuex('vuex_token', '')
that.$u.vuex('openId', '')
that.$u.vuex('userInfo', {})
......
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