Merge branch 'master' of http://git.ichunt.net/semour/semour_web

public/assets/css/about/about.less

@@ -12,11 +12,11 @@ body{background: #000;min-width: 1200px;}
         p{font-size: 110px;font-weight: bold;color:#fff;width:1200px;margin:0 auto;}
     }
     .floor2{
-        height:1485px;
+        height:1142px;
         background: url("../../images/about/companybg2.png") center top no-repeat;
         .jscon{
             width: 1200px;
-            height: 1243px;
+            height: 900px;
             margin:0 auto;
             background: rgba(40, 63, 235, 0.4);
             font-size: 30px;

public/assets/css/common/common.less

@@ -63,7 +63,7 @@
         margin:0 auto;
 
         a.ghn-logo {
-            width   : 463px;
+            width   : 261px;
             height  : 44px;
             position: relative;
             top     : 32px;
@@ -450,7 +450,7 @@
 
                 .search-input-box {
                     width      : 340px;
-                    margin-left: 140px;
+                    margin-left: 303px;
                     height     : 48px;
                     line-height: 44px;
                     border     : 2px solid #164D9A;
@@ -543,6 +543,7 @@
                             box-shadow: 0px 0px 5px #ccc;
                             padding   : 15px 0px;
                             display   : none;
+                            z-index: 2;
 
                             a {
                                 box-sizing : border-box;

resources/views/about/company.blade.php

@@ -14,13 +14,14 @@
     </div>
     <div class="floor2">
         <div class="jscon boxsiz">
-            <p><b>S</b>emour Electronics Co., LTD, located in Hong Kong, is one of the subsidiaries of Shenzhen ICHUNT Technology Co., LTD. As a global electronic supply chain solution provider, Semour is committed to many EMS/OEM/ODM manufacturer clients with the comprehensive real-time stock goods and supporting services.
-            </p>
-            <p><b>W</b>ith rich industry experience, Semour Electronics provides customer-oriented one-stop electronic component services, including spot and related financial, warehousing and logistics services. So far, Semour online store has brought more than 1,000 categories of inventory to nearly 1,000 suppliers around the world. The online store allows customers to search for inventory and prices in real time and enjoy the one-on-one service of our professional sales team.
+         
+        <p><b>S</b> emour Electronics Co., LTD located in Hong Kong. As a global electronic supply chain solution provider, Semour is committed to many EMS/OEM/ODM manufacturer clients with the comprehensive real-time stock goods and supporting services.
         </p>
-            <p><b>T</b>hrough Semour Quality Inspection Center, Semour Electronics can prevent counterfeit components from entering your supply chain. Our well-established supply chain system can respond to any customer inquiry and meet the diverse market environment. Semour Electronics' goal is to increase the productivity of electronic trading services and to continuously bring intervention and innovation to the industry.
+        <p>
+        <b>W</b> ith rich industry experience, Semour Electronics provides customer-oriented one-stop electronic component services, including spot and related financial, warehousing and logistics services. So far, Semour online store has brought more than 1,000 categories of inventory to nearly 1,000 suppliers around the world. The online store allows customers to search for inventory and prices in real time and enjoy the one-on-one service of our professional sales team.
         </p>
-            <p><b>T</b>he parent company of Semour Electronics is Shenzhen ICHUNT Technology CO., LTD, which headquarter located in Shenzhen, China. The company currently has more than 430 employees and the business network has covered most of the major cities of China including Hong Kong, Beijing, Shanghai, Suzhou, Nanjing, Hefei, Wuhan, Dalian, Qingdao. These branches can rapidly respond to the various requirements from the customers worldwide. Now ICHUNT has obtained several rounds of financial investment from well-known venture capital, including Matrix Partners China, Welight Capital, Hua Partners, JD. Capital, Haitong Securities.
+        <p>
+        <b>T</b> hrough Semour Quality Inspection Center, Semour Electronics can prevent counterfeit components from entering your supply chain. Our well-established supply chain system can respond to any customer inquiry and meet the diverse market environment. Semour Electronics' goal is to increase the productivity of electronic trading services and to continuously bring intervention and innovation to the industry.
         </p>
         </div>
         <div class="readbox">

resources/views/common/footersm.blade.php

@@ -21,7 +21,7 @@
             <a href="/about/termuser">Terms of Use</a>
         </div>
         <div class="itemftsm">
-            <p class="row"><b>A member of</b><img src="/assets/images/home/lxlogo.png" alt="" class="logoftsm2"></p>
+            <!-- <p class="row"><b>A member of</b><img src="/assets/images/home/lxlogo.png" alt="" class="logoftsm2"></p> -->
             <a href="javascript:void(0)" class="fz-14">Copyright © 2023 SEMOUR ELECTRONICS All rights reserved.</a>
         </div>
         

resources/views/common/headerNav.blade.php

@@ -2,7 +2,7 @@
                                         echo 'top:0px;';
                                     } ?>">
     <div class="ghn-con clr">
-        <a class="fl ghn-logo" href="/"><img src="/assets/images/home/top.png" alt=""></a>
+        <a class="fl ghn-logo" href="/"><img src="/assets/images/home/top.png?v=20230222" alt=""></a>
         <div class="fr clr ghn-right-box">
             <div class="grb-top clr">
                 <a href="javascript:void(0)" class="fr clj gofooter">CONTACT US</a>

resources/views/common/mallFooter.blade.php

@@ -55,7 +55,7 @@
                     <a href="/about/termuser">Terms of Use</a>
                 </div>
                 <div class="itemftsp">
-                    <p class="row"><span>A member of</span> <img src="/assets/images/home/lxlogo.png" alt="" class="logoftsm2"></p>
+                    <!-- <p class="row"><span>A member of</span> <img src="/assets/images/home/lxlogo.png" alt="" class="logoftsm2"></p> -->
                     <span>Copyright © 2023 SEMOUR ELECTRONICS All rights reserved.</span>
                 </div>
 

resources/views/common/mallHeaderNav.blade.php

 <div class="mall-header-nav">
     <div class="search-car w1200">
         <div class="row cons verCenter">
-            <a href="/mall" class="logo"><img src="{{$public}}/assets/images/common/logo.png" alt=""></a>
+            <a href="/mall" class="logo"><img src="{{$public}}/assets/images/common/logo.png?v=20230222" alt=""></a>
             <div class="search-input-box row boxsiz">
                 <input type="text" class="searchvalx mallsearchvalx" placeholder="Enter part #" value="{{request()->get('keyword')}}">
                 <div class="searchbtnx boxsiz mallsearchbtnx"><i class="icon iconfont icon-sousuo-shangcheng"></i></div>

resources/views/home/home.blade.php

@@ -12,8 +12,8 @@
     <div class="floor1">
         <div class="fl1-con">
             <div class="rtdes">
-                <p>BE THE BEST PART</p>
-                <p>OF YOURS</p>
+                <p>STOCK AS A SERVICE</p>
+             
                 <p class="p24">WHY CHOOSE SEMOUR?</p>
                 <img src="{{$public}}/assets/images/home/mallgif.gif" alt="">
             </div>

resources/views/layouts/app.blade.php

@@ -11,32 +11,25 @@
 
   @yield('css')
   <!-- Google tag (gtag.js) -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=G-FEW2RM8MTJ"></script>
+  <script async src="https://www.googletagmanager.com/gtag/js?id=G-FEW2RM8MTJ"></script>
+<script>
+window.dataLayer = window.dataLayer || [];
+function gtag(){dataLayer.push(arguments);}
+gtag('js', new Date());
+
+gtag('config', 'G-FEW2RM8MTJ');
+</script>
+<!-- Google tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-251026219-1">
+</script>
 <script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
 
-  gtag('config', 'G-FEW2RM8MTJ');
-  
-</script>
-<!-- Meta Pixel Code -->
-<script>
-!function(f,b,e,v,n,t,s)
-{if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-n.callMethod.apply(n,arguments):n.queue.push(arguments)};
-if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
-n.queue=[];t=b.createElement(e);t.async=!0;
-t.src=v;s=b.getElementsByTagName(e)[0];
-s.parentNode.insertBefore(t,s)}(window, document,'script',
-'https://connect.facebook.net/en_US/fbevents.js');
-fbq('init', '492184879780601');
-fbq('track', 'PageView');
+  gtag('config', 'UA-251026219-1');
 </script>
-<noscript><img height="1" width="1" style="display:none"
-src="https://www.facebook.com/tr?id=492184879780601&ev=PageView&noscript=1"
-/></noscript>
-<!-- End Meta Pixel Code -->
+
 
 </head>
 <body>

resources/views/layouts/appMall.blade.php

@@ -13,29 +13,23 @@
   <!-- Google tag (gtag.js) -->
 <script async src="https://www.googletagmanager.com/gtag/js?id=G-FEW2RM8MTJ"></script>
 <script>
+window.dataLayer = window.dataLayer || [];
+function gtag(){dataLayer.push(arguments);}
+gtag('js', new Date());
+
+gtag('config', 'G-FEW2RM8MTJ');
+</script>
+<!-- Google tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-251026219-1">
+</script>
+<script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
 
-  gtag('config', 'G-FEW2RM8MTJ');
+  gtag('config', 'UA-251026219-1');
 </script>
-<!-- Meta Pixel Code -->
-<script>
-!function(f,b,e,v,n,t,s)
-{if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-n.callMethod.apply(n,arguments):n.queue.push(arguments)};
-if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
-n.queue=[];t=b.createElement(e);t.async=!0;
-t.src=v;s=b.getElementsByTagName(e)[0];
-s.parentNode.insertBefore(t,s)}(window, document,'script',
-'https://connect.facebook.net/en_US/fbevents.js');
-fbq('init', '492184879780601');
-fbq('track', 'PageView');
-</script>
-<noscript><img height="1" width="1" style="display:none"
-src="https://www.facebook.com/tr?id=492184879780601&ev=PageView&noscript=1"
-/></noscript>
-<!-- End Meta Pixel Code -->
+
 </head>
 <body>
 <div id="app">