Skip to content

P
pica-professional-exam
提交 a9aa9008 编写于 作者: guofeng.chen's avatar guofeng.chen
浏览文件
操作

Merge branch 'dev-coursedetail-0817' of... 

Merge branch 'dev-coursedetail-0817' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-professional-exam into dev-coursedetail-0817
上级 2579968b ab1f5525
显示空白字符变更
内嵌 并排
正在显示 包含 36 行增加 和 51 行删除
package-lock.json
浏览文件 @ a9aa9008
...@@ -2653,8 +2653,7 @@ ...@@ -2653,8 +2653,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -2675,14 +2674,12 @@ ...@@ -2675,14 +2674,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -2697,20 +2694,17 @@ ...@@ -2697,20 +2694,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -2827,8 +2821,7 @@ ...@@ -2827,8 +2821,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -2840,7 +2833,6 @@ ...@@ -2840,7 +2833,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -2855,7 +2847,6 @@ ...@@ -2855,7 +2847,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -2863,14 +2854,12 @@ ...@@ -2863,14 +2854,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -2889,7 +2878,6 @@ ...@@ -2889,7 +2878,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -2970,8 +2958,7 @@ ...@@ -2970,8 +2958,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -2983,7 +2970,6 @@ ...@@ -2983,7 +2970,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -3069,8 +3055,7 @@ ...@@ -3069,8 +3055,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -3106,7 +3091,6 @@ ...@@ -3106,7 +3091,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -3126,7 +3110,6 @@ ...@@ -3126,7 +3110,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -3170,14 +3153,12 @@ ...@@ -3170,14 +3153,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
...@@ -5008,14 +4989,12 @@ ...@@ -5008,14 +4989,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -5035,8 +5014,7 @@ ...@@ -5035,8 +5014,7 @@
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
...@@ -10751,6 +10729,11 @@ ...@@ -10751,6 +10729,11 @@
"integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
"dev": true "dev": true
}, },
"weixin-js-sdk": {
"version": "1.6.0",
"resolved": "http://192.168.110.93:4873/weixin-js-sdk/-/weixin-js-sdk-1.6.0.tgz",
"integrity": "sha512-3IYQH7aalJGFJrwdT3epvTdR1MboMiH7vIZ5BRL2eYOJ12BNah7csoMkmSZzkq1+l92sSq29XdTCVjCJoK2sBQ=="
},
"whet.extend": { "whet.extend": {
"version": "0.9.9", "version": "0.9.9",
"resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
......
package.json
浏览文件 @ a9aa9008
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
"vue": "^2.1.0", "vue": "^2.1.0",
"vue-router": "^2.1.1", "vue-router": "^2.1.1",
"vuex": "^2.0.0", "vuex": "^2.0.0",
"web-buried-point": "^2.1.0" "web-buried-point": "^2.1.0",
"weixin-js-sdk": "^1.4.0-test"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.0.0", "@babel/core": "^7.0.0",
......
src/components/common/common-navbar.vue
浏览文件 @ a9aa9008
<template> <template>
<section :class="isFixNavbar ? 'nav-top fixed' : 'nav-top'" :style="'height:' + navHeight"> <section v-if="!isWeb" :class="isFixNavbar ? 'nav-top fixed' : 'nav-top'" :style="'height:' + navHeight">
<div <div
class="nav-part" class="nav-part"
:style="'background:' + bgColor + ';' :style="'background:' + bgColor + ';'
......
src/components/common/common-tcplayer.vue
浏览文件 @ a9aa9008
...@@ -67,8 +67,7 @@ export default { ...@@ -67,8 +67,7 @@ export default {
const tcPlayer = new TcPlayer(this.id, options); const tcPlayer = new TcPlayer(this.id, options);
tcPlayer.video.on('timeupdate', (event) => { tcPlayer.video.on('timeupdate', (event) => {
let ct = tcPlayer.currentTime(); let ct = tcPlayer.currentTime();
// console.log('视频播放时长S => ', ct);
console.log('视频播放时长S => ', ct);
if (options.trySeeTime && ct >= options.trySeeTime) { if (options.trySeeTime && ct >= options.trySeeTime) {
tcPlayer.currentTime(0); tcPlayer.currentTime(0);
tcPlayer.pause(); tcPlayer.pause();
......
src/main.js
浏览文件 @ a9aa9008
...@@ -6,6 +6,8 @@ import store from './store/' ...@@ -6,6 +6,8 @@ import store from './store/'
const mixins = require('@/utils/mixins'); const mixins = require('@/utils/mixins');
import '@/utils/rem' // 引入自适应 import '@/utils/rem' // 引入自适应
import '@/utils/yqy-bridge' // 移动端服务 import '@/utils/yqy-bridge' // 移动端服务
import '@/utils/wxShare';
// import FastClick from 'fastclick'
import vueFilters from '@/utils/filter'; import vueFilters from '@/utils/filter';
import BuriedPoint, { sendBuriedData } from 'web-buried-point'; import BuriedPoint, { sendBuriedData } from 'web-buried-point';
import Vant from 'vant'; import Vant from 'vant';
......
src/utils/wxShare.js
浏览文件 @ a9aa9008
/* eslint-disable */ /* eslint-disable */
import Vue from 'vue' import Vue from 'vue'
import request from '@/service/api'; import request from '@/utils/fetch';
import wx from 'weixin-js-sdk' import wx from 'weixin-js-sdk'
import { getBaseUrl } from "@/utils/index"; import { getBaseUrl } from "@/utils/index";
/** 注入配置信息 */ /** 注入配置信息 */
export const wxConfig = (link) => { export const wxConfig = (link) => {
// const params = { resetURI: true, url: encodeURIComponent(location.href) }; // const params = { resetURI: true, url: encodeURIComponent(location.href) };
// 上线前是需要把域名改为线上的sc // 上线前是需要把域名改为线上的sc
let baseUrl = getBaseUrl(); let baseUrl = getBaseUrl("");
// request({ url: `https://sc.yunqueyi.com/wechats/signs?url=${encodeURIComponent(link)}` }).then(res => { // request({ url: `https://sc.yunqueyi.com/wechats/signs?url=${encodeURIComponent(link)}` }).then(res => {
request({ url: `${baseUrl}/wechats/signs?url=${encodeURIComponent(link)}` }).then(res => { request({ url: `${baseUrl}/wechats/signs?url=${encodeURIComponent(link)}` }).then(res => {
let configs = res.data.signMap; let configs = res.data.signMap;
......
src/views/share-merge-detail.vue
浏览文件 @ a9aa9008
...@@ -406,9 +406,9 @@ export default { ...@@ -406,9 +406,9 @@ export default {
// 跳转到原生的购买页面 // 跳转到原生的购买页面
// TODO 没有购买逻辑了 // TODO 没有购买逻辑了
confirm() { confirm() {
this.$sendBuriedData({ // this.$sendBuriedData({
component_tag: `882#88203` // component_tag: `882#88203`
}); // });
this.$refs.tcPlayerRef && this.$refs.tcPlayerRef.pause(); this.$refs.tcPlayerRef && this.$refs.tcPlayerRef.pause();
window.location.href = window.location.href =
"https://a.app.qq.com/o/simple.jsp?pkgname=com.picahealth.yunque"; "https://a.app.qq.com/o/simple.jsp?pkgname=com.picahealth.yunque";
...@@ -457,9 +457,9 @@ export default { ...@@ -457,9 +457,9 @@ export default {
console.log("in changeClick"); console.log("in changeClick");
this.showChangeCard = true; this.showChangeCard = true;
this.$sendBuriedData({ // this.$sendBuriedData({
component_tag: `882#88202` // component_tag: `882#88202`
}); // });
}, },
scrollFun() { scrollFun() {
...@@ -477,7 +477,7 @@ export default { ...@@ -477,7 +477,7 @@ export default {
} }
if (window.__isWeb) { if (window.__isWeb) {
h = intorOffsetTop - 75; h = intorOffsetTop - 88;
} else if (window.__isIOS) { } else if (window.__isIOS) {
h = intorOffsetTop - 140; h = intorOffsetTop - 140;
} }
...@@ -659,9 +659,9 @@ export default { ...@@ -659,9 +659,9 @@ export default {
} }
// 请求成功后统计，获取项目名 // 请求成功后统计，获取项目名
this.$sendBuriedData({ // this.$sendBuriedData({
component_tag: `882#88201#${_this.projectId}#${_this.project.projectName}` // component_tag: `882#88201#${_this.projectId}#${_this.project.projectName}`
}); // });
// 二次分享 // 二次分享
let shareUrl = location.href; let shareUrl = location.href;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或