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

@@ -21,6 +21,7 @@ const getPageInfo = (pageInfo) => {
         dest.oldUserCouponPic = pageInfo.data.oldUserCouponPic;
         dest.oldUserCouponPic = pageInfo.data.oldUserCouponPic;
         dest.mobile = pageInfo.data.mobile;
         dest.mobile = pageInfo.data.mobile;
         dest.wechatShare = true;
         dest.wechatShare = true;
+        dest.secondScreenPic = pageInfo.data.secondScreenPic;
 
 
         // 强制活动开始，活动上线产品要求这样设置
         // 强制活动开始，活动上线产品要求这样设置
         pageInfo.data.flag = 1;
         pageInfo.data.flag = 1;
@@ -91,7 +92,7 @@ exports.getCoupon = (data) => {
             method: 'wap.order.drawOrderShareCoupon'
             method: 'wap.order.drawOrderShareCoupon'
         },
         },
 
 
-    // 处理完成后，发给后端
+        // 处理完成后，发给后端
         phoneData = Object.assign(defaultParam, data);
         phoneData = Object.assign(defaultParam, data);
 
 
     return api.get('', phoneData).then(result => {
     return api.get('', phoneData).then(result => {
@@ -108,10 +109,10 @@ exports.registerAndSendCoupon = (data) => {
             method: 'wap.order.registerAndSendCoupon'
             method: 'wap.order.registerAndSendCoupon'
         },
         },
 
 
-    // 处理完成后，发给后端
+        // 处理完成后，发给后端
         verifyData = Object.assign(defaultParam, data);
         verifyData = Object.assign(defaultParam, data);
 
 
     return api.get('', verifyData).then(result => {
     return api.get('', verifyData).then(result => {
         return getUserStatus(result);
         return getUserStatus(result);
-    });  // 所有数据返回一个 Promise，方便 Promise.all 调用
-};
+    }); // 所有数据返回一个 Promise，方便 Promise.all 调用
+};

@@ -2,6 +2,9 @@
 <div class="receive-coupon-page">
 <div class="receive-coupon-page">
     <div class="bg-contain">
     <div class="bg-contain">
         <img src="{{image bgImg 640 1136}}">
         <img src="{{image bgImg 640 1136}}">
+        {{#if secondScreenPic}}
+            <img src="{{image secondScreenPic}}">
+        {{/if}}
     </div>
     </div>
     <p class="hidden" id="orderCode">{{ordercode}}</p>
     <p class="hidden" id="orderCode">{{ordercode}}</p>
     <p class="hidden" id="oldUserCouponPic">{{image oldUserCouponPic}}</p>
     <p class="hidden" id="oldUserCouponPic">{{image oldUserCouponPic}}</p>

@@ -91,7 +91,9 @@ const _searchGoods = (params) => {
         delete params.filter_poolId;
         delete params.filter_poolId;
     }
     }
 
 
-    if (params.brand) {
+    if (params.shop_id) {
+        method = 'app.search.li';
+    } else if (params.brand) {
         method = 'app.search.brand';
         method = 'app.search.brand';
     }
     }