帮助中心bug修改

@@ -42,7 +42,8 @@ const detail = (req, res, next) => {
     let params = {
         id: parseInt(q.id || 1, 10),
         contId: +req.query.contId || 0,
-        keywords: req.query.helpQuery
+        keywords: req.query.helpQuery,
+        url: req.originalUrl
     };
 
     let nav = [
@@ -68,7 +69,10 @@ const detail = (req, res, next) => {
         res.display('detail', {
             module: 'help',
             page: 'help',
-            content: Object.assign({nav}, result.data),
+            content: Object.assign({
+                nav: nav,
+                helpQuery: req.query.helpQuery
+            }, result.data),
             qid: q.helpQuery ? false : params.id
         });
     }).catch(next);

@@ -15,14 +15,14 @@ const helpApi = require('./help-api');
  * @returns {*[]}
  * @private
  */
-const _getNav = (id, menuData)=> {
+const _getNav = (id, menuData, url)=> {
     for (let i = 0; i < menuData.length; i++) {
         if (menuData[i].subsets) {
             for (let j = 0; j < menuData[i].subsets.length; j++) {
                 if (menuData[i].subsets[j].id === id) {
                     return [
                         {
-                            link: ' ',
+                            link: url,
                             name: menuData[i].categoryName
                         }, {
                             name: menuData[i].subsets[j].categoryName
@@ -262,7 +262,7 @@ const _processDetailData = (result, params) => {
             }
         ];
     } else {
-        nav = _getNav(params.id, menuData);
+        nav = _getNav(params.id, menuData, params.url);
     }
 
     return {

@@ -24,7 +24,7 @@
                     <ul class="menu-common new-guide">
                         {{#each categoryItems}}
                             <li>
-                                <a href="{{jumpLink}}">
+                                <a href="{{jumpLink}}" target="_blank">
                                     <img src="{{categoryIco}}" width="70" height="70">
                                     <p>{{categoryName}}</p>
                                 </a>
@@ -38,7 +38,7 @@
                     <ul class="menu-common self-service">
                         {{#each list}}
                             <li>
-                                <a href="{{jumpUrl}}">
+                                <a href="{{jumpUrl}}" target="_blank">
                                     <img src="{{categoryIco}}" width="70" height="70">
                                     <p>{{categoryName}}</p>
                                 </a>
@@ -62,7 +62,7 @@
                             <div class="list-box">
                                 <div class="nav-list">
                                     {{#categoryItems}}
-                                        <a href="{{jumpLink}}">{{categoryName}}</a>
+                                        <a href="{{jumpLink}}"  target="_blank">{{categoryName}}</a>
                                     {{/categoryItems}}
                                 </div>
                             </div>

 <div class="search-box">
     <div class="search-area">
         <form id="help-search-form" action="{{siteUrl}}/help/detail">
-            <input type="text" class="help-search" autocomplete="off" name="helpQuery">
+            <input type="text" class="help-search" autocomplete="off" name="helpQuery" value="{{helpQuery}}">
             <span class="iconfont search-btn">&#xe605;</span>
         </form>
     </div>

@@ -7,11 +7,13 @@
 var cutStr = function(params) {
     var strLength = 0;
     var strCut = '';
-    var strLen = params.str.length || 0;
-    var i, curStr, addTxt;
+    var i, curStr, addTxt, strLen;
 
+    params.str = params.str.replace(/\s/g, '');
     params.str = params.str.replace(/<[^>]*>/g, '');
 
+    strLen = params.str.length || 0;
+
     if (params.type === 2) {
         addTxt = '';
     } else {
@@ -20,6 +22,7 @@ var cutStr = function(params) {
 
     for (i = 0; i < strLen; i++) {
         curStr = params.str.charAt(i);
+        curStr = params.str.charAt(i);
         strLength++;
         if (escape(curStr).length > 4) {
             // 中文字符的长度经编码之后大于4
@@ -41,8 +44,9 @@ var cutStr = function(params) {
 
 // 搜索关键词标蓝显示
 var keywordLabel = function(str, key) {
-    str = str.replace(key, '<i class="keyword">' + key + '</i>');
+    var reg = new RegExp(key, 'gm');
 
+    str = str.replace(reg, '<i class="keyword">' + key + '</i>');
     return str.replace('www.yohobuy.com', '<a href="http://www.yohobuy.com" class="keyword">www.yohobuy.com</a>');
 };
 

@@ -36,6 +36,13 @@ var helpSearch = {
     searchDefaultVal: function() {
         var _this = this;
         var defaultVal = '请输入您想知道的帮助信息';
+        var startVal = defaultVal;
+        var defaultColor = '#989898';
+
+        if (_this.$search.val()) {
+            startVal = _this.$search.val();
+            defaultColor = '#1b1b1b';
+        }
 
         _this.$search.focus(function() {
             var key = _this.$search.val();
@@ -49,7 +56,7 @@ var helpSearch = {
             if ($.trim(key) === '') {
                 _this.$search.val(defaultVal).css('color', '#989898');
             }
-        }).val(defaultVal).css('color', '#989898');
+        }).val(startVal).css('color', defaultColor);
     }
 };
 

@@ -36,10 +36,9 @@ if (keywords) {
             $.each(result.helper_list, function(k, s) {
                 if (s.helperType === 2) {
                     s.problem = true;
-                    s.allCont = s.content;
                 }
 
-                if (s.secendCategoryId === 0) {
+                if (s.secendCategoryId === '0') {
                     id = s.firstCategoryId;
                 } else {
                     id = s.secendCategoryId;

@@ -48,11 +48,14 @@
             margin: 10px 0 45px;
             font-size: 14px;
             color: #000;
-            text-align: left;
+            text-align: center;
 
             a {
-                margin: 0 8px;
+                margin: 0 1px;
                 display: inline-block;
+                line-height: 18px;
+                text-align: left;
+                width: 56px;
             }
 
             a:hover {
@@ -295,8 +298,9 @@
         }
 
         .problem-area {
-            width: 520px;
-            min-height: 260px;
+            max-width: 520px;
+            min-height: 200px;
+            min-width: 300px;
             background: #fff;
             position: relative;
             z-index: 2;
@@ -304,13 +308,12 @@
             display: inline-block;
             line-height: 24px;
             text-align: left;
-            padding: 60px 0;
+            padding: 60px 40px;
             box-sizing: border-box;
         }
 
         .a-area,
         .q-area {
-            width: 450px;
             margin: 15px auto 0;
             position: relative;
             font-size: 14px;

@@ -9,7 +9,7 @@
             <li class="{{#if problem}}problem-li{{else}}article-li{{/if}}">
                 <p class="title">{{{caption}}}</p>
                 {{#if problem}}
-                    <div class="cont">{{{allCont}}}</div>
+                    <div class="cont">{{{content}}}</div>
                 {{else}}
                     <div class="cont">{{{content}}}</div>
                 {{/if}}