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
85bf4547
Commit
85bf4547
authored
Oct 19, 2016
by
汪波
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
32c719d0
64bf8a11
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
400 additions
and
111 deletions
+400
-111
AliPay.php
src/common/libs/alipay/AliPay.php
+1
-1
AlipayNotify.php
src/common/libs/alipay/AlipayNotify.php
+2
-1
Course.php
src/common/models/Course.php
+23
-10
Member.php
src/common/models/Member.php
+125
-2
Orders.php
src/common/models/Orders.php
+8
-6
User.php
src/common/models/User.php
+7
-6
m160927_104153_users_init.php
src/console/migrations/m160927_104153_users_init.php
+1
-0
m160927_121107_course_init.php
src/console/migrations/m160927_121107_course_init.php
+1
-1
m160927_122231_orders_init.php
src/console/migrations/m160927_122231_orders_init.php
+1
-1
main-local.php
src/environments/dev/frontend/config/main-local.php
+5
-1
main-local.php
src/environments/prod/frontend/config/main-local.php
+5
-1
HomeController.php
src/frontend/controllers/HomeController.php
+49
-13
MyCourseController.php
src/frontend/controllers/MyCourseController.php
+2
-2
MyMemberController.php
src/frontend/controllers/MyMemberController.php
+22
-1
PayController.php
src/frontend/controllers/PayController.php
+70
-43
SignupForm.php
src/frontend/models/SignupForm.php
+11
-0
index.php
src/frontend/views/my-member/index.php
+9
-6
video-intro.vue
src/frontend/web/js/home/components/video-intro.vue
+1
-1
video-play.vue
src/frontend/web/js/home/components/video-play.vue
+56
-14
webpack.config.js
src/frontend/web/webpack.config.js
+1
-1
No files found.
src/common/libs/alipay/AliPay.php
View file @
85bf4547
...
@@ -105,7 +105,7 @@ class AliPay
...
@@ -105,7 +105,7 @@ class AliPay
"partner"
=>
$this
->
alipay_config
[
'partner'
],
"partner"
=>
$this
->
alipay_config
[
'partner'
],
"seller_id"
=>
$this
->
alipay_config
[
'seller_id'
],
"seller_id"
=>
$this
->
alipay_config
[
'seller_id'
],
"payment_type"
=>
$this
->
alipay_config
[
'payment_type'
],
"payment_type"
=>
$this
->
alipay_config
[
'payment_type'
],
"
return_url"
=>
$this
->
alipay_config
[
'return
_url'
],
"
notify_url"
=>
$this
->
alipay_config
[
'notify
_url'
],
"_input_charset"
=>
trim
(
strtolower
(
$this
->
alipay_config
[
'input_charset'
]))
"_input_charset"
=>
trim
(
strtolower
(
$this
->
alipay_config
[
'input_charset'
]))
],
$para_temp
);
],
$para_temp
);
...
...
src/common/libs/alipay/AlipayNotify.php
View file @
85bf4547
...
@@ -8,7 +8,8 @@
...
@@ -8,7 +8,8 @@
namespace
common\libs\alipay
;
namespace
common\libs\alipay
;
require_once
(
dirname
(
__FILE__
)
.
"/libs/alipay_core.function.php"
);
require_once
(
dirname
(
__FILE__
)
.
"/libs/alipay_md5.function.php"
);
class
AlipayNotify
class
AlipayNotify
{
{
/**
/**
...
...
src/common/models/Course.php
View file @
85bf4547
...
@@ -13,14 +13,18 @@ use yii\redis\ActiveRecord;
...
@@ -13,14 +13,18 @@ use yii\redis\ActiveRecord;
*
*
* @property integer $id
* @property integer $id
* @property integer $user_id
* @property integer $user_id
* @property integer $class
ed
_id
* @property integer $class_id
* @property string $name
* @property string $name
* @property
integer
$price
* @property
string
$price
* @property integer $free_time
* @property integer $free_time
* @property string $intro
* @property string $intro
* @property string $preview_pic
* @property string $preview_pic
* @property integer $recommend
* @property integer $recommend
* @property integer $status
* @property integer $status
* @property integer $play_count
* @property integer $comment_count
* @property integer $favorite_count
* @property integer $support_count
* @property integer $created_at
* @property integer $created_at
* @property integer $updated_at
* @property integer $updated_at
*/
*/
...
@@ -80,7 +84,7 @@ class Course extends \yii\db\ActiveRecord
...
@@ -80,7 +84,7 @@ class Course extends \yii\db\ActiveRecord
[
'name'
,
'string'
,
'length'
=>
[
1
,
60
]],
[
'name'
,
'string'
,
'length'
=>
[
1
,
60
]],
[[
'user_id'
,
'class_id'
],
'integer'
],
[[
'user_id'
,
'class_id'
],
'integer'
],
[
'intro'
,
'string'
],
[
'intro'
,
'string'
],
[
'price'
,
'integer'
,
'min'
=>
0
,
'max'
=>
9999
],
[
[
'price'
],
'number'
],
[
'free_time'
,
'integer'
,
'min'
=>
0
,
'max'
=>
15
],
[
'free_time'
,
'integer'
,
'min'
=>
0
,
'max'
=>
15
],
[
'recommend'
,
'boolean'
],
[
'recommend'
,
'boolean'
],
[[
'recommend'
,
'comment_count'
,
'favorite_count'
,
'support_count'
,
'play_count'
],
'default'
,
'value'
=>
0
],
[[
'recommend'
,
'comment_count'
,
'favorite_count'
,
'support_count'
,
'play_count'
],
'default'
,
'value'
=>
0
],
...
@@ -94,13 +98,22 @@ class Course extends \yii\db\ActiveRecord
...
@@ -94,13 +98,22 @@ class Course extends \yii\db\ActiveRecord
public
function
attributeLabels
()
public
function
attributeLabels
()
{
{
return
[
return
[
'teacher'
=>
'讲师'
,
'id'
=>
'ID'
,
'name'
=>
'标题'
,
'user_id'
=>
'User ID'
,
'price'
=>
'价格'
,
'class_id'
=>
'Class ID'
,
'free_time'
=>
'免费试看'
,
'name'
=>
'Name'
,
'intro'
=>
'课程介绍'
,
'price'
=>
'Price'
,
'preview_pic'
=>
'预览图'
,
'free_time'
=>
'Free Time'
,
'favorite_count'
=>
'favorite_count'
'intro'
=>
'Intro'
,
'preview_pic'
=>
'Preview Pic'
,
'recommend'
=>
'0 表示推荐 1推荐'
,
'status'
=>
'0 未审核 1 审核通过 2 审核不通过 3 锁定 '
,
'play_count'
=>
'播放次数'
,
'comment_count'
=>
'评论次数'
,
'favorite_count'
=>
'收藏次数'
,
'support_count'
=>
'点赞次数'
,
'created_at'
=>
'Created At'
,
'updated_at'
=>
'Updated At'
,
];
];
}
}
...
...
src/common/models/Member.php
View file @
85bf4547
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
namespace
common\models
;
namespace
common\models
;
use
Yii
;
use
Yii
;
use
yii\data\Pagination
;
/**
/**
* This is the model class for table "member".
* This is the model class for table "member".
...
@@ -16,6 +17,10 @@ use Yii;
...
@@ -16,6 +17,10 @@ use Yii;
*/
*/
class
Member
extends
\yii\db\ActiveRecord
class
Member
extends
\yii\db\ActiveRecord
{
{
const
TYPE_VIP
=
1
;
//付费会员
const
TYPE_NORMAL
=
0
;
//普通会员
/**
/**
* @inheritdoc
* @inheritdoc
*/
*/
...
@@ -24,14 +29,30 @@ class Member extends \yii\db\ActiveRecord
...
@@ -24,14 +29,30 @@ class Member extends \yii\db\ActiveRecord
return
'member'
;
return
'member'
;
}
}
/**
* @inheritdoc
*/
public
function
behaviors
()
{
return
[
[
'class'
=>
TimestampBehavior
::
className
(),
'attributes'
=>
[
ActiveRecord
::
EVENT_BEFORE_INSERT
=>
[
'created_at'
,
'updated_at'
],
ActiveRecord
::
EVENT_BEFORE_UPDATE
=>
[
'updated_at'
],
]
]
];
}
/**
/**
* @inheritdoc
* @inheritdoc
*/
*/
public
function
rules
()
public
function
rules
()
{
{
return
[
return
[
[[
'user_id'
,
'member_id'
,
'type'
,
'created_at'
,
'updated_at'
],
'required'
],
[[
'user_id'
,
'member_id'
,
'type'
],
'required'
],
[[
'user_id'
,
'member_id'
,
'type'
,
'created_at'
,
'updated_at'
],
'integer'
],
[[
'user_id'
,
'member_id'
,
'type'
],
'integer'
],
];
];
}
}
...
@@ -49,4 +70,106 @@ class Member extends \yii\db\ActiveRecord
...
@@ -49,4 +70,106 @@ class Member extends \yii\db\ActiveRecord
'updated_at'
=>
'Updated At'
,
'updated_at'
=>
'Updated At'
,
];
];
}
}
/**
* 获取指定用户所有的会员列表
*
* @param int $userId
* @param int $page 页数,从0开始,传入 null 则使用内置分页,默认为0
* @param int $num 每页获取数量,默认10
* @param null $type 默认为获取全部会员,传入状态获取付费会员或非付费会员
* @return array
*/
public
static
function
getMembersByUserId
(
$userId
,
$page
=
0
,
$num
=
10
,
$type
=
null
)
{
$where
=
[
'user_id'
=>
$userId
];
$type
!==
null
&&
$where
[
'type'
]
=
$type
;
$count
=
self
::
find
()
->
where
(
$where
)
->
count
();
$return
=
[
'count'
=>
$count
,
'data'
=>
[]];
if
(
$page
===
NULL
)
{
$pagination
=
new
Pagination
([
'totalCount'
=>
$count
,
'pageSize'
=>
$num
,
'forcePageParam'
=>
FALSE
]);
$offset
=
$pagination
->
offset
;
$return
[
'pagination'
]
=
$pagination
;
}
else
{
$offset
=
$page
*
$num
;
}
if
(
$count
>
0
)
{
$return
[
'data'
]
=
self
::
find
()
->
select
(
'm.id,m.member_id,m.type'
)
->
alias
(
'm'
)
->
where
(
$where
)
->
with
(
'user'
)
->
offset
(
$offset
)
->
limit
(
$num
)
->
orderBy
([
'id'
=>
SORT_DESC
])
->
asArray
()
->
all
();
}
return
$return
;
}
/**
* 关联用户信息
* @return $this
*/
public
function
getUser
()
{
return
$this
->
hasOne
(
User
::
className
(),
[
'id'
=>
'member_id'
])
->
select
(
'id,username,telephone,role,avatar'
);
}
/**
* 向成员列表中注入购买和课程相关信息
*
* 向传入的二维数组中注入 credit_total 消费总额和 first_order 第一个订单的数据(其中包括课程信息)
*
* @param int $userId 所属课堂用户ID
* @param array $list 包含 member_id 的二维数组
*/
public
static
function
injectOrderInfo
(
$userId
,
&
$list
)
{
$memberIds
=
array_column
(
$list
,
'member_id'
);
if
(
!
$memberIds
)
return
;
//先取出最小订单ID和消费总额
$group
=
Income
::
find
()
->
alias
(
'i'
)
->
select
(
'MIN(i.orders_id) AS min_id, o.user_id, SUM(o.credit) AS credit_total'
)
->
join
(
'LEFT JOIN'
,
Orders
::
tableName
()
.
' o'
,
'o.id=i.orders_id'
)
->
where
([
'i.user_id'
=>
$userId
])
->
andWhere
([
'in'
,
'o.user_id'
,
$memberIds
])
->
groupBy
(
'o.user_id'
)
->
asArray
()
->
indexBy
(
'user_id'
)
->
all
();
//再取出订单关联的课程信息
if
(
$group
)
{
$orders
=
Orders
::
find
()
->
select
(
'id,course_id,credit,updated_at'
)
->
where
([
'in'
,
'id'
,
array_column
(
$group
,
'min_id'
)])
->
with
(
'course'
)
->
asArray
()
->
indexBy
(
'id'
)
->
all
();
foreach
(
$group
as
&
$row
)
{
$row
[
'first_order'
]
=
isset
(
$orders
[
$row
[
'min_id'
]])
?
$orders
[
$row
[
'min_id'
]]
:
null
;
}
unset
(
$row
);
}
foreach
(
$list
as
&
$row
)
{
$g
=
isset
(
$group
[
$row
[
'member_id'
]])
?
$group
[
$row
[
'member_id'
]]
:
null
;
$row
[
'credit_total'
]
=
$g
?
$g
[
'credit_total'
]
:
0
;
$row
[
'first_order'
]
=
$g
?
$g
[
'first_order'
]
:
null
;
}
}
public
static
function
typeCount
(
$userId
)
{
$data
=
self
::
find
()
->
select
(
'COUNT(1) AS count, type'
)
->
where
([
'user_id'
=>
$userId
])
->
groupBy
(
'type'
)
->
asArray
()
->
all
();
$count
=
[
self
::
TYPE_NORMAL
=>
0
,
self
::
TYPE_VIP
=>
0
];
foreach
(
$data
as
$row
)
{
$count
[
$row
[
'type'
]]
=
$row
[
'count'
];
}
return
$count
;
}
}
}
src/common/models/Orders.php
View file @
85bf4547
...
@@ -5,7 +5,7 @@ namespace common\models;
...
@@ -5,7 +5,7 @@ namespace common\models;
use
Yii
;
use
Yii
;
use
yii\behaviors\TimestampBehavior
;
use
yii\behaviors\TimestampBehavior
;
use
yii\data\Pagination
;
use
yii\data\Pagination
;
use
yii\
redis
\ActiveRecord
;
use
yii\
db
\ActiveRecord
;
/**
/**
* This is the model class for table "orders".
* This is the model class for table "orders".
...
@@ -20,7 +20,7 @@ use yii\redis\ActiveRecord;
...
@@ -20,7 +20,7 @@ use yii\redis\ActiveRecord;
* @property integer $created_at
* @property integer $created_at
* @property integer $updated_at
* @property integer $updated_at
*/
*/
class
Orders
extends
\yii\db\
ActiveRecord
class
Orders
extends
ActiveRecord
{
{
//订单支付状体
//订单支付状体
...
@@ -60,7 +60,8 @@ class Orders extends \yii\db\ActiveRecord
...
@@ -60,7 +60,8 @@ class Orders extends \yii\db\ActiveRecord
return
[
return
[
[[
'user_id'
,
'course_id'
,
'number'
,
'credit'
,
'pay_order'
],
'required'
],
[[
'user_id'
,
'course_id'
,
'number'
,
'credit'
,
'pay_order'
],
'required'
],
[[
'user_id'
,
'course_id'
,
'status'
,
'created_at'
,
'updated_at'
],
'integer'
],
[[
'user_id'
,
'course_id'
,
'status'
,
'created_at'
,
'updated_at'
],
'integer'
],
[[
'number'
,
'credit'
],
'string'
,
'max'
=>
32
],
[[
'number'
],
'string'
,
'max'
=>
32
],
[[
'credit'
],
'number'
],
[[
'pay_order'
],
'string'
,
'max'
=>
64
],
[[
'pay_order'
],
'string'
,
'max'
=>
64
],
];
];
}
}
...
@@ -124,6 +125,7 @@ class Orders extends \yii\db\ActiveRecord
...
@@ -124,6 +125,7 @@ class Orders extends \yii\db\ActiveRecord
])
->
one
();
])
->
one
();
}
}
/**
/**
* 关联下单用户信息
* 关联下单用户信息
* @return $this
* @return $this
...
@@ -135,7 +137,7 @@ class Orders extends \yii\db\ActiveRecord
...
@@ -135,7 +137,7 @@ class Orders extends \yii\db\ActiveRecord
/**
/**
* 关联课程信息
* 关联课程信息
* @return
$this
* @return
\yii\db\ActiveQuery
*/
*/
public
function
getCourse
()
public
function
getCourse
()
{
{
...
@@ -144,11 +146,11 @@ class Orders extends \yii\db\ActiveRecord
...
@@ -144,11 +146,11 @@ class Orders extends \yii\db\ActiveRecord
/**
/**
* 关联课程信息(包括课程的讲师列表)
* 关联课程信息(包括课程的讲师列表)
* @return
$this
* @return
\yii\db\ActiveQuery
*/
*/
public
function
getCourseWithTeachers
()
public
function
getCourseWithTeachers
()
{
{
return
$this
->
hasOne
(
Course
::
className
(),
[
'id'
=>
'course_id'
])
->
select
(
'id,user_id,name,price,preview_pic'
)
->
with
(
'teachers'
);
return
$this
->
getCourse
(
)
->
with
(
'teachers'
);
}
}
}
}
src/common/models/User.php
View file @
85bf4547
...
@@ -76,7 +76,7 @@ class User extends ActiveRecord implements IdentityInterface
...
@@ -76,7 +76,7 @@ class User extends ActiveRecord implements IdentityInterface
public
function
rules
()
public
function
rules
()
{
{
return
[
return
[
[[
'username'
,
'auth_key'
,
'password_hash'
,
'telephone'
,
'ip'
,
'logged_at'
],
'required'
],
[[
'username'
,
'auth_key'
,
'password_hash'
,
'telephone'
,
'ip'
,
'
from'
,
'
logged_at'
],
'required'
],
[[
'role'
,
'status'
],
'integer'
],
[[
'role'
,
'status'
],
'integer'
],
[[
'created_at'
,
'updated_at'
,
'logged_at'
],
'safe'
],
[[
'created_at'
,
'updated_at'
,
'logged_at'
],
'safe'
],
[[
'username'
,
'auth_key'
,
'wx_open_id'
,
'ip'
],
'string'
,
'max'
=>
32
],
[[
'username'
,
'auth_key'
,
'wx_open_id'
,
'ip'
],
'string'
,
'max'
=>
32
],
...
@@ -106,6 +106,7 @@ class User extends ActiveRecord implements IdentityInterface
...
@@ -106,6 +106,7 @@ class User extends ActiveRecord implements IdentityInterface
'avatar'
=>
'avatar'
,
'avatar'
=>
'avatar'
,
'wx_open_id'
=>
'wx_open_id'
,
'wx_open_id'
=>
'wx_open_id'
,
'ip'
=>
'ip'
,
'ip'
=>
'ip'
,
'from'
=>
'from'
,
'created_at'
=>
'created_at'
,
'created_at'
=>
'created_at'
,
'updated_at'
=>
'updated_at'
,
'updated_at'
=>
'updated_at'
,
'logged_at'
=>
'logged_at'
,
'logged_at'
=>
'logged_at'
,
...
@@ -182,15 +183,15 @@ class User extends ActiveRecord implements IdentityInterface
...
@@ -182,15 +183,15 @@ class User extends ActiveRecord implements IdentityInterface
* @param string $size 头像尺寸,目前仅支持 m,留空返回原图
* @param string $size 头像尺寸,目前仅支持 m,留空返回原图
* @return string
* @return string
*/
*/
public
static
function
getAvatarUrl
(
$avatar
,
$size
=
'm'
)
public
static
function
getAvatarUrl
(
$avatar
,
$size
=
'm'
)
{
{
if
(
!
$avatar
)
{
if
(
!
$avatar
)
{
return
\frontend\assets\AppAsset
::
getStaticUrl
(
'img/avatarMax.png'
)
;
return
\frontend\assets\AppAsset
::
getStaticUrl
(
'img/avatarMax.png'
);
}
}
$url
=
Yii
::
$app
->
qiniu
->
getUrl
(
'public'
,
$avatar
);
$url
=
Yii
::
$app
->
qiniu
->
getUrl
(
'public'
,
$avatar
);
return
$size
?
$url
.
"-
{
$size
}
.avatar"
:
$url
;
return
$size
?
$url
.
"-
{
$size
}
.avatar"
:
$url
;
}
}
/**
/**
...
...
src/console/migrations/m160927_104153_users_init.php
View file @
85bf4547
...
@@ -26,6 +26,7 @@ class m160927_104153_users_init extends Migration
...
@@ -26,6 +26,7 @@ class m160927_104153_users_init extends Migration
'avatar'
=>
$this
->
string
(
128
)
->
notNull
()
->
defaultValue
(
''
),
'avatar'
=>
$this
->
string
(
128
)
->
notNull
()
->
defaultValue
(
''
),
'wx_open_id'
=>
$this
->
string
(
32
)
->
defaultValue
(
''
)
->
comment
(
'登录微信id'
),
'wx_open_id'
=>
$this
->
string
(
32
)
->
defaultValue
(
''
)
->
comment
(
'登录微信id'
),
'ip'
=>
$this
->
string
(
32
)
->
notNull
(),
'ip'
=>
$this
->
string
(
32
)
->
notNull
(),
'from'
=>
$this
->
integer
()
->
unsigned
()
->
defaultValue
(
0
)
->
comment
(
'0 来自注册 其它为某个user_id'
),
'created_at'
=>
$this
->
integer
()
->
notNull
(),
'created_at'
=>
$this
->
integer
()
->
notNull
(),
'updated_at'
=>
$this
->
integer
()
->
notNull
(),
'updated_at'
=>
$this
->
integer
()
->
notNull
(),
'logged_at'
=>
$this
->
integer
()
->
notNull
()
'logged_at'
=>
$this
->
integer
()
->
notNull
()
...
...
src/console/migrations/m160927_121107_course_init.php
View file @
85bf4547
...
@@ -19,7 +19,7 @@ class m160927_121107_course_init extends Migration
...
@@ -19,7 +19,7 @@ class m160927_121107_course_init extends Migration
'user_id'
=>
$this
->
integer
()
->
notNull
()
->
unsigned
(),
'user_id'
=>
$this
->
integer
()
->
notNull
()
->
unsigned
(),
'class_id'
=>
$this
->
integer
(
10
)
->
notNull
()
->
unsigned
(),
'class_id'
=>
$this
->
integer
(
10
)
->
notNull
()
->
unsigned
(),
'name'
=>
$this
->
string
(
32
)
->
notNull
(),
'name'
=>
$this
->
string
(
32
)
->
notNull
(),
'price'
=>
$this
->
integer
(
10
)
->
notNull
()
->
defaultValue
(
0
),
'price'
=>
$this
->
decimal
(
6
,
2
)
->
unsigned
(
)
->
notNull
()
->
defaultValue
(
0
),
'free_time'
=>
$this
->
integer
(
10
)
->
notNull
()
->
defaultValue
(
0
),
'free_time'
=>
$this
->
integer
(
10
)
->
notNull
()
->
defaultValue
(
0
),
'intro'
=>
$this
->
text
()
->
notNull
(),
'intro'
=>
$this
->
text
()
->
notNull
(),
'preview_pic'
=>
$this
->
string
(
255
)
->
notNull
(),
'preview_pic'
=>
$this
->
string
(
255
)
->
notNull
(),
...
...
src/console/migrations/m160927_122231_orders_init.php
View file @
85bf4547
...
@@ -19,7 +19,7 @@ class m160927_122231_orders_init extends Migration
...
@@ -19,7 +19,7 @@ class m160927_122231_orders_init extends Migration
'user_id'
=>
$this
->
integer
()
->
notNull
()
->
unsigned
(),
'user_id'
=>
$this
->
integer
()
->
notNull
()
->
unsigned
(),
'course_id'
=>
$this
->
integer
()
->
notNull
()
->
unsigned
(),
'course_id'
=>
$this
->
integer
()
->
notNull
()
->
unsigned
(),
'number'
=>
$this
->
string
(
32
)
->
notNull
(),
'number'
=>
$this
->
string
(
32
)
->
notNull
(),
'credit'
=>
$this
->
string
(
32
)
->
notNull
()
->
comment
(
'消费'
),
'credit'
=>
$this
->
decimal
(
6
,
2
)
-
unsigned
(
)
->
notNull
()
->
comment
(
'消费'
),
'status'
=>
$this
->
smallInteger
()
->
notNull
()
->
defaultValue
(
0
)
->
unsigned
()
->
comment
(
'0 未支付 1 已支付'
),
'status'
=>
$this
->
smallInteger
()
->
notNull
()
->
defaultValue
(
0
)
->
unsigned
()
->
comment
(
'0 未支付 1 已支付'
),
'pay_order'
=>
$this
->
string
(
64
)
->
notNull
()
->
comment
(
'第三方支付订单'
),
'pay_order'
=>
$this
->
string
(
64
)
->
notNull
()
->
comment
(
'第三方支付订单'
),
'created_at'
=>
$this
->
integer
()
->
notNull
(),
'created_at'
=>
$this
->
integer
()
->
notNull
(),
...
...
src/environments/dev/frontend/config/main-local.php
View file @
85bf4547
...
@@ -4,7 +4,11 @@ $config = [
...
@@ -4,7 +4,11 @@ $config = [
'components'
=>
[
'components'
=>
[
'request'
=>
[
'request'
=>
[
// !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
// !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
'cookieValidationKey'
=>
'1o1zEUf8jdBvsnZy_JygPUO5_sZ7zBci'
,
'cookieValidationKey'
=>
''
,
'parsers'
=>
[
'text/xml'
=>
'light\yii2\XmlParser'
,
'application/xml'
=>
'light\yii2\XmlParser'
,
],
],
],
'session'
=>
[
'session'
=>
[
'timeout'
=>
3600
,
'timeout'
=>
3600
,
...
...
src/environments/prod/frontend/config/main-local.php
View file @
85bf4547
...
@@ -3,7 +3,11 @@
...
@@ -3,7 +3,11 @@
$config
=
[
$config
=
[
'components'
=>
[
'components'
=>
[
'request'
=>
[
'request'
=>
[
'cookieValidationKey'
=>
'1o1zEUf8jdBvsnZy_JygPUO5_sZ7zBci'
,
'cookieValidationKey'
=>
''
,
'parsers'
=>
[
'text/xml'
=>
'light\yii2\XmlParser'
,
'application/xml'
=>
'light\yii2\XmlParser'
,
],
],
],
'session'
=>
[
'session'
=>
[
'timeout'
=>
3600
,
'timeout'
=>
3600
,
...
...
src/frontend/controllers/HomeController.php
View file @
85bf4547
...
@@ -106,7 +106,6 @@ class HomeController extends \yii\web\Controller
...
@@ -106,7 +106,6 @@ class HomeController extends \yii\web\Controller
*/
*/
public
function
actionGetRecommendCourses
(
$classId
)
public
function
actionGetRecommendCourses
(
$classId
)
{
{
if
(
Yii
::
$app
->
request
->
isAjax
)
{
if
(
Yii
::
$app
->
request
->
isAjax
)
{
$result
=
Course
::
getRecommendByClassId
(
$classId
);
$result
=
Course
::
getRecommendByClassId
(
$classId
);
}
else
{
}
else
{
...
@@ -141,11 +140,12 @@ class HomeController extends \yii\web\Controller
...
@@ -141,11 +140,12 @@ 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
);
$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
]);
]);
...
@@ -387,14 +387,12 @@ class HomeController extends \yii\web\Controller
...
@@ -387,14 +387,12 @@ class HomeController extends \yii\web\Controller
$order
->
save
();
$order
->
save
();
}
else
{
}
else
{
//价格变动后给支付宝的订单编号也会变动
//价格变动后给支付宝的订单编号也会变动
if
(
$
price
!==
$order
->
credit
)
{
if
(
$
order
->
status
!==
Orders
::
PAID
)
{
$order
->
credit
=
$price
;
$order
->
credit
=
$price
;
$order
->
number
=
$number
;
$order
->
number
=
$number
;
$order
->
update
();
$order
->
update
();
}
}
}
}
$alipay
=
new
AliPay
();
$alipay
=
new
AliPay
();
$parameter
=
array
(
$parameter
=
array
(
...
@@ -413,24 +411,62 @@ class HomeController extends \yii\web\Controller
...
@@ -413,24 +411,62 @@ class HomeController extends \yii\web\Controller
}
}
/**
/**
* 获取微信支付的
二维码
* 获取微信支付的
数据
*/
*/
public
public
function
actionWeixinPayQrcode
(
$courseId
)
function
actionWeixinPayQrcode
(
$courseId
)
{
{
$userId
=
Yii
::
$app
->
user
->
identity
->
getId
();
$courseBaseInfo
=
Course
::
findBaseInfoByCourseId
(
$courseId
);
$courseBaseInfo
=
Course
::
findBaseInfoByCourseId
(
$courseId
);
if
(
$courseBaseInfo
!==
NULL
)
{
if
(
$courseBaseInfo
!==
NULL
)
{
$userId
=
Yii
::
$app
->
user
->
identity
->
getId
();
$order
=
Orders
::
findByUserIdAndCourseId
(
$userId
,
$courseId
);
$price
=
$courseBaseInfo
[
'price'
];
$price
=
$courseBaseInfo
[
'price'
];
$productId
=
$this
->
generateOrderNumber
(
$userId
,
$courseId
,
$price
);
$number
=
$this
->
generateOrderNumber
(
$userId
,
$courseId
,
$price
);
$weixinPay
=
WeixinPay
::
getInstance
();
//判断订单是否存在
return
QrCode
::
jpg
(
$weixinPay
->
makePayUrl
(
$productId
));
if
(
$order
===
NULL
)
{
$order
=
new
Orders
();
$order
->
user_id
=
$userId
;
$order
->
course_id
=
$courseId
;
$order
->
number
=
$number
;
$order
->
credit
=
$price
;
$order
->
status
=
Orders
::
UNPAID
;
$order
->
pay_order
=
'0'
;
$order
->
save
();
}
else
{
if
(
$order
->
status
!==
Orders
::
PAID
)
{
$order
->
credit
=
$price
;
$order
->
number
=
$number
;
$order
->
update
();
}
}
Utils
::
ajaxResponse
(
TRUE
,
'ok'
,
[
'number'
=>
$number
]);
}
else
{
}
else
{
throw
new
InvalidParamException
(
'参数错误'
);
throw
new
InvalidParamException
(
'参数错误'
);
}
}
}
}
/**
* 判断支付状态
* @param $number
*/
public
function
actionCheckPayStatus
(
$number
)
{
$order
=
Orders
::
findOne
([
'number'
=>
$number
]);
$result
=
(
$order
!==
NULL
and
$order
->
status
===
Orders
::
PAID
)
?
TRUE
:
FALSE
;
Utils
::
ajaxResponse
(
TRUE
,
'ok'
,
$result
);
}
/**
* @param $number
* 生成二维码
*/
public
function
actionGetQrcode
(
$number
)
{
$weixinPay
=
WeixinPay
::
getInstance
();
$url
=
$weixinPay
->
makePayUrl
(
$number
);
return
QrCode
::
jpg
(
urldecode
(
$url
));
}
/**
/**
* 移动端微信支付
* 移动端微信支付
...
@@ -482,6 +518,6 @@ class HomeController extends \yii\web\Controller
...
@@ -482,6 +518,6 @@ class HomeController extends \yii\web\Controller
private
private
function
generateOrderNumber
(
$userId
,
$courseId
,
$price
)
function
generateOrderNumber
(
$userId
,
$courseId
,
$price
)
{
{
return
md5
(
date
(
"YmdHis"
,
time
()
)
.
"_
{
$userId
}
_
{
$courseId
}
_
{
$price
}
"
);
return
md5
(
microtime
(
)
.
"_
{
$userId
}
_
{
$courseId
}
_
{
$price
}
"
);
}
}
}
}
src/frontend/controllers/MyCourseController.php
View file @
85bf4547
...
@@ -87,7 +87,7 @@ class MyCourseController extends \yii\web\Controller
...
@@ -87,7 +87,7 @@ class MyCourseController extends \yii\web\Controller
$request
=
Yii
::
$app
->
request
;
$request
=
Yii
::
$app
->
request
;
$userId
=
Yii
::
$app
->
user
->
identity
->
getId
();
$userId
=
Yii
::
$app
->
user
->
identity
->
getId
();
$classId
=
1
;
$classId
=
$this
->
classStatus
[
'id'
]
;
//验证临时ID
//验证临时ID
$tmpId
=
$request
->
post
(
'tmp'
);
$tmpId
=
$request
->
post
(
'tmp'
);
...
@@ -240,7 +240,7 @@ class MyCourseController extends \yii\web\Controller
...
@@ -240,7 +240,7 @@ class MyCourseController extends \yii\web\Controller
$action
=
Yii
::
$app
->
request
->
get
(
'action'
);
$action
=
Yii
::
$app
->
request
->
get
(
'action'
);
$userId
=
Yii
::
$app
->
user
->
identity
->
getId
();
$userId
=
Yii
::
$app
->
user
->
identity
->
getId
();
$course
=
Course
::
getBasicData
(
$id
);
$course
=
Course
::
findBaseInfoByCourseId
(
$id
);
if
(
!
$course
)
{
if
(
!
$course
)
{
throw
new
\yii\web\NotFoundHttpException
;
throw
new
\yii\web\NotFoundHttpException
;
...
...
src/frontend/controllers/MyMemberController.php
View file @
85bf4547
...
@@ -2,14 +2,35 @@
...
@@ -2,14 +2,35 @@
namespace
frontend\controllers
;
namespace
frontend\controllers
;
use
common\models\Member
;
use
Yii
;
class
MyMemberController
extends
\yii\web\Controller
class
MyMemberController
extends
\yii\web\Controller
{
{
public
$layout
=
'classCenter'
;
public
$layout
=
'classCenter'
;
/**
* 我的会员
* @return string
*/
public
function
actionIndex
()
public
function
actionIndex
()
{
{
return
$this
->
render
(
'index'
);
$type
=
Yii
::
$app
->
request
->
get
(
'type'
);
in_array
(
$type
,
[
0
,
1
])
||
$type
=
null
;
$uid
=
Yii
::
$app
->
user
->
getId
();
$typeCount
=
Member
::
typeCount
(
$uid
);
$data
=
Member
::
getMembersByUserId
(
$uid
,
null
,
20
);
//注入订单等信息
if
(
$data
[
'count'
]
>
0
)
{
Member
::
injectOrderInfo
(
$uid
,
$data
[
'data'
]);
}
return
$this
->
render
(
'index'
,
$data
+
compact
(
'typeCount'
));
}
}
}
}
src/frontend/controllers/PayController.php
View file @
85bf4547
...
@@ -15,6 +15,7 @@ use common\libs\WeixinPay;
...
@@ -15,6 +15,7 @@ use common\libs\WeixinPay;
use
common\models\Consume
;
use
common\models\Consume
;
use
common\models\Course
;
use
common\models\Course
;
use
common\models\Income
;
use
common\models\Income
;
use
common\models\Member
;
use
common\models\Orders
;
use
common\models\Orders
;
use
dosamigos\qrcode\formats\Wifi
;
use
dosamigos\qrcode\formats\Wifi
;
use
GuzzleHttp\Client
;
use
GuzzleHttp\Client
;
...
@@ -42,7 +43,6 @@ class PayController extends Controller
...
@@ -42,7 +43,6 @@ class PayController extends Controller
//获取支付宝的通知返回参数,可参考技术文档中服务器异步通知参数列表
//获取支付宝的通知返回参数,可参考技术文档中服务器异步通知参数列表
//商户订单号
//商户订单号
$out_trade_no
=
$_POST
[
'out_trade_no'
];
$out_trade_no
=
$_POST
[
'out_trade_no'
];
$trade_no
=
$_POST
[
'trade_no'
];
$trade_no
=
$_POST
[
'trade_no'
];
...
@@ -50,7 +50,7 @@ class PayController extends Controller
...
@@ -50,7 +50,7 @@ class PayController extends Controller
$order
=
Orders
::
findOne
([
'number'
=>
$out_trade_no
]);
$order
=
Orders
::
findOne
([
'number'
=>
$out_trade_no
]);
if
(
$order
!==
NULL
and
$order
->
status
!==
Orders
::
PAID
)
{
//交易状态
//交易状态
$trade_status
=
$_POST
[
'trade_status'
];
$trade_status
=
$_POST
[
'trade_status'
];
...
@@ -72,6 +72,21 @@ class PayController extends Controller
...
@@ -72,6 +72,21 @@ class PayController extends Controller
$order
->
update
();
$order
->
update
();
}
}
//判断是否为会员 不是则添加
$member
=
Member
::
findOne
([
'user_id'
=>
$courseInfo
[
'user_id'
],
'member_id'
=>
$order
->
user_id
]);
if
(
$member
===
NULL
)
{
$member
=
new
Member
();
$member
->
user_id
=
$courseInfo
[
'user_id'
];
$member
->
member_id
=
$order
->
user_id
;
$member
->
type
=
Member
::
TYPE_VIP
;
$member
->
save
();
}
else
{
if
(
$member
->
type
!=
Member
::
TYPE_VIP
)
{
$member
->
type
=
Member
::
TYPE_VIP
;
$member
->
update
();
}
}
}
//——请根据您的业务逻辑来编写程序(以上代码仅作参考)——
//——请根据您的业务逻辑来编写程序(以上代码仅作参考)——
echo
"success"
;
//请不要修改或删除
echo
"success"
;
//请不要修改或删除
...
@@ -94,8 +109,6 @@ class PayController extends Controller
...
@@ -94,8 +109,6 @@ class PayController extends Controller
*/
*/
public
function
actionWeixinPayCallback
()
public
function
actionWeixinPayCallback
()
{
{
//获取
//获取
$data
=
(
\Yii
::
$app
->
request
->
post
());
$data
=
(
\Yii
::
$app
->
request
->
post
());
$weixinpay
=
\Yii
::
$app
->
params
[
'weixinpay'
];
$weixinpay
=
\Yii
::
$app
->
params
[
'weixinpay'
];
...
@@ -178,7 +191,6 @@ class PayController extends Controller
...
@@ -178,7 +191,6 @@ class PayController extends Controller
'sign'
=>
''
'sign'
=>
''
];
];
$return
[
'sign'
]
=
WeixinPay
::
makeWeixinPaySign
(
$return
,
$weixinpay
[
'key'
]);
$return
[
'sign'
]
=
WeixinPay
::
makeWeixinPaySign
(
$return
,
$weixinpay
[
'key'
]);
//生成订单数据
return
\Yii
::
createObject
([
return
\Yii
::
createObject
([
'class'
=>
'yii\web\Response'
,
'class'
=>
'yii\web\Response'
,
...
@@ -221,7 +233,7 @@ class PayController extends Controller
...
@@ -221,7 +233,7 @@ class PayController extends Controller
]);
]);
}
}
$weixinpay
=
\Yii
::
$app
->
params
[
'weixinpay'
];
$weixinpay
=
\Yii
::
$app
->
params
[
'weixinpay'
];
if
(
$data
[
'sign'
]
!==
$weixinpay
[
'key'
]
)
{
if
(
$data
[
'sign'
]
!==
WeixinPay
::
makeWeixinPaySign
(
$data
,
$weixinpay
[
'key'
])
)
{
return
\Yii
::
createObject
([
return
\Yii
::
createObject
([
'class'
=>
'yii\web\Response'
,
'class'
=>
'yii\web\Response'
,
'format'
=>
\yii\web\Response
::
FORMAT_XML
,
'format'
=>
\yii\web\Response
::
FORMAT_XML
,
...
@@ -240,7 +252,9 @@ class PayController extends Controller
...
@@ -240,7 +252,9 @@ class PayController extends Controller
$orderId
=
$data
[
'out_trade_no'
];
$orderId
=
$data
[
'out_trade_no'
];
$payOrder
=
$data
[
'transaction_id'
];
$payOrder
=
$data
[
'transaction_id'
];
//修改订单状态
$order
=
Orders
::
findOne
([
'number'
=>
$orderId
]);
if
(
$order
!==
NULL
and
$order
->
status
!==
Orders
::
PAID
)
{
//修改订单状态
$order
=
Orders
::
findOne
([
'number'
=>
$orderId
]);
$order
=
Orders
::
findOne
([
'number'
=>
$orderId
]);
$order
->
status
=
Orders
::
PAID
;
$order
->
status
=
Orders
::
PAID
;
$order
->
pay_order
=
$payOrder
;
$order
->
pay_order
=
$payOrder
;
...
@@ -257,6 +271,21 @@ class PayController extends Controller
...
@@ -257,6 +271,21 @@ class PayController extends Controller
$income
->
user_id
=
$courseInfo
[
'user_id'
];
$income
->
user_id
=
$courseInfo
[
'user_id'
];
$income
->
save
();
$income
->
save
();
//判断是否为会员 不是则添加
$member
=
Member
::
findOne
([
'user_id'
=>
$courseInfo
[
'user_id'
],
'member_id'
=>
$order
->
user_id
]);
if
(
$member
===
NULL
)
{
$member
=
new
Member
();
$member
->
user_id
=
$courseInfo
[
'user_id'
];
$member
->
member_id
=
$order
->
user_id
;
$member
->
type
=
Member
::
TYPE_VIP
;
$member
->
save
();
}
else
{
if
(
$member
->
type
!=
Member
::
TYPE_VIP
)
{
$member
->
type
=
Member
::
TYPE_VIP
;
$member
->
update
();
}
}
}
return
\Yii
::
createObject
([
return
\Yii
::
createObject
([
'class'
=>
'yii\web\Response'
,
'class'
=>
'yii\web\Response'
,
'format'
=>
\yii\web\Response
::
FORMAT_XML
,
'format'
=>
\yii\web\Response
::
FORMAT_XML
,
...
@@ -274,5 +303,3 @@ class PayController extends Controller
...
@@ -274,5 +303,3 @@ class PayController extends Controller
}
}
}
}
opcache_invalidate
(
__FILE__
);
\ No newline at end of file
src/frontend/models/SignupForm.php
View file @
85bf4547
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
namespace
frontend\models
;
namespace
frontend\models
;
use
common\libs\Utils
;
use
common\libs\Utils
;
use
common\models\Member
;
use
Yii
;
use
Yii
;
use
yii\base\Model
;
use
yii\base\Model
;
use
common\models\User
;
use
common\models\User
;
...
@@ -59,10 +60,20 @@ class SignupForm extends Model
...
@@ -59,10 +60,20 @@ class SignupForm extends Model
$user
->
logged_at
=
time
();
$user
->
logged_at
=
time
();
$user
->
avatar
=
''
;
$user
->
avatar
=
''
;
$user
->
ip
=
Utils
::
getRealIP
();
$user
->
ip
=
Utils
::
getRealIP
();
$user
->
from
=
$this
->
from
;
if
(
!
$user
->
save
())
{
if
(
!
$user
->
save
())
{
Yii
::
getLogger
()
->
log
(
$user
->
getErrors
(),
Logger
::
LEVEL_ERROR
);
Yii
::
getLogger
()
->
log
(
$user
->
getErrors
(),
Logger
::
LEVEL_ERROR
);
$user
=
NULL
;
$user
=
NULL
;
}
}
//添加非注册会员
if
(
$this
->
from
!=
0
)
{
$member
=
new
Member
();
$member
->
user_id
=
$this
->
from
;
$member
->
member_id
=
$user
->
id
;
$member
->
type
=
Member
::
TYPE_NORMAL
;
$member
->
save
();
}
return
$user
;
return
$user
;
}
}
...
...
src/frontend/views/my-member/index.php
View file @
85bf4547
<?php
<?php
/**
/**
* @var $this yii\web\View
* @var $this yii\web\View
* @var $typeCount array
* @var $data array
* @var $data array
* @var $count int
* @var $pagination \yii\data\Pagination
* @var $pagination \yii\data\Pagination
*/
*/
$this
->
title
=
'我的会员'
;
?>
?>
<div
class=
"vip-top clearfix"
>
<div
class=
"vip-top clearfix"
>
<div
class=
"col-md-6"
>
<div
class=
"col-md-6"
>
<div
class=
"reg-vip-box"
>
<div
class=
"reg-vip-box"
>
<b>
47
</b>
<b>
<?=
array_sum
(
$typeCount
)
?>
</b>
<span>
全部会员
</span>
<span>
全部会员
</span>
<i
class=
"icon-verified_user"
></i>
<i
class=
"icon-verified_user"
></i>
</div>
</div>
</div>
</div>
<div
class=
"col-md-6"
>
<div
class=
"col-md-6"
>
<div
class=
"money-vip-box"
>
<div
class=
"money-vip-box"
>
<b>
23
</b>
<b>
<?=
$typeCount
[
\common\models\Member
::
TYPE_VIP
]
?>
</b>
<span>
付费会员
</span>
<span>
付费会员
</span>
<i
class=
"icon-heart"
></i>
<i
class=
"icon-heart"
></i>
</div>
</div>
...
@@ -40,13 +44,12 @@
...
@@ -40,13 +44,12 @@
<td>
2016-12-11
</td>
<td>
2016-12-11
</td>
<td>
<?=
$row
[
'user'
][
'telephone'
]
?>
/
<?=
$row
[
'user'
][
'username'
]
?>
</td>
<td>
<?=
$row
[
'user'
][
'telephone'
]
?>
/
<?=
$row
[
'user'
][
'username'
]
?>
</td>
<td>
推广
</td>
<td>
推广
</td>
<?php
if
(
!
empty
(
$row
[
'firstOrder'
]))
{
?>
<?php
if
(
!
empty
(
$row
[
'first_order'
]))
{
?>
<td>
《
<?=
$row
[
'firstOrder'
][
'course'
][
'name'
]
?>
》
</td>
<td>
《
<?=
$row
[
'first_order'
][
'course'
][
'name'
]
?>
》
</td>
<td>
¥
<?=
$row
[
'firstOrder'
][
'credit_total'
]
?>
</td>
<?php
}
else
{
?>
<?php
}
else
{
?>
<td>
无
</td>
<td>
无
</td>
<td>
¥0
</td>
<?php
}
?>
<?php
}
?>
<td>
¥
<?=
$row
[
'credit_total'
]
?>
</td>
</tr>
</tr>
<?php
}
?>
<?php
}
?>
</tbody>
</tbody>
...
...
src/frontend/web/js/home/components/video-intro.vue
View file @
85bf4547
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<div
class=
"video-description"
>
<div
class=
"video-description"
>
<div
class=
"title"
>
视频介绍
</div>
<div
class=
"title"
>
视频介绍
</div>
<div
class=
"text"
>
<div
class=
"text"
>
{{
coursewareInfo
.
intro
}}
{{
{
coursewareInfo
.
intro
}
}
}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
...
src/frontend/web/js/home/components/video-play.vue
View file @
85bf4547
<
template
>
<
template
xmlns:v-el=
"http://www.w3.org/1999/xhtml"
>
<div
class=
"container"
>
<div
class=
"container"
>
<div
class=
"cnt-tit"
>
<div
class=
"cnt-tit"
>
<h3>
{{
coursewareInfo
.
courseName
}}
</h3>
<h3>
{{
coursewareInfo
.
courseName
}}
</h3>
...
@@ -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>
...
@@ -59,11 +66,10 @@
...
@@ -59,11 +66,10 @@
<div v-show="
showQrcode
" class="
wecat
-
qrcode
">
<div v-show="
showQrcode
" class="
wecat
-
qrcode
">
<div class="
top
-
back
-
a
">
<div class="
top
-
back
-
a
">
<a href="
javascript
:;
" @click="
showQrcode
=
false
">
<
返回支付渠道选择</a>
<a href="
javascript
:;
" @click="
showQrcode
=
false
">
<
返回支付渠道选择</a>
</div>
</div>
<div class="
qrcode
-
img
">
<div v-el:weixin-qrcode class="
qrcode
-
img
">
<img :src="
getWeixinPayQrcode
(
coursewareInfo
.
course_id
)
">
正在加载
<p>请使用微信扫一扫付款</p>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -82,9 +88,7 @@
...
@@ -82,9 +88,7 @@
<div class="
teacher
-
info
text
-
center
">
<div class="
teacher
-
info
text
-
center
">
<img :src="
getFullPic
(
item
.
avatar
)
">
<img :src="
getFullPic
(
item
.
avatar
)
">
<h3>{{item.name
}}
</h3>
<h3>{{item.name
}}
</h3>
<p class="
teacher
-
detail
">
<p class="
teacher
-
detail
">{{{item.intro
}}
}
</p>
{{item.intro
}}
</p>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -105,12 +109,50 @@
...
@@ -105,12 +109,50 @@
export default{
export default{
data(){
data(){
return {
return {
showQrcode: false
showQrcode: false,
weixinCheckHandler: false,
reload:false
}
}
,
watch: {
reload(){
window.location.reload();
}
,
showQrcode(){
if (this.showQrcode === true) {
var self = this;
var url = __BASE_URL__ + 'home/weixin-pay-qrcode?courseId=' + self.coursewareInfo.course_id;
$.getJSON(url, function (response) {
if (response.status !== false) {
var imgUrl = __BASE_URL__ + 'home/get-qrcode?number=' + response.data.number;
$(self.$els.weixinQrcode).html('<img src="
' + imgUrl + '
"/> <p>请使用微信扫一扫付款</p>');
//添加监听
clearInterval(self.weixinCheckHandler);
self.weixinCheckHandler = setInterval(function () {
var checkUrl = __BASE_URL__ + 'home/check-pay-status?number=' + response.data.number;
$.getJSON(checkUrl, function (response) {
if (response.status) {
if (response.data) {
self.reload = true;
}
}
}
);
}
, 1500);
}
}
).error(function () {
layer.alert('获取微信url信息错误', {
'icon': 2, 'title': '提示'
}
)
}
);
}
else {
clearInterval(this.weixinCheckHandler);
}
}
}
}
,
}
,
methods: {
methods: {
getWeixinPayQrcode(courseId){
getWeixinPayQrcode(courseId){
return __BASE_URL__ + 'home/weixin-pay-qrcode?courseId=' + courseId;
}
,
}
,
alipay(courseId){
alipay(courseId){
var url = __BASE_URL__ + 'home/pay?courseId=' + courseId;
var url = __BASE_URL__ + 'home/pay?courseId=' + courseId;
...
...
src/frontend/web/webpack.config.js
View file @
85bf4547
...
@@ -100,7 +100,7 @@ if (process.env.NODE_ENV === 'production') {
...
@@ -100,7 +100,7 @@ if (process.env.NODE_ENV === 'production') {
new
webpack
.
DefinePlugin
({
new
webpack
.
DefinePlugin
({
__BASE_URL__
:
JSON
.
stringify
(
'http://c.pp.cc/'
),
__BASE_URL__
:
JSON
.
stringify
(
'http://c.pp.cc/'
),
__CDN_URL__
:
JSON
.
stringify
(
'http://c.pp.cc/'
),
__CDN_URL__
:
JSON
.
stringify
(
'http://c.pp.cc/'
),
__QINIU_URL__
:
JSON
.
stringify
(
'http://
dev.qdn.pp.cc
/'
),
__QINIU_URL__
:
JSON
.
stringify
(
'http://
of805nn40.bkt.clouddn.com
/'
),
}),
}),
new
webpack
.
optimize
.
UglifyJsPlugin
({
new
webpack
.
optimize
.
UglifyJsPlugin
({
compress
:
{
compress
:
{
...
...
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