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

app/Http/Services/ClassService.php

@@ -9,6 +9,10 @@ class ClassService
     //获取首页需要的所有分类,没有英文名称的不要
     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();
         $secondClassList = [];
@@ -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 [];
     }
 
     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();
         if (isset($classData['code']) && $classData['code'] == 0) {
             $classificationCache = $classData['data'];
@@ -87,6 +98,8 @@ class ClassService
                 }
             }
             $classification['sku_number'] = $totalSkuNumber;
+            Redis::set('semour_classification_cache_' . $classId, json_encode($classification));
+            Redis::expire('semour_classification_cache_' . $classId, 600);
             return $classification;
         }
         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];
     }

resources/views/about/certification.blade.php

@@ -3,7 +3,7 @@
 <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
 @endsection
 
-
+@section('title','Certification - ')
 @section('body')
 @include('common.headerTop')
 @include('common.headerNav')
@@ -63,4 +63,4 @@
 
 @section('js')
 
-@endsection
\ No newline at end of file
+@endsection

resources/views/about/company.blade.php

@@ -3,7 +3,7 @@
 <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
 @endsection
 
-
+@section('title','Company - ')
 @section('body')
 @include('common.headerTop')
 @include('common.headerNav')
@@ -39,4 +39,4 @@
 
 @section('js')
 
-@endsection
\ No newline at end of file
+@endsection

resources/views/about/privacy.blade.php

@@ -3,7 +3,7 @@
 <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
 @endsection
 
-
+@section('title','Privacy - ')
 @section('body')
 @include('common.headerTop')
 @include('common.headerNav')
@@ -256,4 +256,4 @@
 
 @section('js')
 
-@endsection
\ No newline at end of file
+@endsection

resources/views/about/quality.blade.php

@@ -3,6 +3,7 @@
 <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
 @endsection
 
+@section('title','Quality - ')
 
 @section('body')
 @include('common.headerTop')
@@ -43,4 +44,4 @@
 
 @section('js')
 
-@endsection
\ No newline at end of file
+@endsection

resources/views/about/refund.blade.php

@@ -3,6 +3,7 @@
 <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
 @endsection
 
+@section('title','Refund - ')
 
 @section('body')
 @include('common.headerTop')
@@ -72,4 +73,4 @@
 
 @section('js')
 
-@endsection
\ No newline at end of file
+@endsection

resources/views/about/term.blade.php

@@ -3,6 +3,7 @@
 <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
 @endsection
 
+@section('title','Term - ')
 
 @section('body')
 @include('common.headerTop')
@@ -146,4 +147,4 @@
 
 @section('js')
 
-@endsection
\ No newline at end of file
+@endsection

resources/views/about/termuser.blade.php

@@ -3,6 +3,7 @@
 <link rel="stylesheet" href="{{$public}}/assets/css/about/about.min.css?v={{time()}}">
 @endsection
 
+@section('title','Term User - ')
 
 @section('body')
 @include('common.headerTop')
@@ -135,4 +136,4 @@
 
 @section('js')
 
-@endsection
\ No newline at end of file
+@endsection

resources/views/auth/changePassword.blade.php

 @extends('layouts.app')
+@section('title','Change Password - ')
+
 @section('css')
 <link rel="stylesheet" href="{{$public}}/assets/css/auth/forget.min.css?v={{time()}}">
 @endsection
@@ -30,13 +32,13 @@
                     <p class="labelp ">CONFIRM PASSWORD</p>
                     <input type="text">
                 </div>
-                
+
                 <div class="tips">Wrong Email Address</div>
                 <div class="but gobtn gonext">Submit</div>
             </div>
         </div>
     </div>
-   
+
 </div>
 
 @endsection
@@ -44,4 +46,4 @@
 @section('js')
 
 <script src="{{$public}}/assets/js/auth/changePassword.js?v={{time()}}"></script>
-@endsection
\ No newline at end of file
+@endsection

resources/views/auth/forget.blade.php

 @extends('layouts.app')
+@section('title','Forget Password - ')
+
 @section('css')
 <link rel="stylesheet" href="{{$public}}/assets/css/auth/forget.min.css?v={{time()}}">
 @endsection
