fe / yohobuywap-node · Commits

Go to a project

Authored by 毕凯
Commit e132e9d79bf8daf0648eeba1a87f52af962aa98e 2 parents 54b02c9a 86e49dd7

Merge branch 'hotfix/qa' into 'master' 

Hotfix/qa

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

See merge request !81
Inline Side-by-side
Showing 4 changed files with 25 additions and 6 deletions
@@ -108,6 +108,16 @@ @@ -108,6 +108,16 @@
108 <span class="iconfont num">{{inboxTotal}} &#xe604;</span> 108 <span class="iconfont num">{{inboxTotal}} &#xe604;</span>
109 </a> 109 </a>
110 </div> 110 </div>
  111 +
  112 + <div class="group-list">
  113 + <a class="list-item" href="/service/chatQaList">
  114 + <span class="iconfont icon">&#xe639;</span>
  115 + 服务与反馈
  116 + <span class="iconfont num">&#xe604;</span>
  117 + </a>
  118 + </div>
  119 +
  120 + {{!--
111 <div class="group-list"> 121 <div class="group-list">
112 <a class="list-item" href="/home/onlineService"> 122 <a class="list-item" href="/home/onlineService">
113 <span class="iconfont icon">&#xe63c;</span> 123 <span class="iconfont icon">&#xe63c;</span>
@@ -127,6 +137,7 @@ @@ -127,6 +137,7 @@
127 <span class="iconfont num">&#xe604;</span> 137 <span class="iconfont num">&#xe604;</span>
128 </a> 138 </a>
129 </div> 139 </div>
  140 + --}}
130 {{#unless @root.wap.ucenter.removePrefer}} 141 {{#unless @root.wap.ucenter.removePrefer}}
131 {{> common/recommend-for-you}} 142 {{> common/recommend-for-you}}
132 {{/unless}} 143 {{/unless}}
@@ -19,7 +19,7 @@ exports.qaList = (req, res, next) => { @@ -19,7 +19,7 @@ exports.qaList = (req, res, next) => {
19 pageHeader: headerData, 19 pageHeader: headerData,
20 module: 'service', 20 module: 'service',
21 page: 'chat-qa', 21 page: 'chat-qa',
22 - title: 'Yoho!Buy有货 | 潮流购物逛不停', 22 + title: '服务与反馈 | Yoho!Buy有货 | 潮流购物逛不停',
23 width750: true, 23 width750: true,
24 pageFooter: true 24 pageFooter: true
25 }; 25 };
@@ -43,7 +43,7 @@ exports.qaSearch = (req, res, next) => { @@ -43,7 +43,7 @@ exports.qaSearch = (req, res, next) => {
43 pageHeader: headerData, 43 pageHeader: headerData,
44 module: 'service', 44 module: 'service',
45 page: 'chat-qa', 45 page: 'chat-qa',
46 - title: 'Yoho!Buy有货 | 潮流购物逛不停', 46 + title: '服务与反馈 | Yoho!Buy有货 | 潮流购物逛不停',
47 width750: true 47 width750: true
48 }; 48 };
49 49
@@ -77,7 +77,7 @@ exports.qaDetail = (req, res, next) => { @@ -77,7 +77,7 @@ exports.qaDetail = (req, res, next) => {
77 pageHeader: headerData, 77 pageHeader: headerData,
78 module: 'service', 78 module: 'service',
79 page: 'chat-qa', 79 page: 'chat-qa',
80 - title: 'Yoho!Buy有货 | 潮流购物逛不停', 80 + title: '问题详情 | Yoho!Buy有货 | 潮流购物逛不停',
81 width750: true, 81 width750: true,
82 pageFooter: true 82 pageFooter: true
83 }; 83 };
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <input class="get-qa" type="text" placeholder="有问题？点我搜搜看吧" / > 5 <input class="get-qa" type="text" placeholder="有问题？点我搜搜看吧" / >
6 </div> 6 </div>
7 <a class="cancel-btn">取消</a> 7 <a class="cancel-btn">取消</a>
8 - </div> 8 + </div>
9 <div class="list-group hot-group"> 9 <div class="list-group hot-group">
10 {{# hotSearch}} 10 {{# hotSearch}}
11 <a class="common-item" href="//m.yohobuy.com/service/qaDetail?sonId={{id}}"> 11 <a class="common-item" href="//m.yohobuy.com/service/qaDetail?sonId={{id}}">
@@ -22,5 +22,9 @@ @@ -22,5 +22,9 @@
22 <p>抱歉，没有找到与“<span class="noKey"></span>”相关的问题，</p> 22 <p>抱歉，没有找到与“<span class="noKey"></span>”相关的问题，</p>
23 <p>您可以换个词再试试</p> 23 <p>您可以换个词再试试</p>
24 </div> 24 </div>
  25 + {{#if @root.wap.clientService.new}}
25 <div class="fix-tip">没有相关问题，请联系<a href="/service/im">在线客服</a></div> 26 <div class="fix-tip">没有相关问题，请联系<a href="/service/im">在线客服</a></div>
26 -</div>  
  27 + {{else}}
  28 + <div class="fix-tip">没有相关问题，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=">在线客服</a></div>
  29 + {{/if}}
  30 +</div>
1 <div class="list-group"> 1 <div class="list-group">
  2 + {{#if @root.wap.clientService.new}}
2 <a class="list clearfix" href="/service/im"> 3 <a class="list clearfix" href="/service/im">
  4 + {{else}}
  5 + <a class="list clearfix" href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=">
  6 + {{/if}}
3 <i class="gm-ico icon"></i> 7 <i class="gm-ico icon"></i>
4 <div style="border-bottom: solid 1px #e6e6e6;"> 8 <div style="border-bottom: solid 1px #e6e6e6;">
5 <p class="title">在线客服</p> 9 <p class="title">在线客服</p>
@@ -24,4 +28,4 @@ @@ -24,4 +28,4 @@
24 <span>400-886-9646</span> 28 <span>400-886-9646</span>
25 <i class="arr-ico iconfont">&#xe604;</i> 29 <i class="arr-ico iconfont">&#xe604;</i>
26 </a> 30 </a>
27 -</div>  
  31 +</div>