Commit 4fd94352 authored by 汪波's avatar 汪波

Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
parents b7e733af 8d460662
...@@ -123,6 +123,9 @@ class HomeController extends \yii\web\Controller ...@@ -123,6 +123,9 @@ class HomeController extends \yii\web\Controller
{ {
$coursewareInfo = Courseware::findOne(['course_id' => $courseId, 'status' => Courseware::STATUS_OK]); $coursewareInfo = Courseware::findOne(['course_id' => $courseId, 'status' => Courseware::STATUS_OK]);
$course = Course::findOne(['id' => $courseId]); $course = Course::findOne(['id' => $courseId]);
if($course === NULL){
throw new InvalidParamException('参数错误');
}
$teachers = $course->teachers; $teachers = $course->teachers;
$userId = Yii::$app->user->id; $userId = Yii::$app->user->id;
if ($coursewareInfo === NULL) { if ($coursewareInfo === NULL) {
......
...@@ -29,7 +29,6 @@ class MyMemberController extends \yii\web\Controller ...@@ -29,7 +29,6 @@ class MyMemberController extends \yii\web\Controller
if ($data['count'] > 0) { if ($data['count'] > 0) {
Member::injectOrderInfo($uid, $data['data']); Member::injectOrderInfo($uid, $data['data']);
} }
return $this->render('index', $data + compact('typeCount')); return $this->render('index', $data + compact('typeCount'));
} }
......
<?php
/**
* Created by PhpStorm.
* User: xiabin
* Date: 2016/10/13
* Time: 上午9:57
*/
namespace frontend\controllers;
use common\libs\Utils;
use GuzzleHttp\Client;
use yii\web\Controller;
class TestController extends Controller
{
public $enableCsrfValidation = FALSE;
public function actionIndex2()
{
$data = (\Yii::$app->request->post());
$order_id = date("YmdHis");
$order_id = '20161013135950';
//发送统一下单请求
$client = new Client(
[
'timeout' => 8,
'verify' => FALSE,
'connect_timeout' => 8
]
);
$uri = 'https://api.mch.weixin.qq.com/pay/unifiedorder';
$weixinpay = \Yii::$app->params['weixinpay'];
$xml = [
'appid' => $weixinpay['appid'],
'mch_id' => $weixinpay['mchid'],
'device_info' => "WEB",
'nonce_str' => \Yii::$app->security->generateRandomString(16),
'sign' => '',
'body' => '云崖充值中心-课程购买',
'out_trade_no' => $order_id,
'total_fee' => 1,
'spbill_create_ip' => '114.112.65.4',
'notify_url' => 'http://c.pp.cc/frontend/web/index.php/pay/weixin-notify',
'trade_type' => 'NATIVE',
];
$xml['sign'] = Utils::makeWeixinPaySign($xml, $weixinpay['key']);
$xml = Utils::assocArrayToXML('xml', $xml);
$reponse = $client->request('POST', $uri, ['Content-Type' => 'text/xml; charset=UTF8', 'body' => $xml]);
$reponse = $reponse->getBody();
$result = ((string)$reponse);
$result = simplexml_load_string($result);
$prepay_id = (string)$result->prepay_id;
$return = [
'return_code' => 'SUCCESS',
'appid'=>$weixinpay['appid'],
'mch_id'=>$weixinpay['mchid'],
'nonce_str'=>(string)$result->nonce_str,
'prepay_id'=>(string)$result->prepay_id,
'result_code'=>'SUCCESS',
'sign'=>''
];
$return['sign'] = Utils::makeWeixinPaySign($return,$weixinpay['key']);
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
]);
// var_dump(Yii::$app->request->post());
// $log = \Yii::$app->log->getLogger();
// $log->log(json_encode($data),Logger::LEVEL_ERROR);
}
public function actionIndex(){
return $this->render('index');
}
}
opcache_invalidate(__FILE__);
\ No newline at end of file
<?php <?php
/* @var $this yii\web\View */ /* @var $this yii\web\View */
$this->title=$classInfo['name'];
$this->registerMetaTag(['name' => 'keywords', 'content' => $classInfo['name']]);
\frontend\assets\AppAsset::addScript($this, '@web/assets/home_index.js'); \frontend\assets\AppAsset::addScript($this, '@web/assets/home_index.js');
\frontend\assets\AppAsset::addCss($this, '@web/assets/css/home_index.css'); \frontend\assets\AppAsset::addCss($this, '@web/assets/css/home_index.css');
\frontend\assets\AppAsset::addCss($this, '@web/assets/css/main.css'); \frontend\assets\AppAsset::addCss($this, '@web/assets/css/main.css');
?> ?>
<input id="class-info" type="hidden" value="<?= \yii\helpers\Html::encode(json_encode($classInfo)) ?>"/> <input id="class-info" type="hidden" value="<?= \yii\helpers\Html::encode(json_encode($classInfo)) ?>"/>
......
...@@ -5,8 +5,12 @@ ...@@ -5,8 +5,12 @@
* Date: 2016/10/14 * Date: 2016/10/14
* Time: 下午5:39 * Time: 下午5:39
*/ */
$this->title = "视频播放"; use frontend\assets\AppAsset;
\backend\assets\AppAsset::register($this);
$this->registerMetaTag(['name' => 'keywords', 'content' => $coursewareInfo['className']]);
$this->registerMetaTag(['name' => 'description', 'content' => strip_tags(mb_substr($coursewareInfo['intro'],0,70))]);
$this->title = "{$coursewareInfo['courseName']}-{$coursewareInfo['className']}";
AppAsset::register($this);
$js = <<<JS $js = <<<JS
window._bd_share_config = { window._bd_share_config = {
"common": { "common": {
......
...@@ -8,14 +8,5 @@ ...@@ -8,14 +8,5 @@
?> ?>
<div class="tp-head navbar-fixed-top clearfix"> <div class="tp-head navbar-fixed-top clearfix">
<div class="menu-btn fl"><a href="javascript:;"><i class="icon-menu"></i></a></div> <div class="menu-btn fl"><a href="javascript:;"><i class="icon-menu"></i></a></div>
<div class="avatar fr" style="position: relative"> <div class="avatar fr"><a href="<?= \yii\helpers\Url::base() . '/user-center/'?>"><img src="<?=\common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar) ?>"></a></div>
<a href="<?= \yii\helpers\Url::base() . 'user-center/'?>"><img src="<?=\common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar) ?>"></a>
<!--<ul class="dropdown-menu" style="display: block; right: 100px;">
<li><a href="#">个人中信</a></li>
<li><a href="#">我的课堂</a></li>
<li class="divider"></li>
<li><a href="#">退出</a></li>
</ul>-->
</div>
</div> </div>
...@@ -14,10 +14,8 @@ $baseUrl = \yii\helpers\Url::base(); ...@@ -14,10 +14,8 @@ $baseUrl = \yii\helpers\Url::base();
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<html lang="<?= Yii::$app->language ?>"> <html lang="<?= Yii::$app->language ?>">
<title><?= $this->title ?></title>
<meta charset="<?= Yii::$app->charset ?>"> <meta charset="<?= Yii::$app->charset ?>">
<meta name="description" content=""> <meta name="copyright" content="云涯">
<meta name="keywords" content="">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="shortcut icon" href="<?= AppAsset::getStaticUrl('img/favicon.ico') ?>"> <link rel="shortcut icon" href="<?= AppAsset::getStaticUrl('img/favicon.ico') ?>">
...@@ -30,7 +28,7 @@ $baseUrl = \yii\helpers\Url::base(); ...@@ -30,7 +28,7 @@ $baseUrl = \yii\helpers\Url::base();
<?php if (Yii::$app->user->isGuest) : ?> <?php if (Yii::$app->user->isGuest) : ?>
<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>
<!-- <!--
<ul class="c-menu-item pull-left"> <ul class="c-menu-item pull-left">
<li class="active"><a href="#">首页</a></li> <li class="active"><a href="#">首页</a></li>
...@@ -47,8 +45,8 @@ $baseUrl = \yii\helpers\Url::base(); ...@@ -47,8 +45,8 @@ $baseUrl = \yii\helpers\Url::base();
<?php else : ?> <?php else : ?>
<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/info" ?>">云崖</a></div>
<div class="avatar pull-right"><a href="<?= \yii\helpers\Url::base() . '/user-center/'?>"><img src="<?=\common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar) ?>"></a></div> <div class="avatar pull-right"><a href="<?= $baseUrl . '/user-center/info'?>"><img src="<?=\common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar) ?>"></a></div>
</div> </div>
<?php endif; ?> <?php endif; ?>
......
...@@ -80,4 +80,14 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css'); ...@@ -80,4 +80,14 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css');
<button type="submit" class="btn btn-save m-l-10">保存</button> <button type="submit" class="btn btn-save m-l-10">保存</button>
</div> </div>
</form> </form>
</div> </div>
\ No newline at end of file <script type="text/javascript">
$(function(){
$( window ).unload(function() {
// return "Bye now!";
alert("Goodbye!");
return false;
});
});
</script>
\ No newline at end of file
...@@ -57,7 +57,7 @@ AppAsset::addScript($this, '@web/assets/my_income.js'); ...@@ -57,7 +57,7 @@ AppAsset::addScript($this, '@web/assets/my_income.js');
<?=date('Y-m-d H:i', $row['order']['updated_at'])?> <?=date('Y-m-d H:i', $row['order']['updated_at'])?>
</td> </td>
<td><?=$row['order']['user']['telephone']?> / <?=$row['order']['user']['username']?></td> <td><?=$row['order']['user']['telephone']?> / <?=$row['order']['user']['username']?></td>
<td>《<a href="<?=\common\models\Course::url($row['order']['course_id'])?>" target="_blank"><?=$row['order']['course']['name']?></a>》</td> <td><a href="<?=\common\models\Course::url($row['order']['course_id'])?>" target="_blank">《<?=$row['order']['course']['name']?>》</a></td>
<td>¥<?=$row['order']['credit']?></td> <td>¥<?=$row['order']['credit']?></td>
<td><?=($row['status'] ? '已结算' : '未结算')?></td> <td><?=($row['status'] ? '已结算' : '未结算')?></td>
</tr> </tr>
......
...@@ -45,7 +45,7 @@ $this->title = '我的会员'; ...@@ -45,7 +45,7 @@ $this->title = '我的会员';
<td><?=$row['user']['telephone']?> / <?=$row['user']['username']?></td> <td><?=$row['user']['telephone']?> / <?=$row['user']['username']?></td>
<td>推广</td> <td>推广</td>
<?php if (!empty($row['first_order'])) { ?> <?php if (!empty($row['first_order'])) { ?>
<td>《<?=$row['first_order']['course']['name']?>》</td> <td><a target="_blank" href="<?=\common\models\Course::url($row['first_order']['course_id'],true)?>">《<?=$row['first_order']['course']['name']?>》</a></td>
<?php } else { ?> <?php } else { ?>
<td>无</td> <td>无</td>
<?php } ?> <?php } ?>
......
...@@ -7,6 +7,8 @@ use frontend\assets\AppAsset; ...@@ -7,6 +7,8 @@ use frontend\assets\AppAsset;
$this->title = '添加讲师'; $this->title = '添加讲师';
AppAsset::addScript($this, '@web/assets/teacher_form.js'); AppAsset::addScript($this, '@web/assets/teacher_form.js');
AppAsset::addCss($this, '@web/assets/css/teacher_form.css');
?> ?>
<div class="add-box"> <div class="add-box">
<div class="add-box-main"> <div class="add-box-main">
...@@ -20,7 +22,7 @@ AppAsset::addScript($this, '@web/assets/teacher_form.js'); ...@@ -20,7 +22,7 @@ AppAsset::addScript($this, '@web/assets/teacher_form.js');
</div> </div>
<div class="teacher-info"> <div class="teacher-info">
<textarea name="intro" placeholder="请输入讲师介绍..."></textarea> <textarea id="teacher-intro" name="intro" placeholder="请输入讲师介绍..."></textarea>
<p class="text-number">20 / 500</p> <p class="text-number">20 / 500</p>
</div> </div>
......
...@@ -4,6 +4,8 @@ use frontend\assets\AppAsset; ...@@ -4,6 +4,8 @@ use frontend\assets\AppAsset;
$this->title = '修改讲师信息'; $this->title = '修改讲师信息';
AppAsset::addScript($this, '@web/assets/teacher_form.js'); AppAsset::addScript($this, '@web/assets/teacher_form.js');
AppAsset::addCss($this, '@web/assets/css/teacher_form.css');
?> ?>
<div class="add-box"> <div class="add-box">
<div class="add-box-main"> <div class="add-box-main">
...@@ -17,7 +19,7 @@ AppAsset::addScript($this, '@web/assets/teacher_form.js'); ...@@ -17,7 +19,7 @@ AppAsset::addScript($this, '@web/assets/teacher_form.js');
</div> </div>
<div class="teacher-info"> <div class="teacher-info">
<textarea name="intro" placeholder="请输入讲师介绍..."><?=$teacher->intro?></textarea> <textarea id="teacher-intro" name="intro" placeholder="请输入讲师介绍..."><?=$teacher->intro?></textarea>
<p class="text-number">20 / 500</p> <p class="text-number">20 / 500</p>
</div> </div>
......
...@@ -10,51 +10,9 @@ $url = Yii::$app->qiniu->storages['public']['url']; ...@@ -10,51 +10,9 @@ $url = Yii::$app->qiniu->storages['public']['url'];
?> ?>
<div id="user-center-info-container">
<div id="edit-container" class="add-box" style="display: none"> <info avatarsrc="<?= \common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar) ?>" username="<?=\yii\bootstrap\Html::encode(Yii::$app->user->identity->username)?>" avatar="<?= \yii\bootstrap\Html::encode(Yii::$app->user->identity->avatar)?>" public-token="<?=$publicToken?>"></info>
<div class="add-box-main">
<div class="tit">基本信息</div>
<div class="upload-avatar" id="avatar-uploader" token="<?= $publicToken ?>">
<div id="upload-avatar-value">
<i class=" icon-image"></i>
<p>上传头像</p>
</div>
<span id="upload-process" style="display:none;" class="loading-tip">上传中</span>
</div>
<input id="avatar" type="hidden"
value="<?= \yii\bootstrap\Html::encode(Yii::$app->user->identity->avatar) ?>">
<div class="type-name">
<input id="username" type="text"
value="<?= \yii\bootstrap\Html::encode(Yii::$app->user->identity->username) ?>"
placeholder="请输入您的昵称...">
</div>
<div class="btn-box m-t-20">
<button id="cancel" class="btn btn-nobg">取消</button>
<button id="save" class="btn btn-save m-l-10">保存</button>
</div>
</div>
</div> </div>
<div id="normal-container" class="add-box">
<div class="add-box-main">
<div class="tit">基本信息</div>
<div class="upload-avatar">
<img id="avatar-uploader"
src="<?=\common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar)?>">
</div>
<div class="type-name m-b-20"><?= \yii\bootstrap\Html::encode(Yii::$app->user->identity->username) ?></div>
<a id="edit" href="javascript:;" class="edit-info"><i class="icon-mode_edit"></i></a>
</div>
</div>
...@@ -56,4 +56,28 @@ var vm = new Vue({ ...@@ -56,4 +56,28 @@ var vm = new Vue({
self.avatar = data.uuid; self.avatar = data.uuid;
}); });
} }
});
var Simditor = require("../utils/simditor");
//添加编辑器部分
var editor = new Simditor({
textarea: $('#teacher-intro'),
upload: false,
tabIndent: true,
toolbar: [
'bold',
'italic',
'underline',
'color',
'ol',
'ul'
],
toolbarFloat: true,
toolbarFloatOffset: 0,
toolbarHidden: false,
pasteImage: false,
cleanPaste: false,
//optional options
}); });
\ No newline at end of file
<template>
<div id="edit-container" class="add-box" v-if="showEdit">
<div class="add-box-main">
<div class="tit">基本信息</div>
<avatar-upload :uptoken="publicToken"></avatar-upload>
<input id="avatar" type="hidden"
v-model="avatar">
<div class="type-name">
<input id="username" type="text"
v-model="username"
placeholder="请输入您的昵称...">
</div>
<div class="btn-box m-t-20">
<button @click="cancel" class="btn btn-nobg">取消
</button>
<button @click="save" id="save" class="btn btn-save m-l-10">保存</button>
</div>
</div>
</div>
<div v-if="!showEdit" id="normal-container" class="add-box">
<div class="add-box-main">
<div class="tit">基本信息</div>
<div class="upload-avatar">
<img id="avatar-uploader"
:src="avatarsrc">
</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>
</div>
</div>
</template>
<script>
import avatarUploader from '../../components/uploader/avatar-upload.vue';
export default{
data(){
return {
showEdit:false,
change:false
}
},
props:{
publicToken:String,
avatar:String,
username:String,
avatarsrc:String
},
components:{
"avatarUpload":avatarUploader
},
methods:{
cancel(){
window.location.reload();
},
save(){
var url = __BASE_URL__ + 'user-center/save-user-info';
var dataObj = {
avatar: this.avatar,
username: this.username
};
$.ajax({
type: "POST",
url: url,
data: dataObj,
dataType: 'json',
success: function (reponse) {
if (!reponse.status === true) {
layer.alert(reponse.message || '系统错误', {icon: 2, title: "提示"})
} else {
window.location.reload();
}
}
}).error(function () {
layer.alert('保存用户信息接口错误', {'icon': 2, 'title': '提示'});
})
},
},
ready(){
this.$on("avatar-uploaded", function(name, data) {
this.avatar = data.key
});
}
}
</script>
/** /**
* Created by xiabin on 2016/9/29. * Created by xiabin on 2016/9/29.
*/ */
require.ensure('../libs/plupload/plupload.full.min.js', function () { var Vue = require('vue');
require('script!../libs/plupload/plupload.full.min.js'); var info = require('./conponents/info.vue');
var token = $('#avatar-uploader').attr('token'); new Vue({
var uploader = new plupload.Uploader({ el:'#user-center-info-container',
runtimes: 'html5,flash,html4', components: {
browse_button: 'avatar-uploader', "info": info
url: "http://upload.qiniu.com/", },
multipart_params: { data:function () {
token: token return {
}, showEdit:false
max_file_size: '5MB', }
flash_swf_url: __CDN_URL__ + 'assets/single-lib/plupload/Moxie.swf', }
max_retries: 0,
dragdrop: false,
multi_selection: false,
auto_start: true,
init: {
'FilesAdded': function (up, files) {
// plupload.each(files, function (file) {
// ready.find(".upload-info-size").text(filesize(file.origSize));
// ready.find("h3").text(file.name);
// });
//
// container.find(".upload-video-btn").hide();
// ready.show();
//
up.start();
up.disableBrowse();
//
// startTime = (new Date()).getTime();
},
'BeforeUpload': function (up, file) {
// 每个文件上传前,处理相关的事情
},
'UploadProgress': function (up, file) {
$('#upload-process').show();
},
'FileUploaded': function (up, file, info) {
// 每个文件上传成功后,处理相关的事情
$('#upload-process').hide();
var res = JSON.parse(info.response);
var url = __QINIU_URL__ + res.key;
var html = '<img src="' + url + '">';
$('#upload-avatar-value').html(html);
$('#avatar').val(res.key);
},
'Error': function (up, err, errTip) {
//上传出错时,处理相关的事情
},
'UploadComplete': function () {
//队列文件处理完毕后,处理相关的事情
}
}
});
uploader.init()
}); });
$("#cancel").click(function () {
window.location.reload();
});
var oldAvatar = $('#avatar').val();
var oldUsername = $("#username").val();
$("#save").click(function () {
var avatar = $('#avatar').val();
var username = $("#username").val();
if (avatar === oldAvatar && username === oldUsername) {
return false;
}
var url = __BASE_URL__ + 'user-center/save-user-info';
console.log(avatar);
console.log(username);
var dataObj = {
avatar: avatar,
username: username
};
$.ajax({
type: "POST",
url: url,
data: dataObj,
dataType: 'json',
success: function (reponse) {
if (!reponse.status === true) {
layer.alert(reponse.message || '系统错误', {icon: 2, title: "提示"})
} else {
window.location.reload();
}
}
}).error(function () {
layer.alert('保存用户信息接口错误', {'icon': 2, 'title': '提示'});
})
});
$('#edit').click(function () {
$('#edit-container').show();
$('#normal-container').hide();
});
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