@@ -48,7 +50,7 @@
             </div>
         </div>
     </div>
-   
+
 </div>
 
 @endsection
@@ -56,4 +58,4 @@
 @section('js')
 
 <script src="{{$public}}/assets/js/auth/forget.js?v={{time()}}"></script>
-@endsection
\ No newline at end of file
+@endsection

resources/views/auth/login.blade.php

 @extends('layouts.app')
+@section('title','Login - ')
+
 @section('css')
 <link rel="stylesheet" href="{{$public}}/assets/css/auth/login.min.css?v={{time()}}">
 @endsection
@@ -36,4 +38,4 @@
 
 @section('js')
 <script src="{{$public}}/assets/js/auth/login.js?v={{time()}}"></script>
-@endsection
\ No newline at end of file
+@endsection

resources/views/auth/passwords/confirm.blade.php

 @extends('layouts.app')
+@section('title','Confirm - ')
 
 @section('content')
 <div class="container">

resources/views/auth/passwords/email.blade.php

 @extends('layouts.app')
+@section('title','Email - ')
 
 @section('content')
 <div class="container">

resources/views/auth/passwords/reset.blade.php

 @extends('layouts.app')
+@section('title','Reset Password - ')
 
 @section('content')
 <div class="container">

resources/views/auth/register.blade.php

 @extends('layouts.app')
+@section('title','Register - ')
+
 @section('css')
 <link rel="stylesheet" href="{{$public}}/assets/css/auth/reg.min.css?v={{time()}}">
 @endsection
@@ -84,12 +86,12 @@
                 <div class="resendbox row">
                     Didn't receive a code?<div class="resendbut">Resend</div>
                 </div>
-                
+
                 <div class="butbox row rowCenter">
                     <div class="backbut">Back</div>
                     <div class="but nextbut gonext2">Register</div>
                 </div>
-                
+
             </div>
         </div>
         <div class="auth-box regStep3" style="display:none">
@@ -112,7 +114,7 @@
                             <p class="labelp"><span>*</span>STATE</p>
                             <input type="text" class="province3 verify" verifyTip='{"type":"null","text":"STATE"}'>
                         </div>
-                       
+
                     </div>
                     <div class="row">
                         <div class="input-group-auth">
@@ -139,9 +141,9 @@
                             <p class="labelp"><span>*</span>POSTAL CODE</p>
                             <input type="text" class="post_code3 verify" verifyTip='{"type":"null","text":"POSTAL CODE"}'>
                         </div>
-                        
+
                     </div>
-                  
+
                 </div>
                 <div class="tikup">
                     <span>*</span>
@@ -153,7 +155,7 @@
                 <div class="but gobtn gonext  gonext3">Submit</div>
                 <div class="but gobtn gonext  gonext3Jump">Skip</div>
                 </div>
-                
+
             </div>
         </div>
     </div>
@@ -165,4 +167,4 @@
 @section('js')
 
 <script src="{{$public}}/assets/js/auth/reg.js?v={{time()}}"></script>
-@endsection
\ No newline at end of file
+@endsection

resources/views/brand/list.blade.php

 @extends('layouts.appMall')
+@section('title','Brand - ')
+
 @section('css')
 <link rel="stylesheet" href="{{$public}}/assets/css/brand/list.min.css?v={{time()}}">
 @endsection
@@ -76,7 +78,7 @@
                         <div class="th">Options</div>
                     </div>
                     <div class="data-td">
-                       
+
 
                     </div>
                     <div class="M-pagebox row rowCenter"></div>
@@ -140,4 +142,4 @@
 
 @section('js')
 <script src="{{$public}}/assets/js/brand/list.js?v={{time()}}"></script>
-@endsection
\ No newline at end of file
+@endsection

resources/views/brand/map.blade.php

 @extends('layouts.appMall')
+@section('title','Brand Map - ')
+
 @section('css')
 <link rel="stylesheet" href="{{$public}}/assets/css/brand/brand.min.css?v={{time()}}">
 @endsection
