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

@@ -88,8 +88,10 @@
     {{/ baseShopHome}}
     {{/ baseShopHome}}
     <!-- /基础店铺页面 -->
     <!-- /基础店铺页面 -->
 
 
-    <!-- 优惠卷 -->
-    <div class="coupon-group"></div>
+    {{#ifor brandHome baseShopHome}}
+        <!-- 优惠卷 -->
+        <div class="coupon-group"></div>
+    {{/ifor}}
 
 
     <div>
     <div>
         <ul id="list-nav" class="list-nav clearfix">
         <ul id="list-nav" class="list-nav clearfix">

@@ -29,6 +29,10 @@ shopCoupon = {
         var that = this,
         var that = this,
             _url = location.protocol + '//m.yohobuy.com';
             _url = location.protocol + '//m.yohobuy.com';
 
 
+        if ($('.coupon-group').length <= 0) {
+            return false;
+        }
+
         if (that.common.shopId) {
         if (that.common.shopId) {
             // 店铺领券
             // 店铺领券
             _url += '/product/index/getShopCouponsList';
             _url += '/product/index/getShopCouponsList';

@@ -699,9 +699,14 @@ var chat = {
     _drawMSG: function(viewData, cusAction = null) {
     _drawMSG: function(viewData, cusAction = null) {
         let chatWin = this.$chatWin[0];
         let chatWin = this.$chatWin[0];
 
 
+        if (viewData.type === 'picture') {
+            viewData.data.content = viewData.data.content.replace(/^http:/, '');
+        }
+
         // console.log(viewData);
         // console.log(viewData);
         let $html = $(this.messageT(viewData));
         let $html = $(this.messageT(viewData));
 
 
+
         this.checkTime();
         this.checkTime();
         if (cusAction) {
         if (cusAction) {
             cusAction.apply(this, [$html]);
             cusAction.apply(this, [$html]);