Commit b40522f5 authored by 杨培's avatar 杨培

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/composer.lock
parents 4307aefd 7a3e0652
<?php
/**
* Created by PhpStorm.
* User: xiabin
* Date: 2016/10/19
* Time: 下午3:52
*/
namespace common\components;
use yii\base\Object;
/**
* 移动设备检测功能
* @link http://mobiledetect.net/
*
* @example
* //注册一个检测移动设备组件
* Yii::$app->set('deviceDetect', [
* 'class' => 'common\service\DeviceDetect',
* ]);
* //使用
* Yii::$app->deviceDetect->isMobile();
*
* Class MyMobileDetect
*/
class MobileDetect extends Object
{
/**
* @var
*/
private $detector;
/**
*init
*/
public function init()
{
parent::init();
$this->detector = new \Detection\MobileDetect();
}
/**
* @param string $name
* @param array $params
* @return mixed
*/
public function __call($name, $params)
{
return call_user_func_array(
array($this->detector, $name),
$params
);
}
}
\ No newline at end of file
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
namespace common\libs; namespace common\libs;
use dosamigos\qrcode\formats\Wifi;
class WeixinPay class WeixinPay
{ {
......
...@@ -12,7 +12,7 @@ namespace common\libs\alipay; ...@@ -12,7 +12,7 @@ namespace common\libs\alipay;
use DOMDocument; use DOMDocument;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
require_once (dirname(__FILE__) . "/libs/alipay_core.function.php"); require_once(dirname(__FILE__) . "/libs/alipay_core.function.php");
require_once(dirname(__FILE__) . "/libs/alipay_md5.function.php"); require_once(dirname(__FILE__) . "/libs/alipay_md5.function.php");
class AliPay class AliPay
......
<?php
require_once dirname(__FILE__)."/libs/WxPay.Api.php";
/**
*
* JSAPI支付实现类
* 该类实现了从微信公众平台获取code、通过code获取openid和access_token、
* 生成jsapi支付js接口所需的参数、生成获取共享收货地址所需的参数
*
* 该类是微信支付提供的样例程序,商户可根据自己的需求修改,或者使用lib中的api自行开发
*
* @author widy
*
*/
class JsApiPay
{
/**
*
* 网页授权接口微信服务器返回的数据,返回样例如下
* {
* "access_token":"ACCESS_TOKEN",
* "expires_in":7200,
* "refresh_token":"REFRESH_TOKEN",
* "openid":"OPENID",
* "scope":"SCOPE",
* "unionid": "o6_bmasdasdsad6_2sgVt7hMZOPfL"
* }
* 其中access_token可用于获取共享收货地址
* openid是微信支付jsapi支付接口必须的参数
* @var array
*/
public $data = NULL;
/**
*
* 通过跳转获取用户的openid,跳转流程如下:
* 1、设置自己需要调回的url及其其他参数,跳转到微信服务器https://open.weixin.qq.com/connect/oauth2/authorize
* 2、微信服务处理完成之后会跳转回用户redirect_uri地址,此时会带上一些参数,如:code
*
* @return 用户的openid
*/
public function GetOpenid()
{
//通过code获得openid
if (!isset($_GET['code'])) {
//触发微信返回code码
$baseUrl = urlencode('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING']);
$url = $this->__CreateOauthUrlForCode($baseUrl);
Header("Location: $url");
exit();
} else {
//获取code码,以获取openid
$code = $_GET['code'];
$openid = $this->getOpenidFromMp($code);
return $openid;
}
}
/**
*
* 获取jsapi支付的参数
* @param array $UnifiedOrderResult 统一支付接口返回的数据
* @throws WxPayException
*
* @return json数据,可直接填入js函数作为参数
*/
public function GetJsApiParameters($UnifiedOrderResult)
{
if (!array_key_exists("appid", $UnifiedOrderResult)
|| !array_key_exists("prepay_id", $UnifiedOrderResult)
|| $UnifiedOrderResult['prepay_id'] == ""
) {
throw new WxPayException("参数错误");
}
$jsapi = new WxPayJsApiPay();
$jsapi->SetAppid($UnifiedOrderResult["appid"]);
$timeStamp = time();
$jsapi->SetTimeStamp("$timeStamp");
$jsapi->SetNonceStr(WxPayApi::getNonceStr());
$jsapi->SetPackage("prepay_id=" . $UnifiedOrderResult['prepay_id']);
$jsapi->SetSignType("MD5");
$jsapi->SetPaySign($jsapi->MakeSign());
$parameters = json_encode($jsapi->GetValues());
return $parameters;
}
/**
*
* 通过code从工作平台获取openid机器access_token
* @param string $code 微信跳转回来带上的code
*
* @return openid
*/
public function GetOpenidFromMp($code)
{
$url = $this->__CreateOauthUrlForOpenid($code);
//初始化curl
$ch = curl_init();
//设置超时
curl_setopt($ch, CURLOPT_TIMEOUT, $this->curl_timeout);
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
curl_setopt($ch, CURLOPT_HEADER, FALSE);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
if (WxPayConfig::CURL_PROXY_HOST != "0.0.0.0"
&& WxPayConfig::CURL_PROXY_PORT != 0
) {
curl_setopt($ch, CURLOPT_PROXY, WxPayConfig::CURL_PROXY_HOST);
curl_setopt($ch, CURLOPT_PROXYPORT, WxPayConfig::CURL_PROXY_PORT);
}
//运行curl,结果以jason形式返回
$res = curl_exec($ch);
curl_close($ch);
//取出openid
$data = json_decode($res, TRUE);
$this->data = $data;
$openid = $data['openid'];
return $openid;
}
/**
*
* 拼接签名字符串
* @param array $urlObj
*
* @return 返回已经拼接好的字符串
*/
private function ToUrlParams($urlObj)
{
$buff = "";
foreach ($urlObj as $k => $v) {
if ($k != "sign") {
$buff .= $k . "=" . $v . "&";
}
}
$buff = trim($buff, "&");
return $buff;
}
/**
*
* 获取地址js参数
*
* @return 获取共享收货地址js函数需要的参数,json格式可以直接做参数使用
*/
public function GetEditAddressParameters()
{
$getData = $this->data;
$data = array();
$data["appid"] = WxPayConfig::APPID;
$data["url"] = "http://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
$time = time();
$data["timestamp"] = "$time";
$data["noncestr"] = "1234568";
$data["accesstoken"] = $getData["access_token"];
ksort($data);
$params = $this->ToUrlParams($data);
$addrSign = sha1($params);
$afterData = array(
"addrSign" => $addrSign,
"signType" => "sha1",
"scope" => "jsapi_address",
"appId" => WxPayConfig::APPID,
"timeStamp" => $data["timestamp"],
"nonceStr" => $data["noncestr"]
);
$parameters = json_encode($afterData);
return $parameters;
}
/**
*
* 构造获取code的url连接
* @param string $redirectUrl 微信服务器回跳的url,需要url编码
*
* @return 返回构造好的url
*/
private function __CreateOauthUrlForCode($redirectUrl)
{
$urlObj["appid"] = WxPayConfig::APPID;
$urlObj["redirect_uri"] = "$redirectUrl";
$urlObj["response_type"] = "code";
$urlObj["scope"] = "snsapi_base";
$urlObj["state"] = "STATE" . "#wechat_redirect";
$bizString = $this->ToUrlParams($urlObj);
return "https://open.weixin.qq.com/connect/oauth2/authorize?" . $bizString;
}
/**
*
* 构造获取open和access_toke的url地址
* @param string $code ,微信跳转带回的code
*
* @return 请求的url
*/
private function __CreateOauthUrlForOpenid($code)
{
$urlObj["appid"] = WxPayConfig::APPID;
$urlObj["secret"] = WxPayConfig::APPSECRET;
$urlObj["code"] = $code;
$urlObj["grant_type"] = "authorization_code";
$bizString = $this->ToUrlParams($urlObj);
return "https://api.weixin.qq.com/sns/oauth2/access_token?" . $bizString;
}
}
\ No newline at end of file
This diff is collapsed.
<?php
/**
* 配置账号信息
*/
class WxPayConfig
{
//=======【基本信息设置】=====================================
//
/**
* TODO: 修改这里配置为您自己申请的商户信息
* 微信公众号信息配置
*
* APPID:绑定支付的APPID(必须配置,开户邮件中可查看)
*
* MCHID:商户号(必须配置,开户邮件中可查看)
*
* KEY:商户支付密钥,参考开户邮件设置(必须配置,登录商户平台自行设置)
* 设置地址:https://pay.weixin.qq.com/index.php/account/api_cert
*
* APPSECRET:公众帐号secert(仅JSAPI支付的时候需要配置, 登录公众平台,进入开发者中心可设置),
* 获取地址:https://mp.weixin.qq.com/advanced/advanced?action=dev&t=advanced/dev&token=2005451881&lang=zh_CN
* @var string
*/
const APPID = 'wx5714a24a60083b2a';
const MCHID = '1399794002';
const KEY = '8934e7d15453e97507ef794cf7b0519d';
const APPSECRET = '7c18222c6ec31efa65d21606a629585d';
//=======【证书路径设置】=====================================
/**
* TODO:设置商户证书路径
* 证书路径,注意应该填写绝对路径(仅退款、撤销订单时需要,可登录商户平台下载,
* API证书下载地址:https://pay.weixin.qq.com/index.php/account/api_cert,下载之前需要安装商户操作证书)
* @var path
*/
const SSLCERT_PATH = '../cert/apiclient_cert.pem';
const SSLKEY_PATH = '../cert/apiclient_key.pem';
//=======【curl代理设置】===================================
/**
* TODO:这里设置代理机器,只有需要代理的时候才设置,不需要代理,请设置为0.0.0.0和0
* 本例程通过curl使用HTTP POST方法,此处可修改代理服务器,
* 默认CURL_PROXY_HOST=0.0.0.0和CURL_PROXY_PORT=0,此时不开启代理(如有需要才设置)
* @var unknown_type
*/
const CURL_PROXY_HOST = "0.0.0.0";//"10.152.18.220";
const CURL_PROXY_PORT = 0;//8080;
//=======【上报信息配置】===================================
/**
* TODO:接口调用上报等级,默认紧错误上报(注意:上报超时间为【1s】,上报无论成败【永不抛出异常】,
* 不会影响接口调用流程),开启上报之后,方便微信监控请求调用的质量,建议至少
* 开启错误上报。
* 上报等级,0.关闭上报; 1.仅错误出错上报; 2.全量上报
* @var int
*/
const REPORT_LEVENL = 1;
}
This diff is collapsed.
<?php
/**
*
* 微信支付API异常类
* @author widyhu
*
*/
class WxPayException extends Exception {
public function errorMessage()
{
return $this->getMessage();
}
}
<?php
/**
*
* 回调基础类
* @author widyhu
*
*/
class WxPayNotify extends WxPayNotifyReply
{
/**
*
* 回调入口
* @param bool $needSign 是否需要签名输出
*/
final public function Handle($needSign = true)
{
$msg = "OK";
//当返回false的时候,表示notify中调用NotifyCallBack回调失败获取签名校验失败,此时直接回复失败
$result = WxpayApi::notify(array($this, 'NotifyCallBack'), $msg);
if($result == false){
$this->SetReturn_code("FAIL");
$this->SetReturn_msg($msg);
$this->ReplyNotify(false);
return;
} else {
//该分支在成功回调到NotifyCallBack方法,处理完成之后流程
$this->SetReturn_code("SUCCESS");
$this->SetReturn_msg("OK");
}
$this->ReplyNotify($needSign);
}
/**
*
* 回调方法入口,子类可重写该方法
* 注意:
* 1、微信回调超时时间为2s,建议用户使用异步处理流程,确认成功之后立刻回复微信服务器
* 2、微信服务器在调用失败或者接到回包为非确认包的时候,会发起重试,需确保你的回调是可以重入
* @param array $data 回调解释出的参数
* @param string $msg 如果回调处理失败,可以将错误信息输出到该方法
* @return true回调出来完成不需要继续回调,false回调处理未完成需要继续回调
*/
public function NotifyProcess($data, &$msg)
{
//TODO 用户基础该类之后需要重写该方法,成功的时候返回true,失败返回false
return true;
}
/**
*
* notify回调方法,该方法中需要赋值需要输出的参数,不可重写
* @param array $data
* @return true回调出来完成不需要继续回调,false回调处理未完成需要继续回调
*/
final public function NotifyCallBack($data)
{
$msg = "OK";
$result = $this->NotifyProcess($data, $msg);
if($result == true){
$this->SetReturn_code("SUCCESS");
$this->SetReturn_msg("OK");
} else {
$this->SetReturn_code("FAIL");
$this->SetReturn_msg($msg);
}
return $result;
}
/**
*
* 回复通知
* @param bool $needSign 是否需要签名输出
*/
final private function ReplyNotify($needSign = true)
{
//如果需要签名
if($needSign == true &&
$this->GetReturn_code($return_code) == "SUCCESS")
{
$this->SetSign();
}
WxpayApi::replyNotify($this->ToXml());
}
}
\ No newline at end of file
...@@ -29,14 +29,30 @@ class Member extends \yii\db\ActiveRecord ...@@ -29,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'],
]; ];
} }
...@@ -149,12 +165,12 @@ class Member extends \yii\db\ActiveRecord ...@@ -149,12 +165,12 @@ class Member extends \yii\db\ActiveRecord
{ {
$data = self::find()->select('COUNT(1) AS count, type')->where(['user_id'=>$userId])->groupBy('type') $data = self::find()->select('COUNT(1) AS count, type')->where(['user_id'=>$userId])->groupBy('type')
->asArray()->all(); ->asArray()->all();
$count = [ $count = [
self::TYPE_NORMAL => 0, self::TYPE_NORMAL => 0,
self::TYPE_VIP => 0 self::TYPE_VIP => 0
]; ];
foreach ($data as $row) { foreach ($data as $row) {
$count[$row['type']] = $row['count']; $count[$row['type']] = $row['count'];
} }
......
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
"guzzlehttp/guzzle": "^6.2", "guzzlehttp/guzzle": "^6.2",
"qiniu/php-sdk": "^7.0", "qiniu/php-sdk": "^7.0",
"light/yii2-xmlparser": "*", "light/yii2-xmlparser": "*",
"2amigos/yii2-qrcode-helper": "*" "2amigos/yii2-qrcode-helper": "*",
"mobiledetect/mobiledetectlib": "^2.8"
}, },
"require-dev": { "require-dev": {
"yiisoft/yii2-codeception": "*", "yiisoft/yii2-codeception": "*",
......
...@@ -357,16 +357,16 @@ ...@@ -357,16 +357,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "6.2.2", "version": "6.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60" "reference": "3f808fba627f2c5b69e2501217bf31af349c1427"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://packagist.phpcomposer.com/files/guzzle/guzzle/ebf29dee597f02f09f4d5bbecc68230ea9b08f60.zip", "url": "https://packagist.phpcomposer.com/files/guzzle/guzzle/3f808fba627f2c5b69e2501217bf31af349c1427.zip",
"reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60", "reference": "3f808fba627f2c5b69e2501217bf31af349c1427",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -415,7 +415,7 @@ ...@@ -415,7 +415,7 @@
"rest", "rest",
"web service" "web service"
], ],
"time": "2016-10-08 15:01:37" "time": "2016-07-15 17:22:37"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
......
...@@ -22,6 +22,7 @@ return [ ...@@ -22,6 +22,7 @@ return [
'transport' => 'http', 'transport' => 'http',
'payment_type' => '1', 'payment_type' => '1',
'service' => 'create_direct_pay_by_user', 'service' => 'create_direct_pay_by_user',
'wap_service' => 'alipay.wap.create.direct.pay.by.user',
], ],
// 'weixinpay'=>[ // 'weixinpay'=>[
// 'appid'=>'wx180521eb22e9d7af', // 'appid'=>'wx180521eb22e9d7af',
......
...@@ -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,
......
...@@ -22,6 +22,7 @@ return [ ...@@ -22,6 +22,7 @@ return [
'transport' => 'http', 'transport' => 'http',
'payment_type' => '1', 'payment_type' => '1',
'service' => 'create_direct_pay_by_user', 'service' => 'create_direct_pay_by_user',
'wap_service' => 'alipay.wap.create.direct.pay.by.user',
], ],
// 'weixinpay'=>[ // 'weixinpay'=>[
// 'appid'=>'wx180521eb22e9d7af', // 'appid'=>'wx180521eb22e9d7af',
......
...@@ -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,
......
...@@ -13,6 +13,9 @@ return [ ...@@ -13,6 +13,9 @@ return [
'controllerNamespace' => 'frontend\controllers', 'controllerNamespace' => 'frontend\controllers',
'defaultRoute' => 'user-center', 'defaultRoute' => 'user-center',
'components' => [ 'components' => [
'deviceDetect' => [
'class' => 'common\components\MobileDetect',
],
'request' => [ 'request' => [
'csrfParam' => '_csrf-frontend', 'csrfParam' => '_csrf-frontend',
], ],
...@@ -20,7 +23,7 @@ return [ ...@@ -20,7 +23,7 @@ return [
'appendTimestamp' => TRUE, 'appendTimestamp' => TRUE,
//'baseUrl' => 'http://www.baidu.com/', //'baseUrl' => 'http://www.baidu.com/',
'bundles' => [ 'bundles' => [
'yii\web\JqueryAsset' => false, 'yii\web\JqueryAsset' => FALSE,
] ]
], ],
'user' => [ 'user' => [
......
...@@ -21,6 +21,7 @@ use yii\base\InvalidParamException; ...@@ -21,6 +21,7 @@ use yii\base\InvalidParamException;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
use yii\helpers\Html; use yii\helpers\Html;
use yii\helpers\Url;
use yii\web\ForbiddenHttpException; use yii\web\ForbiddenHttpException;
class HomeController extends \yii\web\Controller class HomeController extends \yii\web\Controller
...@@ -106,7 +107,6 @@ class HomeController extends \yii\web\Controller ...@@ -106,7 +107,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 {
...@@ -142,12 +142,13 @@ class HomeController extends \yii\web\Controller ...@@ -142,12 +142,13 @@ class HomeController extends \yii\web\Controller
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); $order = Orders::findByUserIdAndCourseId($userId, $courseId);
var_dump($order->status);
$coursewareInfo['isShop'] = ($order !== NULL and $order->status === Orders::PAID ? TRUE : FALSE); $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;
$coursewareInfo['isMobile'] = Yii::$app->deviceDetect->isMobile();
return $this->render('video', [ return $this->render('video', [
'coursewareInfo' => $coursewareInfo 'coursewareInfo' => $coursewareInfo
]); ]);
...@@ -389,14 +390,12 @@ class HomeController extends \yii\web\Controller ...@@ -389,14 +390,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(
...@@ -406,6 +405,11 @@ class HomeController extends \yii\web\Controller ...@@ -406,6 +405,11 @@ class HomeController extends \yii\web\Controller
"body" => '云崖购买',//商品描述 "body" => '云崖购买',//商品描述
); );
if (Yii::$app->deviceDetect->isMobile()) {
$parameter['service'] = \Yii::$app->params['alipay']['wap_service'];
$parameter['app_pay'] = 'Y';
$parameter['return_rul'] = Url::base() . 'home/video?courseId=' . $courseId;
}
$html_text = $alipay->buildRequestForm($parameter, "get", "确认"); $html_text = $alipay->buildRequestForm($parameter, "get", "确认");
echo $html_text; echo $html_text;
} else { } else {
...@@ -415,24 +419,62 @@ class HomeController extends \yii\web\Controller ...@@ -415,24 +419,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));
}
/** /**
* 移动端微信支付 * 移动端微信支付
...@@ -484,6 +526,6 @@ class HomeController extends \yii\web\Controller ...@@ -484,6 +526,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}");
} }
} }
...@@ -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;
...@@ -70,6 +71,21 @@ class PayController extends Controller ...@@ -70,6 +71,21 @@ class PayController extends Controller
$order->status = Orders::PAID; $order->status = Orders::PAID;
$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();
}
}
} }
//——请根据您的业务逻辑来编写程序(以上代码仅作参考)—— //——请根据您的业务逻辑来编写程序(以上代码仅作参考)——
...@@ -93,13 +109,29 @@ class PayController extends Controller ...@@ -93,13 +109,29 @@ 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'];
$order_id = $data['product_id']; $order_id = $data['product_id'];
$order = Orders::findOne(['number' => $order_id]);
if ($order === NULL) {
return \Yii::createObject([
'class' => 'yii\web\Response',
'format' => \yii\web\Response::FORMAT_XML,
'formatters' => [
\yii\web\Response::FORMAT_XML => [
'class' => 'yii\web\XmlResponseFormatter',
'rootTag' => 'xml', //根节点
],
],
'data' => [
'return_code' => 'FAIL',
'return_msg' => '数据错误'
]
]);
}
//发送统一下单请求 //发送统一下单请求
$client = new Client( $client = new Client(
[ [
...@@ -118,7 +150,7 @@ class PayController extends Controller ...@@ -118,7 +150,7 @@ class PayController extends Controller
'sign' => '', 'sign' => '',
'body' => '最课堂-课程购买', 'body' => '最课堂-课程购买',
'out_trade_no' => $order_id, 'out_trade_no' => $order_id,
'total_fee' => 1, 'total_fee' => $order->price,
'spbill_create_ip' => $_SERVER['SERVER_ADDR'], 'spbill_create_ip' => $_SERVER['SERVER_ADDR'],
'notify_url' => WeixinPay::NOTIFY_URL, 'notify_url' => WeixinPay::NOTIFY_URL,
'trade_type' => 'NATIVE', 'trade_type' => 'NATIVE',
...@@ -177,7 +209,6 @@ class PayController extends Controller ...@@ -177,7 +209,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',
...@@ -220,7 +251,7 @@ class PayController extends Controller ...@@ -220,7 +251,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,
...@@ -239,23 +270,40 @@ class PayController extends Controller ...@@ -239,23 +270,40 @@ 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]); $order = Orders::findOne(['number' => $orderId]);
$order->status = Orders::PAID; if ($order !== NULL and $order->status !== Orders::PAID) {
$order->pay_order = $payOrder; //修改订单状态
$order->update(); $order = Orders::findOne(['number' => $orderId]);
//并添加消费记录 $order->status = Orders::PAID;
$consume = new Consume(); $order->pay_order = $payOrder;
$consume->orders_id = $order->id; $order->update();
$consume->user_id = $order->user_id; //并添加消费记录
$consume->save(); $consume = new Consume();
//添加收入记录 $consume->orders_id = $order->id;
$income = new Income(); $consume->user_id = $order->user_id;
$income->orders_id = $order->id; $consume->save();
$courseInfo = Course::findBaseInfoByCourseId($order->course_id); //添加收入记录
$income->user_id = $courseInfo['user_id']; $income = new Income();
$income->save(); $income->orders_id = $order->id;
$courseInfo = Course::findBaseInfoByCourseId($order->course_id);
$income->user_id = $courseInfo['user_id'];
$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,
...@@ -273,5 +321,3 @@ class PayController extends Controller ...@@ -273,5 +321,3 @@ class PayController extends Controller
} }
} }
opcache_invalidate(__FILE__);
\ No newline at end of file
...@@ -36,6 +36,7 @@ class SiteController extends Controller ...@@ -36,6 +36,7 @@ class SiteController extends Controller
const REDIS_SIGNUP_MSG_EXPIRE = 60;//second const REDIS_SIGNUP_MSG_EXPIRE = 60;//second
const SIGNUP_TOKEN = 'sign_token'; const SIGNUP_TOKEN = 'sign_token';
public $layout = 'site';
/** /**
* 默认action * 默认action
......
<?php
/**
* Created by PhpStorm.
* User: xiabin
* Date: 2016/10/19
* Time: 下午5:15
*/
namespace frontend\controllers;
use common\models\Course;
use common\models\Orders;
use Yii;
use yii\web\Controller;
use yii\web\ForbiddenHttpException;
class WeixinJsPayController extends Controller
{
public $layout = FALSE;
public $enableCsrfValidation = FALSE;
public function actionIndex($courseId)
{
$courseBaseInfo = Course::findBaseInfoByCourseId($courseId);
if ($courseBaseInfo !== NULL) {
$userId = Yii::$app->user->identity->getId();
$order = Orders::findByUserIdAndCourseId($userId, $courseId);
$price = $courseBaseInfo['price'];
$number = $this->generateOrderNumber($userId, $courseId, $price);
//判断订单是否存在
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();
}
}
return $this->render('index', ['number' => $number, 'price' => $price]);
} else {
throw new ForbiddenHttpException('非法请求');
}
}
private
function generateOrderNumber($userId, $courseId, $price)
{
return md5(microtime() . "_{$userId}_{$courseId}_{$price}");
}
}
\ No newline at end of file
...@@ -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;
...@@ -64,6 +65,15 @@ class SignupForm extends Model ...@@ -64,6 +65,15 @@ class SignupForm extends Model
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;
} }
......
...@@ -11,4 +11,5 @@ ...@@ -11,4 +11,5 @@
<course-lists :class-id="classId"></course-lists> <course-lists :class-id="classId"></course-lists>
</div> </div>
<div class="copyright m-t-20">© 2016 c.pp.cc 皖ICP备13046642号</div>
...@@ -34,3 +34,5 @@ $this->registerJs($js); ...@@ -34,3 +34,5 @@ $this->registerJs($js);
<video-intro :courseware-info="coursewareInfo"></video-intro> <video-intro :courseware-info="coursewareInfo"></video-intro>
</div> </div>
<div class="xs-show-bg"></div>
<div class="copyright">© 2016 c.pp.cc 皖ICP备13046642号</div>
...@@ -46,6 +46,14 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -46,6 +46,14 @@ $this->beginContent('@app/views/layouts/center.php');
</div> </div>
</div> </div>
<script type='text/javascript'>
$(function () {
$('.menu-btn').click(function () {
$('.tp-sidebar').animate({left:"0"});
});
})
</script>
<div class="auto-main"> <div class="auto-main">
<?= $this->render('centerHeader') ?> <?= $this->render('centerHeader') ?>
......
...@@ -7,7 +7,6 @@ use yii\helpers\Html; ...@@ -7,7 +7,6 @@ use yii\helpers\Html;
use frontend\assets\AppAsset; use frontend\assets\AppAsset;
AppAsset::register($this); AppAsset::register($this);
AppAsset::addCss($this, '@web/assets/css/login_css.css');
$baseUrl = \yii\helpers\Url::base(); $baseUrl = \yii\helpers\Url::base();
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
...@@ -49,6 +48,7 @@ $baseUrl = \yii\helpers\Url::base(); ...@@ -49,6 +48,7 @@ $baseUrl = \yii\helpers\Url::base();
<div class="navbar-main navbar-static-top clearfix"> <div class="navbar-main navbar-static-top clearfix">
<div id="main-logo" class="logo pull-left"><a href="<?= $baseUrl . "/user-center" ?>">云崖</a></div> <div id="main-logo" class="logo pull-left"><a href="<?= $baseUrl . "/user-center" ?>">云崖</a></div>
<div class="avatar pull-right"><a href="user-center"><img src="/assets/img/avatar.jpg"></a></div>
</div> </div>
<?php endif; ?> <?php endif; ?>
......
<?php
use frontend\assets\AppAsset;
/* @var $this \yii\web\View */
/* @var $content string */
$this->beginPage();
$this->beginBody();
$this->beginContent('@app/views/layouts/main.php');
AppAsset::addCss($this, '@web/assets/css/login_css.css');
?>
<?= $content ?>
<?php
$this->endContent();
$this->endBody();
$this->endPage();
...@@ -50,6 +50,14 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -50,6 +50,14 @@ $this->beginContent('@app/views/layouts/center.php');
</div> </div>
</div> </div>
</div> </div>
<script type='text/javascript'>
$(function () {
$('.menu-btn').click(function () {
$('.tp-sidebar').animate({left:"0"});
});
})
</script>
<?php <?php
$this->endContent(); $this->endContent();
$this->endBody(); $this->endBody();
......
<?php
//error_reporting(E_ERROR);
use common\libs\WeixinPay;
require_once dirname(dirname(dirname(dirname(__FILE__))))."/common/libs/weixin/libs/WxPay.Api.php";
require_once dirname(dirname(dirname(dirname(__FILE__))))."/common/libs/weixin/WxPay.JsApiPay.php";
//打印输出数组信息
function printf_info($data)
{
foreach ($data as $key => $value) {
echo "<font color='#00ff55;'>$key</font> : $value <br/>";
}
}
//①、获取用户openid
$tools = new JsApiPay();
$openId = $tools->GetOpenid();
//②、统一下单
$input = new WxPayUnifiedOrder();
$input->SetBody("最课堂-课程购买");
$input->SetOut_trade_no($number);
$input->SetTotal_fee($price);
$input->SetTime_start(date("YmdHis"));
$input->SetTime_expire(date("YmdHis", time() + 600));
$input->SetNotify_url(WeixinPay::NOTIFY_URL);
$input->SetTrade_type("JSAPI");
$input->SetOpenid($openId);
$order = WxPayApi::unifiedOrder($input);
echo '<font color="#f00"><b>统一下单支付单信息</b></font><br/>';
printf_info($order);
$jsApiParameters = $tools->GetJsApiParameters($order);
//获取共享收货地址js函数参数
$editAddress = $tools->GetEditAddressParameters();
//③、在支持成功回调通知中处理成功之后的事宜,见 notify.php
/**
* 注意:
* 1、当你的回调地址不可访问的时候,回调通知会失败,可以通过查询订单来确认支付是否成功
* 2、jsapi支付时需要填入用户openid,WxPay.JsApiPay.php中有获取openid流程 (文档可以参考微信公众平台“网页授权接口”,
* 参考http://mp.weixin.qq.com/wiki/17/c0f37d5704f0b64713d5d2c37b468d75.html)
*/
?>
<html>
<head>
<meta http-equiv="content-type" content="text/html;charset=utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>微信支付样例-支付</title>
<script type="text/javascript">
//调用微信JS api 支付
function jsApiCall() {
WeixinJSBridge.invoke(
'getBrandWCPayRequest',
<?php echo $jsApiParameters; ?>,
function (res) {
WeixinJSBridge.log(res.err_msg);
alert(res.err_code + res.err_desc + res.err_msg);
}
);
}
function callpay() {
if (typeof WeixinJSBridge == "undefined") {
if (document.addEventListener) {
document.addEventListener('WeixinJSBridgeReady', jsApiCall, false);
} else if (document.attachEvent) {
document.attachEvent('WeixinJSBridgeReady', jsApiCall);
document.attachEvent('onWeixinJSBridgeReady', jsApiCall);
}
} else {
jsApiCall();
}
}
</script>
<script type="text/javascript">
//获取共享地址
function editAddress() {
WeixinJSBridge.invoke(
'editAddress',
<?php echo $editAddress; ?>,
function (res) {
var value1 = res.proviceFirstStageName;
var value2 = res.addressCitySecondStageName;
var value3 = res.addressCountiesThirdStageName;
var value4 = res.addressDetailInfo;
var tel = res.telNumber;
alert(value1 + value2 + value3 + value4 + ":" + tel);
}
);
}
window.onload = function () {
if (typeof WeixinJSBridge == "undefined") {
if (document.addEventListener) {
document.addEventListener('WeixinJSBridgeReady', editAddress, false);
} else if (document.attachEvent) {
document.attachEvent('WeixinJSBridgeReady', editAddress);
document.attachEvent('onWeixinJSBridgeReady', editAddress);
}
} else {
editAddress();
}
};
</script>
</head>
<body>
<br/>
<font color="#9ACD32"><b>该笔订单支付金额为<span style="color:#f00;font-size:50px"><?=$price?></span</b></font><br/><br/>
<div align="center">
<button
style="width:210px; height:50px; border-radius: 15px;background-color:#FE6714; border:0px #FE6714 solid; cursor: pointer; color:white; font-size:16px;"
type="button" onclick="callpay()">立即支付
</button>
</div>
</body>
</html>
\ No newline at end of file
cGnhDtidLEiMVuZg
\ No newline at end of file
...@@ -35,6 +35,29 @@ a,a:hover,a:link { ...@@ -35,6 +35,29 @@ a,a:hover,a:link {
color: #333; color: #333;
display: block; display: block;
} }
.avatar {
padding-right: 30px;
height: 60px;
}
.avatar a {
display: block;
margin-top: 15px;
}
.avatar a img {
height: 30px;
width: 30px;
border-radius: 100%;
}
.menu-btn {
padding-left: 255px;
height: 60px;
line-height: 60px;
font-size: 24px;
color: #999;
text-align: center;
}
.z-m-center { .z-m-center {
text-align: center; text-align: center;
margin-top: 40px; margin-top: 40px;
......
This diff is collapsed.
...@@ -111,7 +111,7 @@ html { ...@@ -111,7 +111,7 @@ html {
-----------------------------*/ -----------------------------*/
.submenu { .submenu {
width: 100%; width: 100%;
display: none; /*display: none;*/
font-size: 14px; font-size: 14px;
} }
...@@ -300,6 +300,7 @@ html { ...@@ -300,6 +300,7 @@ html {
height: 300px; height: 300px;
margin: 0 10px 40px 10px; margin: 0 10px 40px 10px;
text-align: center; text-align: center;
overflow: hidden;
} }
.teacher-box > img { .teacher-box > img {
margin-top: 100px; margin-top: 100px;
...@@ -346,6 +347,7 @@ html { ...@@ -346,6 +347,7 @@ html {
-webkit-transition: all 0.4s ease; -webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease; -o-transition: all 0.4s ease;
transition: all 0.4s ease; transition: all 0.4s ease;
word-break:break-all;
} }
.teacher-box:hover > img { .teacher-box:hover > img {
margin-top: 50px; margin-top: 50px;
......
<template> <template>
<div class="container v-list" v-show="lists.length > 0"> <div class="container v-list" v-show="lists.length > 0">
<div class="row"> <div class="row">
<div v-for="(index,item) in lists" class="col-md-3"> <div v-for="(index,item) in lists" class="col-md-4">
<div class="v-main-box"> <div class="v-main-box">
<div class="v-screen"> <div class="v-screen">
<a @click="itemClick(item.id)" href="javascript:;"> <a @click="itemClick(item.id)" href="javascript:;">
<img :src="getFullPreViewPic(item.preview_pic)"> <img :src="getFullPreViewPic(item.preview_pic)">
<span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span> <span class="play-mask"><i class="icon-play"></i></span>
</a> </a>
<!--头像-->
</div> </div>
<div class="v-tit"><a @click="itemClick(item.id)" href="javascript:;">{{item.name}}</a></div> <div class="v-tit"><a @click="itemClick(item.id)" href="javascript:;">{{item.name}}</a></div>
......
<template> <template>
<div class="swiper-container" v-if="lists.length !== 0"> <div class="container m-t-20">
<div class="swiper-wrapper"> <div class="swiper-container" v-if="lists.length !== 0">
<div v-for="item in lists" @click="itemClick(item.id)" class="swiper-slide" <div class="swiper-wrapper">
:style="{background: 'url('+getFullPreViewPic(item.preview_pic)+') top center no-repeat'}"> <div v-for="item in lists" @click="itemClick(item.id)" class="swiper-slide"
{{item.name}} :style="{background: 'url('+getFullPreViewPic(item.preview_pic)+') top center no-repeat'}">
{{item.name}}
</div>
</div> </div>
<div class="swiper-pagination"></div>
</div> </div>
<div class="swiper-pagination"></div>
</div> </div>
</template> </template>
<script> <script>
......
<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>
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
</div> </div>
</div> </div>
<div class="video-main"> <div v-show="videoShow" class="video-main">
<video id="my-video-play" class="video-js vjs-default-skin vjs-big-play-centered" <video id="my-video-play" class="video-js vjs-default-skin vjs-big-play-centered"
controls preload="auto" width="640" height="264"> controls preload="auto">
<source :src="coursewareInfo.videoUrl" type="video/mp4"/> <source :src="coursewareInfo.videoUrl" type="video/mp4"/>
</video> </video>
</div> </div>
...@@ -22,22 +22,36 @@ ...@@ -22,22 +22,36 @@
:src="getFullPic(item.avatar)"></a> :src="getFullPic(item.avatar)"></a>
<p><a href="javascript:;" data-toggle="modal" data-target="#myModal2">{{item.name}}</a></p> <p><a href="javascript:;" data-toggle="modal" data-target="#myModal2">{{item.name}}</a></p>
</div> </div>
<div class="video-sm-info pull-left"> <div class="video-sm-info pull-right">
<a href="javascript:;"><i class="icon-comment-empty"></i>{{coursewareInfo.comment_count}}</a> <p class="mb-right">
<a @click="favorite" href="javascript:;"><i <a href="javascript:;"><i class="icon-comment-empty"></i>{{coursewareInfo.comment_count}}</a>
:class="{'icon-fav-full':coursewareInfo.isFavorite,'icon-fav-empty':!coursewareInfo.isFavorite}"></i>{{coursewareInfo.favorite_count}}</a> <a @click="favorite" href="javascript:;"><i
<a @click="support" href="javascript:;"><i :class="{'icon-fav-full':coursewareInfo.isFavorite,'icon-fav-empty':!coursewareInfo.isFavorite}"></i>{{coursewareInfo.favorite_count}}</a>
:class="{'icon-zan-full':coursewareInfo.isSupport,'icon-zan-empty':!coursewareInfo.isSupport}"></i>{{coursewareInfo.support_count}}</a> <a @click="support" href="javascript:;"><i
:class="{'icon-zan-full':coursewareInfo.isSupport,'icon-zan-empty':!coursewareInfo.isSupport}"></i>{{coursewareInfo.support_count}}</a>
<button v-if="coursewareInfo.isGuest" @click="login" class="btn btn-danger m-l-20 hidden-xs">购买 </p>
<button v-if="coursewareInfo.isGuest" @click="login" class="btn btn-danger m-l-20 mb-left">购买
¥{{coursewareInfo.price}} ¥{{coursewareInfo.price}}
</button> </button>
<template v-else> <template v-else>
<button v-if="coursewareInfo.isShop" class="btn btn-danger m-l-20 hidden-xs" data-toggle="modal">已购买 <button v-if="coursewareInfo.isShop" class="btn btn-danger m-l-20 hidden-xs mb-left"
</button> data-toggle="modal">已购买
<button v-else class="btn btn-danger m-l-20 hidden-xs" data-toggle="modal"
data-target="#pay">购买 ¥{{coursewareInfo.price}}
</button> </button>
<template v-else>
<button v-if="isMobile === false && isWeixin === false" class="btn btn-danger m-l-20 mb-left"
data-toggle="modal"
data-target="#pay">购买 ¥{{coursewareInfo.price}}
</button>
<button v-if="isMobile === true && isWeixin === false" class="btn btn-danger m-l-20 mb-left"
@click="alipay(coursewareInfo.course_id)">购买 ¥{{coursewareInfo.price}}
</button>
<button v-if="isWeixin === true" class="btn btn-danger m-l-20 mb-left"
@click="weixinJsPay(coursewareInfo.course_id)">购买 ¥{{coursewareInfo.price}}
</button>
</template>
</template> </template>
...@@ -66,11 +80,10 @@ ...@@ -66,11 +80,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"> &lt; 返回支付渠道选择</a> <a href="javascript:;" @click="showQrcode = false"><i class="icon-navigate_before"></i>返回支付渠道选择</a>
</div> </div>
<div class="qrcode-img"> <div v-el:weixin-qrcode class="qrcode-img">
<img :src="getWeixinPayQrcode(coursewareInfo.course_id)"> <span>正在加载</span>
<p>请使用微信扫一扫付款</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -95,8 +108,6 @@ ...@@ -95,8 +108,6 @@
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -106,17 +117,56 @@ ...@@ -106,17 +117,56 @@
videojs.options.flash.swf = __CDN_URL__ + 'assets/videojs/video-js.swf'; videojs.options.flash.swf = __CDN_URL__ + 'assets/videojs/video-js.swf';
window.VIDEOJS_NO_BASE_THEME = true; window.VIDEOJS_NO_BASE_THEME = true;
// //
import Utils from '../../libs/utils';
export default{ export default{
data(){ data(){
return { return {
showQrcode: false showQrcode: false,
weixinCheckHandler: false,
reload: false,
isMobile: false,
isWeixin: false,
videoShow: false
} }
}, },
methods: { watch: {
getWeixinPayQrcode(courseId){ reload(){
return __BASE_URL__ + 'home/weixin-pay-qrcode?courseId=' + courseId; 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: {
alipay(courseId){ alipay(courseId){
var url = __BASE_URL__ + 'home/pay?courseId=' + courseId; var url = __BASE_URL__ + 'home/pay?courseId=' + courseId;
...@@ -129,6 +179,14 @@ ...@@ -129,6 +179,14 @@
}); });
}, },
mobileAliPay(courseId){
var url = __BASE_URL__ + 'home/pay?courseId=' + courseId;
window.location.href(url);
},
weixinJsPay(courseId){
var url = __BASE_URL__ + '/weixin-js-pay/index?courseId=' + courseId;
window.location.href = url;
},
login(){ login(){
var returnUrl = __BASE_URL__ + 'home/video?courseId=' + this.coursewareInfo.course_id; var returnUrl = __BASE_URL__ + 'home/video?courseId=' + this.coursewareInfo.course_id;
var url = __BASE_URL__ + 'site/set-return-url?url=' + returnUrl; var url = __BASE_URL__ + 'site/set-return-url?url=' + returnUrl;
...@@ -186,6 +244,9 @@ ...@@ -186,6 +244,9 @@
}, },
components: {}, components: {},
ready(){ ready(){
var self = this;
this.isMobile = this.coursewareInfo.isMobile;
this.isWeixin = Utils.isWeixin();
videojs("my-video-play", { videojs("my-video-play", {
"controls": true, "controls": true,
"autoplay": false, "autoplay": false,
...@@ -193,9 +254,17 @@ ...@@ -193,9 +254,17 @@
poster: this.coursewareInfo.previewUrl poster: this.coursewareInfo.previewUrl
}).ready(function () { }).ready(function () {
var myPlayer = this; var myPlayer = this;
var rate = 9 / 16;
// EXAMPLE: Start playing the video. $('#my-video-play').css('width', '100%');
// myPlayer.play(); var wVideo = $('.video-detail-info').width();
var hVideo = wVideo * rate;
$('#my-video-play').css('height', hVideo);
window.onresize = function () {
var wVideo = $('.video-detail-info').width();
var hVideo = wVideo * rate;
$('#my-video-play').css('height', hVideo);
};
self.videoShow = true;
}); });
} }
......
/**
* Created by xiabin on 2016/10/19.
*/
var Utils = {
isWeixin: function () {
var ua = navigator.userAgent.toLowerCase();
return ua.indexOf('micromessenger') != -1;
}
};
module.exports = Utils;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment