Merge remote-tracking branch 'remotes/origin/developer' into developerA

src/main/resources/static/js/base.js

@@ -198,6 +198,21 @@ var globalHead = new Vue({
             })
         }
         console.log('hello')
+        $('#baseTopNavUl').find('li').each(function() {
+            var _that = $(this);
+            var _textHtml = _that.find('a').text();
+            switch (_textHtml){
+                case '产品':
+                    _that.find('a').text('医疗器械产品');
+                    break;
+                case '仪器':
+                    _that.find('a').text('医疗器械仪器');
+                    break;
+                case '信息平台':
+                    _that.find('a').text('医疗器械信息');
+                    break;
+            }
+        })
         // 判断导航菜单高亮-对比url
         setTimeout(function(){
             var path = window.location.pathname;
@@ -394,7 +409,6 @@ $(function(){
         document.body.removeChild(oInput);
         CAIMEI.dialog('复制成功');
     });
-
 });
 /*function uuid() {
     var s = [];

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

@@ -113,7 +113,7 @@
                 <a class="classBtn nav on" href="javascript:void(0);">分类展示</a>
                 <a class="home nav" href="/">首页</a>
                 <div class="navBox">
-                    <ul class="clear">
+                    <ul class="clear" id="baseTopNavUl">
                         <!--导航菜单-->
                         <li th:each="menu: ${topMenuList}">
                             <a class="nav" th:href="${menu.link}" th:text="${menu.name}" th:attr="rel=${#strings.contains(menu.link,'caimei365.com')} ? '' : 'nofollow'" target="_blank"></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>