Skip to content

M
mt-education-mobile
Commit 0ea331af authored by fanlin@91isoft.com's avatar fanlin@91isoft.com
Browse files
Options

Merge branches 'dev-publish' and 'master' of... 

Merge branches 'dev-publish' and 'master' of ssh://103.249.252.28:10022/wangxu/mt-education-mobile into dev-publish
parents 4070835a cbcb7d58
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 77 deletions
package-lock.json
View file @ 0ea331af
......@@ -944,9 +944,9 @@
}
},
"@tjmt/wnsdk": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/@tjmt/wnsdk/-/wnsdk-1.2.4.tgz",
"integrity": "sha512-QQ5j7qSEquU0vXTLt4i6qL+lxIzO5FF8BZ/b44N3QcORixWPsFzvrQEyTkMHxSneTT0UUZ5/Xp0LOzr/RpD/hQ=="
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/@tjmt/wnsdk/-/wnsdk-1.3.5.tgz",
"integrity": "sha512-LsATGEuA5QAAWZtdp0QF1JvhkQz1P5sqr2t8HusqAbNjzmagK98SOC7KuvP76FvVkhX8UW6ITKK1x2eistCL9g=="
},
"@types/anymatch": {
"version": "1.3.1",
......@@ -2404,6 +2404,11 @@
"resolve": "^1.4.0"
}
},
"babel-plugin-syntax-dynamic-import": {
"version": "6.18.0",
"resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
"integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo="
},
"babel-runtime": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
......@@ -8780,9 +8785,9 @@
}
},
"pdfjs-dist": {
"version": "2.2.228",
"resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.2.228.tgz",
"integrity": "sha512-W5LhYPMS2UKX0ELIa4u+CFCMoox5qQNQElt0bAK2mwz1V8jZL0rvLao+0tBujce84PK6PvWG36Nwr7agCCWFGQ==",
"version": "2.0.943",
"resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.0.943.tgz",
"integrity": "sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==",
"requires": {
"node-ensure": "^0.0.0",
"worker-loader": "^2.0.0"
......@@ -9716,6 +9721,11 @@
"unpipe": "1.0.0"
}
},
"raw-loader": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
"integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao="
},
"read-pkg": {
"version": "5.1.1",
"resolved": "https://registry.npm.taobao.org/read-pkg/download/read-pkg-5.1.1.tgz",
......@@ -11927,6 +11937,11 @@
"integrity": "sha512-yUu71+z45AII83QBjL0H5qNumjdnKoMR+2QicP0GCF7nNqCQ8hN4TK7lcYpC9eZrzljZ+Vt8KPhyhMHkvmyTxw==",
"dev": true
},
"vue-cropper": {
"version": "0.4.9",
"resolved": "https://registry.npmjs.org/vue-cropper/-/vue-cropper-0.4.9.tgz",
"integrity": "sha512-Uf1i/sCh+ZqSM9hb2YTGRENzJFH+mvDuv8N2brGLjK7UBuF7XDP7zbis8g/dcqZiMojAcBDtObFCn4ERFbRMxQ=="
},
"vue-eslint-parser": {
"version": "2.0.3",
"resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-2.0.3.tgz",
......@@ -11995,11 +12010,14 @@
"integrity": "sha1-JdHHWzpRwXAYEp3mB7RLsSCjOFo="
},
"vue-pdf": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/vue-pdf/-/vue-pdf-3.1.2.tgz",
"integrity": "sha512-O71PLAXY4yyW2Kuh4s9pm/ba0CiedOK96VbDv8WLb6HNPybXL/Pw5Kq0x0u+Z4LauN8gsk3j5eFDebzpV5S/tA==",
"version": "4.0.7",
"resolved": "https://registry.npmjs.org/vue-pdf/-/vue-pdf-4.0.7.tgz",
"integrity": "sha512-fId38x4WrD4NalJV4AFzr30iX+IyycI+ii8fFNcgikWBrhHEytZwfOFDwNv57SLgtgBMocYwm+gBIOTyvixXMg==",
"requires": {
"pdfjs-dist": "^2.0.250",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"loader-utils": "^1.2.3",
"pdfjs-dist": "2.0.943",
"raw-loader": "^0.5.1",
"vue-resize-sensor": "^2.0.0"
}
},
......
src/api/test.js
View file @ 0ea331af
import axios from '@/utils/request'
import axiosIns from 'axios'
const api = {
test: '/wangxu',
......@@ -135,18 +136,28 @@ export const get = {
})
},
// 首页 tabs列表查询课程 请求
getHomeBLessons: (params) => {
getHomeBLessons: (params, that) => {
return axios({
url: api.HomeBLessons,
method: 'get',
cancelToken: new axiosIns.CancelToken(function executor(c) { // 设置 cancel token
if (that) {
that.sourceCnacle = c
}
}),
params: params
})
},
// 首页 tabs列表查询课程 请求
getListAllLesson: (params) => {
getListAllLesson: (params, that) => {
return axios({
url: api.ListAllLesson,
method: 'get',
cancelToken: new axiosIns.CancelToken(function executor(c) { // 设置 cancel token
if (that) {
that.sourceCnacle = c
}
}),
params: params
})
},
......
src/components/Search/index.vue
View file @ 0ea331af
......@@ -234,7 +234,8 @@ export default {
}, {
name: '返积分'
}],
valueIndex: [1, 0, 1]
valueIndex: [1, 0, 1],
sourceCnacle: ''
}
},
methods: {
......@@ -293,12 +294,16 @@ export default {
if (reg.test(this.value)) {
this.value = ''
}
if (this.sourceCnacle) {
this.sourceCnacle()
}
const res = await get.getListAllLesson({
valueConsumeSort: this.freeValue !== '1' && this.costValue === '1' ? '0' : this.freeValue === '1' && this.costValue === '1' && this.returnValue === '1' ? '0' : '', // 积分消耗（1升序 0降序）
valueGainSort: (this.returnValue === '1' && this.costValue === '1') ? '0' : this.returnValue === '1' ? '0' : '', // 积分奖励（1升序 0降序）
releaseDateSort: this.returnValue !== '1' ? '0' : '', // 发布时间排序（1升序 0降序）
searchType: '0', // 查询类型 0 全部 1 推荐 2在学 3收藏 4兴趣
courseIds: '',
course: this.tabsName,
departs: '',
labelId: this.labelId, // 接收标签id
lessonType: this.lessonType, // 课程类型 0 线上课程 1 线下培训
......@@ -309,7 +314,7 @@ export default {
viewParam: this.value,
page: 1,
rows: this.pageNum
})
}, this)
// 遍历 学习人数和评论人数
res.data.data.rows.map((list) => {
if (this.returnValue === '1') {
......
src/views/Home/index.vue
View file @ 0ea331af
......@@ -96,15 +96,16 @@
<span>{{ item.menuName }}</span>
</div>
</a>
<a v-if="zcdshList.length == 0"
@click="goOutLink({url:'https://zhixin.zhiguaniot.com/eduread', title: '总裁读书会'})"
<a
v-if="zcdshList.length == 0"
@click="goOutLink({url:'https://zhixin.zhiguaniot.com/eduread', title: '总裁读书会'})"
>
<div class="menu-wrapper">
<img
class="bossSrc"
src="~@assets/images/index/01_03.png"
>
<span>{{'总裁读书会'}}</span>
<span>{{ '总裁读书会' }}</span>
</div>
</a>
</div>
......@@ -258,7 +259,10 @@
</div>
</div>
<!--tab切换-->
<div class="tabs-box" v-if="tabsList.length !== 1 || tabsContentList.length !== 0" >
<div
class="tabs-box"
v-if="tabsList.length !== 1 || tabsContentList.length !== 0"
>
<div :class="{'tabs-box-sizing': true,'tabs-position': tabsPosition}">
<tabs
class="v-tabs"
......@@ -311,7 +315,7 @@
class="default-img"
src="@assets/images/暂无数据.png"
>
<span>{{isLoadShow}}</span>
<span>{{ isLoadShow }}</span>
</div>
</div>
</div>
......@@ -323,7 +327,7 @@
class="default-img"
src="@assets/images/暂无数据.png"
>
<span>{{isLoadShowRecommend}}</span>
<span>{{ isLoadShowRecommend }}</span>
</div>
</pull-refresh>
<div
......@@ -336,7 +340,7 @@
</div>
<search-box
ref="searchBox"
:hackReset = 'hackReset'
:hack-reset="hackReset"
@onCancel="onCancel"
/>
</nav-bar-view>
......@@ -395,7 +399,8 @@ export default {
lineWidth: '60px',
zcdshList: [],
isProhibit: true,
isHiddenClose: false // 是否显示关闭及返回按钮
isHiddenClose: false, // 是否显示关闭及返回按钮
sourceCnacle: ''
}
},
filters: {
......@@ -597,33 +602,47 @@ export default {
* tabs 列表查询课程 请求
* courseLevelOne 一级课程分类 ID
*/
async HomeBLessons(courseLevelOne) {
this.isLoadShow = '加载中'
const res = await get.getHomeBLessons({
courseLevelOne: courseLevelOne,
requireId: '',
departs: [],
viewParam: '',
page: 1,
rows: this.pageNum
})
this.isLoadShow = '未筛选到相关数据'
// 遍历 学习人数和评论人数
res.data.data.rows.map((list) => {
list.personNumber !== '0' && list.personNumber !== '' ? (list.personNumber = list.personNumber + (list.lessonType === '1' ? '人报名' : '人学习')) : list.personNumber = ''
list.discussNumber === '0' || list.discussNumber === '' ? list.comment = '' : list.comment = list.discussNumber + '人评论'
})
this.tabsContentList = res.data.data.rows
this.tabsContentList.length > 0 ? this.isShow = false : this.isShow = true
// 加载状态结束
this.loading = false
// 数据全部加载完成
if (this.pageNum > res.data.data.total) {
this.finished = true
HomeBLessons(courseLevelOne) {
const that = this
if (that.sourceCnacle) {
that.sourceCnacle()
}
console.log(courseLevelOne)
console.log('___________________________________')
return new Promise(resolve => {
that.isLoadShow = '加载中'
get.getHomeBLessons({
courseLevelOne: courseLevelOne,
requireId: '',
departs: [],
viewParam: '',
page: 1,
rows: that.pageNum
}, that).then(res => {
console.log(courseLevelOne)
console.log('++++++++++++++++++++++++++++++')
that.isLoadShow = '未筛选到相关数据'
// 遍历 学习人数和评论人数
res.data.data.rows.map((list) => {
list.personNumber !== '0' && list.personNumber !== '' ? (list.personNumber = list.personNumber + (list.lessonType === '1' ? '人报名' : '人学习')) : list.personNumber = ''
list.discussNumber === '0' || list.discussNumber === '' ? list.comment = '' : list.comment = list.discussNumber + '人评论'
})
that.tabsContentList = res.data.data.rows
that.tabsContentList.length > 0 ? that.isShow = false : that.isShow = true
// 加载状态结束
that.loading = false
// 数据全部加载完成
if (that.pageNum > res.data.data.total) {
that.finished = true
}
resolve()
}).catch(err => {
console.log(err)
})
})
},
// tab标签切换事件
tabsClick(name, title) {
async tabsClick(name, title) {
if (title === '全部分类') {
name = ''
}
......@@ -632,15 +651,13 @@ export default {
this.tabsName = name
this.pageNum = 4
this.tabsContentList = []
this.$nextTick(() => {
this.HomeBLessons(name)
})
await this.HomeBLessons(name)
},
// 上拉触底 异步加载tabs内容
onLoad() {
async onLoad() {
this.pageNum = this.pageNum + 4
// // 异步更新数据
this.HomeBLessons(this.tabsName)
await this.HomeBLessons(this.tabsName)
},
// 点击更多 事件
moreClick(title) {
......
src/views/OnlineExamination/paperDetail.vue
View file @ 0ea331af
......@@ -120,7 +120,7 @@
class="radio-p"
v-for="(option,optionIndex) in item.options"
:key="optionIndex"
:class="{'correct-background': item.key.indexOf(option.alisa) !== -1 && detailObj.data.paper.showKey,'error-background': item.Answer.indexOf(option.alisa) > -1 && item.key.indexOf(item.Answer[optionIndex]) === -1 && detailObj.data.paper.showKey}"
:class="{'correct-background':item.key.indexOf(option.alisa) !== -1 && detailObj.data.paper.showKey,'error-background': item.Answer.indexOf(option.alisa) > -1 && item.key.indexOf(item.Answer[optionIndex]) === -1 && item.key.indexOf(option.alisa) === -1 && detailObj.data.paper.showKey}"
>
<van-checkbox
class="paper-detail-radio"
......@@ -333,7 +333,6 @@ export default {
pid: this.item.e_pid
}).then(result => {
const res = result
console.log(res)
this.detailObj = res
this.title = this.item.p_name
console.log(this.title, '55555555555555')
......@@ -375,7 +374,7 @@ export default {
}
// 只看错题
if (this.checked) {
if (this.detailObj.data.check[Qid] <= 3) {
if (this.detailObj.data.check[Qid] !== item.score) {
this.paper.push({
type: item.type,
id: item.id,
......@@ -407,7 +406,6 @@ export default {
}
})
})
console.log(this.paper, 'OIOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOoo')
// this.subjectContent()
},
/**
......
yarn.lock
View file @ 0ea331af
......@@ -732,10 +732,10 @@
error-stack-parser "^2.0.0"
string-width "^2.0.0"
"@tjmt/wnsdk@^1.2.6":
version "1.2.6"
resolved "https://registry.yarnpkg.com/@tjmt/wnsdk/-/wnsdk-1.2.6.tgz#2de402bf62ca2aba3237a936438b9228604acd45"
integrity sha512-d748EZQurad4SIShTNaLvwDoLlVi9HIXMMJEuX3Muah3QNnq3jNPofRwM8rs5a9V/QHtteKzyb5UTf0YRXEOqQ==
"@tjmt/wnsdk@^1.3.4":
version "1.3.5"
resolved "https://registry.yarnpkg.com/@tjmt/wnsdk/-/wnsdk-1.3.5.tgz#8dcac07389a032fb7483ceaa5b570ee60fd2c6e0"
integrity sha512-LsATGEuA5QAAWZtdp0QF1JvhkQz1P5sqr2t8HusqAbNjzmagK98SOC7KuvP76FvVkhX8UW6ITKK1x2eistCL9g==
"@types/anymatch@*":
version "1.3.1"
......@@ -814,10 +814,10 @@
"@types/webpack-sources" "*"
source-map "^0.6.0"
"@vant/icons@1.1.15":
version "1.1.15"
resolved "https://registry.yarnpkg.com/@vant/icons/-/icons-1.1.15.tgz#53c51ace21e9992bfeeb2e1ad9094fbf6506d116"
integrity sha512-96tbJotfofrKpOrUGWKkiGLJsCFc0OX5pikWLW5yarD+EMhi0zCrQSDb95xGrp/HETAFm+nSTQu2e1zGsWN/7A==
"@vant/icons@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@vant/icons/-/icons-1.2.1.tgz#309fecb97a4989866f045ce676b545c454701c8f"
integrity sha512-5ivsKQR4ySbdBW5UPoQDVqO6rdc1um3rvq/0VL+ZSA7Y3MdBQ3E4/NL0hoAY5/sZZeYfIDKEP21gpjUzdeEDQQ==
"@videojs/http-streaming@1.10.6":
version "1.10.6"
......@@ -1620,6 +1620,11 @@ babel-plugin-module-resolver@3.2.0:
reselect "^3.0.1"
resolve "^1.4.0"
babel-plugin-syntax-dynamic-import@^6.18.0:
version "6.18.0"
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=
babel-runtime@^6.9.2:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
......@@ -6451,10 +6456,10 @@ pbkdf2@^3.0.3:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
pdfjs-dist@^2.0.250:
version "2.2.228"
resolved "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.2.228.tgz#777b068a0a16c96418433303807c183058b47aaa"
integrity sha512-W5LhYPMS2UKX0ELIa4u+CFCMoox5qQNQElt0bAK2mwz1V8jZL0rvLao+0tBujce84PK6PvWG36Nwr7agCCWFGQ==
pdfjs-dist@2.0.943:
version "2.0.943"
resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.0.943.tgz#32fb9a2d863df5a1d89521a0b3cd900c16e7edde"
integrity sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==
dependencies:
node-ensure "^0.0.0"
worker-loader "^2.0.0"
......@@ -7121,6 +7126,11 @@ raw-body@2.4.0:
iconv-lite "0.4.24"
unpipe "1.0.0"
raw-loader@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
rc@^1.2.7:
version "1.2.8"
resolved "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
......@@ -8672,13 +8682,13 @@ validate-npm-package-license@^3.0.1:
spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0"
vant@^2.2.11:
version "2.2.14"
resolved "https://registry.yarnpkg.com/vant/-/vant-2.2.14.tgz#882f1d46626bc04b89bc1e1bda7171f24f0d84b7"
integrity sha512-IpYs2FsQ8ZY6EcesOD0SBl24mpnzJW/aDVGfjDoGI5fgLQJcYp24twCeLbiX9KdZ0lAgS4PKwKQjkFX/i0yHnQ==
vant@^2.0.6:
version "2.8.7"
resolved "https://registry.yarnpkg.com/vant/-/vant-2.8.7.tgz#24220a8aa6919bf34b774c3b1c1d051543453770"
integrity sha512-xwZbEsk7/ab5JY6qd4aNfiBv3VbB+4OXM8B1eCFcKMZY7rPRRLe/z0POKy3QW8Rv8cn5Q6RKMe/yTxrgE7+GcA==
dependencies:
"@babel/runtime" "7.x"
"@vant/icons" "1.1.15"
"@vant/icons" "1.2.1"
"@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
vue-lazyload "1.2.3"
......@@ -8813,6 +8823,11 @@ vue-cli-plugin-style-resources-loader@^0.1.3:
resolved "https://registry.npmjs.org/vue-cli-plugin-style-resources-loader/-/vue-cli-plugin-style-resources-loader-0.1.3.tgz#0fed01f429ba4af2f4265161dbeab9e9d233e810"
integrity sha512-yUu71+z45AII83QBjL0H5qNumjdnKoMR+2QicP0GCF7nNqCQ8hN4TK7lcYpC9eZrzljZ+Vt8KPhyhMHkvmyTxw==
vue-cropper@^0.4.9:
version "0.4.9"
resolved "https://registry.yarnpkg.com/vue-cropper/-/vue-cropper-0.4.9.tgz#fe650f32516ecf29014bbd4a9079191c8dc5a5ae"
integrity sha512-Uf1i/sCh+ZqSM9hb2YTGRENzJFH+mvDuv8N2brGLjK7UBuF7XDP7zbis8g/dcqZiMojAcBDtObFCn4ERFbRMxQ==
vue-eslint-parser@^2.0.3:
version "2.0.3"
resolved "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
......@@ -8863,12 +8878,15 @@ vue-ls@^3.2.1:
resolved "https://registry.npmjs.org/vue-ls/-/vue-ls-3.2.1.tgz#25d1c75b3a51c17018129de607b44bb120a3385a"
integrity sha512-JoZDpSu0qV5AM50vspEzOut2lcm8R0tr5WG99jMHh14qFXkUes3ZdmDMG/p8iSQVQpg0pd/svGwM9Nd7OI2oaw==
vue-pdf@3.1.2:
version "3.1.2"
resolved "https://registry.npmjs.org/vue-pdf/-/vue-pdf-3.1.2.tgz#ac6edb147db039ff6fcc4ed644d2d95115f35118"
integrity sha512-O71PLAXY4yyW2Kuh4s9pm/ba0CiedOK96VbDv8WLb6HNPybXL/Pw5Kq0x0u+Z4LauN8gsk3j5eFDebzpV5S/tA==
vue-pdf@4.0.7:
version "4.0.7"
resolved "https://registry.yarnpkg.com/vue-pdf/-/vue-pdf-4.0.7.tgz#64a5bf0cec2423f7b596d70b4b69d2717b574531"
integrity sha512-fId38x4WrD4NalJV4AFzr30iX+IyycI+ii8fFNcgikWBrhHEytZwfOFDwNv57SLgtgBMocYwm+gBIOTyvixXMg==
dependencies:
pdfjs-dist "^2.0.250"
babel-plugin-syntax-dynamic-import "^6.18.0"
loader-utils "^1.2.3"
pdfjs-dist "2.0.943"
raw-loader "^0.5.1"
vue-resize-sensor "^2.0.0"
vue-resize-sensor@^2.0.0:
......
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