Merge branch 'developer' of http://git.caimei365.com/caimei365/caimei365-www into developerB

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

@@ -9,7 +9,8 @@
 .pcOnly,.jqSelect .pc,.baseHeadCenter .headCart,.baseHeadCenter .hotKey,.baseTopNav_nav{display:none!important;}
 .baseHeadTop .wrap ul>li,.baseHeadTop .header_top_left{display:none;}
 .mIcon:before{content:'';display:inline-block;font-size:0;background:url(/img/supplier-login/H5.png) no-repeat;background-size:100vw auto;}
-.H5-icon:before{content:'';display:inline-block;font-size:0;background:url(/img/supplier-login/H5.png) no-repeat;background-size:100vw auto;}
+/*.H5-icon:before{content:'';display:inline-block;font-size:0;background:url(/img/supplier-login/H5.png) no-repeat;background-size:100vw auto;}*/
+.H5-icon:before{content:'';display:inline-block;font-size:0;background:url(/img/base/H5-icon.png) no-repeat;background-size:100vw auto;}
 .icon.shop,.icon.heart{vertical-align:middle;display:inline-block;height:5.5vw;line-height:5.5vw}
 .icon.shop:before{width:7.5vw;height:6vw;background-position:-91vw -.5vw}
 .icon.heart:before{width:5.5vw;height:5.5vw;background-position:0 -17vw}

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

