Merge remote-tracking branch 'origin/master' into release/6.0.2

@@ -293,17 +293,15 @@ module.exports = class extends global.yoho.BaseModel {
 
 
                     let perOrder = this._getOrderStatus(value);
                     let perOrder = this._getOrderStatus(value);
 
 
-                    /* 是否是虚拟商品 */
-                    let isTickets = this.order.virtual_type && parseInt(this.order.virtual_type, 10) === 3;
 
 
                     Object.assign(perOrder, {
                     Object.assign(perOrder, {
                         orderNum: value.order_code,
                         orderNum: value.order_code,
                         orderStatus: value.status_str,
                         orderStatus: value.status_str,
                         sumCost: value.amount,
                         sumCost: value.amount,
-                        goods: this._formatOrderGoods(value.order_goods, count, false, isTickets),
+                        goods: this._formatOrderGoods(value.order_goods, count, false),
                         detailUrl: helpers.urlFormat('/home/orderdetail', {order_code: value.order_code}),
                         detailUrl: helpers.urlFormat('/home/orderdetail', {order_code: value.order_code}),
                         count: value.buy_total,
                         count: value.buy_total,
-                        isVirtual: isTickets,
+                        isVirtual: _.get(value, 'order_goods[0].goods_type'),
                         orderTitle: value.order_title
                         orderTitle: value.order_title
                     });
                     });
 
 

@@ -112,7 +112,7 @@ class Auth {
             }), '&');
             }), '&');
 
 
             return {
             return {
-                refer: `${backurl.protocol}//${backurl.host}?${queryStr}`
+                refer: `${backurl.protocol}//${backurl.host}${backurl.pathname}?${queryStr}`
             };
             };
         }
         }
         res.clearCookie('third_type', {
         res.clearCookie('third_type', {

@@ -74,7 +74,11 @@
             })();
             })();
 
 
             {{#if @root.isLogin}}
             {{#if @root.isLogin}}
+                {{#if @root.isApp}}
+                _hmt.push(['_setCustomVar', 1, 'loginFromApp', true, 2]);
+                {{^}}
                 _hmt.push(['_setCustomVar', 1, 'login', true, 2]);
                 _hmt.push(['_setCustomVar', 1, 'login', true, 2]);
+                {{/if}}
             {{/if}}
             {{/if}}
         }, 1000);
         }, 1000);
     }());
     }());