Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica.cloud.web-education-admin
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
提交
议题看板
打开侧边栏
jingqi.liu
pica.cloud.web-education-admin
提交
41d51382
提交
41d51382
编写于
11月 15, 2018
作者:
chendeli
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add
上级
96191de6
变更
12
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
198 行增加
和
140 行删除
+198
-140
yqy-adjust.vue
src/components/business-new/yqy-adjust.vue
+19
-7
yqy-five-minutes.vue
src/components/business-new/yqy-five-minutes.vue
+2
-2
yqy-home-adv.vue
src/components/business-new/yqy-home-adv.vue
+7
-18
yqy-home-banner.vue
src/components/business-new/yqy-home-banner.vue
+13
-2
yqy-home-header.vue
src/components/business-new/yqy-home-header.vue
+9
-3
yqy-teacher-list.vue
src/components/business-new/yqy-teacher-list.vue
+8
-5
teach-top.vue
src/components/teachers/teach-top.vue
+1
-1
fetch.js
src/utils/fetch.js
+1
-1
index.js
src/utils/index.js
+4
-0
mixins.js
src/utils/mixins.js
+5
-4
home-new.vue
src/views/home/home-new.vue
+128
-96
detail.vue
src/views/teachers/detail.vue
+1
-1
未找到文件。
src/components/business-new/yqy-adjust.vue
浏览文件 @
41d51382
<
template
>
<
template
>
<div
class=
"cource-teach"
id=
"adjust-u"
>
<div
class=
"cource-teach"
id=
"adjust-u"
>
<div
:class=
"isFixed ? 'cource-header fixed' : 'cource-header'"
:style=
"
{
paddingTop:ptop,
height:menuHeight}">
<div
:class=
"isFixed ? 'cource-header fixed' : 'cource-header'"
:style=
"
{height:menuHeight}">
<div
class=
"font-title"
:style=
"
{
top:isFixed?ptop:'0'
}">
<div
class=
"font-title"
:style=
"
{
paddingTop:ptop
}">
{{
title
}}
{{
title
}}
</div>
</div>
...
@@ -58,6 +58,7 @@ export default {
...
@@ -58,6 +58,7 @@ export default {
isShowLoading
:
true
,
isShowLoading
:
true
,
menuHeight
:
0
,
menuHeight
:
0
,
ptop
:
0
,
ptop
:
0
,
popHeight
:
0
}
}
},
},
props
:{
props
:{
...
@@ -79,10 +80,15 @@ export default {
...
@@ -79,10 +80,15 @@ export default {
},
},
},
},
mounted
(){
mounted
(){
//alert(this.userToken+"自组建");
this
.
list
=
this
.
parmData
;
this
.
list
=
this
.
parmData
;
this
.
menuHeight
=
this
.
statusBarHeight
+
7
+
40
+
"px"
;
if
(
window
.
__isAndroid
){
this
.
ptop
=
this
.
statusBarHeight
+
"px"
;
this
.
popHeight
=
this
.
statusBarHeight
/
2
}
else
{
this
.
popHeight
=
this
.
statusBarHeight
}
this
.
menuHeight
=
this
.
popHeight
+
7
+
40
+
"px"
;
this
.
ptop
=
this
.
popHeight
+
"px"
;
// this.getData();
// this.getData();
},
},
...
@@ -172,7 +178,12 @@ export default {
...
@@ -172,7 +178,12 @@ export default {
token
:
_this
.
userToken
,
token
:
_this
.
userToken
,
type
:
status
,
type
:
status
,
courseId
:
id
,
courseId
:
id
,
setEntry
:
'headers'
setEntry
:
'headers'
,
token
:
_this
.
userToken
,
setEntry
:
'headers'
,
data
:{
token
:
_this
.
userToken
,
}
}
}
/// alert(this.token)
/// alert(this.token)
_this
.
POST
(
'contents/favors'
,
parm
).
then
(
function
(
res
){
_this
.
POST
(
'contents/favors'
,
parm
).
then
(
function
(
res
){
...
@@ -266,7 +277,7 @@ export default {
...
@@ -266,7 +277,7 @@ export default {
.font-title
{
.font-title
{
line-height
:
px2rem
(
40px
);
line-height
:
px2rem
(
40px
);
height
:
px2rem
(
40px
);
/*height: px2rem(40px);*/
background
:
#fff
;
background
:
#fff
;
}
}
}
}
...
@@ -295,6 +306,7 @@ export default {
...
@@ -295,6 +306,7 @@ export default {
}
}
}
}
.fixed
{
.fixed
{
background
:
#fff
;
.font-title
{
.font-title
{
position
:
fixed
;
position
:
fixed
;
top
:
0
;
top
:
0
;
...
...
src/components/business-new/yqy-five-minutes.vue
浏览文件 @
41d51382
<
template
>
<
template
>
<div
class=
"hot-teacher"
>
<div
class=
"hot-teacher"
>
<div
class=
"space-between"
>
<div
class=
"space-between"
id=
"fiveBoxMenu"
>
<img
class=
"img"
src=
"../../images/mins.png"
/>
<img
class=
"img"
src=
"../../images/mins.png"
/>
<div
@
click=
"goToPage('')"
class=
"five-more gray fs11"
>
<div
@
click=
"goToPage('')"
class=
"five-more gray fs11"
>
更多
<img
src=
"../../images/right-throw.png"
class=
"thorw-icon"
/>
更多
<img
src=
"../../images/right-throw.png"
class=
"thorw-icon"
/>
...
...
src/components/business-new/yqy-home-adv.vue
浏览文件 @
41d51382
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
<
script
>
<
script
>
// import { setEventByModuleCode } from '@/utils/index'
// import { setEventByModuleCode } from '@/utils/index'
import
{
jumpWebPageUrl
}
from
'@/utils/index'
export
default
{
export
default
{
data
(){
data
(){
return
{
return
{
...
@@ -50,32 +51,20 @@ export default {
...
@@ -50,32 +51,20 @@ export default {
//跳转
//跳转
goToPage
(
item
,
parm
){
goToPage
(
item
,
parm
){
console
.
log
(
item
);
//
console.log(item);
let
_this
=
this
;
let
_this
=
this
;
let
url
=
location
.
host
+
'/#/'
//let url = location.protocol+'//'+
location.host+'/#/'
//alert(url);
if
(
parm
==
'list'
){
if
(
parm
==
'list'
){
rocNative
.
gotoNewWebActivity
({
rocNative
.
gotoNewWebActivity
({
url
:
'http://10.177.10.231:8000/#/
teachers'
url
:
jumpWebPageUrl
+
'
teachers'
})
})
// this.$router.push({
// path: '/teachers',
// query:{
// userToken:_this.userToken
// }
// })
}
else
{
}
else
{
rocNative
.
gotoNewWebActivity
({
rocNative
.
gotoNewWebActivity
({
url
:
'http://10.177.10.231:8000/#/
teachersDetail?id='
+
item
.
id
+
"&from=appHome"
url
:
jumpWebPageUrl
+
'
teachersDetail?id='
+
item
.
id
+
"&from=appHome"
})
})
// this.$router.push({
// path: '/teachersDetail',
// query:{
// id:item.id,
// userToken:_this.userToken
// }
// })
}
}
// let obj = {}
// let obj = {}
...
...
src/components/business-new/yqy-home-banner.vue
浏览文件 @
41d51382
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
</
template
>
</
template
>
<
script
>
<
script
>
// import { setEventByModuleCode
} from '@/utils/index'
import
{
jumpWebPageUrl
}
from
'@/utils/index'
export
default
{
export
default
{
name
:
'YqyHomeBanner'
,
name
:
'YqyHomeBanner'
,
data
(){
data
(){
...
@@ -38,11 +38,22 @@ export default {
...
@@ -38,11 +38,22 @@ export default {
goToPage
(
itemData
){
goToPage
(
itemData
){
let
paramList
=
this
.
setEventByModuleCode
(
itemData
);
let
paramList
=
this
.
setEventByModuleCode
(
itemData
);
if
(
itemData
.
appModuleInfo
&&
itemData
.
appModuleInfo
.
code
!=
'M400'
){
if
(
itemData
.
appModuleInfo
.
code
!=
'M400'
){
//alert(itemData.appModuleInfo.code);
rocNative
.
dispatchEventByModuleCode
({
rocNative
.
dispatchEventByModuleCode
({
modeCode
:
itemData
.
appModuleInfo
.
code
,
modeCode
:
itemData
.
appModuleInfo
.
code
,
jsonString
:
paramList
jsonString
:
paramList
})
})
}
else
{
rocNative
.
gotoNewWebActivity
({
url
:
jumpWebPageUrl
+
'teachers'
})
// this.$router.push({
// path: paramList[0].url,
// query:paramList[0].query
// })
}
}
this
.
pageBurialPoin
({
this
.
pageBurialPoin
({
menuLevel
:
1
,
menuLevel
:
1
,
...
...
src/components/business-new/yqy-home-header.vue
浏览文件 @
41d51382
<
template
>
<
template
>
<div
:class=
"searchFix?'header fixed' : 'header' "
id=
"search-top"
:style=
"
{height:menuptop}">
<div
:class=
"searchFix?'header fixed' : 'header' "
id=
"search-top"
:style=
"
{height:menuptop}">
<div
class=
"search-menu"
:style=
"
{paddingTop:
ptop
}">
<div
class=
"search-menu"
:style=
"
{paddingTop:
'20px'
}">
<!--
<div
:class=
"isTransparent?'search-transparent':'bgWhite'"
class=
"search"
>
<!--
<div
:class=
"isTransparent?'search-transparent':'bgWhite'"
class=
"search"
>
<input
type=
"search"
:class=
"isTransparent?'search-transparent':''"
class=
"input"
v-model=
"searchVal"
:placeholder=
"placeholder"
:disabled=
"disabled"
/>
<input
type=
"search"
:class=
"isTransparent?'search-transparent':''"
class=
"input"
v-model=
"searchVal"
:placeholder=
"placeholder"
:disabled=
"disabled"
/>
<img
v-if=
"searchFix"
class=
"search-img"
src=
'../../images/search-grey.png'
>
<img
v-if=
"searchFix"
class=
"search-img"
src=
'../../images/search-grey.png'
>
...
@@ -28,6 +28,7 @@ export default {
...
@@ -28,6 +28,7 @@ export default {
isShowMsg
:
true
,
isShowMsg
:
true
,
ptop
:
0
,
ptop
:
0
,
menuptop
:
0
,
menuptop
:
0
,
popHeight
:
0
}
}
},
},
props
:{
props
:{
...
@@ -47,9 +48,14 @@ export default {
...
@@ -47,9 +48,14 @@ export default {
mounted
(){
mounted
(){
if
(
window
.
__isAndroid
){
this
.
popHeight
=
this
.
statusBarHeight
/
2
}
else
{
this
.
popHeight
=
this
.
statusBarHeight
}
this
.
count
=
this
.
msgCount
;
this
.
count
=
this
.
msgCount
;
this
.
ptop
=
this
.
statusBar
Height
+
7
+
'px'
;
this
.
ptop
=
this
.
pop
Height
+
7
+
'px'
;
this
.
menuptop
=
this
.
statusBarHeight
+
7
+
43
+
'px'
this
.
menuptop
=
this
.
popHeight
+
7
+
'px'
// console.log(this.statusBarHeight);
// console.log(this.statusBarHeight);
if
(
this
.
msgCount
==
''
){
if
(
this
.
msgCount
==
''
){
this
.
isShowMsg
=
false
this
.
isShowMsg
=
false
...
...
src/components/business-new/yqy-teacher-list.vue
浏览文件 @
41d51382
<
template
>
<
template
>
<div
class=
"cource-teach"
id=
"new-course"
>
<div
class=
"cource-teach"
>
<div
class=
"space-between cource-header"
>
<div
class=
"space-between cource-header"
>
<div
class=
"title"
>
{{
title
}}
</div>
<div
class=
"title"
id=
"new-course"
>
{{
title
}}
</div>
</div>
</div>
<div
class=
"couse-list"
>
<div
class=
"couse-list"
>
...
@@ -112,10 +112,13 @@ export default {
...
@@ -112,10 +112,13 @@ export default {
})
})
let
_this
=
this
,
let
_this
=
this
,
parm
=
{
parm
=
{
token
:
this
.
userToken
,
token
:
_
this
.
userToken
,
type
:
status
,
type
:
status
,
courseId
:
id
,
courseId
:
id
,
setEntry
:
'headers'
setEntry
:
'headers'
,
data
:{
token
:
_this
.
userToken
,
}
}
}
_this
.
POST
(
'contents/favors'
,
parm
).
then
(
function
(
res
){
_this
.
POST
(
'contents/favors'
,
parm
).
then
(
function
(
res
){
...
...
src/components/teachers/teach-top.vue
浏览文件 @
41d51382
...
@@ -41,7 +41,7 @@ export default {
...
@@ -41,7 +41,7 @@ export default {
methods
:
{
methods
:
{
backPre
(){
backPre
(){
alert
(
"999"
);
///
alert("999");
rocNative
.
goBack
()
rocNative
.
goBack
()
// this.$router.back(-1);
// this.$router.back(-1);
},
},
...
...
src/utils/fetch.js
浏览文件 @
41d51382
...
@@ -14,7 +14,7 @@ service.interceptors.request.use(config => {
...
@@ -14,7 +14,7 @@ service.interceptors.request.use(config => {
// console.log('config: ', config, config.data.setEntry)
// console.log('config: ', config, config.data.setEntry)
if
(
config
.
data
&&
config
.
data
.
setEntry
)
{
if
(
config
.
data
&&
config
.
data
.
setEntry
)
{
config
.
headers
[
'sysCode'
]
=
config
.
data
.
sysCode
||
10
config
.
headers
[
'sysCode'
]
=
config
.
data
.
sysCode
||
10
if
(
config
.
token
){
if
(
config
.
data
.
token
){
config
.
headers
[
'token'
]
=
config
.
data
.
token
||
'63C3FA92AF8A45A48B31EB7FD97B95EB'
config
.
headers
[
'token'
]
=
config
.
data
.
token
||
'63C3FA92AF8A45A48B31EB7FD97B95EB'
}
}
...
...
src/utils/index.js
浏览文件 @
41d51382
...
@@ -230,6 +230,8 @@ export function jumpEvaluatPage(){
...
@@ -230,6 +230,8 @@ export function jumpEvaluatPage(){
}
}
// dev地址
// dev地址
// const baseUrl = 'https://dev-sc.yunqueyi.com/'
// const baseUrl = 'https://dev-sc.yunqueyi.com/'
// const apiUrl = 'https://dev-api.yunqueyi.com/'
// const apiUrl = 'https://dev-api.yunqueyi.com/'
...
@@ -240,6 +242,8 @@ const apiUrl = 'https://test1-api.yunqueyi.com/'
...
@@ -240,6 +242,8 @@ const apiUrl = 'https://test1-api.yunqueyi.com/'
const
evaluatPageUrl
=
'https://test1-phome.yunqueyi.com/gpr/#/home'
const
evaluatPageUrl
=
'https://test1-phome.yunqueyi.com/gpr/#/home'
export
const
jumpWebPageUrl
=
'https://test1-sc.yunqueyi.com/appl/#/'
//const devApiUri = 'https://test1-api.yunqueyi.com/'
//const devApiUri = 'https://test1-api.yunqueyi.com/'
// // uat地址
// // uat地址
...
...
src/utils/mixins.js
浏览文件 @
41d51382
...
@@ -103,11 +103,12 @@ module.exports = {
...
@@ -103,11 +103,12 @@ module.exports = {
let
path
=
paramList
[
0
][
'key'
];
let
path
=
paramList
[
0
][
'key'
];
let
v
=
paramList
[
0
][
'value'
];
let
v
=
paramList
[
0
][
'value'
];
let
query
=
this
.
setRouterParm
(
paramList
);
let
query
=
this
.
setRouterParm
(
paramList
);
//alert(this.token);
paramList
=
[{
this
.
$router
.
push
({
url
:
v
,
path
:
v
,
query
:
query
query
:
query
})
}]
//alert(this.token);
}
}
if
(
typeof
paramList
===
'string'
&&
!
paramList
){
if
(
typeof
paramList
===
'string'
&&
!
paramList
){
paramList
=
[]
paramList
=
[]
...
...
src/views/home/home-new.vue
浏览文件 @
41d51382
此差异已折叠。
点击以展开。
src/views/teachers/detail.vue
浏览文件 @
41d51382
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
<div
class=
"item-line"
v-for=
"(item,index) in newsList"
>
<div
class=
"item-line"
v-for=
"(item,index) in newsList"
>
<div
class=
"line-img"
@
click=
"goToPage(item)"
>
<div
class=
"line-img"
@
click=
"goToPage(item)"
>
<img
:src=
"item.imageUrl"
>
<img
:src=
"item.imageUrl"
>
<span
class=
"tag"
>
{{
item
.
structureName
}}
</span>
<span
class=
"tag"
v-if=
"item.structureName"
>
{{
item
.
structureName
}}
</span>
<span
class=
"line-play"
@
click
.
stop=
"goToPage(item)"
>
<span
class=
"line-play"
@
click
.
stop=
"goToPage(item)"
>
<img
src=
"../../images/grey-play.png"
>
<img
src=
"../../images/grey-play.png"
>
</span>
</span>
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录