Merge remote-tracking branch 'origin/developer' into developerB

src/main/resources/static/css/base/base.pc.css

@@ -105,7 +105,7 @@ iframe{width:320px !important;height: 280px !important}
 
 .baseHeadCenter,.baseTopNav{width:100%;background:#FFF}
 .baseHeadCenter .wrap{height: 100px;box-sizing: border-box;padding: 10px 0;}
-.baseHeadCenter .logo{float:left;width:178px;height:44px;margin-right:122px;margin-top: 10px;}
+.baseHeadCenter .logo{float:left;width:58px;height:44px;margin-right:122px;margin-top: 10px;}
 .baseHeadCenter .searchBox{width:668px;float:left}
 .baseHeadCenter .search{width:100%;height:44px;line-height:44px;border:1px solid #FFE6DC;position:relative}
 .baseHeadCenter .search:before{content:'';position:absolute;left:104px;top:16px;height:12px;border-right:2px solid #C0C6D1}

src/main/resources/templates/article/components/article-header.html

@@ -10,7 +10,7 @@
         </div>
         <div class="type">
             <div>
-                <a class="home" href="/" target="_blank">采美商城</a>
+                <a class="home" href="/" target="_blank">首页</a>
                 <a th:each="type: *{articleType}" th:text="${type.name}" th:href="'/info/center-'+${type.id}+'-1.html'" th:class="${typeId==type.id}?'typeBtn current':'typeBtn'" th:typeId="${type.id}"></a>
             </div>
         </div>
@@ -23,6 +23,7 @@
     <input type="hidden" th:value="${labelId}" id="labelId">
     <input type="hidden" th:value="${typeId}" id="typeId">
     <input type="hidden" th:value="${pageNum}" id="pageNum">
-    <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
+    <input type="hidden" th:value="${spiServer}" id="spiServer">
+    <input type="hidden" th:value="${coreServer}" id="coreServer">
     <input type="hidden" th:value="${agent}" id="userAgent">
 </header>

src/main/resources/templates/components/header.html

@@ -2,7 +2,8 @@
     <!--顶部导航-->
     <div class="baseHeadTop">
         <div class="wrap clear">
-            <div class="header_top_left">欢迎来到采美采购服务平台</div>
+<!--            <div class="header_top_left">欢迎来到采美采购服务平台</div>-->
+            <div class="header_top_left"></div>
             <ul class="header_top_ul">
                 <li class="headCart" v-if="GLOBAL_USER_ID>0">
                     <a href="javascript:void(0)" class="addBtn icon" @click="goCartsLinkFn">购物车<em v-text="'('+headCart.cartCount+')'"></em></a>
@@ -59,8 +60,8 @@
         <div class="wrap clear">
             <a href="javascript:void(0);" class="h5Only mClassBtn mIcon" title="分类"></a>
             <a href="/" class="logo">
-                <img class="pcOnly" src="/img/base/logo.png" alt="采美 生美/医美采购服务平台"/>
-                <img class="h5Only" src="/img/base/logo_m.png" alt="采美 生美/医美采购服务平台"/>
+                <img class="pcOnly" src="/img/base/logo@2x.png" alt="采美 生美/医美采购服务平台"/>
+                <img class="h5Only" src="/img/base/logo@2x.png" alt="采美 生美/医美采购服务平台"/>
             </a>
             <div class="mf h5Only mUserCenter">
                 <a :href="loginStatus?'/shopping/cart.html':'javascript:void(0);'" :class="loginStatus?'mAddCart mIcon':'mAddCart mIcon toLogin'" title="购物车" rel="nofollow"></a>
@@ -109,7 +110,7 @@
     <div class="baseTopNav">
         <div class="wrap clear">
             <div class="baseTopNav_nav">
-                <a class="classBtn nav on" href="javascript:void(0);">商品分类</a>
+                <a class="classBtn nav on" href="javascript:void(0);">分类展示</a>
                 <a class="home nav" href="/">首页</a>
                 <div class="navBox">
                     <ul class="clear">
@@ -166,7 +167,7 @@
                                         </th:block>
                                         <th:block th:unless="${small.containsKey('tinyTypeList')} and ${small.get('smallTypeList')!=null}">
                                             <a th:href="'/product/classify-'+ ${big.getString('typeSort')} +'-'+ *{bigTypeId} +'-'+ *{smallTypeId} + '.html'" target="_blank">
-                                                <img v-if="!isPC" th:src="*{crmIcon}" alt="全部商品"><p>全部商品</p>
+                                                <img v-if="!isPC" th:src="*{crmIcon}" alt=""><p>全部</p>
                                             </a>
                                         </th:block>
                                     </div>
@@ -181,7 +182,7 @@
                                     </div>
                                     <div class="rgt mfw" >
                                         <a th:href="'/product/classify-'+ ${big.getString('typeSort')} +'-'+ *{bigTypeId} +'.html'" target="_blank">
-                                            <img v-if="!isPC" th:src="*{crmIcon}" alt="全部商品"><p>全部商品</p>
+                                            <img v-if="!isPC" th:src="*{crmIcon}" alt=""><p>全部</p>
                                         </a>
                                     </div>
                                 </div>

src/main/resources/templates/index.html

@@ -351,7 +351,7 @@
                 </template>
                 <div class="section_page">
                     <div class="section_page_title">
-                        <h1 data-id="99">优质供应商</h1>
+                        <h1 data-id="99">品牌展示</h1>
                         <p>采美正品联盟 质量保证</p>
                     </div>
                     <div class="section_page_bottom" th:object="${floorJson.get('supplierImage')}">

src/main/resources/templates/product/detail.html

@@ -186,7 +186,7 @@
                 <ul class="swiper-wrapper" v-cloak>
                     <li class="swiper-slide mfc" v-for="p in recommends">
                         <div class="item">
-                            <a class="image" :href="'/product-'+p.id+'.html'" target="_blank">
+                            <a class="image" :href="'/product-'+p.productId+'.html'" target="_blank">
                                 <img :src="p.image" :alt="p.name" onerror="javascript:this.src='/img/base/placeholder.png';">
                                 <span v-html="p.name"></span>
                             </a>

src/main/resources/templates/shopping/cart.html

@@ -203,7 +203,7 @@
                 <div  :class="reducedPrice>0?'item priceTotal':'item'">合计：<em>¥{{totalPrice | NumFormat}}</em>
                     <span v-if="reducedPrice>0" class="dl"><del>¥{{originalPrice | NumFormat}}</del><em>减¥{{reducedPrice | NumFormat}}</em></span>
                 </div>
-                <a class="submit" href="javascript:void(0);" @click="submitCart()">去结算</a>
+                <a class="submit" href="javascript:void(0);" @click="submitCart()" onclick="_czc.push(['_trackEvent','购物车去结算','点击','去结算','','Um_Event_CartConfirmOrder'])">去结算</a>
             </div>
         </div>
     </div>