Skip to content

semour / semour_web

Go to a project
Commit a0cb00f1 by 肖康
Options

p品牌路由 新增地址

parent f4140683
Expand all
Inline Side-by-side
Showing with 407 additions and 138 deletions
app/Http/Controllers/BrandController.php
...@@ -24,10 +24,13 @@ class BrandController extends Controller ...@@ -24,10 +24,13 @@ class BrandController extends Controller
*/ */
public function map() public function map()
{ {
$brandList = BrandService::getStandardBrandList(); $brandList = BrandService::getStandardBrandList();
return view('brand.map',compact('brandList')); return view('brand.map',compact('brandList'));
} }
public function list()
public function info(Request $request)
{ {
return view('brand.list'); return view('brand.list');
} }
......
app/Http/Services/BrandService.php
...@@ -13,7 +13,7 @@ class BrandService ...@@ -13,7 +13,7 @@ class BrandService
$redisKey = 'semour_standard_brand_map'; $redisKey = 'semour_standard_brand_map';
$standardBrandList = Redis::get($redisKey); $standardBrandList = Redis::get($redisKey);
if ($standardBrandList) { if ($standardBrandList) {
return $standardBrandList; return json_decode($standardBrandList,true);
} }
$standardBrandCache = Redis::hgetall('standard_brand'); $standardBrandCache = Redis::hgetall('standard_brand');
$standardBrandCache = array_map(function ($value) { $standardBrandCache = array_map(function ($value) {
......
public/assets/css/common/pop.less
...@@ -236,6 +236,7 @@ ...@@ -236,6 +236,7 @@
border-radius: 4px; border-radius: 4px;
margin-right: 6px; margin-right: 6px;
position: relative; position: relative;
top:-1px;
} }
&.act{ &.act{
.chooseicon{ .chooseicon{
......
public/assets/css/user/account.less
...@@ -91,14 +91,30 @@ ...@@ -91,14 +91,30 @@
.addressbox { .addressbox {
margin-top: 16px; margin-top: 16px;
.addbtn{
width: 150px;
line-height: 32px;
color:#fff;
text-align: center;
height: 32px;
background: #164D9A;
border-radius: 8px;
margin-bottom: 15px;
cursor: pointer;
}
.list-table { .list-table {
.w56 { .w56 {
width: 56px; width: 56px;
} }
.w150 { .w200 {
width: 150px; width: 190px;
}
.w160 {
width: 160px;
}
.w140 {
width: 140px;
} }
...@@ -147,7 +163,17 @@ ...@@ -147,7 +163,17 @@
box-sizing : border-box; box-sizing : border-box;
padding-right: 5px; padding-right: 5px;
word-break : break-all; word-break : break-all;
line-height: 22px;
.default-btn{
width: 160px;
height: 32px;
line-height: 32px;
text-align: center;
background: #FAFAFA;
border: 1px solid #DFEAFA;
border-radius: 4px;
margin-left: 70px
}
.bot { .bot {
width : 74px; width : 74px;
height : 32px; height : 32px;
...@@ -176,3 +202,28 @@ ...@@ -176,3 +202,28 @@
} }
.gobtn{background: #F68332!important;} .gobtn{background: #F68332!important;}
.getCountryBox{
position: relative;
.conps{
display: none;
position: absolute;
top:33px;
left:0px;
width:320px;
height:200px;
overflow-y: auto;
background: #fff;
box-shadow: 0px 0px 10px #ccc;
padding:15px 0;
z-index: 2;
.citem{
height:28px;
line-height: 28px;
padding:0 20px;
color:#164D9A;
cursor: pointer;
&:hover{background: #DFEAFA;}
}
}
}
\ No newline at end of file
public/assets/css/user/account.min.css
.accountbox .user-right{width:1024px;min-height:350px;background:#FFFFFF;padding:18px 12px}.accountbox .user-right .nav{border-bottom:1px solid #DFEAFA}.accountbox .user-right .nav .item{height:38px;font-size:16px;color:#222;text-align:center;box-sizing:border-box;padding:0px 30px;line-height:38px;cursor:pointer}.accountbox .user-right .nav .item .tt{width:80px}.accountbox .user-right .nav .item.act{font-weight:bold;border-bottom:4px solid #164D9A}.accountbox .user-right .section .boxinfo{width:1000px;background:#F7FAFF;border-radius:8px;margin:0 auto;box-sizing:border-box;padding:25px 46px;margin-top:10px}.accountbox .user-right .section .grp{font-size:14px;color:#555;margin-bottom:35px}.accountbox .user-right .section .grp:last-child{margin-bottom:0px}.accountbox .user-right .section .grp .labels{width:200px;color:#333;font-weight:bold}.accountbox .user-right .section .grp .labels span{color:#F68332}.accountbox .user-right .section .grp .lval{width:200px;margin-right:70px}.accountbox .user-right .section .grp .edit{color:#164D9A;cursor:pointer}.accountbox .user-right .section .changebtn{width:150px;height:32px;background:#164D9A;border-radius:8px;font-size:14px;color:#fff;text-align:center;line-height:32px;cursor:pointer}.accountbox .user-right .addressbox{margin-top:16px}.accountbox .user-right .addressbox .list-table .w56{width:56px}.accountbox .user-right .addressbox .list-table .w150{width:150px}.accountbox .user-right .addressbox .list-table .thead{width:1000px;height:48px;background:#DFEAFA;border-radius:8px 8px 0px 0px;height:39px;line-height:39px;padding:0 22px;border-bottom:1px solid #DFEAFA;box-sizing:border-box}.accountbox .user-right .addressbox .list-table .thead .th{font-size:14px;color:#333;font-weight:bold;box-sizing:border-box;padding-right:5px}.accountbox .user-right .addressbox .list-table .tbody{width:1000px;background:#F7FAFF;box-sizing:border-box;border-radius:0px 0px 8px 8px;padding:0 22px}.accountbox .user-right .addressbox .list-table .tr{padding:22px 0px;border-bottom:1px solid #DFEAFA}.accountbox .user-right .addressbox .list-table .tr:last-child{border:0px}.accountbox .user-right .addressbox .list-table .tr .td{font-size:14px;color:#555;box-sizing:border-box;padding-right:5px;word-break:break-all}.accountbox .user-right .addressbox .list-table .tr .td .bot{width:74px;height:32px;font-size:14px;background:#164D9A;border-radius:4px;line-height:74px;color:#fff;text-align:center;line-height:32px;cursor:pointer}.accountbox .user-right .addressbox .list-table .tr .td .bot.delbtns{background:#FFD7BB;color:#A74703;margin-left:10px}.gobtn{background:#F68332 !important} .accountbox .user-right{width:1024px;min-height:350px;background:#FFFFFF;padding:18px 12px}.accountbox .user-right .nav{border-bottom:1px solid #DFEAFA}.accountbox .user-right .nav .item{height:38px;font-size:16px;color:#222;text-align:center;box-sizing:border-box;padding:0px 30px;line-height:38px;cursor:pointer}.accountbox .user-right .nav .item .tt{width:80px}.accountbox .user-right .nav .item.act{font-weight:bold;border-bottom:4px solid #164D9A}.accountbox .user-right .section .boxinfo{width:1000px;background:#F7FAFF;border-radius:8px;margin:0 auto;box-sizing:border-box;padding:25px 46px;margin-top:10px}.accountbox .user-right .section .grp{font-size:14px;color:#555;margin-bottom:35px}.accountbox .user-right .section .grp:last-child{margin-bottom:0px}.accountbox .user-right .section .grp .labels{width:200px;color:#333;font-weight:bold}.accountbox .user-right .section .grp .labels span{color:#F68332}.accountbox .user-right .section .grp .lval{width:200px;margin-right:70px}.accountbox .user-right .section .grp .edit{color:#164D9A;cursor:pointer}.accountbox .user-right .section .changebtn{width:150px;height:32px;background:#164D9A;border-radius:8px;font-size:14px;color:#fff;text-align:center;line-height:32px;cursor:pointer}.accountbox .user-right .addressbox{margin-top:16px}.accountbox .user-right .addressbox .addbtn{width:150px;line-height:32px;color:#fff;text-align:center;height:32px;background:#164D9A;border-radius:8px;margin-bottom:15px;cursor:pointer}.accountbox .user-right .addressbox .list-table .w56{width:56px}.accountbox .user-right .addressbox .list-table .w200{width:190px}.accountbox .user-right .addressbox .list-table .w160{width:160px}.accountbox .user-right .addressbox .list-table .w140{width:140px}.accountbox .user-right .addressbox .list-table .thead{width:1000px;height:48px;background:#DFEAFA;border-radius:8px 8px 0px 0px;height:39px;line-height:39px;padding:0 22px;border-bottom:1px solid #DFEAFA;box-sizing:border-box}.accountbox .user-right .addressbox .list-table .thead .th{font-size:14px;color:#333;font-weight:bold;box-sizing:border-box;padding-right:5px}.accountbox .user-right .addressbox .list-table .tbody{width:1000px;background:#F7FAFF;box-sizing:border-box;border-radius:0px 0px 8px 8px;padding:0 22px}.accountbox .user-right .addressbox .list-table .tr{padding:22px 0px;border-bottom:1px solid #DFEAFA}.accountbox .user-right .addressbox .list-table .tr:last-child{border:0px}.accountbox .user-right .addressbox .list-table .tr .td{font-size:14px;color:#555;box-sizing:border-box;padding-right:5px;word-break:break-all;line-height:22px}.accountbox .user-right .addressbox .list-table .tr .td .default-btn{width:160px;height:32px;line-height:32px;text-align:center;background:#FAFAFA;border:1px solid #DFEAFA;border-radius:4px;margin-left:70px}.accountbox .user-right .addressbox .list-table .tr .td .bot{width:74px;height:32px;font-size:14px;background:#164D9A;border-radius:4px;line-height:74px;color:#fff;text-align:center;line-height:32px;cursor:pointer}.accountbox .user-right .addressbox .list-table .tr .td .bot.delbtns{background:#FFD7BB;color:#A74703;margin-left:10px}.gobtn{background:#F68332 !important}.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;z-index:2}.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 \ No newline at end of file
public/assets/js/brand/map.js
define('map', [], function (require, exports, module) { define('map', ['tool'], function (require, exports, module) {
var tool=require("tool")
var map = { var map = {
init: function () { init: function () {
map.handle(); map.handle();
...@@ -17,6 +18,20 @@ define('map', [], function (require, exports, module) { ...@@ -17,6 +18,20 @@ define('map', [], function (require, exports, module) {
}) })
}) })
$("body").on("input", '.searchbrandx', tool.debounce(function (e) {
var str_ = $(this).val();
if(!str_){$(".brand-con .brand-group .ttc a").show();return}
str_=str_.toLocaleLowerCase();
$(".brand-con .brand-group .ttc a").each(function(){
var val_=$(this).text().toLocaleLowerCase();
if(val_.indexOf(str_)!=-1){
$(this).show()
}else{
$(this).hide();
}
})
}, 300))
} }
} }
module.exports = map.init(); module.exports = map.init();
......
public/assets/js/common/mallUi.js
...@@ -143,9 +143,10 @@ define('mallUi', ['tool', 'liexin_pop'], function (require, exports, module) { ...@@ -143,9 +143,10 @@ define('mallUi', ['tool', 'liexin_pop'], function (require, exports, module) {
remark: $(".allInquiryPop .inquiryremark").val() remark: $(".allInquiryPop .inquiryremark").val()
}, function (res) { }, function (res) {
if (res.code === 0) { if (res.code === 0) {
setTimeout(function () { liexin_pop.Tip({ title: res.msg },function(){
history.go(0) history.go(0)
}, 1000) })
} else { } else {
liexin_pop.Tip({ title: res.msg }) liexin_pop.Tip({ title: res.msg })
......
resources/views/brand/map.blade.php
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<div class="mallpage"> <div class="mallpage">
@include('common.mallHeaderTop') @include('common.mallHeaderTop')
@include('common.mallHeaderNav') @include('common.mallHeaderNav')
<div class="brandmap w1200"> <div class="brandmap w1200">
<div class="bread-menu row boxsiz"> <div class="bread-menu row boxsiz">
<a href="">Home</a> <a href="">Home</a>
...@@ -16,8 +17,9 @@ ...@@ -16,8 +17,9 @@
<div class="cons row bothSide"> <div class="cons row bothSide">
<div class="left-box boxsiz"> <div class="left-box boxsiz">
<p>REFINE SEARCH</p> <p>REFINE SEARCH</p>
<input type="text"> <input type="text" class="searchbrandx">
</div> </div>
<div class="right-box boxsiz"> <div class="right-box boxsiz">
<p>Manufacturers</p> <p>Manufacturers</p>
<div class="brand-head row boxsiz avarage"> <div class="brand-head row boxsiz avarage">
...@@ -50,96 +52,9 @@ ...@@ -50,96 +52,9 @@
<span guid="Z">Z</span> <span guid="Z">Z</span>
</div> </div>
<div class="brand-con boxsiz"> <div class="brand-con boxsiz">
<div class="brand-group" guid="#"> @foreach ($brandList as $key=>$item)
<div class="ttl">#</div> <div class="brand-group" guid="{{$key}}">
<div class="ttc row boxsiz"> <div class="ttl">{{$key}}</div>
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
</div>
</div>
<div class="brand-group" guid="A">
<div class="ttl">A</div>
<div class="ttc row boxsiz">
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
</div>
</div>
<div class="brand-group" guid="B">
<div class="ttl">B</div>
<div class="ttc row boxsiz">
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
</div>
</div>
<div class="brand-group" guid="C">
<div class="ttl">C</div>
<div class="ttc row boxsiz">
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
</div>
</div>
<div class="brand-group" guid="D">
<div class="ttl">D</div>
<div class="ttc row boxsiz">
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
</div>
</div>
<div class="brand-group" guid="E">
<div class="ttl">E</div>
<div class="ttc row boxsiz">
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
</div>
</div>
<div class="brand-group" guid="F">
<div class="ttl">F</div>
<div class="ttc row boxsiz">
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
</div>
</div>
<div class="brand-group" guid="G">
<div class="ttl">G</div>
<div class="ttc row boxsiz">
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
<a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a>
<a href="">4D Systems</a>
</div>
</div>
<div class="brand-group" guid="H">
<div class="ttl">H</div>
<div class="ttc row boxsiz"> <div class="ttc row boxsiz">
<a href="">3DXTECH</a> <a href="">3DXTECH</a>
<a href="">3G Shielding Specialties</a> <a href="">3G Shielding Specialties</a>
...@@ -149,6 +64,9 @@ ...@@ -149,6 +64,9 @@
<a href="">4D Systems</a> <a href="">4D Systems</a>
</div> </div>
</div> </div>
@endforeach
</div> </div>
</div> </div>
</div> </div>
......
resources/views/user/account.blade.php
...@@ -85,41 +85,20 @@ ...@@ -85,41 +85,20 @@
</div> </div>
</div> </div>
<div class="lboxs addressbox" style="display:none;"> <div class="lboxs addressbox" style="display:none;">
<div class="clear">
<div class="addbtn fr popaddressbtn">Add Address</div>
</div>
<div class="list-table"> <div class="list-table">
<div class="thead row boxsiz"> <div class="thead row boxsiz">
<div class="th w56">NO.</div> <div class="th w56">NO.</div>
<div class="th w150">NAME</div> <div class="th w200">NAME/COMPANY NAME</div>
<div class="th w150">COMPANY NAME</div> <div class="th w200">EMAIL/TELEPHONE</div>
<div class="th w150">EMAIL</div> <div class="th w200">ADDRESS</div>
<div class="th w150">TELEPHONE</div> <div class="th w160">CITY</div>
<div class="th w150">ADDRESS</div> <div class="th w140">Options</div>
<div class="th w150">Options</div>
</div> </div>
<div class="tbody"> <div class="tbody">
<div class="tr row boxsiz">
<div class="td w56">1</div>
<div class="td w150">Michael Jordan</div>
<div class="td w150">ABC123456789</div>
<div class="td w150">ABCD@qq.com</div>
<div class="td w150">000-000-0000</div>
<div class="td w150">asdasdasdasdasdas</div>
<div class="td w150 row avarage">
<div class="bot editbtns">Edit</div>
<div class="bot delbtns">Delete</div>
</div>
</div>
<div class="tr row boxsiz">
<div class="td w56">1</div>
<div class="td w150">Michael Jordan</div>
<div class="td w150">ABC123456789</div>
<div class="td w150">ABCD@qq.com</div>
<div class="td w150">000-000-0000</div>
<div class="td w150">asdasdasdasdasdas</div>
<div class="td w150 row avarage">
<div class="bot editbtns">Edit</div>
<div class="bot delbtns">Delete</div>
</div>
</div>
</div> </div>
...@@ -237,6 +216,126 @@ ...@@ -237,6 +216,126 @@
<div class="but gobtn gonext changeinfopopbtn">Submit</div> <div class="but gobtn gonext changeinfopopbtn">Submit</div>
</div> </div>
</div> </div>
<!--新增地址弹窗-->
<div class="addressPop" style="display:none;">
<div class="inputboxp">
<div class="checkbox row">
<div class="check-group row act check-group-addressp" guid="1">
<p class="row verCenter rowCenter">
<font></font>
</p>
<span>Company</span>
</div>
<div class="check-group row check-group-addressp" guid="2">
<p class="row verCenter rowCenter">
<font></font>
</p>
<span>Personal</span>
</div>
</div>
<div class="input-con">
<div class="row">
<div class="input-group-auth">
<p class="labelp"><span>*</span>EMAIL</p>
<input type="text" class="email6 verify" verifyTip='{"type":"null","text":"EMAIL"}'>
</div>
<div class="input-group-auth ml30">
<p class="labelp"><span>*</span>TELEPHONE</p>
<input type="text" class="telephone6 verify" verifyTip='{"type":"null","text":"TELEPHONE"}'>
</div>
</div>
<div class="row">
<div class="input-group-auth sm ">
<p class="labelp"><span>*</span>FIRST NAME</p>
<input type="text" class="first_name6 verify" verifyTip='{"type":"null","text":"FIRST NAME"}'>
</div>
<div class="input-group-auth sm ml30">
<p class="labelp"><span>*</span>LAST NAME</p>
<input type="text" class="last_name6 verify" verifyTip='{"type":"null","text":"LAST NAME"}'>
</div>
<div class="input-group-auth ml30">
<p class="labelp"><span>*</span>COMPANY NAME</p>
<input type="text" class="company_name6 verify" verifyTip='{"type":"null","text":"COMPANY NAME"}'>
</div>
</div>
<div class="row">
<div class="input-group-auth">
<p class="labelp"><span>*</span>ADDRESS</p>
<textarea name="" class="address6 verify" verifyTip='{"type":"null","text":"ADDRESS"}'></textarea>
</div>
</div>
<div class="row">
<div class="input-group-auth">
<p class="labelp"><span>*</span>COUNTRY/REGIONL</p>
<div class="getCountryBox">
<input type="text" class="getCountry country6 verify" verifyTip='{"type":"null","text":"COUNTRY/REGION"}'>
<div class="conps scrollbar boxsiz countryconent">
<div class="citem">ddd</div>
<div class="citem">ttt</div>
</div>
</div>
</div>
<div class="input-group-auth ml30">
<p class="labelp">STATE</p>
<input type="text" class="state6">
</div>
</div>
<div class="row">
<div class="input-group-auth">
<p class="labelp"><span>*</span>CITY</p>
<input type="text" class="city6 verify" verifyTip='{"type":"null","text":"CITY"}'>
</div>
<div class="input-group-auth ml30">
<p class="labelp"><span>*</span>POST CODE</p>
<input type="text" class="post_code6 verify" verifyTip='{"type":"null","text":"POST CODE"}'>
</div>
</div>
<div class="tips"></div>
<div class="row subbtn">
<div class="choose row act chooseaddresx">
<div class="chooseicon"></div>
<span>Default address</span>
</div>
<div class="but gobtn gonext addressPopBtn">SAVE</div>
</div>
</div>
</div>
</div>
@verbatim
<script id="DataTmp" type="text/html">
{{each data value index}}
<div class="tr row boxsiz">
<div class="td w56">{{index+1}}</div>
<div class="td w200">
<div>{{value.first_name}} {{value.last_name}}</div>
<div>{{value.company_name}}</div>
{{if (value.is_default==1) }}
<div class="default-btn">Default address</div>
{{/if}}
</div>
<div class="td w200">
<div>{{value.email}}</div>
<div>{{value.phone}}</div>
</div>
<div class="td w200">{{value.detail_address}}</div>
<div class="td w160">
<div>{{value.country}}</div>
<div>{{value.province}}</div>
<div>{{value.city}}</div>
</div>
<div class="td w140 row avarage">
<div class="bot editbtns popaddressbtn" guid="{{value.address_id}}">Edit</div>
<div class="bot delbtns" guid="{{value.address_id}}">Delete</div>
</div>
</div>
{{/each}}
</script>
@endverbatim
@section('js') @section('js')
<script src="{{$public}}/assets/js/user/account.js?v={{time()}}"></script> <script src="{{$public}}/assets/js/user/account.js?v={{time()}}"></script>
@endsection @endsection
\ No newline at end of file
routes/web.php
...@@ -44,6 +44,7 @@ Route::get('/sku', 'SkuController@detail')->name('sku.detail'); ...@@ -44,6 +44,7 @@ Route::get('/sku', 'SkuController@detail')->name('sku.detail');
Route::get('/class', 'ClassificationController@index')->name('classification.index'); Route::get('/class', 'ClassificationController@index')->name('classification.index');
Route::get('/brand/map', 'BrandController@map')->name('brand.map'); Route::get('/brand/map', 'BrandController@map')->name('brand.map');
Route::get('/brand/list', 'BrandController@list')->name('brand.list'); Route::get('/brand/list', 'BrandController@list')->name('brand.list');
Route::get('/brand/{id}', 'BrandController@info')->name('brand.info');
Route::get('/search', 'SearchController@index')->name('search.index'); Route::get('/search', 'SearchController@index')->name('search.index');
......
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