Authored by 陈轩

Merge branch 'feature/captcha' of http://git.yoho.cn/fe/yohobuywap-node into feature/captcha

... ... @@ -88,8 +88,10 @@
{{/ baseShopHome}}
<!-- /基础店铺页面 -->
<!-- 优惠卷 -->
<div class="coupon-group"></div>
{{#ifor brandHome baseShopHome}}
<!-- 优惠卷 -->
<div class="coupon-group"></div>
{{/ifor}}
<div>
<ul id="list-nav" class="list-nav clearfix">
... ...
... ... @@ -29,6 +29,10 @@ shopCoupon = {
var that = this,
_url = location.protocol + '//m.yohobuy.com';
if ($('.coupon-group').length <= 0) {
return false;
}
if (that.common.shopId) {
// 店铺领券
_url += '/product/index/getShopCouponsList';
... ...
... ... @@ -699,9 +699,14 @@ var chat = {
_drawMSG: function(viewData, cusAction = null) {
let chatWin = this.$chatWin[0];
if (viewData.type === 'picture') {
viewData.data.content = viewData.data.content.replace(/^http:/, '');
}
// console.log(viewData);
let $html = $(this.messageT(viewData));
this.checkTime();
if (cusAction) {
cusAction.apply(this, [$html]);
... ...