Skip to content

semour / semour_web

Go to a project
Commit 2dfa4af1 by 杨树贤
Options

Merge branch 'dev/ver/1.0.0'

parents 22298369 d435402b
Expand all
Inline Side-by-side
Showing with 25 additions and 22 deletions
app/Http/Services/BrandService.php
......@@ -70,9 +70,12 @@ class BrandService
public static function getStandardBrandInfo($brandId)
{
$standardBrand = Redis::hget('standard_brand', $brandId);
$standardBrand = json_decode($standardBrand, true);
$standardBrandData = \Http::get(config('website.footstone_url') . '/open/getStandardBrandInfo?brand_id=' . $brandId)->json();
if (isset($standardBrandData['code']) && $standardBrandData['code'] == 0) {
$standardBrand = $standardBrandData['data'];
return $standardBrand;
}
return [];
}
}
app/Http/Services/OrderService.php
......@@ -462,9 +462,7 @@ class OrderService
->keyby("rec_id")
->toArray();
$temp = [];
$return_amount_all = 0;
foreach ($returnItems as $k=>$v){
$recId = $v["rec_id"];
$orderGoodsInfo = \Arr::get($orderItemsArr,$recId);
......@@ -479,12 +477,13 @@ class OrderService
"after_sale_price"=>$v["return_price"], // 售后单价
"return_amount"=>$v["return_amount"], // 售后金额
];
$return_amount_all += $v["return_amount"];
}
$return_amount_all = 0;
$temp = array_values($temp);
foreach ($temp as $c=>&$a){
$a["no"] = $c+1;
$return_amount_all += $a["return_amount"];
}
return ["return_amount_all"=>$return_amount_all,"items"=>$temp];
}
......
public/assets/css/about/about.less
.gw-header-nav{
position: fixed;
top:70px;
......@@ -83,13 +84,13 @@ body{background: #000;min-width: 1200px;}
&.trr{padding-left: 122px;}
&.trl{text-align: right;padding-right: 122px;margin-right: 1px;}
span{transition: all 0.6s;}
&:hover{ background: url("../../images/home/subj.png") no-repeat;background-size: 100% 100%;
&:hover{ background: url("../../images/home/subj.png") no-repeat;
span{opacity: 0;}
}
&.bgrp1:hover{ background: url("../../images/about/bgrp1.png") no-repeat;background-size: 100% 100%;}
&.bgrp2:hover{ background: url("../../images/about/bgrp2.png") no-repeat;background-size: 100% 100%;}
&.bgrp3:hover{ background: url("../../images/about/bgrp3.png") no-repeat;background-size: 100% 100%;}
&.bgrp4:hover{ background: url("../../images/about/bgrp4.png") no-repeat;background-size: 100% 100%;}
&.bgrp1:hover{ background: url("../../images/about/bgrp1.png") right top no-repeat;}
&.bgrp2:hover{ background: url("../../images/about/bgrp2.png") left top no-repeat;}
&.bgrp3:hover{ background: url("../../images/about/bgrp3.png") right top no-repeat;}
&.bgrp4:hover{ background: url("../../images/about/bgrp4.png") left top no-repeat;}
}
}
.readbox{
......
public/assets/css/auth/reg.less
......@@ -161,7 +161,7 @@ html,
.resendbut {
cursor : pointer;
color : #283FEB;
color : #F68332;
font-size : 14px;
font-weight: bold;
margin-left: 27px;
......@@ -177,7 +177,7 @@ html,
.backbut {
font-size : 16px;
font-weight : bold;
color : #283FEB;
color : #F68332;
cursor : pointer;
position : relative;
top : 17px;
......
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;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
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:#F68332;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:#F68332;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/common/common.less
......@@ -46,7 +46,7 @@
.gw-header-nav {
height : 112px;
background : rgba(255, 255, 255, 0.1);
backdrop-filter: blur(5px);
backdrop-filter: blur(10px);
width : 100%;
position : fixed;
top : 70px;
......@@ -129,14 +129,14 @@
.searchenter {
.searchtopbox {
position : relative;
width : 120px;
width : 160px;
box-sizing: border-box;
opacity: 0;
width:30px;
overflow: hidden;
transition: all 0.8s;
input {
width : 120px;
width : 160px;
border-radius: 40px;
height:30px;
display: none;
......@@ -155,7 +155,7 @@
}
}
&:hover{
.searchtopbox {width:120px;opacity:1;input{display: block;}}
.searchtopbox {width:160px;opacity:1;input{display: block;}}
a{display: none;}
}
}
......
public/assets/css/common/pop.less
......@@ -8,7 +8,7 @@
line-height: 32px;
font-weight: bold;
position: fixed;
top:150px;
top:200px;
color:#fff;
z-index: 99999;
display: block;
......
public/assets/css/home/home.less
......@@ -119,7 +119,7 @@ body{background: #000;min-width: 1200px;}
height:160px;
width:100%;
background: rgba(255,255,255,0.3);
backdrop-filter: blur(5px);
backdrop-filter: blur(10px);
color:#fff;
position: fixed;
bottom:0px;
......
public/assets/css/home/home.min.css
.gw-header-nav{position:fixed;top:70px}body{background:#000;min-width:1200px}.homepage{background:#000}.homepage .floor1{height:1021px;width:100%;background:url("../../images/home/bg1.png") center top no-repeat}.homepage .floor1 .fl1-con{padding-top:440px;width:1200px;margin:0 auto}.homepage .floor1 .fl1-con .rtdes{position:relative}.homepage .floor1 .fl1-con .rtdes p{color:#fff;font-size:60px}.homepage .floor1 .fl1-con .rtdes .p24{font-size:24px;margin-top:30px}.homepage .floor1 .fl1-con .rtdes img{display:block;position:absolute;z-index:1;width:450px;right:-50px;top:-150px}.homepage .floor1 .fl1-con .fl1botbox{margin-top:94px}.homepage .floor1 .fl1-con .fl1botbox .ftitem{width:390px;padding-top:38px;padding-bottom:42px;background:rgba(2,11,51,0.75);margin-right:15px;text-align:center;transition:all .8s}.homepage .floor1 .fl1-con .fl1botbox .ftitem.ftlast{margin-right:0px}.homepage .floor1 .fl1-con .fl1botbox .ftitem div{height:88px;width:88px;margin:0 auto;background:#fff;border-radius:88px;text-align:center;transition:all .8s}.homepage .floor1 .fl1-con .fl1botbox .ftitem div i{font-size:47px;position:relative;top:18px;color:#283FEB}.homepage .floor1 .fl1-con .fl1botbox .ftitem p{text-align:center;font-size:30px;color:#fff;margin-top:38px;margin-bottom:24px}.homepage .floor1 .fl1-con .fl1botbox .ftitem i.ijt{color:#283FEB;transition:all .8s}.homepage .floor1 .fl1-con .fl1botbox .ftitem:hover{background:rgba(40,63,235,0.75)}.homepage .floor1 .fl1-con .fl1botbox .ftitem:hover i.ijt{color:#F68332}.homepage .floor1 .fl1-con .fl1botbox .ftitem:hover div{background:none}.homepage .floor1 .fl1-con .fl1botbox .ftitem:hover div i{font-size:60px;color:#fff}.homepage .floor2{height:480px;background:url("../../images/home/bg2.png") center top no-repeat;font-size:24px;color:#fff}.homepage .floor2 b{font-size:40px}.homepage .floor2 .f2con{width:500px;margin:0 auto;position:relative;top:260px;width:864px}.homepage .floor2 video{width:1200px;margin:0 auto;display:block}.homepage .floor3{padding-top:4px}.homepage .floor3 .row{margin-bottom:1px}.homepage .floor3 .itemf3{height:200px;width:50%;background:#1B2037;color:#fff;font-size:30px;line-height:200px;margin-bottom:1px}.homepage .floor3 .itemf3.trr{padding-left:122px}.homepage .floor3 .itemf3.trl{text-align:right;padding-right:122px;margin-right:1px}.homepage .floor3 .itemf3 b{font-size:40px;font-weight:bold;margin-right:10px}.homepage .floor3 .itemf3:hover b{font-size:100px;font-weight:bold}.homepage .floor3 .itemf3.bgbts1:hover{background:url("../../images/home/bgf1.png") no-repeat;background-size:100% 100%}.homepage .floor3 .itemf3.bgbts2:hover{background:url("../../images/home/bgf2.png") no-repeat;background-size:100% 100%}.homepage .floor3 .itemf3.bgbts3:hover{background:url("../../images/home/bgf3.png") no-repeat;background-size:100% 100%}.homepage .floor3 .itemf3.bgbts4:hover{background:url("../../images/home/bgf4.png") no-repeat;background-size:100% 100%}.homepage .floor4{padding-top:60px;text-align:center;padding-bottom:60px}.homepage .floor4 p{font-size:30px;font-weight:bold;color:#FFf;margin-bottom:36px}.homepage .floor4 .but{width:560px;height:64px;line-height:64px;background:#283FEB;color:#fff;font-size:22px;border:2px solid #283FEB;cursor:pointer}.homepage .floor4 .but.but-lk{background:none;margin-left:39px}.homepage .footfixedcor{height:160px;width:100%;background:rgba(255,255,255,0.3);backdrop-filter:blur(5px);color:#fff;position:fixed;bottom:0px;z-index:1}.homepage .footfixedcor .confotfix{position:relative;padding-top:44px;padding-bottom:47px;z-index:2}.homepage .footfixedcor .confotfix div.textt{width:656px;font-size:18px;line-height:24px;margin-right:28px;color:#fff}.homepage .footfixedcor .confotfix .but{display:block;position:relative;top:10px;text-align:center;width:248px;height:48px;line-height:48px;background:#283FEB;color:#fff;font-size:20px;border:1px solid #283FEB;cursor:pointer}.homepage .footfixedcor .confotfix .but.but-lk{background:none;margin-right:20px;color:#283FEB}
\ No newline at end of file
.gw-header-nav{position:fixed;top:70px}body{background:#000;min-width:1200px}.homepage{background:#000}.homepage .floor1{height:1021px;width:100%;background:url("../../images/home/bg1.png") center top no-repeat}.homepage .floor1 .fl1-con{padding-top:440px;width:1200px;margin:0 auto}.homepage .floor1 .fl1-con .rtdes{position:relative}.homepage .floor1 .fl1-con .rtdes p{color:#fff;font-size:60px}.homepage .floor1 .fl1-con .rtdes .p24{font-size:24px;margin-top:30px}.homepage .floor1 .fl1-con .rtdes img{display:block;position:absolute;z-index:1;width:450px;right:-50px;top:-150px}.homepage .floor1 .fl1-con .fl1botbox{margin-top:94px}.homepage .floor1 .fl1-con .fl1botbox .ftitem{width:390px;padding-top:38px;padding-bottom:42px;background:rgba(2,11,51,0.75);margin-right:15px;text-align:center;transition:all .8s}.homepage .floor1 .fl1-con .fl1botbox .ftitem.ftlast{margin-right:0px}.homepage .floor1 .fl1-con .fl1botbox .ftitem div{height:88px;width:88px;margin:0 auto;background:#fff;border-radius:88px;text-align:center;transition:all .8s}.homepage .floor1 .fl1-con .fl1botbox .ftitem div i{font-size:47px;position:relative;top:18px;color:#283FEB}.homepage .floor1 .fl1-con .fl1botbox .ftitem p{text-align:center;font-size:30px;color:#fff;margin-top:38px;margin-bottom:24px}.homepage .floor1 .fl1-con .fl1botbox .ftitem i.ijt{color:#283FEB;transition:all .8s}.homepage .floor1 .fl1-con .fl1botbox .ftitem:hover{background:rgba(40,63,235,0.75)}.homepage .floor1 .fl1-con .fl1botbox .ftitem:hover i.ijt{color:#F68332}.homepage .floor1 .fl1-con .fl1botbox .ftitem:hover div{background:none}.homepage .floor1 .fl1-con .fl1botbox .ftitem:hover div i{font-size:60px;color:#fff}.homepage .floor2{height:480px;background:url("../../images/home/bg2.png") center top no-repeat;font-size:24px;color:#fff}.homepage .floor2 b{font-size:40px}.homepage .floor2 .f2con{width:500px;margin:0 auto;position:relative;top:260px;width:864px}.homepage .floor2 video{width:1200px;margin:0 auto;display:block}.homepage .floor3{padding-top:4px}.homepage .floor3 .row{margin-bottom:1px}.homepage .floor3 .itemf3{height:200px;width:50%;background:#1B2037;color:#fff;font-size:30px;line-height:200px;margin-bottom:1px}.homepage .floor3 .itemf3.trr{padding-left:122px}.homepage .floor3 .itemf3.trl{text-align:right;padding-right:122px;margin-right:1px}.homepage .floor3 .itemf3 b{font-size:40px;font-weight:bold;margin-right:10px}.homepage .floor3 .itemf3:hover b{font-size:100px;font-weight:bold}.homepage .floor3 .itemf3.bgbts1:hover{background:url("../../images/home/bgf1.png") no-repeat;background-size:100% 100%}.homepage .floor3 .itemf3.bgbts2:hover{background:url("../../images/home/bgf2.png") no-repeat;background-size:100% 100%}.homepage .floor3 .itemf3.bgbts3:hover{background:url("../../images/home/bgf3.png") no-repeat;background-size:100% 100%}.homepage .floor3 .itemf3.bgbts4:hover{background:url("../../images/home/bgf4.png") no-repeat;background-size:100% 100%}.homepage .floor4{padding-top:60px;text-align:center;padding-bottom:60px}.homepage .floor4 p{font-size:30px;font-weight:bold;color:#FFf;margin-bottom:36px}.homepage .floor4 .but{width:560px;height:64px;line-height:64px;background:#283FEB;color:#fff;font-size:22px;border:2px solid #283FEB;cursor:pointer}.homepage .floor4 .but.but-lk{background:none;margin-left:39px}.homepage .footfixedcor{height:160px;width:100%;background:rgba(255,255,255,0.3);backdrop-filter:blur(10px);color:#fff;position:fixed;bottom:0px;z-index:1}.homepage .footfixedcor .confotfix{position:relative;padding-top:44px;padding-bottom:47px;z-index:2}.homepage .footfixedcor .confotfix div.textt{width:656px;font-size:18px;line-height:24px;margin-right:28px;color:#fff}.homepage .footfixedcor .confotfix .but{display:block;position:relative;top:10px;text-align:center;width:248px;height:48px;line-height:48px;background:#283FEB;color:#fff;font-size:20px;border:1px solid #283FEB;cursor:pointer}.homepage .footfixedcor .confotfix .but.but-lk{background:none;margin-right:20px;color:#283FEB}
\ 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 sign in to comment