@@ -26,7 +26,7 @@ iframe{width:320px !important;height: 280px !important}
 .jqSelect ul{display:none;position:absolute;left:0;background:#FFF;box-shadow:0 3px 6px rgba(45,48,54,.2);border-radius:2px;z-index:9}
 .jqSelect ul li{box-sizing:border-box;padding:0 15px;display:inline-block;width:100%;height:38px;line-height:38px;white-space:nowrap;text-align:left;cursor:pointer}
 .jqSelect ul li:hover{background:#FEF6F3;color:#FF5B00}
-.wrap{width:1280px;margin:0 auto;}
+.wrap{width:1184px;margin:0 auto;}
 .icon:before,.baseTopNav .nav:after{content:'';display:inline-block;background:url(/img/supplier-login/PC.png) no-repeat;font-size:0;}
 .WEB-icon:before{content:'';display:inline-block;background:url(/img/base/WEB-icon.png) no-repeat;font-size:0;}
 .icon.shop,.icon.heart{vertical-align:middle;display:inline-block;height:25px;line-height:25px;}
@@ -108,13 +108,13 @@ 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:228px;height:76px;margin-right:75px;}
-.baseHeadCenter .searchBox{width:668px;float:left}
+.baseHeadCenter .searchBox{width:570px;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}
 .baseHeadCenter .search .jqSelect{width:104px;height:44px;line-height:44px;border:none}
 .baseHeadCenter .search .jqSelect:before{right:16px}
 .baseHeadCenter .search .jqSelect ul{z-index:999;}
-.baseHeadCenter .keyword{width:578px;height:44px;line-height:44px;text-indent:15px;position:absolute;right:0;top:0;border:none;outline:none}
+.baseHeadCenter .keyword{width:478px;height:44px;line-height:44px;text-indent:15px;position:absolute;right:0;top:0;border:none;outline:none}
 .baseHeadCenter .keyword:focus{outline:none;border:none}
 .baseHeadCenter .searchBtn{position:absolute;right: 0;top: 0;font-size:0;padding: 7px 12px;height: 30px;line-height: 30px;}
 .baseHeadCenter .searchBtn:before{width: 30px;height: 30px;background-position: 4px 4px;}

src/main/resources/templates/account/login.html

@@ -62,6 +62,7 @@
                     </div>
                 </div>
                 <div class="forget">
+<!--                    <a class="btn" href="/club/register.html" rel="nofollow" onclick="_czc.push(['_trackEvent','登录页面','注册','点击','','Um_Event_Regirster'])">免费注册</a>-->
                     <a class="btn" href="/club/register.html" rel="nofollow" onclick="_czc.push(['_trackEvent','登录页面','注册','点击','','Um_Event_Regirster'])">免费注册</a>
                     <a href="/forget.html" v-if="loginTabs === 1" style="z-index: 99999">忘记密码？</a>
                 </div>

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

@@ -45,13 +45,13 @@
                     <div class="cShow" v-if="userIdentity == 4 || userIdentity == 2">
                         <a href="/user/dashboard.html" rel="nofollow">我的采美</a>
                         <a href="/user/setting/information.html" rel="nofollow">机构资料</a>
-                        <a @click="goMsgLinkFn('/user/message/list.html')" href="javascript:void(0);">我的消息<span>（{{noticeNum}}）</span></a>
+<!--                        <a @click="goMsgLinkFn('/user/message/list.html')" href="javascript:void(0);">我的消息<span>（{{noticeNum}}）</span></a>-->
                         <a href="javascript:void(0);" @click="userLogOut()">退出登录</a>
                     </div>
                     <div class="cShow" v-if="userIdentity == 3">
                         <a href="/supplier/dashboard.html" rel="nofollow">我的采美</a>
                         <a href="javascript:void(0);" @click="pageLinkSupplier()">店铺管理</a>
-                        <a @click="goMsgLinkFn('/supplier/message/list.html')" href="javascript:void(0);">我的消息<span>（{{noticeNum}}）</span></a>
+<!--                        <a @click="goMsgLinkFn('/supplier/message/list.html')" href="javascript:void(0);">我的消息<span>（{{noticeNum}}）</span></a>-->
                         <a href="javascript:void(0);" @click="userLogOut()">退出登录</a>
                     </div>
                 </li>
@@ -72,20 +72,21 @@
             </a>
             <div class="mf h5Only mUserCenter">
                 <template v-if="loginStatus">
-                    <a class="mUserIcon mIcon toLogin" href="/user/member.html" v-if="!isPC && userIdentity != 3" title="超级会员" rel="nofollow"></a>
+<!--                    <a class="mUserIcon mIcon toLogin" href="/user/member.html" v-if="!isPC && userIdentity != 3" title="超级会员" rel="nofollow"></a>-->
                     <a href="/shopping/cart.html" :class="loginStatus?'mAddCart mIcon':'mAddCart mIcon toLogin'" v-if="!isPC && userIdentity != 3" title="购物车" rel="nofollow"></a>
-<!--                    <a v-if="userIdentity===3" @click="goMsgLinkFn('/supplier/message/list.html')" href="javascript:void(0);" :class="loginStatus?'mNotice H5-icon':'mNotice H5-icon toLogin'" title="消息" rel="nofollow"></a>-->
-<!--                    <a v-else @click="goMsgLinkFn('/user/message/list.html')" href="javascript:void(0);" :class="loginStatus?'mNotice H5-icon':'mNotice H5-icon toLogin'" title="消息" rel="nofollow"></a>-->
+                    <a v-if="userIdentity===3" style="background-position: " @click="goMsgLinkFn('/supplier/message/list.html')" href="javascript:void(0);" :class="loginStatus?'mNotice H5-icon':'mNotice H5-icon toLogin'" title="消息" rel="nofollow"></a>
+                    <a v-else @click="goMsgLinkFn('/user/message/list.html')" href="javascript:void(0);" :class="loginStatus?'mNotice H5-icon':'mNotice H5-icon toLogin'" title="消息" rel="nofollow"></a>
                     <a @click="showGlobalMenu()" class="mUserIcon mIcon" href="javascript:void(0);" title="个人中心" rel="nofollow"></a>
                 </template>
                 <template v-else>
-                    <a class="mUserIcon mIcon superVip" :href="GLOBAL_USER_ID === 0 ? '/login.html' : '/user/member.html'" title="超级会员" rel="nofollow"></a>
-                    <a href="/login.html" :class="loginStatus?'mAddCart mIcon':'mAddCart mIcon toLogin'" title="购物车" rel="nofollow"></a>
+<!--                    <a class="mUserIcon mIcon superVip" :href="GLOBAL_USER_ID === 0 ? '/login.html' : '/user/member.html'" title="超级会员" rel="nofollow"></a>-->
+<!--                    <a href="/login.html" :class="loginStatus?'mAddCart mIcon':'mAddCart mIcon toLogin'" title="购物车" rel="nofollow"></a>-->
                     <a class="mUserIcon mIcon toLogin" href="javascript:void(0);" title="个人中心" rel="nofollow"></a>
                 </template>
             </div>
             <div class="searchBox" id="topSearch">
-                <div class="search auto-input" id="autoInput" :style="{float: (userIdentity !== 3 && loginStatus) ? 'none' : '', margin: (userIdentity !== 3 && loginStatus) ? '0 auto' : '' }">
+<!--                :style="{float: (userIdentity !== 3 && loginStatus) ? 'none' : '', margin: (userIdentity !== 3 && loginStatus) ? '0 auto' : '' }"-->
+                <div class="search auto-input" :style="{width: !isPC ? '95.4vw' : ''}" id="autoInput">
                     <div class="jqSelect">
                         <div class="pc">
                             <span data-select="0">产品</span>
@@ -100,9 +101,9 @@
                     <input class="keyword" type="text" placeholder="请输入搜索关键词" maxlength="30"/>
                     <a class="searchBtn icon mIcon" href="javascript:void(0);" onclick="_czc.push(['_trackEvent','顶部导航','搜索按钮','点击','','Um_Event_SearchButton'])"></a>
                 </div>
-                <div class="supplierH5" v-if="!isPC && (userIdentity !== 4 && userIdentity !== 2)">
-                    <a class="mIcon supplier_H5" href="/supplier-login/index.html" title="供应商服务" rel="nofollow"></a>
-                </div>
+<!--                <div class="supplierH5" v-if="!isPC && (userIdentity !== 4 && userIdentity !== 2)">-->
+<!--                    <a class="mIcon supplier_H5" href="/supplier-login/index.html" title="供应商服务" rel="nofollow"></a>-->
+<!--                </div>-->
                 <!-- 热门搜索关键词 -->
                 <div class="hotKey">
                     <span th:each="word,wordStat: ${searchHotWord}">