提交 5078ab54 authored 作者: GOD_ZYX's avatar GOD_ZYX

update

上级 9175ac8e
...@@ -7,7 +7,7 @@ const util = require('../utils/util.js') ...@@ -7,7 +7,7 @@ const util = require('../utils/util.js')
// 测试 用 cur_course_id:6438232736871219200 cur_video_id:6290435412296990720 // 测试 用 cur_course_id:6438232736871219200 cur_video_id:6290435412296990720
const getChapterList = (cur_course_id, cur_semester_id, cur_video_id, callback) => { const getChapterList = (cur_course_id, cur_semester_id, cur_video_id, callback) => {
util.requestApi({ util.requestApi({
url: util.config.URL_PATH + '/v2/education/courses/' + cur_semester_id + '/' + cur_course_id, url: util.config.URL_PATH + '/v2/education/courses/' + cur_course_id,
callback: function (res) { callback: function (res) {
let i = 0, j = 0, nextVideo = {}, prevVideo = {}; let i = 0, j = 0, nextVideo = {}, prevVideo = {};
/* 计算上一章 和 下一章 */ /* 计算上一章 和 下一章 */
...@@ -110,7 +110,7 @@ const getCurrentChapterDetail = (vid, callback) => { ...@@ -110,7 +110,7 @@ const getCurrentChapterDetail = (vid, callback) => {
// 测试 用 device_id : jjhz92fn0.le2a6c06c9g0.thhg7ekb1f8 // 测试 用 device_id : jjhz92fn0.le2a6c06c9g0.thhg7ekb1f8
const getProgress = (vid, did, sid, callback) => { const getProgress = (vid, did, sid, callback) => {
util.requestApi({ util.requestApi({
url: util.config.URL_PATH + '/v2/education/video/' + sid + '/' + vid + '/device', url: util.config.URL_PATH + '/v2/education/video/' + vid + '/device',
data: { data: {
device_id: did device_id: did
}, },
...@@ -127,7 +127,6 @@ const updateProgress = (obj) => { ...@@ -127,7 +127,6 @@ const updateProgress = (obj) => {
d: obj.did, d: obj.did,
i: obj.did, i: obj.did,
c: obj.cid, c: obj.cid,
s: obj.sid,
v: obj.vid, v: obj.vid,
_p: obj.pt, // 累计时间 _p: obj.pt, // 累计时间
_m: obj.mpt, // 当前播放最大时间 _m: obj.mpt, // 当前播放最大时间
......
...@@ -51,7 +51,7 @@ const getCourseList = (isMy, param, callback) => { ...@@ -51,7 +51,7 @@ const getCourseList = (isMy, param, callback) => {
/* 获取某个课程详细信息 - 课程考核 和 课程讨论单独获取 */ /* 获取某个课程详细信息 - 课程考核 和 课程讨论单独获取 */
const getCourseDetail = (id, sid, callback) => { const getCourseDetail = (id, sid, callback) => {
util.requestApi({ util.requestApi({
url: util.config.URL_PATH + '/v2/education/courses/' + sid + '/' + id, url: util.config.URL_PATH + '/v2/education/courses/' + id,
callback: function (res) { callback: function (res) {
let cur = res.data, _cur = cur.curriculum let cur = res.data, _cur = cur.curriculum
/* 课程类型 curriculum_elective_type 类型 改为 course_type 吴锚要求 */ /* 课程类型 curriculum_elective_type 类型 改为 course_type 吴锚要求 */
...@@ -113,11 +113,11 @@ const getCourseDetail = (id, sid, callback) => { ...@@ -113,11 +113,11 @@ const getCourseDetail = (id, sid, callback) => {
} }
}) })
} }
json.tabs1ChapterList.course.push({ // json.tabs1ChapterList.course.push({
title: '课程大作业', // title: '课程大作业',
isUp: true, // isUp: true,
chapters: [] // chapters: []
}) // })
json.tabs1ChapterList.course.push({ json.tabs1ChapterList.course.push({
title: '课程资料', title: '课程资料',
isUp: true, isUp: true,
...@@ -132,7 +132,7 @@ const getCourseDetail = (id, sid, callback) => { ...@@ -132,7 +132,7 @@ const getCourseDetail = (id, sid, callback) => {
/* 获取课程考核信息 */ /* 获取课程考核信息 */
const getCourseAssess = (cid, sid, callback) => { const getCourseAssess = (cid, sid, callback) => {
util.requestApi({ util.requestApi({
url: util.config.URL_PATH + '/v2/analytics/courses/' + sid + '/' + cid + '/evaluation', url: util.config.URL_PATH + '/v2/analytics/courses/' + cid + '/evaluation',
callback: function (res) { callback: function (res) {
let cur = res.data let cur = res.data
let video = []; let video = [];
...@@ -175,8 +175,8 @@ const getCourseAssess = (cid, sid, callback) => { ...@@ -175,8 +175,8 @@ const getCourseAssess = (cid, sid, callback) => {
video: video, video: video,
homewrok: homewrok, homewrok: homewrok,
essay: { essay: {
status: cur.essay_evaluation.status || '暂无', // status: cur.essay_evaluation.status || '暂无',
score: cur.essay_evaluation.score || '暂无' // score: cur.essay_evaluation.score || '暂无'
} }
} }
callback(json) callback(json)
...@@ -186,7 +186,7 @@ const getCourseAssess = (cid, sid, callback) => { ...@@ -186,7 +186,7 @@ const getCourseAssess = (cid, sid, callback) => {
/* 获取试题信息 */ /* 获取试题信息 */
const getExamDetail = (eid, sid, callback) => { const getExamDetail = (eid, sid, callback) => {
util.requestApi({ util.requestApi({
url: util.config.URL_PATH + '/v2/education/homeworks/' + sid + '/' + eid, url: util.config.URL_PATH + '/v2/education/homeworks/' + eid,
callback: function (res) { callback: function (res) {
callback(res) callback(res)
} }
...@@ -207,7 +207,7 @@ const submitExamDetail = (param, callback) => { ...@@ -207,7 +207,7 @@ const submitExamDetail = (param, callback) => {
const selectCourse = (cid, sid, callback) => { const selectCourse = (cid, sid, callback) => {
util.requestApi({ util.requestApi({
url: util.config.URL_PATH + '/v2/education/courses/major', url: util.config.URL_PATH + '/v2/education/courses/major',
data: { course_id: cid, semester_id: sid }, data: { course_id: cid },
method: 'POST', method: 'POST',
callback: function (res) { callback: function (res) {
callback(res) callback(res)
...@@ -218,7 +218,7 @@ const selectCourse = (cid, sid, callback) => { ...@@ -218,7 +218,7 @@ const selectCourse = (cid, sid, callback) => {
const outSelectCourse = (cid, sid, callback) => { const outSelectCourse = (cid, sid, callback) => {
util.requestApi({ util.requestApi({
url: util.config.URL_PATH + '/v2/education/courses/drop', url: util.config.URL_PATH + '/v2/education/courses/drop',
data: { course_id: cid, semester_id: sid }, data: { course_id: cid },
method: 'POST', method: 'POST',
callback: function (res) { callback: function (res) {
callback(res) callback(res)
......
...@@ -48,5 +48,6 @@ ...@@ -48,5 +48,6 @@
"selectedIconPath": "/pages/learnSystem/icons/my-on.png" "selectedIconPath": "/pages/learnSystem/icons/my-on.png"
} }
] ]
} },
"sitemapLocation": "sitemap.json"
} }
\ No newline at end of file
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
<view style='width: 100%; font-size: 30rpx; margin: 40rpx auto 10rpx auto; text-align: center;'>暂无数据</view> <view style='width: 100%; font-size: 30rpx; margin: 40rpx auto 10rpx auto; text-align: center;'>暂无数据</view>
</block> </block>
</view> </view>
<view class='table-title'>大作业</view> <!-- <view class='table-title'>大作业</view>
<view class='status-text'>状 态:{{item.assess.essay.status}}</view> <view class='status-text'>状 态:{{item.assess.essay.status}}</view>
<view class='status-text'>得 分:{{item.assess.essay.score}}</view> <view class='status-text'>得 分:{{item.assess.essay.score}}</view> -->
</view> </view>
</template> </template>
\ No newline at end of file
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<image class='img' src='{{headerInfo.bgSrc}}' mode='aspectFill'></image> <image class='img' src='{{headerInfo.bgSrc}}' mode='aspectFill'></image>
<view class='tit' bindtap='noWantThisCourse' data-cid='{{headerInfo.id}}' data-sid='{{headerInfo.sid}}'>{{headerInfo.title}}<view class='tit1'>{{headerInfo.time}}<view style='display:inline-block;height:22rpx;width:35rpx;'></view>{{headerInfo.status}}</view></view> <view class='tit' bindtap='noWantThisCourse' data-cid='{{headerInfo.id}}' data-sid='{{headerInfo.sid}}'>{{headerInfo.title}}<view class='tit1'>{{headerInfo.time}}<view style='display:inline-block;height:22rpx;width:35rpx;'></view>{{headerInfo.status}}</view></view>
<view class='group'> <view class='group'>
<block wx:for='{{headerInfo.arrTab}}' wx:key='{{index}}' wx:for-item='item1'> <block wx:for='{{headerInfo.arrTab}}' wx:key='{{index}}' wx:for-item='item1' wx:if='{{index != 2}}'>
<view class='tabs-item'>{{item1}}</view> <view class='tabs-item'>{{item1}}</view>
</block> </block>
<block wx:if='{{headerInfo.isStart && tabs[1].chapterList.currentChapterId}}'> <block wx:if='{{headerInfo.isStart && tabs[1].chapterList.currentChapterId}}'>
......
...@@ -59,12 +59,12 @@ Page({ ...@@ -59,12 +59,12 @@ Page({
*/ */
onLoad: function (options) { onLoad: function (options) {
wx.showLoading({ title: '页面加载中...', mask: true }) wx.showLoading({ title: '页面加载中...', mask: true })
CourseApi.getlearnFindList((_) => { // CourseApi.getlearnFindList((_) => {
this.setData({ 'find[0].arrItem': _ }) // this.setData({ 'find[0].arrItem': _ })
CourseApi.getCourseList(false, this.param, (json) => { // })
this.setData({ 'homeList': json }) CourseApi.getCourseList(false, this.param, (json) => {
wx.hideLoading() this.setData({ 'homeList': json })
}) wx.hideLoading()
}) })
}, },
/** /**
......
<!--pages/learnSystem/courseSquare/courseSquare.wxml--> <!--pages/learnSystem/courseSquare/courseSquare.wxml-->
<!-- 分类 --> <!-- 分类 -->
<view class='select-find'> <view class='select-find'>
<block wx:for='{{find}}' wx:key='{{index}}'> <block wx:for='{{find}}' wx:key='{{index}}' wx:if='{{index != 0}}'>
<view class='col-3'><view class='sel-item {{item.isShow ? "on" : ""}}' bindtap='selFindShow' data-index='{{index}}'>{{item.name}}</view></view> <view class='col-3'><view class='sel-item {{item.isShow ? "on" : ""}}' bindtap='selFindShow' data-index='{{index}}'>{{item.name}}</view></view>
<block wx:if='{{item.isShow}}'> <block wx:if='{{item.isShow}}'>
<view class='content'> <view class='content'>
......
...@@ -53,15 +53,15 @@ Page({ ...@@ -53,15 +53,15 @@ Page({
*/ */
onLoad: function (options) { onLoad: function (options) {
wx.showLoading({ title: '页面加载中...', mask: true }) wx.showLoading({ title: '页面加载中...', mask: true })
CourseApi.getlearnFindList((_) => { // CourseApi.getlearnFindList((_) => {
this.setData({ 'find[0].arrItem': _ }) // this.setData({ 'find[0].arrItem': _ })
CourseApi.getCourseList(true, this.param, (json) => { // })
this.setData({ 'homeList': json }) CourseApi.getCourseList(true, this.param, (json) => {
wx.hideLoading() this.setData({ 'homeList': json })
if (!json.length) { wx.hideLoading()
wx.showToast({ title: '请去选课广场选课', icon: 'none', duration: 3500 }) if (!json.length) {
} wx.showToast({ title: '请去选课广场选课', icon: 'none', duration: 3500 })
}) }
}) })
}, },
/** /**
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</view> </view>
<!-- 分类 --> <!-- 分类 -->
<view class='select-find'> <view class='select-find'>
<block wx:for='{{find}}' wx:key='{{index}}'> <block wx:for='{{find}}' wx:key='{{index}}' wx:if='{{index != 0}}'>
<view class='col-5'><view class='sel-item {{item.isShow ? "on" : ""}}' bindtap='selFindShow' data-index='{{index}}'>{{item.name}}</view></view> <view class='col-5'><view class='sel-item {{item.isShow ? "on" : ""}}' bindtap='selFindShow' data-index='{{index}}'>{{item.name}}</view></view>
<block wx:if='{{item.isShow}}'> <block wx:if='{{item.isShow}}'>
<view class='content'> <view class='content'>
......
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
<view class='text'>我的讨论</view> <view class='text'>我的讨论</view>
</view> </view>
</block> </block>
<view class='item' bindtap='goMyScore'> <!-- <view class='item' bindtap='goMyScore'>
<image class='img' src='../icons/my/my-credit.png' mode='aspectFit'></image> <image class='img' src='../icons/my/my-credit.png' mode='aspectFit'></image>
<view class='text'>我的学分</view> <view class='text'>我的学分</view>
</view> </view> -->
<view class='item' bindtap='outSystem'> <view class='item' bindtap='outSystem'>
<image class='img' src='../icons/my/out-system.png' mode='aspectFit'></image> <image class='img' src='../icons/my/out-system.png' mode='aspectFit'></image>
<view class='text'>退出系统</view> <view class='text'>退出系统</view>
......
...@@ -5,13 +5,24 @@ ...@@ -5,13 +5,24 @@
"es6": true, "es6": true,
"postcss": true, "postcss": true,
"minified": true, "minified": true,
"newFeature": true "newFeature": true,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"nodeModules": false
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.3.0", "libVersion": "2.3.0",
"appid": "wx81555c44ed2d7653", "appid": "wx81555c44ed2d7653",
"projectname": "learnOnline-enterprise", "projectname": "learnOnline-enterprise",
"isGameTourist": false, "isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": { "condition": {
"search": { "search": {
"current": -1, "current": -1,
......
{
"desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
"rules": [{
"action": "allow",
"page": "*"
}]
}
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论