'mg-master'

@@ -2,6 +2,11 @@
     <div class="ma-header">
     <div class="ma-header">
         <div>{{headerTip}}</div>
         <div>{{headerTip}}</div>
     </div>
     </div>
+    {{# download}}
+        <a href="{{url}}" class="down">
+            <img src="{{img}}" alt="{{alt}}" />
+        </a>
+    {{/ download}}
     <div class="tab">
     <div class="tab">
         <div class="swiper-container">
         <div class="swiper-container">
             <div class="swiper-wrapper">
             <div class="swiper-wrapper">
@@ -42,9 +47,4 @@
         	<p>{{title}}</p>
         	<p>{{title}}</p>
         </div>
         </div>
     {{/ newsList}}
     {{/ newsList}}
-    {{# download}}
-        <a href="{{url}}" class="down">
-            <img src="{{img}}" alt="{{alt}}" />
-        </a>
-    {{/ download}}
 </div>
 </div>

@@ -4,13 +4,19 @@ const model = require('../models/myqrcode'),
     headerModel = require('../../../doraemon/models/header'); // 头部model
     headerModel = require('../../../doraemon/models/header'); // 头部model
 
 
 exports.index = (req, res, next) => {
 exports.index = (req, res, next) => {
-    let params = req.query;
+    let params = req.query,
+        esc = false,
+        appversion = req.query.app_version;
+
+    if (Number(appversion.substr(0, 1) < 5) || (Number(appversion.substr(0, 1)) === 5 && Number(appversion.substr(2, 1)) < 2)) {
+        esc = true;
+    }
 
 
     model.getQr({
     model.getQr({
         token: params.token,
         token: params.token,
     }).then(result => {
     }).then(result => {
         params.token = result;
         params.token = result;
-        params.uname = decodeURIComponent(params.uname.replace(/\%/g, escape('%')));
+        params.uname = esc ? decodeURIComponent(params.uname) : decodeURIComponent(params.uname.replace(/\%/g, escape('%')));
         params.icon = params.icon || 'https://img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/2/w/{width}/h/{height}';
         params.icon = params.icon || 'https://img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/2/w/{width}/h/{height}';
         res.render('myqrcode', {
         res.render('myqrcode', {
             title: '查看二维码',
             title: '查看二维码',

@@ -140,7 +140,7 @@
 	<div class='help-group'>
 	<div class='help-group'>
 		<h2>五、服务支持</h2>
 		<h2>五、服务支持</h2>
 		<p>
 		<p>
-			如您在使用有货分期过程中遇到还款及资金安全方面问题您可联系信而富客服，为您进行相关处理和解答，联系电话：400-688-8692（工作日9:00-18:00），如您无法联系信而富客服您可联系有货客服，我们将在3个工作日内给您回复，感谢您的理解与支持！
+			如您在使用有货分期过程中遇到还款及资金安全方面问题，您可联系信而富客服为您进行相关处理和解答，联系电话：400-688-8692（工作日9:00-18:00），如您无法联系信而富客服您可联系有货客服，我们将在3个工作日内给您回复，感谢您的理解与支持！
 		</p>
 		</p>
 	</div>
 	</div>
 </div>
 </div>

 <div class="repayment-list-page installment-order-page yoho-page" data-pos-id="{{posId}}">
 <div class="repayment-list-page installment-order-page yoho-page" data-pos-id="{{posId}}">
-    {{> resources/banner-top}}
     <ul class="header-tab">
     <ul class="header-tab">
         <li class="active">
         <li class="active">
             <a href="/home/installment/order.html?type=1" data-type="1">全部</a>
             <a href="/home/installment/order.html?type=1" data-type="1">全部</a>

@@ -34,5 +34,5 @@
     </ul>
     </ul>
 
 
     {{> sale/common}}
     {{> sale/common}}
-
+    <input type="hidden" id="discount" value="discount">
 </div>
 </div>

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -61,8 +61,8 @@ var $listNav = $('#list-nav'),
 var swipers = [],
 var swipers = [],
     goodsType = ['coat', 'trouser', 'shoes', 'other'];
     goodsType = ['coat', 'trouser', 'shoes', 'other'];
 
 
-require('../common/suspend-cart'); // 悬浮购物车
 require('../common');
 require('../common');
+require('../common/suspend-cart'); // 悬浮购物车
 
 
 ellipsis.init();
 ellipsis.init();
 
 

@@ -242,6 +242,13 @@ function search(opt, params, isScroll) {
 
 
     searching = true;
     searching = true;
     loading.showLoadingMask();
     loading.showLoadingMask();
+
+    /* TODO tar add 161125 sale dicount no yh_channel*/
+    var discount = $('#discount').val();
+    if (discount === 'discount') {
+        delete setting.yh_channel;
+    }
+
     $.ajax({
     $.ajax({
         type: 'GET',
         type: 'GET',
         url: '/product/sale/search',
         url: '/product/sale/search',