Commit f72668b1 authored by xiabin's avatar xiabin

Merge remote-tracking branch 'origin/master'

parents 930f6fd7 fd00ac46
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
* Date: 16/9/29 * Date: 16/9/29
* Time: 16:05 * Time: 16:05
*/ */
namespace common\libs; namespace common\components;
use yii\base\Object; use yii\base\Object;
use yii\helpers\Url;
use Qiniu\Auth; use Qiniu\Auth;
class Qiniu extends Object class Qiniu extends Object
...@@ -88,15 +89,61 @@ class Qiniu extends Object ...@@ -88,15 +89,61 @@ class Qiniu extends Object
$config = $this->storages[$storage]; $config = $this->storages[$storage];
$callbackUrl = Url::to(['qiniu-callback/rem-upload'], true);
$policy = [ $policy = [
'returnBody' => $returnBody, 'returnBody' => $returnBody,
'saveKey' => $filename, 'saveKey' => $filename,
'fsizeLimit' => $config['fsizeLimit'], 'fsizeLimit' => $config['fsizeLimit'],
'mimeLimit' => $config['mimeLimit'] 'mimeLimit' => $config['mimeLimit'],
'callbackUrl' => 'http://t.pp.cc/tmp/qiniu_callback.php',
'callbackBody' => 'key=$(key)&fsize=$(fsize)&time=$(year)-$(mon)-$(day) $(hour)%3A$(min)%3A$(sec)'
]; ];
$auth = $this->getAuthInstance(); $auth = $this->getAuthInstance();
return $auth->uploadToken($config['bucket'], null, $deadSeconds, $policy); return $auth->uploadToken($config['bucket'], null, $deadSeconds, $policy);
} }
public function decodeUploadToken($token)
{
$arr = explode(':', $token);
if (count($arr) != 3) {
return null;
}
list($accessKey, $sign, $data) = $arr;
$dataJson = \Qiniu\base64_urlSafeDecode($data);
$dataArr = json_decode($dataJson, true);
if (!isset($dataArr['scope'])) {
return null;
}
//寻找配置
$config = null;
foreach ($this->storages as $storage => $cfg) {
if ($cfg['bucket'] == $dataArr['scope']) {
$config = $cfg;
break;
}
}
if ($config === null) {
return null;
}
//验证 Token 是否一致
$auth = $this->getAuthInstance();
$reToken = $auth->signWithData($dataJson);
if ($token != $reToken) {
return null;
}
return $dataArr;
}
} }
\ No newline at end of file
...@@ -49,7 +49,7 @@ return [ ...@@ -49,7 +49,7 @@ return [
], ],
], ],
'qiniu' => [ 'qiniu' => [
'class' => 'common\libs\Qiniu', 'class' => 'common\components\Qiniu',
'accessKey' => 'n85SCPB9uO2v32az-3TRFsZCXwJu7YddyzLRYXg-', 'accessKey' => 'n85SCPB9uO2v32az-3TRFsZCXwJu7YddyzLRYXg-',
'secretKey' => 'KDl3b7aLpj7n9YZ07lHGivVY4c_Q-0QSM0TZ_-XS', 'secretKey' => 'KDl3b7aLpj7n9YZ07lHGivVY4c_Q-0QSM0TZ_-XS',
'storages' => [ 'storages' => [
......
...@@ -16,24 +16,24 @@ class MyCourseController extends \yii\web\Controller ...@@ -16,24 +16,24 @@ class MyCourseController extends \yii\web\Controller
public function actionPublish() public function actionPublish()
{ {
/* @var \common\libs\Qiniu $qiniu */ /* @var \common\components\Qiniu $qiniu */
$qiniu = Yii::$app->qiniu; $qiniu = Yii::$app->qiniu;
//$auth = Yii::$app->qiniu->getAuthInstance(); //$auth = Yii::$app->qiniu->getAuthInstance();
$returnBody = '{"uuid":$(uuid), "size": $(fsize), "w":$(imageInfo.width), "h":$(imageInfo.height), "hash":$(etag)}'; $returnBody = '{"uuid":$(uuid), "key": "$(key)", "size": $(fsize), "w":$(imageInfo.width), "h":$(imageInfo.height)}';
//图片上传Token //图片上传Token
//$imgName = 'preview/'.$qiniu->genRandomDir().'/'.Yii::$app->security->generateRandomString(20); //$imgName = 'preview/'.$qiniu->genRandomDir().'/'.Yii::$app->security->generateRandomString(20);
$imgPath = 'preview/'.$qiniu->generateRandomFilePath('$(ext)', 10); $imgPath = 'preview/'.$qiniu->generateRandomFilePath('$(min)$(sec)$(ext)', 8);
$publicToken = $qiniu->getUploadToken('public', $imgPath, $returnBody); $thumbToken = $qiniu->getUploadToken('public', $imgPath, $returnBody, 3600, true);
//视频上传Token //视频上传Token
//$videoName = 'source/'.$qiniu->genRandomDir().'/'.Yii::$app->security->generateRandomString(20); //$videoName = 'source/'.$qiniu->genRandomDir().'/'.Yii::$app->security->generateRandomString(20);
$videoName = 'source/'.$qiniu->generateRandomFilePath('$(ext)'); $videoName = 'source/'.$qiniu->generateRandomFilePath('$(ext)');
$videoToken = $qiniu->getUploadToken('video', $videoName, $returnBody); $videoToken = $qiniu->getUploadToken('video', $videoName, $returnBody, 86400);
$model = new CoursePublishForm(); $model = new CoursePublishForm();
return $this->render('publish', compact('model', 'publicToken', 'videoToken')); return $this->render('publish', compact('model', 'thumbToken', 'videoToken'));
} }
} }
<?php
/**
* Created by PhpStorm.
* User: pader
* Date: 16/10/8
* Time: 20:14
*/
namespace frontend\controllers;
use yii\helpers\Url;
class QiniuCallbackController extends \yii\web\Controller {
/**
* 上传回调 - 记录上传的文件
*
* 记录文件关关联处理以防止生成垃圾文件浪费空间
*/
public function actionRemUpload()
{
/* @var \Qiniu\Auth $auth */
$auth = \Yii::$app->qiniu->getAuthInstance();
//验证回调请求
$requestBody = file_get_contents('php://input');
$authorization = isset($_SERVER['HTTP_AUTHORIZATION']) ? $_SERVER['HTTP_AUTHORIZATION'] : '';
$currentUrl = \Yii::$app->request->hostInfo.\Yii::$app->request->getUrl();
if ($auth->verifyCallback($_SERVER['CONTENT_TYPE'], $authorization, $currentUrl, $requestBody)) {
echo 'ok';
} else {
echo 'no';
}
}
}
\ No newline at end of file
...@@ -19,7 +19,7 @@ AppAsset::addScript($this, '@web/assets/course_publish.js'); ...@@ -19,7 +19,7 @@ AppAsset::addScript($this, '@web/assets/course_publish.js');
<form method="post" name="coursePublish"> <form method="post" name="coursePublish">
<div class="cls-part"> <div class="cls-part">
<div class="tit">标题</div> <div class="tit">标题</div>
<input type="text" class="input-r-control" placeholder="请输入课程标题,20 个汉字以内..."> <input type="text" name="name" class="input-r-control" placeholder="请输入课程标题,20 个汉字以内...">
</div> </div>
<div class="cls-part teacher-list"> <div class="cls-part teacher-list">
...@@ -27,19 +27,19 @@ AppAsset::addScript($this, '@web/assets/course_publish.js'); ...@@ -27,19 +27,19 @@ AppAsset::addScript($this, '@web/assets/course_publish.js');
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox">杨佩佩 <input name="teacher[]" type="checkbox">杨佩佩
</label> </label>
<label class="m-l-10"> <label class="m-l-10">
<input type="checkbox">马骏 <input name="teacher[]" type="checkbox">马骏
</label> </label>
<label class="m-l-10"> <label class="m-l-10">
<input type="checkbox">花木兰 <input name="teacher[]" type="checkbox">花木兰
</label> </label>
<label class="m-l-10"> <label class="m-l-10">
<input type="checkbox">张海 <input name="teacher[]" type="checkbox">张海
</label> </label>
<span class="m-l-10"><a href="#">+ 添加讲师</a></span> <span class="m-l-10"><a href="#">+ 添加讲师</a></span>
...@@ -57,43 +57,40 @@ AppAsset::addScript($this, '@web/assets/course_publish.js'); ...@@ -57,43 +57,40 @@ AppAsset::addScript($this, '@web/assets/course_publish.js');
<div class="checkbox rules-set fl"> <div class="checkbox rules-set fl">
<label class="clearfix"> <label class="clearfix">
<input type="checkbox" class="fl"><span>会员价</span> <input type="text" class="input-r-control"> <span>元</span> <input name="vip_price" type="checkbox" class="fl" value="1"><span>会员价</span> <input type="text" value="price" class="input-r-control"> <span>元</span>
</label> </label>
</div> </div>
<div class="checkbox rules-set m-l-20 fl"> <div class="checkbox rules-set m-l-20 fl">
<label class="clearfix"> <label class="clearfix">
<input type="checkbox" class="fl"><span>免费试看</span> <input type="text" class="input-r-control"> <span>分钟</span> <input name="free_time" type="checkbox" class="fl"><span>免费试看</span> <input type="text" class="input-r-control"> <span>分钟</span>
</label> </label>
</div> </div>
</div> </div>
</div> </div>
<input type="hidden" name="vkey" value="{{videoKey}}" />
<input type="hidden" name="preview_pic" value="{{previewKey}}" />
<div class="cls-part"> <div class="cls-part">
<div class="tit">课程介绍</div> <div class="tit">课程介绍</div>
<div class="cls-intro-textarea"> <div class="cls-intro-textarea">
<textarea name="" id="" class="input-r-control" placeholder="请输入课程介绍..."></textarea> <textarea name="intro" class="input-r-control" placeholder="请输入课程介绍..."></textarea>
</div> </div>
</div> </div>
<div class="cls-part"> <div class="cls-part">
<div class="tit">缩略图 <small>建议尺寸:900像素 * 500像素</small></div> <div class="tit">缩略图 <small>建议尺寸:900像素 * 500像素</small></div>
<div class="upload-video-screen"> <thumb-upload uptoken="<?=$thumbToken?>"></thumb-upload>
<input type="file">
<i class="icon-image"></i>上传缩略图
</div>
</div> </div>
<div class="cls-part p-b-20"> <div class="cls-part p-b-20">
<div class="tit">课程属性</div> <div class="tit">课程属性</div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox">推荐课程 <input type="checkbox">推荐课程
</label> </label>
</div> </div>
</div> </div>
<div class="btn-box text-center" style="border-top: 1px solid #e7e7e7; margin-top: 10px; "> <div class="btn-box text-center" style="border-top: 1px solid #e7e7e7; margin-top: 10px; ">
...@@ -101,6 +98,4 @@ AppAsset::addScript($this, '@web/assets/course_publish.js'); ...@@ -101,6 +98,4 @@ AppAsset::addScript($this, '@web/assets/course_publish.js');
<button class="btn btn-save m-l-10">保存</button> <button class="btn btn-save m-l-10">保存</button>
</div> </div>
</form> </form>
</div> </div>
<input type="hidden" value="<?=$publicToken?>" id="previewToken"/> \ No newline at end of file
<input type="hidden" value="<?=$videoToken?>" id="videoToken"/>
\ No newline at end of file
<template xmlns:v-bind="http://www.w3.org/1999/xhtml">
<div class="upload-video-screen" v-bind:id="uploaderId">
<i class="icon-image"></i>{{text}}
</div>
</template>
<style>
.upload-video-screen {cursor:pointer; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; padding:0 10px;}
</style>
<script>
import layer from "layer-js";
import str from "../../utils/string";
var defaultText = "上传缩略图";
export default{
data() {
return {
uploaderId: "thumbUploader" + str.rand(10),
state: "ready",
text: ""
}
},
props: {
uptoken: String
},
ready() {
this.text = defaultText;
var self = this;
require.ensure(["../../utils/qiniu"], function() {
var qiniu = require("../../utils/qiniu");
var uploader = new qiniu.Uploader({
browse_button: self.uploaderId,
drop_element: self.uploaderId,
upload_token: self.uptoken,
filters: {
max_file_size: '5mb',
mime_types: [
{title: "图片文件", extensions:"jpg,jpeg,gif,png"}
]
},
flash_swf_url: __CDN_URL__ + 'assets/plupload/Moxie.swf',
dragdrop: true,
multi_selection: false,
auto_start: true,
init: {
'FilesAdded': function(up, files) {
plupload.each(files, function(file) {
// self.videoSize = filesize(file.origSize, {fixed:2, spacer:' '}).human('si');
// self.videoName = file.name;
});
self.state = 'uploading';
up.start();
self.text = "上传中..";
},
//每个文件上传前
'BeforeUpload': function(up, file) {
},
'UploadProgress': function(up, file) {
self.text = "上传中.." + file.percent + "%";
},
//每个文件上传成功后
'FileUploaded': function(up, file, info) {
self.text = "上传完成";
setTimeout(function() {
self.text = file.name;
}, 1000);
var response = $.parseJSON(info.response);
self.$dispatch("thumb-uploaded", file.name, response);
},
'Error': function(up, err) {
var msg = "";
if (err.response) {
var data = $.parseJSON(err.response);
msg += "<br>" + data.error;
}
layer.alert("图片 " + err.file.name + " 上传失败!" + msg, {icon:5, title:"上传失败"});
self.state = "error";
},
//队列文件处理完毕后
'UploadComplete': function() {
self.state = 'completed';
}
}
});
//上传中禁止重选文件
self.$watch("state", function(val, old) {
if (val == "uploading") {
uploader.disableBrowse();
} else {
uploader.disableBrowse(false);
}
self.$dispatch("thumb-upload-state-change", val, old);
});
uploader.init();
});
}
}
</script>
<template> <template xmlns:v-bind="http://www.w3.org/1999/xhtml">
<div> <div>
<div class="upload-video-btn" id="uploadVideo1"> <div class="upload-video-btn" v-bind:id="uploaderId" v-show="state=='ready' || state=='error'">
<input type="file">
<i class="icon-play"></i> <i class="icon-play"></i>
<b>上传视频</b> <b>上传视频</b>
</div> </div>
<div class="upload-ready" style="display:none;"> <div class="upload-ready" v-else>
<h3></h3> <h3>{{videoName}}</h3>
<div class="video-detail"> <div class="video-detail">
视频大小:<span class="upload-info-size"></span> 视频大小:{{videoSize}}
速度:<span class="upload-info-speed"></span> 速度:{{speed}}
</div> </div>
<div class="video-loading-text clearfix"> <div class="video-loading-text clearfix">
<div class="upload pull-left">已上传 <span class="upload-info-progress"></span>%</div> <div class="upload pull-left">已上传 {{progress}}%</div>
<div class="time pull-right">大约还剩 <span class="upload-info-remain"></span></div> <div class="time pull-right">大约还剩 <span class="upload-info-remain">{{remain}}</span></div>
</div> </div>
<i class="upload-progress" style="width:0%;"></i> <i class="upload-progress" v-bind:style="{width:progress + '%'}"></i>
</div> </div>
</div> </div>
</template> </template>
<style> <style>
.upload-ready {position:relative;} .upload-video-btn {cursor:pointer;}
.upload-ready {position:relative; z-index:2;}
.upload-ready h3 {overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
</style> </style>
<script> <script>
import filesize from "file-size"; import filesize from "file-size";
import layer from "layer-js";
import str from "../../utils/string";
export default { export default {
// data() { data() {
// return { return {
// msg:'hello vue' state: "ready",
// } videoName: "",
// }, videoSize: "",
progress: 0,
speed: "",
uploaderId: "videoUploader" + str.rand(10)
}
},
props: { props: {
uptoken: String uptoken: String
}, },
components:{
// 'other-component':OtherComponent,
// HeaderComponent,
},
ready() { ready() {
// if (typeof plupload == "undefined") {
// var err = "video-upload component required plupload!\nyou must add to asset by you self.";
// alert(err);
// console.log(err);
// return;
// }
var container = $(this.$el), var container = $(this.$el),
btn = container.find(".upload-video-btn"), btn = container.find(".upload-video-btn"),
ready = container.find(".upload-ready"); ready = container.find(".upload-ready");
var progress = ready.find(".upload-progress"), var infoRemain = ready.find(".upload-info-remain");
infoProgress = ready.find(".upload-info-progress"),
infoRemain = ready.find(".upload-info-remain"),
infoSpeed = ready.find(".upload-info-speed");
var self = this, var self = this,
startTime; startTime;
require.ensure(["../../libs/plupload/plupload.full.min.js", "moment"], function() { require.ensure(["../../utils/qiniu", "moment"], function() {
require("script!../../libs/plupload/plupload.full.min.js"); var qiniu = require("../../utils/qiniu");
var moment = require("moment"); var moment = require("moment");
moment.locale('zh-cn', { moment.locale('zh-cn', {
...@@ -80,42 +74,40 @@ export default { ...@@ -80,42 +74,40 @@ export default {
} }
}); });
var uploader = new plupload.Uploader({ var uploader = new qiniu.Uploader({
runtimes: 'html5,flash,html4', browse_button: self.uploaderId,
browse_button: 'uploadVideo1', drop_element: self.uploaderId,
drop_element: 'uploadVideo1', upload_token: self.uptoken,
url: "http://upload.qiniu.com/", filters: {
multipart_params: { max_file_size: '2gb',
token: self.uptoken mime_types: [
{title: "视频文件", extensions:"3gp,flv,rm,rmvb,divx,mpg,mpeg,mp4,m4v,mov,mkv,vob,qt,avi,asf,asx,wmv,webm"}
]
}, },
max_file_size: '2gb',
flash_swf_url: __CDN_URL__ + 'assets/plupload/Moxie.swf', flash_swf_url: __CDN_URL__ + 'assets/plupload/Moxie.swf',
max_retries: 0,
dragdrop: true, dragdrop: true,
multi_selection: false, multi_selection: false,
auto_start: true, auto_start: true,
init: { init: {
'FilesAdded': function(up, files) { 'FilesAdded': function(up, files) {
plupload.each(files, function(file) { plupload.each(files, function(file) {
ready.find(".upload-info-size").text(filesize(file.origSize, {fixed:2, spacer:' '}).human('si')); self.videoSize = filesize(file.origSize, {fixed:2, spacer:' '}).human('si');
ready.find("h3").text(file.name); self.videoName = file.name;
}); });
container.find(".upload-video-btn").hide(); // container.find(".upload-video-btn").hide();
ready.show(); // ready.show();
self.state = 'uploading';
up.start(); up.start();
up.disableBrowse();
startTime = (new Date()).getTime(); startTime = (new Date()).getTime();
}, },
//每个文件上传前
'BeforeUpload': function(up, file) { 'BeforeUpload': function(up, file) {
// 每个文件上传前,处理相关的事情
}, },
'UploadProgress': function(up, file) { 'UploadProgress': function(up, file) {
progress.css("width", file.percent + "%"); self.progress = file.percent;
infoProgress.text(file.percent); self.speed = filesize(up.total.bytesPerSec).human('si');
infoSpeed.text(filesize(up.total.bytesPerSec).human('si'));
// var avgSpeed = file.loaded / (((new Date()).getTime() - startTime) / 1000); // var avgSpeed = file.loaded / (((new Date()).getTime() - startTime) / 1000);
...@@ -129,29 +121,44 @@ export default { ...@@ -129,29 +121,44 @@ export default {
// infoProgress.text(file.percent); // infoProgress.text(file.percent);
// $("#" + file.id + " .attachup-list-element-status").html("上传中 - " + file.percent + "%"); // $("#" + file.id + " .attachup-list-element-status").html("上传中 - " + file.percent + "%");
}, },
//每个文件上传成功后
'FileUploaded': function(up, file, info) { 'FileUploaded': function(up, file, info) {
infoRemain.parent().text("上传完成"); infoRemain.parent().text("上传完成");
infoSpeed.text(""); self.speed = "-/";
// 每个文件上传成功后,处理相关的事情
// 其中info是文件上传成功后,服务端返回的json,形式如: var response = $.parseJSON(info.response);
// {
// "hash": "Fh8xVqod2MQ1mocfI4S4KpRL6D98", self.$dispatch("video-uploaded", file.name, response);
// "key": "gogopher.jpg"
// }
// 查看简单反馈
// var domain = up.getOption('domain');
// var res = parseJSON(info);
// var sourceLink = domain + res.key; 获取上传成功后的文件的Url
}, },
'Error': function(up, err, errTip) { 'Error': function(up, err) {
//上传出错时,处理相关的事情 var msg = "";
if (err.response) {
var data = $.parseJSON(err.response);
msg += "<br>" + data.error;
}
layer.alert("视频 " + err.file.name + " 上传失败!" + msg, {icon:5, title:"上传失败"});
self.state = "error";
}, },
//队列文件处理完毕后
'UploadComplete': function() { 'UploadComplete': function() {
//队列文件处理完毕后,处理相关的事情 self.state = 'completed';
} }
} }
}); });
//状态变化时禁用或启用上传按钮
self.$watch("state", function(val, old) {
if (val == "ready" || val == "error") {
uploader.disableBrowse(false);
} else {
uploader.disableBrowse();
}
self.$dispatch("video-upload-state-change", val, old);
});
uploader.init(); uploader.init();
}); });
} }
......
/** /**
* Created by pader on 16/9/28. * Created by pader on 16/9/28.
*/ */
var Vue = require('vue'); var Vue = require('vue');
var videoUpload = require('../components/common/video-upload.vue'); var videoUpload = require('../components/common/video-upload.vue');
var thumbUpload = require('../components/common/thumb-upload.vue');
var form = document.forms["coursePublish"]; var form = document.forms["coursePublish"];
var prvToken = $("#previewToken").val();
var vodToken = $("#videoToken").val();
var vm = new Vue({ var vm = new Vue({
el: '#publishMain', el: '#publishMain',
data: {
videoKey: "",
previewKey: ""
},
components: { components: {
videoUpload: videoUpload videoUpload: videoUpload,
thumbUpload: thumbUpload
},
ready: function() {
var self = this;
this.$on("video-uploaded", function(name, data) {
self.videoKey = data.key;
});
this.$on("thumb-uploaded", function(name, data) {
self.previewKey = data.key;
});
} }
}); });
require.ensure("jquery-validation", function() { require.ensure("jquery-validation", function() {
require('jquery-validation'); require('jquery-validation');
$(form).validate();
$(form).validate({
debug: true,
rules: {
required: true
}
});
}); });
/**
* Created by pader on 16/9/30.
*
* 七牛上传组件
*
* e.g.
* //建议使用 require.ensure 方式加载
* var qiniu = require("utils/qiniu.js");
*
* var uploader = new qiniu.Uploader({
* upload_token: "<UPLOAD_TOKEN>",
* ..其它参数与 plupload 一致
* });
*
* uploader.init();
*/
require("script!../libs/plupload/plupload.full.min.js");
module.exports = {
Uploader: function(option) {
var setting = {
runtimes: 'html5,flash,html4',
url: "http://upload.qiniu.com/",
multipart_params: {},
flash_swf_url: __CDN_URL__ + 'assets/plupload/Moxie.swf',
max_retries: 0
};
if (!option.multipart_params) {
option.multipart_params = {};
}
option.multipart_params.token = option.upload_token;
delete option.upload_token;
$.extend(true, option, setting);
return (new plupload.Uploader(option));
}
};
\ No newline at end of file
/**
* Created by pader on 16/10/8.
*/
module.exports = {
/**
* 简单的生成一段随机字符串
*
* @param {int} len 字符串长度
* @returns {string}
*/
rand: function(len) {
var x="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",tmp="";
for(var i=0;i<len;i++){tmp+=x.charAt(Math.ceil(Math.random()*100000000)%x.length);}
return tmp;
}
};
\ No newline at end of file
@charset "utf-8";
body {
font-family: "Microsoft YaHei","Helvitica Neue", Helvitica, Arial, "Hiragino Sans GB", "Arial Regular", "Microsoft JhengHei", sans-serif;
background-color: #f7f8fa;
}
a,a:hover,a:link {
text-decoration: none;
}
.navbar-main {
background-color: #fff;
box-shadow: 0 0 30px rgba(0,0,0,.05);
}
.logo {
line-height: 50px;
margin-left: 30px;
}
.yun-login-btn {
margin-right: 30px;
}
.yun-login-btn li a {
color: #333;
}
.yun-login-btn li:last-child a{
background-color: #34bf49;
color: #fff;
}
.z-m-center {
text-align: center;
}
.z-m-center > p {
font-size: 12px;
padding: 0 0 20px;
color: #999;
}
.tab-a ul,li ,
.tab-find ul,li{
list-style: none;
margin: 0;
padding: 0;
}
.tab-a li,
.tab-find li{
display: inline-block;
margin-right: 25px;
}
.tab-a li:last-child,
.tab-find li:last-child {
margin-right: 0;
}
.tab-a a {
display: inline-block;
color: #333;
height: 60px;
line-height: 60px;
padding: 0 5px;
border-bottom: 2px solid transparent;
}
.tab-a li.active a {
border-bottom: 2px solid #2a6496;
}
.tab-find {
margin-top: 20px;
}
.tab-find a {
display: inline-block;
width: 50px;
height: 50px;
text-align: center;
line-height: 50px;
background-color: #fff;
border-radius: 100%;
}
.tab-find li.active a {
background-color: #4285f4;
color: #fff;
}
.tab-pane {
margin-top: 40px;
}
.form-register {
width: 300px;
display: inline-block;
border: 1px solid #d5d5d5;
border-radius: 3px;
background-color: #fff;
}
.reg-box {
width: 300px;
display: inline-block;
border: 1px solid #d5d5d5;
border-radius: 3px;
background: #fff;
}
.input-wrapper {
position: relative;
border: 0;
border-radius: 0;
box-shadow: none;
}
.input-wrapper input {
width: 100%;
height: 50px;
line-height: 50px;
border: none;
border-bottom: 1px solid #f3f3f3;
text-indent: 10px;
font-size: 14px;
background-color: transparent;
outline: none;
}
.last-wrapper input {
border-bottom: none;
}
.input-wrapper span.tips {
display: inline-block;
height: 50px;
line-height: 50px;
position: absolute;
right: 0;
top: 0;
padding: 0 10px;
color: #f03434;
font-size: 12px;
}
.input-wrapper span.tip-vcode {
right: 85px;
}
.btn-get-vcode {
position: absolute;
top: 0;
right: 0;
background-color: transparent;
height: 50px;
border-radius: 0;
border: none;
border-left: 1px solid #f3f3f3;
outline: none;
font-size: 12px;
color: #2a6496;
}
.foot-reg-btn {
margin-top: 20px;
}
.btn-reg {
width: 300px;
height: 44px;
line-height: 44px;
padding: 0;
background-color: #34bf49;
color: #fff;
}
.btn-reg:hover {
background-color: #31b445;
color: #fff;
}
.btn-log {
width: 300px;
height: 44px;
line-height: 44px;
padding: 0;
background-color: #4285f4;
color: #fff;
}
.btn-log:hover {
background-color: #3f7de4;
color: #fff;
}
.part-wap {
width: 300px;
margin: 20px auto 0;
text-align: left;
}
.part-wap a {
float: right;
}
.div-line {
margin-top: 20px;
color: #999;
font-size: 12px;
}
.sucess-box span {
display: inline-block;
height: 50px;
width: 50px;
border-radius: 100%;
background-color: #34bf49;
line-height: 50px;
text-align: center;
font-size: 24px;
color: #fff;
}
.sucess-box p {
line-height: 30px;
font-size: 12px;
color: #34bf49;
padding-bottom: 20px;
}
This diff is collapsed.
This diff is collapsed.
<!DOCTYPE html>
<html>
<head lang="zh-CN">
<title>找回密码</title>
<meta charset="UTF-8">
<meta name="description" content="">
<meta name="keywords" content="">
<!-- Use latest IE randering angine and switch on chrome Frame if available -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="shortcut icon" href="/favicon.ico">
<link rel="stylesheet" href="css/bootstrap.min.css">
<link rel="stylesheet" href="css/login.css">
</head>
<body>
<nav class="navbar navbar-main navbar-static-top">
<div class="logo pull-left">云涯 YunYa</div>
<ul class="nav navbar-nav pull-right yun-login-btn">
<li><a href="#">登录</a></li>
<li class="active"><a href="#">注册</a></li>
</ul>
</nav>
<div class="container">
<div class="z-m-center">
<h3>找回密码</h3>
<p>请按步骤获取密码</p>
<div id="myTab" class="tab-find">
<ul>
<li class="active"><a href="#one" data-toggle="tab">1</a></li>
<li><a href="#two" data-toggle="tab">2</a></li>
<li><a href="#three" data-toggle="tab">3</a></li>
<li><a href="#four" data-toggle="tab">4</a></li>
</ul>
</div>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade in active" id="one">
<div class="reg-box">
<div class="phone input-wrapper last-wrapper">
<input type="text" class="" placeholder="请输入注册的手机号码" required="" autofocus="">
<!--<span class="tips">手机号或者密码错误</span>-->
</div>
</div>
<div class="foot-reg-btn">
<button class="btn btn-log" type="submit">获取验证码</button>
</div>
</div>
<div class="tab-pane fade" id="two">
<div class="reg-box">
<div class="phone input-wrapper last-wrapper">
<input type="text" class="" placeholder="请输入4位验证码" required="" autofocus="">
<!--<span class="tips">手机号或者密码错误</span>-->
</div>
</div>
<div class="foot-reg-btn">
<button class="btn btn-log" type="submit">下一步</button>
</div>
</div>
<div class="tab-pane fade" id="three">
<div class="reg-box">
<div class="password input-wrapper">
<input type="password" class="" placeholder="设置新密码" required="">
</div>
<div class="check-password input-wrapper last-wrapper">
<input type="password" class="" placeholder="重复输入密码" required="">
</div>
</div>
<div class="foot-reg-btn">
<button class="btn btn-log" type="submit">确认</button>
</div>
</div>
<div class="tab-pane fade" id="four">
<div class="sucess-box">
<span><i class="glyphicon glyphicon-ok"></i></span>
<p>密码重置成功</p>
</div>
<div class="foot-reg-btn">
<button class="btn btn-reg" type="submit">去登录</button>
</div>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="js/jquery-1.11.3.min.js"></script>
<script type='text/javascript' src="js/bootstrap.min.js"></script>
<script type='text/javascript'>
$(function () {
$('#myTab a').click(function (e) {
e.preventDefault()
$(this).tab('show')
})
})
</script>
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html>
<head lang="zh-CN">
<title>注册/登录</title>
<meta charset="UTF-8">
<meta name="description" content="">
<meta name="keywords" content="">
<!-- Use latest IE randering angine and switch on chrome Frame if available -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="shortcut icon" href="/favicon.ico">
<link rel="stylesheet" href="css/bootstrap.min.css">
<link rel="stylesheet" href="css/login.css">
</head>
<body>
<nav class="navbar navbar-main navbar-static-top">
<div class="logo pull-left">云涯 YunYa</div>
<ul class="nav navbar-nav pull-right yun-login-btn">
<li><a href="#">登录</a></li>
<li class="active"><a href="#">注册</a></li>
</ul>
</nav>
<div class="container">
<div class="z-m-center">
<h3>云涯</h3>
<p>欢迎来到最课堂,专注在线直播</p>
<div id="myTab" class="tab-a">
<ul>
<li><a href="#login" data-toggle="tab">登录</a></li>
<li class="active"><a href="#register" data-toggle="tab">注册</a></li>
</ul>
</div>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade" id="login">
<div class="reg-box">
<div class="phone input-wrapper">
<input type="text" class="" placeholder="手机号码" required="" autofocus="">
<span class="tips">手机号或者密码错误</span>
</div>
<div class="password input-wrapper last-wrapper">
<input type="password" class="" placeholder="密码" required="">
</div>
</div>
<div class="checkbox part-wap">
<label>
<input type="checkbox" value="remember-me"> 记住密码
</label>
<a href="#">忘记密码?</a>
</div>
<div class="foot-reg-btn">
<button class="btn btn-log" type="submit">登录</button>
</div>
<div class="div-line">或</div>
<div class="foot-reg-btn">
<button class="btn btn-reg" type="submit">微信登录</button>
</div>
</div>
<div class="tab-pane fade in active" id="register">
<div class="reg-box">
<div class="phone input-wrapper">
<input type="text" class="" placeholder="手机号码" required="" autofocus="">
<span class="tips">手机号或者密码错误</span>
</div>
<div class="v-code input-wrapper">
<input type="text" class="" placeholder="验证码" required="">
<button class="btn btn-get-vcode">获取验证码</button>
<span class="tips tip-vcode">验证码错误</span>
</div>
<div class="password input-wrapper">
<input type="password" class="" placeholder="输入密码" required="">
</div>
<div class="check-password input-wrapper last-wrapper">
<input type="password" class="" placeholder="再次输入密码" required="">
</div>
</div>
<div class="foot-reg-btn">
<button class="btn btn-reg" type="submit">注册</button>
</div>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="js/jquery-1.11.3.min.js"></script>
<script type='text/javascript' src="js/bootstrap.min.js"></script>
<script type='text/javascript'>
$(function () {
$('#myTab a').click(function (e) {
e.preventDefault()
$(this).tab('show')
})
})
</script>
</body>
</html>
\ 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