Skip to content

semour / semour_web

Go to a project
Commit e7afcf92 by 肖康
Options

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

parents d4e77465 3858ad20
Inline Side-by-side
Showing with 79 additions and 58 deletions
app/Http/Services/ClassService.php
...@@ -9,6 +9,10 @@ class ClassService ...@@ -9,6 +9,10 @@ class ClassService
//获取首页需要的所有分类,没有英文名称的不要 //获取首页需要的所有分类,没有英文名称的不要
public static function getClassificationForHome() public static function getClassificationForHome()
{ {
$cache = Redis::get('semour_classification_cache');
if ($cache) {
return json_decode($cache, true);
}
//先获取所有分类 //先获取所有分类
$classData = \Http::get(config('website.footstone_url') . '/open/getClassification')->json(); $classData = \Http::get(config('website.footstone_url') . '/open/getClassification')->json();
$secondClassList = []; $secondClassList = [];
...@@ -56,13 +60,20 @@ class ClassService ...@@ -56,13 +60,20 @@ class ClassService
} }
} }
} }
return array_values($topFields); $data = array_values($topFields);
Redis::set('semour_classification_cache', json_encode($data));
Redis::expire('semour_classification_cache', 600);
return $data;
} }
return []; return [];
} }
public static function getClassificationById($classId, $includeChildren = false) public static function getClassificationById($classId, $includeChildren = false)
{ {
$cache = Redis::get('semour_classification_cache_' . $classId);
if ($cache) {
return json_decode($cache, true);
}
$classData = \Http::get(config('website.footstone_url') . '/open/getClassification')->json(); $classData = \Http::get(config('website.footstone_url') . '/open/getClassification')->json();
if (isset($classData['code']) && $classData['code'] == 0) { if (isset($classData['code']) && $classData['code'] == 0) {
$classificationCache = $classData['data']; $classificationCache = $classData['data'];
...@@ -87,6 +98,8 @@ class ClassService ...@@ -87,6 +98,8 @@ class ClassService
} }
} }
$classification['sku_number'] = $totalSkuNumber; $classification['sku_number'] = $totalSkuNumber;
Redis::set('semour_classification_cache_' . $classId, json_encode($classification));
Redis::expire('semour_classification_cache_' . $classId, 600);
return $classification; return $classification;
} }
return []; return [];
......
app/Http/Services/OrderService.php
...@@ -462,9 +462,7 @@ class OrderService ...@@ -462,9 +462,7 @@ class OrderService
->keyby("rec_id") ->keyby("rec_id")
->toArray(); ->toArray();
$temp = []; $temp = [];
$return_amount_all = 0;
foreach ($returnItems as $k=>$v){ foreach ($returnItems as $k=>$v){
$recId = $v["rec_id"]; $recId = $v["rec_id"];
$orderGoodsInfo = \Arr::get($orderItemsArr,$recId); $orderGoodsInfo = \Arr::get($orderItemsArr,$recId);
...@@ -479,12 +477,13 @@ class OrderService ...@@ -479,12 +477,13 @@ class OrderService
"after_sale_price"=>$v["return_price"], // 售后单价 "after_sale_price"=>$v["return_price"], // 售后单价
"return_amount"=>$v["return_amount"], // 售后金额 "return_amount"=>$v["return_amount"], // 售后金额
]; ];
$return_amount_all += $v["return_amount"];
} }
$return_amount_all = 0;
$temp = array_values($temp); $temp = array_values($temp);
foreach ($temp as $c=>&$a){ foreach ($temp as $c=>&$a){
$a["no"] = $c+1; $a["no"] = $c+1;
$return_amount_all += $a["return_amount"];
} }
return ["return_amount_all"=>$return_amount_all,"items"=>$temp]; return ["return_amount_all"=>$return_amount_all,"items"=>$temp];
} }
......
resources/views/about/certification.blade.php
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
@endsection @endsection
@section('title','Certification - ')
@section('body') @section('body')
@include('common.headerTop') @include('common.headerTop')
@include('common.headerNav') @include('common.headerNav')
...@@ -63,4 +63,4 @@ ...@@ -63,4 +63,4 @@
@section('js') @section('js')
@endsection @endsection
\ No newline at end of file
resources/views/about/company.blade.php
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
@endsection @endsection
@section('title','Company - ')
@section('body') @section('body')
@include('common.headerTop') @include('common.headerTop')
@include('common.headerNav') @include('common.headerNav')
...@@ -39,4 +39,4 @@ ...@@ -39,4 +39,4 @@
@section('js') @section('js')
@endsection @endsection
\ No newline at end of file
resources/views/about/privacy.blade.php
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
@endsection @endsection
@section('title','Privacy - ')
@section('body') @section('body')
@include('common.headerTop') @include('common.headerTop')
@include('common.headerNav') @include('common.headerNav')
...@@ -256,4 +256,4 @@ ...@@ -256,4 +256,4 @@
@section('js') @section('js')
@endsection @endsection
\ No newline at end of file
resources/views/about/quality.blade.php
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
@endsection @endsection
@section('title','Quality - ')
@section('body') @section('body')
@include('common.headerTop') @include('common.headerTop')
...@@ -43,4 +44,4 @@ ...@@ -43,4 +44,4 @@
@section('js') @section('js')
@endsection @endsection
\ No newline at end of file
resources/views/about/refund.blade.php
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
@endsection @endsection
@section('title','Refund - ')
@section('body') @section('body')
@include('common.headerTop') @include('common.headerTop')
...@@ -72,4 +73,4 @@ ...@@ -72,4 +73,4 @@
@section('js') @section('js')
@endsection @endsection
\ No newline at end of file
resources/views/about/term.blade.php
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
@endsection @endsection
@section('title','Term - ')
@section('body') @section('body')
@include('common.headerTop') @include('common.headerTop')
...@@ -146,4 +147,4 @@ ...@@ -146,4 +147,4 @@
@section('js') @section('js')
@endsection @endsection
\ No newline at end of file
resources/views/about/termuser.blade.php
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
@endsection @endsection
@section('title','Term User - ')
@section('body') @section('body')
@include('common.headerTop') @include('common.headerTop')
...@@ -135,4 +136,4 @@ ...@@ -135,4 +136,4 @@
@section('js') @section('js')
@endsection @endsection
\ No newline at end of file
resources/views/auth/changePassword.blade.php
@extends('layouts.app') @extends('layouts.app')
@section('title','Change Password - ')
@section('css') @section('css')
<link rel="stylesheet" href="{{$public}}/assets/css/auth/forget.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/auth/forget.min.css?v={{time()}}">
@endsection @endsection
...@@ -30,13 +32,13 @@ ...@@ -30,13 +32,13 @@
<p class="labelp ">CONFIRM PASSWORD</p> <p class="labelp ">CONFIRM PASSWORD</p>
<input type="text"> <input type="text">
</div> </div>
<div class="tips">Wrong Email Address</div> <div class="tips">Wrong Email Address</div>
<div class="but gobtn gonext">Submit</div> <div class="but gobtn gonext">Submit</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
...@@ -44,4 +46,4 @@ ...@@ -44,4 +46,4 @@
@section('js') @section('js')
<script src="{{$public}}/assets/js/auth/changePassword.js?v={{time()}}"></script> <script src="{{$public}}/assets/js/auth/changePassword.js?v={{time()}}"></script>
@endsection @endsection
\ No newline at end of file
resources/views/auth/forget.blade.php
@extends('layouts.app') @extends('layouts.app')
@section('title','Forget Password - ')
@section('css') @section('css')
<link rel="stylesheet" href="{{$public}}/assets/css/auth/forget.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/auth/forget.min.css?v={{time()}}">
@endsection @endsection
...@@ -48,7 +50,7 @@ ...@@ -48,7 +50,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
...@@ -56,4 +58,4 @@ ...@@ -56,4 +58,4 @@
@section('js') @section('js')
<script src="{{$public}}/assets/js/auth/forget.js?v={{time()}}"></script> <script src="{{$public}}/assets/js/auth/forget.js?v={{time()}}"></script>
@endsection @endsection
\ No newline at end of file
resources/views/auth/login.blade.php
@extends('layouts.app') @extends('layouts.app')
@section('title','Login - ')
@section('css') @section('css')
<link rel="stylesheet" href="{{$public}}/assets/css/auth/login.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/auth/login.min.css?v={{time()}}">
@endsection @endsection
...@@ -36,4 +38,4 @@ ...@@ -36,4 +38,4 @@
@section('js') @section('js')
<script src="{{$public}}/assets/js/auth/login.js?v={{time()}}"></script> <script src="{{$public}}/assets/js/auth/login.js?v={{time()}}"></script>
@endsection @endsection
\ No newline at end of file
resources/views/auth/passwords/confirm.blade.php
@extends('layouts.app') @extends('layouts.app')
@section('title','Confirm - ')
@section('content') @section('content')
<div class="container"> <div class="container">
......
resources/views/auth/passwords/email.blade.php
@extends('layouts.app') @extends('layouts.app')
@section('title','Email - ')
@section('content') @section('content')
<div class="container"> <div class="container">
......
resources/views/auth/passwords/reset.blade.php
@extends('layouts.app') @extends('layouts.app')
@section('title','Reset Password - ')
@section('content') @section('content')
<div class="container"> <div class="container">
......
resources/views/auth/register.blade.php
@extends('layouts.app') @extends('layouts.app')
@section('title','Register - ')
@section('css') @section('css')
<link rel="stylesheet" href="{{$public}}/assets/css/auth/reg.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/auth/reg.min.css?v={{time()}}">
@endsection @endsection
...@@ -84,12 +86,12 @@ ...@@ -84,12 +86,12 @@
<div class="resendbox row"> <div class="resendbox row">
Didn't receive a code?<div class="resendbut">Resend</div> Didn't receive a code?<div class="resendbut">Resend</div>
</div> </div>
<div class="butbox row rowCenter"> <div class="butbox row rowCenter">
<div class="backbut">Back</div> <div class="backbut">Back</div>
<div class="but nextbut gonext2">Register</div> <div class="but nextbut gonext2">Register</div>
</div> </div>
</div> </div>
</div> </div>
<div class="auth-box regStep3" style="display:none"> <div class="auth-box regStep3" style="display:none">
...@@ -112,7 +114,7 @@ ...@@ -112,7 +114,7 @@
<p class="labelp"><span>*</span>STATE</p> <p class="labelp"><span>*</span>STATE</p>
<input type="text" class="province3 verify" verifyTip='{"type":"null","text":"STATE"}'> <input type="text" class="province3 verify" verifyTip='{"type":"null","text":"STATE"}'>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="input-group-auth"> <div class="input-group-auth">
...@@ -139,9 +141,9 @@ ...@@ -139,9 +141,9 @@
<p class="labelp"><span>*</span>POSTAL CODE</p> <p class="labelp"><span>*</span>POSTAL CODE</p>
<input type="text" class="post_code3 verify" verifyTip='{"type":"null","text":"POSTAL CODE"}'> <input type="text" class="post_code3 verify" verifyTip='{"type":"null","text":"POSTAL CODE"}'>
</div> </div>
</div> </div>
</div> </div>
<div class="tikup"> <div class="tikup">
<span>*</span> <span>*</span>
...@@ -153,7 +155,7 @@ ...@@ -153,7 +155,7 @@
<div class="but gobtn gonext gonext3">Submit</div> <div class="but gobtn gonext gonext3">Submit</div>
<div class="but gobtn gonext gonext3Jump">Skip</div> <div class="but gobtn gonext gonext3Jump">Skip</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -165,4 +167,4 @@ ...@@ -165,4 +167,4 @@
@section('js') @section('js')
<script src="{{$public}}/assets/js/auth/reg.js?v={{time()}}"></script> <script src="{{$public}}/assets/js/auth/reg.js?v={{time()}}"></script>
@endsection @endsection
\ No newline at end of file
resources/views/brand/list.blade.php
@extends('layouts.appMall') @extends('layouts.appMall')
@section('title','Brand - ')
@section('css') @section('css')
<link rel="stylesheet" href="{{$public}}/assets/css/brand/list.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/brand/list.min.css?v={{time()}}">
@endsection @endsection
...@@ -76,7 +78,7 @@ ...@@ -76,7 +78,7 @@
<div class="th">Options</div> <div class="th">Options</div>
</div> </div>
<div class="data-td"> <div class="data-td">
</div> </div>
<div class="M-pagebox row rowCenter"></div> <div class="M-pagebox row rowCenter"></div>
...@@ -140,4 +142,4 @@ ...@@ -140,4 +142,4 @@
@section('js') @section('js')
<script src="{{$public}}/assets/js/brand/list.js?v={{time()}}"></script> <script src="{{$public}}/assets/js/brand/list.js?v={{time()}}"></script>
@endsection @endsection
\ No newline at end of file
resources/views/brand/map.blade.php
@extends('layouts.appMall') @extends('layouts.appMall')
@section('title','Brand Map - ')
@section('css') @section('css')
<link rel="stylesheet" href="{{$public}}/assets/css/brand/brand.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/brand/brand.min.css?v={{time()}}">
@endsection @endsection
...@@ -57,7 +59,7 @@ ...@@ -57,7 +59,7 @@
<div class="ttc row boxsiz"> <div class="ttc row boxsiz">
@foreach ($item as $itemchild) @foreach ($item as $itemchild)
<a href="/brand/{{$itemchild['standard_brand_id']}}" >{{$itemchild['brand_name_en']}}</a> <a href="/brand/{{$itemchild['standard_brand_id']}}" >{{$itemchild['brand_name_en']}}</a>
@endforeach @endforeach
</div> </div>
</div> </div>
@endforeach @endforeach
...@@ -73,4 +75,4 @@ ...@@ -73,4 +75,4 @@
@section('js') @section('js')
<script src="{{$public}}/assets/js/brand/map.js?v={{time()}}"></script> <script src="{{$public}}/assets/js/brand/map.js?v={{time()}}"></script>
@endsection @endsection
\ No newline at end of file
resources/views/car/car.blade.php
@extends('layouts.appMall') @extends('layouts.appMall')
@section('title','Shopping Car - ')
@section('css') @section('css')
<link rel="stylesheet" href="{{$public}}/assets/css/car/car.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/car/car.min.css?v={{time()}}">
@endsection @endsection
...@@ -83,7 +85,7 @@ ...@@ -83,7 +85,7 @@
Already Registered? <a href="/login?referer={{\Illuminate\Support\Facades\URL::current()}}">Log In</a> Already Registered? <a href="/login?referer={{\Illuminate\Support\Facades\URL::current()}}">Log In</a>
</div> </div>
@endif @endif
<a href="javascript:void(0)" class="bannerc"> <a href="javascript:void(0)" class="bannerc">
<img src="{{$public}}/assets/images/car/carbanner.png?v=20221124" alt=""> <img src="{{$public}}/assets/images/car/carbanner.png?v=20221124" alt="">
</a> </a>
...@@ -113,7 +115,7 @@ ...@@ -113,7 +115,7 @@
{{if value.pdf}} {{if value.pdf}}
<a class="pdf" href="{{value.pdf}}" target="_blank"><i class="icon iconfont icon-PDF"></i></a> <a class="pdf" href="{{value.pdf}}" target="_blank"><i class="icon iconfont icon-PDF"></i></a>
{{/if}} {{/if}}
</div> </div>
<div class="td w183"> <div class="td w183">
Manufacturers：{{value.brand_name}} Manufacturers：{{value.brand_name}}
...@@ -139,4 +141,4 @@ ...@@ -139,4 +141,4 @@
@section('js') @section('js')
<script src="{{$public}}/assets/js/car/car.js?v={{time()}}"></script> <script src="{{$public}}/assets/js/car/car.js?v={{time()}}"></script>
@endsection @endsection
\ No newline at end of file
resources/views/car/confirm.blade.php
@extends('layouts.appMall') @extends('layouts.appMall')
@section('title','Order Confirm - ')
@section('css') @section('css')
<link rel="stylesheet" href="{{$public}}/assets/css/car/confirm.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/car/confirm.min.css?v={{time()}}">
@endsection @endsection
...@@ -274,4 +276,4 @@ ...@@ -274,4 +276,4 @@
@section('js') @section('js')
<script src="{{$public}}/assets/js/car/confirm.js?v={{time()}}"></script> <script src="{{$public}}/assets/js/car/confirm.js?v={{time()}}"></script>
@endsection @endsection
\ No newline at end of file
resources/views/classification/index.blade.php
@extends('layouts.appMall') @extends('layouts.appMall')
@section('title','Classification - ')
@section('css') @section('css')
<link rel="stylesheet" href="{{$public}}/assets/css/class/class.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/class/class.min.css?v={{time()}}">
@endsection @endsection
...@@ -25,7 +27,7 @@ ...@@ -25,7 +27,7 @@
@if(!empty($classification['children'])) @if(!empty($classification['children']))
<div class="class-three-box boxsiz"> <div class="class-three-box boxsiz">
<div class="chead boxsiz">{{$classification['class_name_en']}}({{$classification['sku_number']}})</div> <div class="chead boxsiz">{{$classification['class_name_en']}}({{$classification['sku_number']}})</div>
<div class="csec boxsiz clear"> <div class="csec boxsiz clear">
@foreach($classification['children'] as $class) @foreach($classification['children'] as $class)
<a href="/class/{{$class['class_id']}}" >{{$class['class_name_en']}}({{$class['sku_number']}})</a> <a href="/class/{{$class['class_id']}}" >{{$class['class_name_en']}}({{$class['sku_number']}})</a>
......
resources/views/home/home.blade.php
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<link rel="stylesheet" href="{{$public}}/assets/css/home/home.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/home/home.min.css?v={{time()}}">
@endsection @endsection
@section('title','Semour: The Global ')
@section('body') @section('body')
@include('common.headerTop') @include('common.headerTop')
@include('common.headerNav') @include('common.headerNav')
...@@ -83,4 +83,4 @@ ...@@ -83,4 +83,4 @@
@section('js') @section('js')
<script src="{{$public}}/assets/js/home/home.js?v={{time()}}"></script> <script src="{{$public}}/assets/js/home/home.js?v={{time()}}"></script>
@endsection @endsection
\ No newline at end of file
resources/views/layouts/app.blade.php
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- CSRF Token --> <!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="csrf-token" content="{{ csrf_token() }}">
<title>@yield('title', '深茂官网')title描述</title> <title>@yield('title')Electronics Supply Chain Solution Provider</title>
@include("common.css") @include("common.css")
@yield('css') @yield('css')
......
resources/views/layouts/appMall.blade.php
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- CSRF Token --> <!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="csrf-token" content="{{ csrf_token() }}">
<title>@yield('title', '深茂官网')title描述</title> <title>@yield('title')Electronics Supply Chain Solution Provider SEMOUR</title>
@include("common.css") @include("common.css")
@yield('css') @yield('css')
......
resources/views/mall/index.blade.php
@extends('layouts.appMall') @extends('layouts.appMall')
@section('css') @section('css')
@section('title',' Online Store - ')
<link rel="stylesheet" href="{{$public}}/assets/css/mall/mall.min.css?v={{time()}}"> <link rel="stylesheet" href="{{$public}}/assets/css/mall/mall.min.css?v={{time()}}">
@endsection @endsection
...@@ -51,4 +52,4 @@ ...@@ -51,4 +52,4 @@
@section('js') @section('js')
<script src="{{$public}}/assets/js/mall/mall.js?v={{time()}}"></script> <script src="{{$public}}/assets/js/mall/mall.js?v={{time()}}"></script>
@endsection @endsection
\ 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