@@ -57,7 +59,7 @@
                         <div class="ttc row boxsiz">
                             @foreach ($item as $itemchild)
                             <a href="/brand/{{$itemchild['standard_brand_id']}}" >{{$itemchild['brand_name_en']}}</a>
-                            @endforeach 
+                            @endforeach
                         </div>
                     </div>
                     @endforeach
@@ -73,4 +75,4 @@
 
 @section('js')
 <script src="{{$public}}/assets/js/brand/map.js?v={{time()}}"></script>
-@endsection
\ No newline at end of file
+@endsection

resources/views/car/car.blade.php

 @extends('layouts.appMall')
+@section('title','Shopping Car - ')
+
 @section('css')
 <link rel="stylesheet" href="{{$public}}/assets/css/car/car.min.css?v={{time()}}">
 @endsection
@@ -83,7 +85,7 @@
                         Already Registered? <a href="/login?referer={{\Illuminate\Support\Facades\URL::current()}}">Log In</a>
                     </div>
                     @endif
-                   
+
                     <a href="javascript:void(0)" class="bannerc">
                         <img src="{{$public}}/assets/images/car/carbanner.png?v=20221124" alt="">
                     </a>
@@ -113,7 +115,7 @@
         {{if value.pdf}}
         <a class="pdf" href="{{value.pdf}}" target="_blank"><i class="icon iconfont icon-PDF"></i></a>
         {{/if}}
-        
+
     </div>
     <div class="td w183">
         Manufacturers：{{value.brand_name}}
@@ -139,4 +141,4 @@
 
 @section('js')
 <script src="{{$public}}/assets/js/car/car.js?v={{time()}}"></script>
-@endsection
\ No newline at end of file
+@endsection

resources/views/car/confirm.blade.php

 @extends('layouts.appMall')
+@section('title','Order Confirm - ')
+
 @section('css')
 <link rel="stylesheet" href="{{$public}}/assets/css/car/confirm.min.css?v={{time()}}">
 @endsection
@@ -274,4 +276,4 @@
 
 @section('js')
 <script src="{{$public}}/assets/js/car/confirm.js?v={{time()}}"></script>
-@endsection
\ No newline at end of file
+@endsection

resources/views/classification/index.blade.php

 @extends('layouts.appMall')
+@section('title','Classification - ')
+
 @section('css')
 <link rel="stylesheet" href="{{$public}}/assets/css/class/class.min.css?v={{time()}}">
 @endsection
@@ -25,7 +27,7 @@
       @if(!empty($classification['children']))
       <div class="class-three-box boxsiz">
         <div class="chead boxsiz">{{$classification['class_name_en']}}({{$classification['sku_number']}})</div>
-       
+
           <div class="csec boxsiz clear">
             @foreach($classification['children'] as $class)
               <a href="/class/{{$class['class_id']}}" >{{$class['class_name_en']}}({{$class['sku_number']}})</a>

resources/views/home/home.blade.php

@@ -3,7 +3,7 @@
 <link rel="stylesheet" href="{{$public}}/assets/css/home/home.min.css?v={{time()}}">
 @endsection
 
-
+@section('title','Semour: The Global ')
 @section('body')
 @include('common.headerTop')
 @include('common.headerNav')
@@ -83,4 +83,4 @@
 
 @section('js')
 <script src="{{$public}}/assets/js/home/home.js?v={{time()}}"></script>
-@endsection
\ No newline at end of file
+@endsection

resources/views/layouts/app.blade.php

@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <!-- 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")
 
   @yield('css')

resources/views/layouts/appMall.blade.php

@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <!-- 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")
 
   @yield('css')

resources/views/mall/index.blade.php

 @extends('layouts.appMall')
 @section('css')
+@section('title',' Online Store - ')
 <link rel="stylesheet" href="{{$public}}/assets/css/mall/mall.min.css?v={{time()}}">
 @endsection
 
@@ -51,4 +52,4 @@
 
 @section('js')
 <script src="{{$public}}/assets/js/mall/mall.js?v={{time()}}"></script>
-@endsection
\ No newline at end of file
+@endsection