景龙 / xingqiu · 提交

转到一个项目

作者 景龙
提交 ec01f9be08648e2b8de5ecec35ea3ac2dd3c692d 1 个父辈 2162edec
1 个管道 的构建 通过 耗费 1 秒

渲染登录注册，等详情页

内嵌 并排对比
正在显示 20 个修改的文件 包含 1050 行增加 和 84 行删除
... ... @@ -27,7 +27,7 @@ class CommonController extends HomeBaseController
* 发送手机验证码
*/
public function sendMobileCode(){
Db::startTrans();
// Db::startTrans();
$mobile = $this->request->param('mobile','');
$mc = new MobileCodeModel();
$search = '/^0?1[3|4|5|6|7|8][0-9]\d{8}$/';
... ... @@ -64,16 +64,18 @@ class CommonController extends HomeBaseController
'create_date' => date('Y-m-d')
]);
}
if($res){
if($res) {
//发送验证码
$is_ok = $this->sendCode($mobile,$mobile_code);
$is_ok = json_decode($is_ok,true);
if($is_ok['code'] != 200){
Db::rollback();
$this->apiResponse(0,$is_ok['msg']);
}
Db::commit();
$this->apiResponse(1,'发送成功');
$this->sendCode($mobile, $mobile_code);
// $is_ok = json_decode($is_ok, true);
// if ($is_ok['code'] != 200) {
// Db::rollback();
// $this->apiResponse(0, $is_ok['msg']);
// } else {
// Db::commit();
// $this->apiResponse(1, '验证码发送成功，请注意查收！');
// }
$this->apiResponse(1, '验证码发送成功，请注意查收！');
}
}
... ... @@ -81,10 +83,14 @@ class CommonController extends HomeBaseController
* 验证手机验证码
*/
public function validateMobileCode($post){
$check = '/^1[3-9]\d{9}$/';
$mc = new MobileCodeModel();
if(empty($post['mobile'])){
$this->apiResponse(0,'手机号不能为空！');
}
if (!preg_match($check, $post['mobile'])) {
$this->apiResponse(0,'请输入正确的手机号！');
}
if(empty($post['mobile_code'])){
$this->apiResponse(0,'验证码不能为空！');
}
... ...
... ... @@ -77,7 +77,7 @@ class IndexController extends HomeBaseController
//星探推荐
$position = CityCategoryModel::xttj;
$field = 'id,post_title,price,thumbnail';
$field = 'id,post_title,price,thumbnail,place';
$res_xttj = $this->getParentArticle($position,$field,16);
$this->assign('res_xttj',$res_xttj);
... ...
... ... @@ -16,37 +16,14 @@ use think\Config;
class LoginController extends HomeBaseController
{
private $config;
/**
* 登录，注册页面
*/
//登录页面
public function login(){
// $login_type = $this->request->param('login_type','1','intval');
// //1->登录 2->注册
// if($login_type == 1){
// $login_title = '登录';
// }elseif($login_type == 2){
// $login_title = '注册';
// }else{
// $this->redirect(url('index/index'));
// }
// $user_login_info = Cookie::get('user_login_info');
// if($user_login_info){
// $mobile = $user_login_info['mobile'];
// $password = $user_login_info['password'];
// $is_remember_password = 1;
// }
// $this->assign('login_type',$login_type);
// $this->assign('login_title',$login_title);
// $this->assign('mobile',isset($mobile)?$mobile:'');
// $this->assign('password',isset($password)?$password:'');
// $this->assign('is_remember_password',isset($is_remember_password)?$is_remember_password:'0');
return $this->fetch();
}
/**
* 手机号登录
*/
public function ajax_login(){
//登录提交
public function loginCommit(){
//提交参数手机号(mobile),密码(user_pass)
$param = $this->request->param();
$validate = new UsersValidate();
... ... @@ -80,10 +57,18 @@ class LoginController extends HomeBaseController
$this->apiResponse(0,'未知错误');
}
/**
* 注册
*/
public function ajax_register(){
//第三方登录页面
public function thirdLogin(){
return $this->fetch();
}
//注册页面
public function register(){
return $this->fetch();
}
//注册提交
public function registerCommit(){
//提交参数手机号(mobile),验证码(mobile_code)，密码(user_pass)
$param = $this->request->param();
//验证验证码是否正确
... ... @@ -113,7 +98,7 @@ class LoginController extends HomeBaseController
$this->apiResponse(1,'注册成功');
}
$this->apiResponse(0,'未知错误');
}
}
//首页个人中心
public function getInfo(){
... ...
... ... @@ -70,7 +70,7 @@ class ScoutController extends HomeBaseController
//旅游路线详情
public function getTravelDetail(){
$id = $this->request->param('id',0,'intval');
$field = 'id,thumbnail,notice,place,project,price,pay_url,post_title,post_excerpt,create_time,more';
$field = 'id,thumbnail,notice,place,project,price,pay_url,post_title,post_excerpt,create_time,more,post_content';
$starModel = new StarController();
$res = $starModel->getDetail($id,$field);
if($res){
... ... @@ -78,12 +78,13 @@ class ScoutController extends HomeBaseController
$res['image_url'] = isset($more['photos']) && !empty($more['photos'])?$more['photos']:'';
}
$this->assign('res',$res);
return $this->fetch();
}
//地道风物，创意设计，悦己悦人详情
public function getSceneryDetail(){
$id = $this->request->param('id',0,'intval');
$field = 'id,thumbnail,price,pay_url,post_title,post_excerpt,create_time,more';
$field = 'id,thumbnail,price,pay_url,post_title,post_excerpt,create_time,more,post_content';
$starModel = new StarController();
$res = $starModel->getDetail($id,$field);
if($res){
... ... @@ -91,5 +92,6 @@ class ScoutController extends HomeBaseController
$res['image_url'] = isset($more['photos']) && !empty($more['photos'])?$more['photos']:'';
}
$this->assign('res',$res);
return $this->fetch(':scenery_detail');
}
}
... ...
... ... @@ -650,6 +650,12 @@
<ul class="swiper-wrapper">
<volist name="res_xttj" id="vo">
<li class="swiper-slide scout_box">
<empty name="vo.place">
<a href="/portal/scout/getSceneryDetail?id={$vo.id}">
<else />
<a href="/portal/scout/getTravelDetail?id={$vo.id}">
</empty>
<div class="scout_image">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
... ... @@ -657,6 +663,7 @@
{$vo.post_title}
</h1>
<p>￥{$vo.price}</p>
</a>
</li>
</volist>
</ul>
... ...
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>登陆</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/login.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
</head>
<body>
<!--头部 -->
<include file="public@header"/>
<main>
<!--彈出框-->
<div class="mask">
</div>
<div class="container">
<div class="login">
<div class="login_left">
<img src="__TMPL__/public/assets/starImg/aicon_88.png" alt="">
</div>
<div class="login_right">
<!--登陆方式-->
<div class="login_right_nav clearfix">
<!-- third 第三方登陆-->
<div class="login_right_nav_third">
<a href="/portal/login/thirdLogin">其他登录方式</a>
</div>
<!--手机号登陆-->
<div class="login_right_nav_phone login_nav_active">
<a href="/portal/login/login">手机号登录</a>
</div>
</div>
<!--登陆-->
<div class="login_right_main">
<form action="">
<!--手机号-->
<div class="login_right_main_phone">
<input type="tel" placeholder="请输入手机号" id="mobile">
</div>
<!--密码-->
<div class="login_right_main_pswd">
<input type="password" placeholder="请输入密码" id="password">
</div>
<!--注册-->
<div class="login_right_main_reg">
没有账号？
<a href="/portal/login/register">
立即注册
</a>
</div>
<!--登陆-->
<button class="logging" type="button">登录</button>
</form>
</div>
</div>
</div>
</div>
</main>
<div class="Keep">
Copyright © 2004-2019 独角星球 版权所有
</div>
<script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
<script src="__TMPL__/public/assets/js/public.js"></script>
<script>
$('.logging').click(function(){
var phone_number = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
var mobile = $("#mobile").val();
var password = $.trim($('#password').val());
if (!phone_number.test(mobile)){
mask("手机号格式有误");
return false;
}
if(password == '') {
mask("密码不能为空");
return false;
}
$.ajax({
type: 'POST',
url: "/portal/login/loginCommit",
data: {
'mobile': mobile,
'user_pass': password
},
dataType: 'json',
success: function (data) {
if (data.code == 1) {
mask(data.msg);
// window.location.href = '/';
} else {
mask(data.msg);
}
}
});
});
</script>
</body>
</html>
... ...
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>注册</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/login.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/register.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
</head>
<body>
<!--头部 -->
<include file="public@header"/>
<main>
<!--彈出框-->
<div class="mask">
</div>
<div class="container">
<div class="login">
<div class="login_left">
<img src="__TMPL__/public/assets/starImg/aicon_88.png" alt="">
</div>
<div class="login_right">
<!--賬號註冊-->
<div class="login_right_nav clearfix">
账号注册
</div>
<!--登陆-->
<div class="login_right_main">
<form action="">
<!--手机号-->
<div class="login_right_main_phone">
<input required type="tel" placeholder="请输入手机号" id="mobile">
</div>
<!--密码-->
<div class="login_right_main_pswd">
<input required type="password" placeholder="请输入密码" id="password">
</div>
<!--验证码-->
<div class="login_right_main_code">
<input type="text" required placeholder="请输入验证码" id="mobile_code">
<input type="button" onclick="sendCode(this)" value="获取验证码" class="ver_codebtn" />
</div>
<!--已有账号，立即登录-->
<div class="logged_in">
已有账号？<a href="/portal/login/login">
立即登录
</a>
</div>
<button type="button" id="zhuce">注册</button>
</form>
</div>
</div>
</div>
</div>
</main>
<div class="Keep">
Copyright © 2004-2019 独角星球 版权所有
</div>
</body>
</html>
<script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
<script src="__TMPL__/public/assets/js/public.js"></script>
<script>
$(function(){
//提交注册
$('#zhuce').click(function () {
var mobile_code = $.trim($('#mobile_code').val());
var password = $.trim($('#password').val());
var phone_number = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
var mobile = $("#mobile").val();
if (!phone_number.test(mobile)){
mask("手机号格式有误");
return false;
}
if(password == '') {
mask("密码不能为空");
return false;
}
if(mobile_code == '') {
mask("验证码不能为空");
return false;
}
$.ajax({
type: 'POST',
url: "/portal/login/registerCommit",
data: {
'mobile': mobile,
'mobile_code': mobile_code,
'user_pass': password
},
dataType: 'json',
success: function (data) {
if (data.code == 1) {
mask('注册成功！');
window.location.href = '/portal/login/login';
} else {
mask(data.msg);
}
}
});
});
});
//注册发送验证码
function sendCode(val){
var phone_number = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
var mobile = $("#mobile").val();
if (!phone_number.test(mobile)){
mask("手机号格式有误");
}else {
$.ajax({
type: 'POST',
url: "/portal/common/sendMobileCode",
data: {
'mobile': mobile
},
dataType: 'json',
success: function (data) {
console.log(data);
if (data.code == 1) {
var countdown = 60;
settime(val, countdown);
mask(data.msg);
} else {
mask(data.msg);
}
}
});
}
}
//倒计时
function settime(val,countdown) {
if (countdown == 0) {
val.removeAttribute("disabled");
val.value="获取验证码";
countdown = 60;
} else {
val.setAttribute("disabled", true);
val.value= countdown +"s";
countdown--;
setTimeout(function() {
settime(val,countdown)
},1000)
}
}
</script>
... ...
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>第三方登录</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/login.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/login_third.css">
</head>
<body>
<!--头部 -->
<include file="public@header"/>
<main>
<div class="container">
<div class="login">
<div class="login_left">
<img src="__TMPL__/public/assets/starImg/aicon_88.png" alt="">
</div>
<div class="login_right">
<!--登陆方式-->
<div class="login_right_nav clearfix">
<!-- third 第三方登陆-->
<div class="login_right_nav_third login_nav_active">
<a href="/portal/login/thirdLogin">其他登录方式</a>
</div>
<!--手机号登陆-->
<div class="login_right_nav_phone">
<a href="/portal/login/login">手机号登录</a>
</div>
</div>
<!--登陆-->
<div class="login_right_main clearfix">
<div class="WeChat">
<a href=""><img src="__TMPL__/public/assets/starImg/aicon_89.png" alt=""></a>
</div>
<div class="Sina">
<a href=""><img src="__TMPL__/public/assets/starImg/aicon_90.png" alt=""></a>
</div>
</div>
</div>
</div>
</div>
</main>
<div class="Keep">
Copyright © 2004-2019 独角星球 版权所有
</div>
</body>
</html>
... ...
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>星探推荐</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment.css">
<link rel="stylesheet" href="__TMPL__/public/assets/js/swiper4/swiper.min.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/activity_wares.css">
</head>
<body>
<include file="public@header"/>
<main>
<div class="container">
<div class="wares clearfix">
<div class="wares_left fl">
<img src="{:cmf_get_image_url($res.thumbnail)}" alt="">
</div>
<div class="wares_right fr">
<div class="wares_right_title">{$res.post_title}</div>
<div class="wares_right_price">
<h2>商品售价：<p>￥<span>{$res.price}</span></p>
</h2>
</div>
<div class="wares_right_text">
<p>
{$res.post_excerpt}
</p>
</div>
<a href="{$res.pay_url}">
<div class="wares_right_pay">
立即前往购买
</div>
</a>
</div>
</div>
</div>
</main>
<include file="public@footer"/>
<script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
<script src="__TMPL__/public/assets/js/swiper4/swiper.min.js"></script>
<script src="__TMPL__/public/assets/js/public.js"></script>
</body>
</html>
... ...
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>旅游路线详情</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment.css">
<link rel="stylesheet" href="__TMPL__/public/assets/js/swiper4/swiper.min.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/activity_Travel.css">
</head>
<>
<include file="public@header"/>
<main>
<div class="container">
<div class="Travel clearfix">
<div class="Travel_left fl">
<div class="swiper-container">
<div class="swiper-wrapper">
<volist name="res.image_url" id="vo">
<div class="swiper-slide"><img src="{:cmf_get_image_url($vo.url)}" alt=""></div>
</volist>
</div>
<!-- Add Arrows -->
<div class="swiper-button-next"></div>
<div class="swiper-button-prev"></div>
</div>
</div>
<div class="Travel_right fr">
<div class="Travel_right_title">
{$res.post_title}
</div>
<div class="Travel_right_spec">
<div class="Travel_right_spec_Book clearfix">
<div class="Travel_right_spec_Book_left fl">
预订须知
</div>
<div class="Travel_right_spec_Book_right fl">
{$res.notice}
</div>
</div>
<div class="Travel_right_spec_Set clearfix">
<div class="Travel_right_spec_Set_left fl">出发地点</div>
<div class="Travel_right_spec_Set_right fl">{$res.place}</div>
</div>
<div class="Travel_right_spec_Contain clearfix">
<div class="Travel_right_spec_Contain_left fl">包含项目</div>
<div class="Travel_right_spec_Contain_right fl">{$res.project}</div>
</div>
<a href="{$res.pay_url}">
<div class="Travel_right_spec_pay">
立即前往购买
</div>
</a>
</div>
<div class="Travel_right_price">
<h2>商品售价：<p>￥<span>{$res.price}</span></p>
</h2>
</div>
<div class="Travel_right_price_text">
<p>
{$res.post_excerpt}
</p>
</div>
</div>
</div>
</div>
</main>
<include file="public@footer"/>
<script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
<script src="__TMPL__/public/assets/js/swiper4/swiper.min.js"></script>
<script src="__TMPL__/public/assets/js/public.js"></script>
<script>
var swiper = new Swiper('.swiper-container', {
pagination: {
el: '.swiper-pagination',
type: 'progressbar',
},
navigation: {
nextEl: '.swiper-button-next',
prevEl: '.swiper-button-prev',
},
});
</script>
</body>
</html>
... ...
... ... @@ -40,12 +40,14 @@
<volist name="res_lylx" id="vo">
<div class="swiper-slide">
<div class="Product_item">
<div class="Product_item_img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="Product_item_Route">
{$vo.post_title}
</div>
<a href="/portal/scout/getTravelDetail?id={$vo.id}">
<div class="Product_item_img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="Product_item_Route">
{$vo.post_title}
</div>
</a>
</div>
</div>
</volist>
... ... @@ -80,13 +82,15 @@
<volist name="res_ddfw" id="vo">
<div class="swiper-slide">
<div class="Specialty_item">
<div class="Specialty_item_img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="Specialty_item_name">
{$vo.post_title}
</div>
<div class="Specialty_item_price">￥{$vo.price}</div>
<a href="/portal/scout/getSceneryDetail?id={$vo.id}">
<div class="Specialty_item_img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="Specialty_item_name">
{$vo.post_title}
</div>
<div class="Specialty_item_price">￥{$vo.price}</div>
</a>
</div>
</div>
</volist>
... ... @@ -121,13 +125,15 @@
<volist name="res_cysj" id="vo">
<div class="swiper-slide">
<div class="Specialty_item">
<div class="Specialty_item_img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="Specialty_item_name">
{$vo.post_title}
</div>
<div class="Specialty_item_price">￥{$vo.price}</div>
<a href="/portal/scout/getSceneryDetail?id={$vo.id}">
<div class="Specialty_item_img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="Specialty_item_name">
{$vo.post_title}
</div>
<div class="Specialty_item_price">￥{$vo.price}</div>
</a>
</div>
</div>
</volist>
... ... @@ -161,13 +167,15 @@
<volist name="res_yjyr" id="vo">
<div class="swiper-slide">
<div class="Lifestyle_item">
<div class="Lifestyle_item_img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="Lifestyle_item_name">
{$vo.post_title}
</div>
<div class="Lifestyle_item_price">￥{$vo.price}</div>
<a href="/portal/scout/getSceneryDetail?id={$vo.id}">
<div class="Lifestyle_item_img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="Lifestyle_item_name">
{$vo.post_title}
</div>
<div class="Lifestyle_item_price">￥{$vo.price}</div>
</a>
</div>
</div>
</volist>
... ...
main {
padding-top: 78px;
padding-bottom: 100px;
}
.Travel {
width: 100%;
box-sizing: border-box;
padding: 44px 35px;
background: #fff;
}
.Travel_left {
width: 590px;
}
.Travel_left img {
width: 590px;
height: 463px;
}
.swiper-button-next,
.swiper-button-prev {
width: 34px !important;
height: 34px !important;
background-size: cover !important;
}
.swiper-button-next {
background-image: url(../starImg/aicon_07.png) !important;
}
.swiper-button-prev {
background-image: url(../starImg/aicon_08.png) !important;
}
.swiper-button-prev.swiper-button-disabled {
background-image: url(../starImg/aicon_10.png) !important;
opacity: 1 !important;
}
.swiper-button-next.swiper-button-disabled {
background-image: url(../starImg/aicon_09.png) !important;
opacity: 1 !important;
}
.Travel_right {
width: 500px;
}
.Travel_right_title {
font-size: 28px;
color: #1A1A1A;
font-weight: bold;
box-sizing: border-box;
padding-top: 10px;
}
.Travel_right_spec {
padding-bottom: 30px;
position: relative;
border-bottom: 1px solid #E6E6E6
}
.Travel_right_spec_pay {
position: absolute;
right: 0;
bottom: 50px;
width: 134px;
height: 50px;
background: rgba(9, 255, 142, 1);
border-radius: 25px;
text-align: center;
font-size: 16px;
color: #1A1A1A;
line-height: 50px;
cursor: pointer;
}
.Travel_right_spec_Book {
margin-top: 34px;
font-size: 14px;
}
.Travel_right_spec_Book_left {
height: 28px;
line-height: 28px;
}
.Travel_right_spec_Book_right {
margin-left: 23px;
box-sizing: border-box;
padding: 3px 7px;
background: #3C3C94;
color: #fff;
color: #fff;
}
.Travel_right_spec_Set,
.Travel_right_spec_Contain {
margin-top: 15px;
font-size: 14px
}
.Travel_right_spec_Set_right,
.Travel_right_spec_Contain_right {
margin-left: 23px;
}
.Travel_right_price{
padding: 20px 0;
color: #00D774;
border-bottom: 1px solid #E6E6E6
}
.Travel_right_price h2{
font-size: 14px;
}
.Travel_right_price h2 p{
font-size: 16px;
display: inline-block;
}
.Travel_right_price h2 p span{
font-size: 30px;
}
.Travel_right_price_text{
box-sizing: border-box;
padding-top: 10px;
}
.Travel_right_price_text p{
font-size: 16px;
color: #666;
margin-bottom: 15px;
}
.Travel_right_price_text p:nth-child(1){
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 5;
overflow: hidden;
}
.Travel_right_price_text p:nth-child(2){
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
\ No newline at end of file
... ...
main {
padding-top: 78px;
padding-bottom: 100px;
}
.wares {
box-sizing: border-box;
padding: 44px 34px;
background: #fff;
}
.wares_left {
width: 460px;
}
.wares_left img {
width: 460px;
height: 460px;
}
.wares_right {
width: 625px;
}
.wares_right_title {
box-sizing: border-box;
padding-top: 10px;
font-size: 28px;
color: #1A1A1A;
font-weight: bold;
padding-bottom: 30px;
border-bottom: 1px solid #E6E6E6;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.wares_right_price {
padding: 20px 0;
color: #00D774;
border-bottom: 1px solid #E6E6E6
}
.wares_right_price h2 {
font-size: 14px;
}
.wares_right_price h2 p {
font-size: 16px;
display: inline-block;
}
.wares_right_price h2 p span {
font-size: 30px;
}
.wares_right_text {
box-sizing: border-box;
padding: 40px 0;
height:247px;
}
.wares_right_text p {
font-size: 16px;
color: #666;
}
.wares_right_text p:nth-child(1) {
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 5;
overflow: hidden;
margin-bottom: 25px;
}
.wares_right_text p:nth-child(2) {
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.wares_right_pay{
width:134px;
height:50px;
background:rgba(9,255,142,1);
border-radius:25px;
line-height: 50px;
text-align: center;
font-size: 16px;
color: #1a1a1a;
cursor: pointer;
}
\ No newline at end of file
... ...
... ... @@ -167,13 +167,17 @@
/* 注册按钮 */
#header .home_login span p:first-child {
width: 78px;
height: 40px;
background: rgba(18, 237, 136, 1);
border-radius: 20px;
color: rgba(255, 255, 255, 1);
line-height: 40px;
text-align: center;
margin-top: 20px
/*#header .home_login span p:first-child {*/
/*width: 78px;*/
/*height: 40px;*/
/*background: rgba(18, 237, 136, 1);*/
/*border-radius: 20px;*/
/*color: rgba(255, 255, 255, 1);*/
/*line-height: 40px;*/
/*text-align: center;*/
/*margin-top: 20px*/
/*}*/
#register,#login{
cursor: pointer;
}
\ No newline at end of file
... ...
body,
ol,
ul,
h1,
h2,
h3,
h4,
h5,
h6,
p,
th,
td,
dl,
dd,
form,
fieldset,
legend,
input,
textarea,
select {
margin: 0;
padding: 0
}
body {
font: 12px "微软雅黑", "MicrosoftYaHei", HELVETICA;
background: #fff;
-webkit-text-size-adjust: 100%;
}
a {
color: #2d374b;
text-decoration: none
}
em,
i {
font-style: normal
}
li {
list-style: none
}
img {
border: 0;
vertical-align: middle
}
table {
border-collapse: collapse;
border-spacing: 0
}
p {
word-wrap: break-word
}
body {
background: #3C3C94;
}
/*清除浮动*/
.clearfix::after {
content: ".";
clear: both;
display: block;
overflow: hidden;
font-size: 0;
height: 0;
}
.clearfix {
zoom: 1;
}
.container {
width: 1200px;
margin: 0 auto;
}
main {
padding-top: 140px;
padding-bottom: 100px;
}
.login {
height: 460px;
}
/*登陆左边背景*/
.login_left {
width: 740px;
float: left;
}
/*登陆方式*/
.login_right {
width: 460px;
height: 460px;
background: #fff;
float: left;
}
.login_right_nav {
padding: 59px 84px 36px 84px;
border-bottom: 1px solid #EBEBEB;
}
.login_right_nav_third {
float: left;
}
.login_right_nav_phone {
float: right;
}
.login_right_nav a {
font-size: 20px;
color: #999;
}
/*登陆方式选中状态*/
.login_right_nav .login_nav_active {
position: relative;
}
.login_right_nav .login_nav_active:after {
content: '';
display: block;
width: 48px;
height: 2px;
background: #28EF94;
position: absolute;
left: 0;
right: 0;
margin: 12px auto;
}
.login_right_nav .login_nav_active a {
color: #28EF94;
font-weight: bold;
}
/*登陆*/
.login_right_main {
padding: 0 60px;
padding-top: 34px;
}
.login_right_main input {
width: 100%;
height: 56px;
padding: 0 24px;
box-sizing: border-box;
outline: none;
margin-bottom: 24px;
background: rgba(241, 241, 241, 1);
border-radius: 2px;
border: 0;
font-size: 16px;
}
.login_right_main input::placeholder {
color: #999;
}
/*忘记密码*/
.login_right_main_reg{
text-align: center;
margin-top: 14px;
}
.login_right_main_reg a,.logged_in a {
color: #28EF94;
}
/*登陆*/
.login_right_main form>button {
width: 100%;
height: 56px;
background: rgba(40, 239, 148, 1);
border-radius: 28px;
color: #fff;
font-size: 20px;
border: 0;
outline: none;
margin-top: 19px;
cursor: pointer;
}
/*网站备案*/
.Keep {
text-align: center;
color: #FFFEFE;
font-synthesis: 16px;
}
... ...
.login_right_main{
padding: 0 109px;
padding-top: 83px;
}
.WeChat{
float: left;
}
.Sina{
float: right;
}
\ No newline at end of file
... ...
.mask{
position:fixed;
left: 44%;
display: none;
top: 300px;
padding: 24px 32px;
box-sizing:border-box;
background:rgba(0,0,0,0.6);
border-radius:10px;
font-size:18px;
color:rgba(255,255,255,1);
}
\ No newline at end of file
... ...
.login_right_nav {
padding-top: 40px;
padding-bottom: 22px;
text-align: center;
font-size: 20px;
color: #1a1a1a;
font-weight: bold;
}
.login_right_main {
padding-top: 24px;
}
.login_right_main_code {
position: relative;
}
.login_right_main_code .ver_codebtn {
position: absolute;
width: 100px;
height: 40px;
background: rgba(255, 255, 255, 1);
border: 1px solid rgba(40, 239, 148, 1);
border-radius: 20px;
cursor: pointer;
outline: none;
top: 8px;
right: 20px;
color: #28EF94;
padding: 0;
}
.logged_in{
text-align: center;
}
... ...
... ... @@ -59,4 +59,25 @@ $(function(){
//改变分页图标
$('.page-item').eq(0).children().text('<');
$('.page-item:last').children().text('>');
});
\ No newline at end of file
//注册页面
$('#register').click(function(){
window.location.href = '/portal/login/register';
});
//登录页面
$('#login').click(function(){
window.location.href = '/portal/login/login';
});
});
//弹框
function mask(msg) {
$('.mask').text(msg);
$('.mask').show();
setTimeout(function(){
$('.mask').hide();
$('.mask').text('');
},4000);
}
\ No newline at end of file
... ...
... ... @@ -44,8 +44,8 @@
<!-- 登录注册 -->
<section class="home_login">
<span>
<p>注册</p>
<p>登录</p>
<p id="register">注册</p>
<p id="login">登录</p>
</span>
</section>
</div>
... ...