Skip to content

semour / semour_web

Go to a project
Commit 085d9d37 by 杨树贤
Options

Merge branch 'dev/ver/1.0.0' of http://git.ichunt.net/semour/semour_web into dev/ver/1.0.0

parents 92caabe5 41e75dc9
Expand all
Inline Side-by-side
Showing with 98 additions and 29 deletions
public/assets/css/about/about.less
......@@ -53,7 +53,7 @@ body{background: #000;min-width: 1200px;}
background: #000;
.floor1{
height:1003px;
background: url("../../images/about/qualitybg.png") center top no-repeat;
background: url("../../images/about/zjbg.png") center top no-repeat;
p{font-size: 80px;font-weight: bold;color:#fff;width:1200px;margin:0 auto;span{font-size: 50px;display: block;}}
}
.floor2{
......
public/assets/css/auth/reg.less
......@@ -26,6 +26,8 @@ html,
width : 118px;
height : 20px;
margin-left: 25px;
position: relative;
top:3px;
}
span {
......
public/assets/css/auth/reg.min.css
body,html,#app{height:100%;background:#000}.authpage{height:100%;background:#000}.authpage .auth-con{height:100%;background:url("../../images/auth/authbg.png") center top no-repeat}.authpage .auth-con .auth-box{width:756px;margin:0 auto}.authpage .auth-con .auth-box .authb-head{height:65px;background:#010720;border-radius:16px 16px 0px 0px}.authpage .auth-con .auth-box .authb-head img{width:118px;height:20px;margin-left:25px}.authpage .auth-con .auth-box .authb-head span{font-size:18px;font-weight:bold;color:#fff;position:relative;margin-left:16px;top:3px}.authpage .auth-con .auth-box .inputboxp{width:756px;background:rgba(255,255,255,0.3);border-radius:0px 0px 16px 16px;padding:25px}.authpage .auth-con .auth-box .inputboxp p.headtips{color:#fff;font-size:18px;font-weight:bold}.authpage .auth-con .auth-box .inputboxp .checkbox{margin-top:22px;padding-left:20px;color:#fff;font-size:14px;margin-bottom:15px}.authpage .auth-con .auth-box .inputboxp .checkbox .check-group{cursor:pointer;margin-right:25px}.authpage .auth-con .auth-box .inputboxp .checkbox .check-group p{width:10px;height:10px;border:1px solid #F68332;border-radius:50%}.authpage .auth-con .auth-box .inputboxp .checkbox .check-group.act p font{display:block;width:4px;height:4px;background:#F68332;border-radius:50%}.authpage .auth-con .auth-box .inputboxp .checkbox .check-group span{margin-left:6px;position:relative;top:-2px}.authpage .auth-con .auth-box .inputboxp .input-con{padding:0 20px}.authpage .auth-con .auth-box .inputboxp .input-con .input-group-auth{margin-bottom:15px}.authpage .auth-con .auth-box .inputboxp .input-con .input-group-auth p.labelp{font-size:14px;color:#fff;margin-bottom:9px}.authpage .auth-con .auth-box .inputboxp .input-con .input-group-auth p.labelp span{color:#F68332}.authpage .auth-con .auth-box .inputboxp .input-con .input-group-auth input{width:320px}.authpage .auth-con .auth-box .inputboxp .input-con .input-group-auth.sm input{width:146px}.authpage .auth-con .auth-box .inputboxp .input-con .input-group-auth.ml30{margin-left:30px}.authpage .auth-con .auth-box .inputboxp .gobtn{width:218px;margin:0 auto;margin-top:10px}.authpage .auth-con .auth-box .inputboxp .tips{font-size:14px;text-align:center;color:#BF0707;height:20px;line-height:20px;margin-top:20px;margin-bottom:5px}.authpage .auth-con .auth-box.regStep2{width:414px}.authpage .auth-con .auth-box.regStep2 .inputboxp{width:414px}.authpage .auth-con .auth-box.regStep2 p.headtips{font-size:16px;margin-bottom:21px}.authpage .auth-con .auth-box.regStep2 .resendbox{font-size:14px;color:#fff;padding-left:20px;margin-bottom:24px}.authpage .auth-con .auth-box.regStep2 .resendbox .resendbut{cursor:pointer;color:#283FEB;font-size:14px;font-weight:bold;margin-left:27px}.authpage .auth-con .auth-box.regStep2 .nextbut{width:218px}.authpage .auth-con .auth-box.regStep2 .backbut{font-size:16px;font-weight:bold;color:#283FEB;cursor:pointer;position:relative;top:17px;margin-right:50px;left:-10px}.authpage .auth-con .auth-box.regStep2 .tips{font-size:14px;padding-left:20px;padding-right:20px;text-align:left;color:#BF0707;height:20px;line-height:20px;margin-top:0px;margin-bottom:15px}.authpage .auth-con .auth-box.regStep3 .inputboxp p.headtips{color:#fff;font-size:16px;font-weight:bold;margin-bottom:24px}.authpage .auth-con .auth-box.regStep3 .inputboxp select{width:320px}.authpage .auth-con .auth-box.regStep3 .inputboxp .hline{height:2px;width:20px;background:#FFf;margin:0 20px;position:relative;top:14px}.authpage .auth-con .auth-box.regStep3 .inputboxp .xs input{width:130px}.authpage .auth-con .auth-box.regStep3 .inputboxp .tikup{padding:0 20px;font-size:14px;color:#fff;line-height:18px}.authpage .auth-con .auth-box.regStep3 .inputboxp .tikup span{color:#F68332}.getCountryBox{position:relative}.getCountryBox .conps{display:none;position:absolute;top:33px;left:0px;width:320px;height:200px;overflow-y:auto;background:#fff;box-shadow:0 0 10px #ccc;padding:15px 0}.getCountryBox .conps .citem{height:28px;line-height:28px;padding:0 20px;color:#164D9A;cursor:pointer}.getCountryBox .conps .citem:hover{background:#DFEAFA}
\ No newline at end of file
body,html,#app{height:100%;background:#000}.authpage{height:100%;background:#000}.authpage .auth-con{height:100%;background:url("../../images/auth/authbg.png") center top no-repeat}.authpage .auth-con .auth-box{width:756px;margin:0 auto}.authpage .auth-con .auth-box .authb-head{height:65px;background:#010720;border-radius:16px 16px 0px 0px}.authpage .auth-con .auth-box .authb-head img{width:118px;height:20px;margin-left:25px;position:relative;top:3px}.authpage .auth-con .auth-box .authb-head span{font-size:18px;font-weight:bold;color:#fff;position:relative;margin-left:16px;top:3px}.authpage .auth-con .auth-box .inputboxp{width:756px;background:rgba(255,255,255,0.3);border-radius:0px 0px 16px 16px;padding:25px}.authpage .auth-con .auth-box .inputboxp p.headtips{color:#fff;font-size:18px;font-weight:bold}.authpage .auth-con .auth-box .inputboxp .checkbox{margin-top:22px;padding-left:20px;color:#fff;font-size:14px;margin-bottom:15px}.authpage .auth-con .auth-box .inputboxp .checkbox .check-group{cursor:pointer;margin-right:25px}.authpage .auth-con .auth-box .inputboxp .checkbox .check-group p{width:10px;height:10px;border:1px solid #F68332;border-radius:50%}.authpage .auth-con .auth-box .inputboxp .checkbox .check-group.act p font{display:block;width:4px;height:4px;background:#F68332;border-radius:50%}.authpage .auth-con .auth-box .inputboxp .checkbox .check-group span{margin-left:6px;position:relative;top:-2px}.authpage .auth-con .auth-box .inputboxp .input-con{padding:0 20px}.authpage .auth-con .auth-box .inputboxp .input-con .input-group-auth{margin-bottom:15px}.authpage .auth-con .auth-box .inputboxp .input-con .input-group-auth p.labelp{font-size:14px;color:#fff;margin-bottom:9px}.authpage .auth-con .auth-box .inputboxp .input-con .input-group-auth p.labelp span{color:#F68332}.authpage .auth-con .auth-box .inputboxp .input-con .input-group-auth input{width:320px}.authpage .auth-con .auth-box .inputboxp .input-con .input-group-auth.sm input{width:146px}.authpage .auth-con .auth-box .inputboxp .input-con .input-group-auth.ml30{margin-left:30px}.authpage .auth-con .auth-box .inputboxp .gobtn{width:218px;margin:0 auto;margin-top:10px}.authpage .auth-con .auth-box .inputboxp .tips{font-size:14px;text-align:center;color:#BF0707;height:20px;line-height:20px;margin-top:20px;margin-bottom:5px}.authpage .auth-con .auth-box.regStep2{width:414px}.authpage .auth-con .auth-box.regStep2 .inputboxp{width:414px}.authpage .auth-con .auth-box.regStep2 p.headtips{font-size:16px;margin-bottom:21px}.authpage .auth-con .auth-box.regStep2 .resendbox{font-size:14px;color:#fff;padding-left:20px;margin-bottom:24px}.authpage .auth-con .auth-box.regStep2 .resendbox .resendbut{cursor:pointer;color:#283FEB;font-size:14px;font-weight:bold;margin-left:27px}.authpage .auth-con .auth-box.regStep2 .nextbut{width:218px}.authpage .auth-con .auth-box.regStep2 .backbut{font-size:16px;font-weight:bold;color:#283FEB;cursor:pointer;position:relative;top:17px;margin-right:50px;left:-10px}.authpage .auth-con .auth-box.regStep2 .tips{font-size:14px;padding-left:20px;padding-right:20px;text-align:left;color:#BF0707;height:20px;line-height:20px;margin-top:0px;margin-bottom:15px}.authpage .auth-con .auth-box.regStep3 .inputboxp p.headtips{color:#fff;font-size:16px;font-weight:bold;margin-bottom:24px}.authpage .auth-con .auth-box.regStep3 .inputboxp select{width:320px}.authpage .auth-con .auth-box.regStep3 .inputboxp .hline{height:2px;width:20px;background:#FFf;margin:0 20px;position:relative;top:14px}.authpage .auth-con .auth-box.regStep3 .inputboxp .xs input{width:130px}.authpage .auth-con .auth-box.regStep3 .inputboxp .tikup{padding:0 20px;font-size:14px;color:#fff;line-height:18px}.authpage .auth-con .auth-box.regStep3 .inputboxp .tikup span{color:#F68332}.getCountryBox{position:relative}.getCountryBox .conps{display:none;position:absolute;top:33px;left:0px;width:320px;height:200px;overflow-y:auto;background:#fff;box-shadow:0 0 10px #ccc;padding:15px 0}.getCountryBox .conps .citem{height:28px;line-height:28px;padding:0 20px;color:#164D9A;cursor:pointer}.getCountryBox .conps .citem:hover{background:#DFEAFA}
\ No newline at end of file
public/assets/css/car/confirm.less
......@@ -450,6 +450,39 @@
}
}
.successPops{
position: fixed;
left:0px;
top:0px;
right:0px;
bottom:0px;
z-index: 2;
.cns{
width: 500px;
height: 118px;
background: #283FEB;
border: 1px solid #FFFFFF;
opacity: 0.65;
border-radius: 10px;
box-sizing: border-box;
margin:0 auto;
position: relative;
top:50%;
margin-top: -59px;
padding:20px 30px;
color:#fff;
p{font-size: 14px;line-height: 20px;}
.btnbox{
text-align: right;
margin-top: 20px;
a{font-size: 16px;color:#fff;&.okbtn{margin-left: 40px;}}
}
}
}
.getCountryBox{
position: relative;
.conps{
......
public/assets/css/common/common.less
......@@ -676,20 +676,34 @@
.headboxx {
height : 28px;
line-height: 28px;
overflow: hidden;
img {
width : 26px;
height : 28px;
width : 22px;
height : 22px;
vertical-align: middle;
position: relative;
left:0px;
transition: all 0.3s;
}
p {
color : #333;
font-size : 14px;
margin-left: 7px;
position: relative;
left:0px;
transition: all 0.3s;
}
}
&:hover{
.headboxx {
img {
left:-25px;
}
p{left:-25px;}
}
}
.conboxx {
margin-top : 14px;
padding-left: 33px;
......
public/assets/js/car/confirm.js
......@@ -266,9 +266,11 @@ define('confirm', ['liexin_pop','form','artTemplate'], function (require, export
$.liexin_ajax('/api/order/addOrder', 'POST', { shipping_address_id:$(".address-group.ship").attr("guid"),billing_address_id:$(".address-group.bill").attr("guid"),items:JSON.stringify(arr_)}, function (res) {
if (res.code == 0) {
tool.setCookie("car_xk",1,-1); //下单成功删掉cookie
liexin_pop.Tip({ title: res.msg },function(){
window.location.href="/user/order"
})
$(".checkorder").attr("href","/user/orderDetail?order_id="+res.data)
$(".successPops").show();
// liexin_pop.Tip({ title: res.msg },function(){
// window.location.href="/user/order"
// })
} else {
$(".ordercreates").removeClass("dis")
liexin_pop.Tip({ title: res.msg })
......
public/assets/js/common/mallUi.js
......@@ -53,6 +53,12 @@ define('mallUi', ['tool', 'liexin_pop'], function (require, exports, module) {
}
window.location.href = "/search?keyword=" + val_
})
$(".mallsearchvalx").keydown(function (e) { //给输入框绑定按键事件
var e = e || event;
if (e.keyCode == 13) {
$(".mallsearchbtnx").click()
}
});
/**上面官网商城通用**/
//官网
......
public/assets/js/common/tool.js
......@@ -58,7 +58,7 @@ define(function (require, exports, module) {
//无结果
module.exports.NoData = function (ele) {
$(ele).html('<div class="row verCenter rowCenter" style="height:150px;color:#555;">No Data</div>')
$(ele).html('<div class="row verCenter rowCenter" style="height:150px;color:#555;">No data. You may submit a <b class="frqbtnxs" style="font-weight:bold;color:#F68332;margin:0 5px;cursor:pointer;">RFQ</b> to us.</div>')
$(ele).next(".M-pagebox").hide();
}
//获取购物车数量
......
public/assets/js/user/order.js
......@@ -17,7 +17,7 @@ define('order', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function (r
page: order.page,
page_size: order.limit,
status: $(".user-right .nav .item.act").attr("guid"),
goods_name: $(".userOrderS").val()
order_sn: $(".userOrderS").val()
}
$.liexin_ajax('/api/order/orderLists', 'POST', data_, function (res) {
......@@ -28,7 +28,7 @@ define('order', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function (r
for(let key in order_count_){
$(".user-right .nav .item[guid='"+key+"'] span").text("("+order_count_[key]+")")
}
if (dataArr.length == 0) {
tool.NoData(".orderdataboxs")
return
......@@ -113,7 +113,7 @@ define('order', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function (r
$(".ttl_swift_code").text(order.bankInfo.ttl_swift_code)
$(".ttl_company_name").text(order.bankInfo.ttl_company_name)
$(".ttl_account_no").text(order.bankInfo.ttl_account_no)
$(".merchandise_pay").text(self.attr("merchandise_pay"))
......@@ -135,8 +135,8 @@ define('order', ['tool', 'liexin_pop', 'artTemplate', 'pagination'], function (r
}
})
},
}
module.exports = order.init();
......
resources/views/about/certification.blade.php
......@@ -36,7 +36,7 @@
<div class="text"><i class="icon iconfont icon-lansejiantou ijt"></i></div>
</a>
<a class="item item1 boxsiz itemlast" href="{{$public}}/assets/images/home/ISO9001.pdf" target="_blank">
<p>ISO9001：2015</p>
<p>ISO9001:2015</p>
<div class="column verCenter rowCenter imgbox">
<img src="{{$public}}/assets/images/about/ht2.png" class="st" alt="">
<img src="{{$public}}/assets/images/about/st2.png" class="ht" alt="">
......
resources/views/about/quality.blade.php
......@@ -10,7 +10,7 @@
<div class="qualitypage">
<div class="floor1 row verCenter">
<p>About Us <span>Quality Control System</span></p>
<p>Quality Control System</p>
</div>
<div class="floor2">
<div class="jscon boxsiz">
......
resources/views/auth/forget.blade.php
......@@ -11,7 +11,7 @@
<div class="authpage">
<div class="auth-con boxsiz row verCenter">
<div class="auth-box forgetStep1" >
<div class="authb-head row rowCenter verCenter"><img src="{{$public}}/assets/images/home/smlogo.png" alt="" class="logoftsm"></div>
<div class="authb-head row rowCenter verCenter"><a href="/"><img src="{{$public}}/assets/images/home/smlogo.png" alt="" class="logoftsm"></a></div>
<div class="inputboxp boxsiz verifyBox">
<p class="headtips">Reset Your Password</p>
<div class="input-group-auth">
......
resources/views/auth/login.blade.php
......@@ -11,7 +11,7 @@
<div class="authpage">
<div class="auth-con boxsiz row verCenter">
<div class="auth-box forgetStep1">
<div class="authb-head row rowCenter verCenter"><img src="{{$public}}/assets/images/home/smlogo.png" alt="" class="logoftsm"></div>
<div class="authb-head row rowCenter verCenter"><a href="/"><img src="{{$public}}/assets/images/home/smlogo.png" alt="" class="logoftsm"></a></div>
<div class="inputboxp boxsiz loginbox verifyBoxlogin">
<p class="headtips">Login</p>
<div class="input-group-auth">
......
resources/views/auth/register.blade.php
......@@ -11,7 +11,7 @@
<div class="authpage">
<div class="auth-con boxsiz row verCenter">
<div class="auth-box regStep1" >
<div class="authb-head row verCenter"><img src="{{$public}}/assets/images/home/smlogo.png" alt="" class="logoftsm"><span>Create an Account</span></div>
<div class="authb-head row verCenter"><a href="/"><img src="{{$public}}/assets/images/home/smlogo.png" alt="" class="logoftsm"></a><span>Create an Account</span></div>
<div class="inputboxp boxsiz verifyBox">
<p class="headtips">WHO IS THIS ACCOUNT FOR?</p>
<div class="checkbox row">
......@@ -67,13 +67,13 @@
</div>
<div class="tips"></div>
<div class="but gobtn gonext gonext1">Continue to Step2</div>
<div class="but gobtn gonext gonext1">Continue to Step 2</div>
</div>
</div>
<div class="auth-box regStep2" style="display:none">
<div class="authb-head row verCenter"><img src="{{$public}}/assets/images/home/smlogo.png" alt="" class="logoftsm"><span>Create an Account</span></div>
<div class="authb-head row verCenter"><a href="/"><img src="{{$public}}/assets/images/home/smlogo.png" alt="" class="logoftsm"></a><span>Create an Account</span></div>
<div class="inputboxp boxsiz verifyBox2">
<p class="headtips">A verification code has been sent.Please enter thecode below to continue.</p>
<p class="headtips">A verification code has been sent. Please enter the code below to continue.</p>
<div class="input-con">
<div class="input-group-auth">
<p class="labelp yxtext">Edward@google.cn</p>
......@@ -93,7 +93,7 @@
</div>
</div>
<div class="auth-box regStep3" style="display:none">
<div class="authb-head row verCenter"><img src="{{$public}}/assets/images/home/smlogo.png" alt="" class="logoftsm"><span>Create an Account</span></div>
<div class="authb-head row verCenter"><a href="/"><img src="{{$public}}/assets/images/home/smlogo.png" alt="" class="logoftsm"></a><span>Create an Account</span></div>
<div class="inputboxp boxsiz verifyBox3">
<p class="headtips">Shipping Address and Contact lnformation</p>
<div class="input-con">
......
resources/views/car/car.blade.php
......@@ -11,7 +11,7 @@
<div class="bread-menu row boxsiz">
<a href="">Home</a>
<i>></i>
<span>Car</span>
<span>Shopping Cart</span>
</div>
<div class="cons">
<div class="titles">Shopping Cart</div>
......@@ -49,7 +49,7 @@
</div>
</div>
<div class="td selectcount">
<b class="fw">0 </b>Items Selected
<b class="fw">0</b> Items Selected
</div>
<div class="td">
<div class="del delcarsd">Delete</div>
......
resources/views/car/confirm.blade.php
......@@ -119,6 +119,16 @@
</div>
@include('common.mallFooter')
</div>
<!--成功提示-->
<div class="successPops" style="display:none;">
<div class="cns">
<p>Save successfully! Our sales will process the order soon and give feedback within 24 hours!</p>
<div class="btnbox">
<a href="/user/orderDetail?order_id=173" class="checkorder">Check Order</a>
<a href="/user/order" class="okbtn">OK</a>
</div>
</div>
</div>
<!--新增地址弹窗-->
<div class="addressPop" style="display:none;">
<div class="inputboxp">
......
resources/views/common/mallHeaderNav.blade.php
......@@ -38,7 +38,7 @@
@foreach ($classification as $key=>$item)
<div class="groupboxx">
<div class="headboxx row">
<img src="{{$public}}/assets/images/common/class1.png" alt="">
<img src="{{$item['img']}}" alt="">
<p>{{$item['class_name']}}</p>
</div>
<div class="conboxx row">
......@@ -74,6 +74,8 @@
<a href="/about/certification" class="twoa">Certification</a>
</ul>
</div>
<a href="/" class="li">Return to Main Site</a>
</div>
</div>
......
resources/views/sku/detail.blade.php
......@@ -116,7 +116,7 @@
</div>
</div>
<div class="right">
<div class="jttitle">Pricing（USD）</div>
<div class="jttitle">Pricing(USD)</div>
<div class="qm row bothSide">
<span>Sales Unit：{{moq}}</span>
<span>Full Reel：{{mult}}</span>
......
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 sign in to comment