Merge branch 'hotfix/qa' into 'master'

Hotfix/qa

个人中心增加 意见与反馈入口 

See merge request !81

@@ -108,6 +108,16 @@
                 <span class="iconfont num">{{inboxTotal}} &#xe604;</span>
             </a>
         </div>
+
+        <div class="group-list">
+            <a class="list-item" href="/service/chatQaList">
+                <span class="iconfont icon">&#xe639;</span>
+                服务与反馈
+                <span class="iconfont num">&#xe604;</span>
+            </a>
+        </div>
+
+        {{!--
         <div class="group-list">
             <a class="list-item" href="/home/onlineService">
                 <span class="iconfont icon">&#xe63c;</span>
@@ -127,6 +137,7 @@
                 <span class="iconfont num">&#xe604;</span>
             </a>
         </div>
+        --}}
         {{#unless @root.wap.ucenter.removePrefer}}
             {{> common/recommend-for-you}}
         {{/unless}}

@@ -19,7 +19,7 @@ exports.qaList = (req, res, next) => {
         pageHeader: headerData,
         module: 'service',
         page: 'chat-qa',
-        title: 'Yoho!Buy有货 | 潮流购物逛不停',
+        title: '服务与反馈 | Yoho!Buy有货 | 潮流购物逛不停',
         width750: true,
         pageFooter: true
     };
@@ -43,7 +43,7 @@ exports.qaSearch = (req, res, next) => {
         pageHeader: headerData,
         module: 'service',
         page: 'chat-qa',
-        title: 'Yoho!Buy有货 | 潮流购物逛不停',
+        title: '服务与反馈 | Yoho!Buy有货 | 潮流购物逛不停',
         width750: true
     };
 
@@ -77,7 +77,7 @@ exports.qaDetail = (req, res, next) => {
         pageHeader: headerData,
         module: 'service',
         page: 'chat-qa',
-        title: 'Yoho!Buy有货 | 潮流购物逛不停',
+        title: '问题详情 | Yoho!Buy有货 | 潮流购物逛不停',
         width750: true,
         pageFooter: true
     };

@@ -5,7 +5,7 @@
 			<input class="get-qa" type="text" placeholder="有问题？点我搜搜看吧" / >
 		</div>
 		<a class="cancel-btn">取消</a>
-	</div>	
+	</div>
 	<div class="list-group hot-group">
 		{{# hotSearch}}
 		<a class="common-item" href="//m.yohobuy.com/service/qaDetail?sonId={{id}}">
@@ -22,5 +22,9 @@
 		<p>抱歉，没有找到与“<span class="noKey"></span>”相关的问题，</p>
 		<p>您可以换个词再试试</p>
 	</div>
+    {{#if @root.wap.clientService.new}}
 	<div class="fix-tip">没有相关问题，请联系<a href="/service/im">在线客服</a></div>
-</div>
\ No newline at end of file
+    {{else}}
+    <div class="fix-tip">没有相关问题，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=">在线客服</a></div>
+    {{/if}}
+</div>

 <div class="list-group">
+    {{#if @root.wap.clientService.new}}
 	<a class="list clearfix" href="/service/im">
+    {{else}}
+    <a class="list clearfix" href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=">
+    {{/if}}
 		<i class="gm-ico icon"></i>
 		<div style="border-bottom: solid 1px #e6e6e6;">
 			<p class="title">在线客服</p>
@@ -24,4 +28,4 @@
 		<span>400-886-9646</span>
 		<i class="arr-ico iconfont">&#xe604;</i>
 	</a>
-</div>
\ No newline at end of file
+</div>