Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
X
x-learn
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
EzijingWeb
x-learn
Commits
32ac98bd
提交
32ac98bd
authored
11月 06, 2020
作者:
lihuihui
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://gitlab.ezijing.com/ezijing/x-learn
# Conflicts: # src/router/routes.js
上级
b8a1a399
982239bf
显示空白字符变更
内嵌
并排
正在显示
49 个修改的文件
包含
1855 行增加
和
121 行删除
+1855
-121
.config.dev.js
.config.dev.js
+1
-1
.config.pro.js
.config.pro.js
+1
-1
.config.test.js
.config.test.js
+1
-1
.eslintrc
.eslintrc
+2
-1
course.js
src/api/course.js
+7
-1
demo.css
src/assets/font-icons/demo.css
+539
-0
demo_index.html
src/assets/font-icons/demo_index.html
+768
-0
iconfont.css
src/assets/font-icons/iconfont.css
+121
-0
iconfont.eot
src/assets/font-icons/iconfont.eot
+0
-0
iconfont.js
src/assets/font-icons/iconfont.js
+2
-0
iconfont.json
src/assets/font-icons/iconfont.json
+191
-0
iconfont.svg
src/assets/font-icons/iconfont.svg
+104
-0
iconfont.ttf
src/assets/font-icons/iconfont.ttf
+0
-0
iconfont.woff
src/assets/font-icons/iconfont.woff
+0
-0
iconfont.woff2
src/assets/font-icons/iconfont.woff2
+0
-0
avatar.png
src/assets/images/avatar.png
+0
-0
b-bj.png
src/assets/images/pay/b-bj.png
+0
-0
bottom-btn-ios.png
src/assets/images/pay/bottom-btn-ios.png
+0
-0
c1.png
src/assets/images/pay/c1.png
+0
-0
c2.png
src/assets/images/pay/c2.png
+0
-0
c3.png
src/assets/images/pay/c3.png
+0
-0
c4.png
src/assets/images/pay/c4.png
+0
-0
c5.png
src/assets/images/pay/c5.png
+0
-0
pay-izq.png
src/assets/images/pay/pay-izq.png
+0
-0
top-bj-ios.png
src/assets/images/pay/top-bj-ios.png
+0
-0
top-bj.png
src/assets/images/pay/top-bj.png
+0
-0
top-btn-ios.png
src/assets/images/pay/top-btn-ios.png
+0
-0
top-btn.png
src/assets/images/pay/top-btn.png
+0
-0
AppSearchBar.vue
src/components/AppSearchBar.vue
+1
-0
CourseList.vue
src/components/CourseList.vue
+1
-1
aside.vue
src/components/layout/aside.vue
+7
-3
index.html
src/index.html
+2
-4
main.js
src/main.js
+1
-3
index.js
src/modules/index.js
+1
-2
api.js
src/modules/viewer/api.js
+27
-45
index.vue
src/modules/viewer/components/aside/index.vue
+2
-2
chapterLive.vue
src/modules/viewer/components/live/chapterLive.vue
+1
-1
chapterPlayer.vue
src/modules/viewer/components/player/chapterPlayer.vue
+5
-5
videoPlayer.vue
src/modules/viewer/components/player/videoPlayer.vue
+5
-7
index.vue
src/modules/viewer/index.vue
+2
-15
routes.js
src/modules/viewer/routes.js
+2
-8
password.vue
src/pages/account/password.vue
+4
-4
item.vue
src/pages/course/learn/item.vue
+3
-1
index.vue
src/pages/course/tag/index.vue
+12
-2
item.vue
src/pages/course/tag/item.vue
+6
-1
routes.js
src/router/routes.js
+3
-1
index.js
src/store/index.js
+0
-7
style.scss
src/style.scss
+25
-0
axios.js
src/utils/axios.js
+8
-4
没有找到文件。
.config.dev.js
浏览文件 @
32ac98bd
...
...
@@ -33,6 +33,6 @@ module.exports = {
},
ProvidePlugin
:
{},
others
:
{
WECHAT_REDIRECT_URL
:
'https://passport2.ezijing.com
'
loginUrl
:
'https://login2.ezijing.com/xlearn/login/index
'
}
}
.config.pro.js
浏览文件 @
32ac98bd
...
...
@@ -14,6 +14,6 @@ module.exports = {
},
ProvidePlugin
:
{},
others
:
{
WECHAT_REDIRECT_URL
:
'https://passport.ezijing.com
'