merge...

learnOnline/apiService/ChapterApi.js

@@ -100,20 +100,14 @@ const getCurrentChapterDetail = (vid, videoType,callback) => {
     },
     callback: function (res) {
       // 进入视频，开始读取视频时，存储 vid、log_key
-      wx.setStorageSync({
-        key: 'video_001',
-        data: {
-          vid: vid,
-          log_key: res.data.log_key || ''
-        }
-      })
+      wx.setStorageSync('video_001', { vid: vid, log_key: res.data.log_key || ''})
       let json = {
         video: {
-          src: videoType == 3 ? res.data.video &&res.data.video.SD : res.data.video[0] && res.data.video[0].playurl,
+          src: res.data.video.SD,
           spareSrc: '' // 正式环境时，需要将 contentVideo 中 spareSrc 改成 src
         },
         audio: {
-          src: videoType == 3 ? res.data.video &&res.data.video.SQ : res.data.audio[0].url,
+          src: res.data.video.SQ,
           poster: res.data.ppts && res.data.ppts[0] && res.data.ppts[0].ppt_url || ''
         },
         image: {
@@ -131,9 +125,10 @@ const getCurrentChapterDetail = (vid, videoType,callback) => {
 /* 结束时，调用接口 */
 const endVideo = () => {
   let json = wx.getStorageSync('video_001') || { vid: '', log_key: '' }
-  if (vid !== '') {
+  if (json.vid !== '') {
     util.requestApi({
       url: util.config.URL_PATH1 + '/v2/education/end-aliyun-video-streaming',
+      method: 'POST',
       data: json,
       callback: function (res) {}
     })

learnOnline/app.js

@@ -2,9 +2,13 @@ import * as api from './api/base.js'
 
 App({
   store: {
+    pageshow: false,
     user: {} // 用户信息
   },
   onLaunch: function () {},
+  onPageNotFound() {
+    wx.redirectTo({ url: 'pages/login/index' })
+  },
   checkPageshow(callback) {
     if (this.store.pageshow) {
       callback && callback(true)

learnOnline/app.json

@@ -16,9 +16,7 @@
     "pages/learnSystem/my/my",
     "pages/learnSystem/myScore/myScore",
     "pages/learnSystem/myDiscuss/myDiscuss",
-    "pages/learnSystem/discussDetail/discussDetail",
-    "pages/videoPlayer/AllBugPages/bugPage1/bugPage1",
-    "pages/videoPlayer/AllBugPages/test"
+    "pages/learnSystem/discussDetail/discussDetail"
   ],
   "window": {
     "navigationBarBackgroundColor": "#fff",

learnOnline/config.js

@@ -3,14 +3,14 @@ const env = 'production'
 
 if (env === 'production') {
   module.exports = {
-    appVersion: 'survey_v3.2.0',
+    appVersion: 'survey_v3.2.2',
     apiBaseURL: 'https://wechat-api.ezijing.com', // 接口请求地址
     tenant: 'sofia'
   }
 } else {
   module.exports = {
-    appVersion: 'survey_v3.2.0',
-    apiBaseURL: 'https://wechat-api.ezijing.com', // 接口请求地址
+    appVersion: 'survey_v3.2.2',
+    apiBaseURL: 'https://wechat-api2.ezijing.com', // 接口请求地址
     tenant: 'sofia'
   }
 }

learnOnline/pages/videoPlayer/contentAudio/audioCtrl.js

@@ -28,7 +28,6 @@ Audio.prototype = {
   RATE: ['0.5', '0.8', '1.0', '1.25', '1.5'],
   init: function (src, _that) {
     let _auCtx = wx.createInnerAudioContext()
-    wx.setInnerAudioOption({ obeyMuteSwitch: false })
     _auCtx.autoplay = false
     _auCtx.src = src
     /* 使用绑定事件，代替wxml中的事件绑定 */

learnOnline/pages/videoPlayer/show.js

@@ -571,6 +571,7 @@ Page({
         _rProgress.pt = parseInt(_rProgress.pt) + (10000 / 1000) * 1.5
         _rProgress.cpt = tempTime
         _rProgress.mpt = tempTime > _rProgress.mpt ? tempTime : _rProgress.mpt
+        _rProgress.ps = _rProgress.ps || []
         ChapterApi.updateProgress(Object.assign({}, _rProgress, { ps: _rProgress.ps.join(',') }))
         this.realTimeProgress.ps = []
       }

learnOnline/project.config.json

 {
   "description": "项目配置文件。",
   "setting": {
-    "urlCheck": false,
+    "urlCheck": true,
     "es6": true,
     "enhance": true,
     "postcss": true,
@@ -20,14 +20,17 @@
     "compileHotReLoad": false,
     "useMultiFrameRuntime": false,
     "useApiHook": true,
+    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
+    "bundle": false,
     "useIsolateContext": true,
     "useCompilerModule": true,
     "userConfirmedUseCompilerModuleSwitch": false,
+    "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
     "minifyWXSS": true

learnOnline/utils/util.js

@@ -2,8 +2,8 @@
  * 所有相关配置项
  */
 const url_test = {
-  URL_PATH1: 'https://lms-api2.ezijing.com', // 正式域名 - 由于项目变动域名
-  URL_PATH2: 'https://sso2.ezijing.com', // 正式域名 - 由于项目变动域名
+  URL_PATH1: 'https://wechat-api2.ezijing.com/api/lms', // 正式域名 - 由于项目变动域名
+  URL_PATH2: 'https://wechat-api2.ezijing.com/api', // 正式域名 - 由于项目变动域名
   outSiteLink: 'https://e-learning.ezijing.com', // 正式外链
   tenant: 'sofia',
   version: '3.2.0'