Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zuiketang
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
zuiketang
Commits
fd720b08
Commit
fd720b08
authored
Nov 22, 2016
by
xiabin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
升级vue
parent
2fe3501a
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
155 additions
and
145 deletions
+155
-145
video-intro.vue
src/frontend/web/js/home/components/video-intro.vue
+13
-7
video-play.vue
src/frontend/web/js/home/components/video-play.vue
+111
-109
info.vue
src/frontend/web/js/user-center/components/info.vue
+27
-25
info.js
src/frontend/web/js/user-center/info.js
+1
-1
package.json
src/frontend/web/package.json
+3
-3
No files found.
src/frontend/web/js/home/components/video-intro.vue
View file @
fd720b08
...
@@ -12,9 +12,9 @@
...
@@ -12,9 +12,9 @@
<small>
{{
coursewareInfo
.
comment_count
}}
</small>
<small>
{{
coursewareInfo
.
comment_count
}}
</small>
</div>
</div>
</div>
</div>
<
!--
<
div
v-if=
"coursewareInfo.isGuest"
class=
"comment-login"
>
<div
v-if=
"coursewareInfo.isGuest"
class=
"comment-login"
>
需要
<a
@
click=
"login"
href=
"javascript:;"
>
登录
</a>
才能评论
需要
<a
@
click=
"login"
href=
"javascript:;"
>
登录
</a>
才能评论
</div>
-->
</div>
<div
v-else
class=
"comment-box"
>
<div
v-else
class=
"comment-box"
>
<div
class=
"comment-input"
>
<div
class=
"comment-input"
>
...
@@ -24,21 +24,27 @@
...
@@ -24,21 +24,27 @@
<div
v-if=
"coursewareInfo.isGuest"
class=
"comment-foot clearfix"
>
<div
v-if=
"coursewareInfo.isGuest"
class=
"comment-foot clearfix"
>
<div
class=
"comment-head pull-left"
>
<div
class=
"comment-head pull-left"
>
<span>
需要
<a
@
click=
"login"
href=
"javascript:;"
>
登录
</a>
才能评论
</span>
<span>
需要
<a
@
click=
"login"
href=
"javascript:;"
>
登录
</a>
才能评论
</span>
</div>
</div>
<button
@
click=
"comment"
class=
"btn btn-info pull-right m-t-10 m-r-10"
disabled=
"disabled"
>
发表评论
</button>
<button
@
click=
"comment"
class=
"btn btn-info pull-right m-t-10 m-r-10"
disabled=
"disabled"
>
发表评论
</button>
</div>
</div>
<div
v-else
class=
"comment-foot clearfix"
>
<div
v-else
class=
"comment-foot clearfix"
>
<div
class=
"comment-head pull-left"
>
<div
class=
"comment-head pull-left"
>
<img
:src=
"coursewareInfo.userAvatar"
>
<img
:src=
"coursewareInfo.userAvatar"
>
</div>
</div>
<button
v-if=
"!coursewareInfo.isPreview"
@
click=
"comment"
class=
"btn btn-primary pull-right m-t-10 m-r-10"
>
发表评论
</button>
<button
v-if=
"!coursewareInfo.isPreview"
@
click=
"comment"
<button
v-else=
"!coursewareInfo.isPreview"
class=
"btn btn-primary pull-right m-t-10 m-r-10"
>
发表评论
</button>
class=
"btn btn-primary pull-right m-t-10 m-r-10"
>
发表评论
</button>
<button
v-else=
"!coursewareInfo.isPreview"
class=
"btn btn-primary pull-right m-t-10 m-r-10"
>
发表评论
</button>
</div>
</div>
...
...
src/frontend/web/js/home/components/video-play.vue
View file @
fd720b08
This diff is collapsed.
Click to expand it.
src/frontend/web/js/user-center/co
n
ponents/info.vue
→
src/frontend/web/js/user-center/co
m
ponents/info.vue
View file @
fd720b08
<
template
>
<
template
>
<div
id=
"edit-container"
class=
"add-box"
v-if=
"showEdit"
>
<div>
<div
class=
"add-box-main"
>
<div
id=
"edit-container"
class=
"add-box"
v-if=
"showEdit"
>
<div
class=
"tit"
>
个人信息
</div>
<div
class=
"add-box-main"
>
<div
class=
"tit"
>
个人信息
</div>
<avatar-upload
:avatar=
"avatarsrc"
:uptoken=
"publicToken"
></avatar-upload>
<avatar-upload
:avatar=
"avatarsrc"
:uptoken=
"publicToken"
></avatar-upload>
<input
id=
"avatar"
type=
"hidden"
<input
id=
"avatar"
type=
"hidden"
v-model=
"avatar"
>
v-model=
"avatar"
>
<div
class=
"type-name"
>
<div
class=
"type-name"
>
<input
id=
"username"
type=
"text"
<input
id=
"username"
type=
"text"
v-model=
"username"
v-model=
"username"
placeholder=
"请输入您的昵称..."
>
placeholder=
"请输入您的昵称..."
>
</div>
</div>
<div
class=
"btn-box m-t-20"
>
<div
class=
"btn-box m-t-20"
>
<button
@
click=
"cancel"
class=
"btn btn-nobg"
>
取消
<button
@
click=
"cancel"
class=
"btn btn-nobg"
>
取消
</button>
</button>
<button
@
click=
"save"
id=
"save"
class=
"btn btn-save m-l-10"
>
保存
</button>
<button
@
click=
"save"
id=
"save"
class=
"btn btn-save m-l-10"
>
保存
</button>
</div>
</div>
</div>
</div>
</div>
</div>
<div
v-if=
"!showEdit"
id=
"normal-container"
class=
"add-box"
>
<div
v-if=
"!showEdit"
id=
"normal-container"
class=
"add-box"
>
<div
class=
"add-box-main"
>
<div
class=
"add-box-main"
>
<div
class=
"tit"
>
个人信息
</div>
<div
class=
"tit"
>
个人信息
</div>
<div
class=
"upload-avatar"
>
<div
class=
"upload-avatar"
>
<img
id=
"avatar-uploader"
<img
id=
"avatar-uploader"
:src=
"avatarsrc"
>
:src=
"avatarsrc"
>
</div>
</div>
<div
class=
"type-name m-b-20"
>
{{
username
}}
</div>
<div
class=
"type-name m-b-20"
>
{{
username
}}
</div>
<a
@
click=
"showEdit=true"
id=
"edit"
href=
"javascript:;"
class=
"edit-info"
><i
class=
"icon-mode_edit"
></i></a>
<a
@
click=
"showEdit=true"
id=
"edit"
href=
"javascript:;"
class=
"edit-info"
><i
class=
"icon-mode_edit"
></i></a>
</div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
...
...
src/frontend/web/js/user-center/info.js
View file @
fd720b08
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* Created by xiabin on 2016/9/29.
* Created by xiabin on 2016/9/29.
*/
*/
var
Vue
=
require
(
'vue'
);
var
Vue
=
require
(
'vue'
);
var
info
=
require
(
'./co
n
ponents/info.vue'
);
var
info
=
require
(
'./co
m
ponents/info.vue'
);
new
Vue
({
new
Vue
({
el
:
'#user-center-info-container'
,
el
:
'#user-center-info-container'
,
components
:
{
components
:
{
...
...
src/frontend/web/package.json
View file @
fd720b08
...
@@ -27,8 +27,8 @@
...
@@ -27,8 +27,8 @@
"style-loader"
:
"^0.13.0"
,
"style-loader"
:
"^0.13.0"
,
"url-loader"
:
"^0.5.7"
,
"url-loader"
:
"^0.5.7"
,
"expose-loader"
:
"^0.7.1"
,
"expose-loader"
:
"^0.7.1"
,
"vue-hot-reload-api"
:
"^
2.0.6
"
,
"vue-hot-reload-api"
:
"^
1.2.0
"
,
"vue-loader"
:
"^
10.0
.0"
,
"vue-loader"
:
"^
9.4
.0"
,
"expose"
:
"^0.1.4"
,
"expose"
:
"^0.1.4"
,
"jsx-loader"
:
"^0.13.2"
,
"jsx-loader"
:
"^0.13.2"
,
"file-loader"
:
"^0.8.5"
,
"file-loader"
:
"^0.8.5"
,
...
@@ -44,6 +44,6 @@
...
@@ -44,6 +44,6 @@
"moment"
:
"^2.13.0"
,
"moment"
:
"^2.13.0"
,
"simditor"
:
"^2.3.6"
,
"simditor"
:
"^2.3.6"
,
"video.js"
:
"^5.11.9"
,
"video.js"
:
"^5.11.9"
,
"vue"
:
"^2.0.
8
"
"vue"
:
"^2.0.
1
"
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment