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
dfc202a1
Commit
dfc202a1
authored
Oct 19, 2016
by
杨培
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
321baf47
0e491e38
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
5 deletions
+15
-5
Orders.php
src/common/models/Orders.php
+1
-0
HomeController.php
src/frontend/controllers/HomeController.php
+3
-1
video-play.vue
src/frontend/web/js/home/components/video-play.vue
+11
-4
No files found.
src/common/models/Orders.php
View file @
dfc202a1
...
@@ -125,6 +125,7 @@ class Orders extends ActiveRecord
...
@@ -125,6 +125,7 @@ class Orders extends ActiveRecord
])
->
one
();
])
->
one
();
}
}
/**
/**
* 关联下单用户信息
* 关联下单用户信息
* @return $this
* @return $this
...
...
src/frontend/controllers/HomeController.php
View file @
dfc202a1
...
@@ -141,11 +141,13 @@ class HomeController extends \yii\web\Controller
...
@@ -141,11 +141,13 @@ class HomeController extends \yii\web\Controller
$coursewareInfo
[
'isFavorite'
]
=
(
Favorite
::
findByUserIdAndCoursewareId
(
$userId
,
$coursewareInfo
[
'id'
])
===
NULL
?
FALSE
:
TRUE
);
$coursewareInfo
[
'isFavorite'
]
=
(
Favorite
::
findByUserIdAndCoursewareId
(
$userId
,
$coursewareInfo
[
'id'
])
===
NULL
?
FALSE
:
TRUE
);
if
(
!
Yii
::
$app
->
user
->
isGuest
)
{
if
(
!
Yii
::
$app
->
user
->
isGuest
)
{
$coursewareInfo
[
'userAvatar'
]
=
User
::
getAvatarUrl
(
Yii
::
$app
->
user
->
identity
->
avatar
);
$coursewareInfo
[
'userAvatar'
]
=
User
::
getAvatarUrl
(
Yii
::
$app
->
user
->
identity
->
avatar
);
$order
=
Orders
::
findByUserIdAndCourseId
(
$userId
,
$courseId
);
var_dump
(
$order
->
status
);
$coursewareInfo
[
'isShop'
]
=
(
$order
!==
NULL
and
$order
->
status
===
Orders
::
PAID
?
TRUE
:
FALSE
);
}
}
$coursewareInfo
[
'price'
]
=
$course
->
price
;
$coursewareInfo
[
'price'
]
=
$course
->
price
;
$coursewareInfo
[
'classId'
]
=
$course
->
class_id
;
$coursewareInfo
[
'classId'
]
=
$course
->
class_id
;
$coursewareInfo
[
'className'
]
=
Classes
::
findOne
([
'id'
=>
$course
->
class_id
])
->
name
;
$coursewareInfo
[
'className'
]
=
Classes
::
findOne
([
'id'
=>
$course
->
class_id
])
->
name
;
return
$this
->
render
(
'video'
,
[
return
$this
->
render
(
'video'
,
[
'coursewareInfo'
=>
$coursewareInfo
'coursewareInfo'
=>
$coursewareInfo
]);
]);
...
...
src/frontend/web/js/home/components/video-play.vue
View file @
dfc202a1
...
@@ -32,9 +32,14 @@
...
@@ -32,9 +32,14 @@
<button v-if="
coursewareInfo
.
isGuest
" @click="
login
" class="
btn
btn
-
danger
m
-
l
-
20
hidden
-
xs
">购买
<button v-if="
coursewareInfo
.
isGuest
" @click="
login
" class="
btn
btn
-
danger
m
-
l
-
20
hidden
-
xs
">购买
¥{{coursewareInfo.price
}}
¥{{coursewareInfo.price
}}
</button>
</button>
<template v-else>
<button v-if="
coursewareInfo
.
isShop
" class="
btn
btn
-
danger
m
-
l
-
20
hidden
-
xs
" data-toggle="
modal
">已购买
</button>
<button v-else class="
btn
btn
-
danger
m
-
l
-
20
hidden
-
xs
" data-toggle="
modal
"
<button v-else class="
btn
btn
-
danger
m
-
l
-
20
hidden
-
xs
" data-toggle="
modal
"
data-target="
#
pay
">购买 ¥{{coursewareInfo.price
}}
data-target="
#
pay
">购买 ¥{{coursewareInfo.price
}}
</button>
</button>
</template>
</div>
</div>
</div>
</div>
...
@@ -51,7 +56,9 @@
...
@@ -51,7 +56,9 @@
<div class="
modal
-
body
">
<div class="
modal
-
body
">
<div class="
pay
-
style
">
<div class="
pay
-
style
">
<h3>¥{{coursewareInfo.price
}}
</h3>
<h3>¥{{coursewareInfo.price
}}
</h3>
<button data-dismiss="
modal
" @click="
alipay
(
coursewareInfo
.
course_id
)
" class="
btn
btn
-
alipay
">支付宝支付</button>
<button data-dismiss="
modal
" @click="
alipay
(
coursewareInfo
.
course_id
)
" class="
btn
btn
-
alipay
">
支付宝支付
</button>
<button @click="
showQrcode
=
true
" class="
btn
btn
-
wecat
">微信支付</button>
<button @click="
showQrcode
=
true
" class="
btn
btn
-
wecat
">微信支付</button>
</div>
</div>
</div>
</div>
...
...
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