merge

@@ -7,8 +7,7 @@ const couponModel = require(`${mRoot}/coupon`); // 领取优惠券 model
 exports.index = (req, res, next) => {
     var renderData = {
             module: 'activity',
-            page: 'coupon',
-            appDownLoadLink: 'http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho'
+            page: 'coupon'
         },
         ordercode = req.query.ordercode,
         uid = req.query.uid,
@@ -28,7 +27,6 @@ exports.index = (req, res, next) => {
             // 获取信息成功
             couponData.ordercode = ordercode;
         }
-        couponData.appDownLoadLink = renderData.appDownLoadLink;
         res.render('coupon', {
             result: couponData,
             module: 'activity',
@@ -99,4 +97,4 @@ exports.verify = (req, res, next) => {
             result: couponData
         });
     }).catch(next);
-};
+};
\ No newline at end of file

@@ -24,8 +24,9 @@ const getPageInfo = (pageInfo) => {
         dest.wechatShare = true;
         dest.secondScreenPic = pageInfo.data.secondScreenPic;
         dest.activityEndPic = pageInfo.data.activityEndPic;
+        dest.buttonLink = pageInfo.data.buttonLink;
 
-        if (pageInfo.data.flag === 3 || pageInfo.data.flag === 4) {
+        if (pageInfo.data.flag === 3 || pageInfo.data.flag === 4 || pageInfo.data.flag === 5) {
             // flag为3 表示活动结束 , 4 表示未开始
             dest.bgImg = pageInfo.data.activityEndPic;
             dest.ended = true;
@@ -116,4 +117,4 @@ exports.registerAndSendCoupon = (data) => {
     return api.get('', verifyData).then(result => {
         return getUserStatus(result);
     }); // 所有数据返回一个 Promise，方便 Promise.all 调用
-};
+};
\ No newline at end of file

@@ -58,6 +58,7 @@
         <input id="appurl" type="hidden" value="{{appUrl}}">
         <input id="wapurl" type="hidden" value="{{wapUrl}}">
     {{/ noLoginUrl}}
+    {{> common/suspend-home}}
 </div>
 <div class="floor-mask"></div>
 <div class="floor-message">

@@ -27,7 +27,7 @@
             <p>登录Yoho!Buy有货客户端即可使用</p>
 
             <div class="use-coupon-btn">
-                <a href="{{appDownLoadLink}}">马上去Yoho!Buy有货使用</a>
+                <a href="{{buttonLink}}">马上去Yoho!Buy有货使用</a>
             </div>
             <span class="description"></span>
         </div>

@@ -35,4 +35,5 @@
     <input id="isApp" type="hidden" value={{isApp}}>
     {{/if}}
 {{/ guang}}
+{{> common/suspend-home}}
 </div>

@@ -174,4 +174,5 @@
         <input id="shareTitle" type="hidden" value="{{shareTitle}}">
         <input id="shareDesc" type="hidden" value="{{shareDesc}}">
     {{/ guang}}
+    {{> common/suspend-home}}
 </div>

@@ -35,4 +35,5 @@
     <input id="isApp" type="hidden" value={{isApp}}>
     {{/if}}
 {{/ guang}}
+{{> common/suspend-home}}
 </div>
\ No newline at end of file

@@ -15,5 +15,5 @@
     <div class="plusstar-resources">
     	<!--资源位数据模板-->
 	</div><!--/plusstar-resources-->
-
+	{{> common/suspend-home}}
 </div><!--/plusstar-page-->
\ No newline at end of file

@@ -17,4 +17,5 @@
             </div>
         {{/if}}
     </div>
+    {{> common/suspend-home}}
 </div>
\ No newline at end of file

@@ -175,6 +175,6 @@
     {{#if showPannel}}
         <input type="hidden" id="showPannel" value="1">
     {{/if}}
-
+    {{> common/suspend-home}}
 </div>
 {{/ result}}

@@ -39,6 +39,7 @@
 
     {{> common/query-param}}
 
+    {{> common/suspend-home}}
     {{> common/suspend-cart}}
 </div>
 

@@ -51,5 +51,5 @@
         {{> common/filter-nav}}
     </div>
     {{> sale/common}}
-
+    {{> common/suspend-home}}
 </div>

@@ -233,6 +233,7 @@
                 </ul>
             </div>
         </div>
+        {{> common/suspend-home}}
     </div>
     {{> common/filter}}
 {{/ shopIndex}}

@@ -143,7 +143,7 @@
     </div>
 
     {{> common/query-param}}
-
+    {{> common/suspend-home}}
     {{> common/suspend-cart}}
 {{/ goodList}}
 

@@ -32,7 +32,8 @@ module.exports = () => {
             res.set('Access-Control-Allow-Origin', '*');
         }
 
-        res.locals.cartUrl = helpers.urlFormat('/cart/index/index');
+        res.locals.cartUrl = helpers.urlFormat('/cart/index/index'); // 悬挂购物车
+        res.locals.indexUrl = helpers.urlFormat('/?go=1'); // 悬挂首页
         res.locals.showHeader = true;
 
         next();

+<div id="suspend-home" class="suspend-home hide">
+    <a href="{{@root.indexUrl}}">
+        <span class="iconfont">&#xe62a;</span>
+    </a>
+</div>
+<script type="text/javascript">
+    var isWechat = /micromessenger/i.test(navigator.userAgent || '');
+    if (isWechat) document.getElementById('suspend-home').classList.remove('hide');
+</script>
\ No newline at end of file

@@ -313,6 +313,11 @@ if (!orderInfo('addressId')) {
 // 配送方式 发生改变
 $('.delivery-id').on('touchend', 'li', function() {
     orderInfo('deliveryId', $(this).data('id'));
+
+    // 实付金额发生变化，使用有货币为0
+    orderInfo('yohoCoin', 0);
+    $('.coin').find('.checkbox').removeClass('icon-cb-radio').addClass('icon-radio');
+
     orderCompute();
 });
 

@@ -617,7 +617,7 @@
 
     .yoho-coin-help-dialog {
         position: fixed;
-        width: 450px;
+        width: 540px;
         height: 510px;
         background-color: #fff;
         z-index: 2;

@@ -27,7 +27,7 @@
         height: 290px;
         width: 153px;
         margin-right: 26px;
-        background: #ccc;
+        background: #fff;
         border-radius: 5px;
         vertical-align: top;
 
@@ -38,7 +38,7 @@
 
         .goods-info {
             position: relative;
-            height: 168px;
+            height: 84px;
             width: 200%;
             background: #fff;
             padding: 24px 0 20px 20px;

@@ -29,7 +29,7 @@
         height: 290px;
         width: 153px;
         margin-right: 26px;
-        background: #ccc;
+        background: #fff;
         border-radius: 5px;
         vertical-align: top;
 
@@ -40,7 +40,7 @@
 
         .goods-info {
             position: relative;
-            height: 168px;
+            height: 84px;
             width: 200%;
             background: #fff;
             padding: 28px 0 20px 20px;

 @import "good";
 @import "filter";
 @import "suspend-cart";
+@import "suspend-home";
 @import "error";
 @import "loading";
 @import "data-bind";

+.suspend-home {
+    position: fixed;
+    right: 30px;
+    bottom: 140px;
+    z-index: 10;
+    width: 88px;
+    height: 88px;
+    border-radius: 50%;
+    background: rgba(0, 0, 0, 0.3);
+    text-align: center;
+    line-height: 88px;
+
+    a {
+        display: block;
+        width: 100%;
+        height: 100%;
+    }
+
+    .iconfont {
+        color: #fff;
+        font-size: 36px;
+    }
+}
\ No newline at end of file

@@ -94,4 +94,8 @@
         padding-left: 0.375rem;
         padding-top: 0.2rem;
     }
+
+    .suspend-home {
+        bottom: 258px;
+    }
 }

@@ -311,4 +311,8 @@
             }
         }
     }
+
+    .suspend-home {
+        bottom: 258px;
+    }
 }