Merge branch 'master' into feature/optimize20200528

* master:
  还原滑块验证
  feat(注册)：删除 token验证
  feat(注册页)：删除潮流口令
  feat(电子刊)： 边界值判断
  chore(*):移除滑块校验
  feat(注册)： 移除滑块校验
  feat(电子刊): 去掉验证码&样式修改
  feat(电子刊)： 新增购买数量
  feat(电子刊)： 提示文案修改
  chore(*): npm version
  fix(电子刊)： 样式修改
  fix(电子刊)：样式修改

@@ -4,15 +4,27 @@ class detailModel extends global.yoho.BaseModel {
         super(ctx);
         super(ctx);
     }
     }
     getMagazineInfo(params) {
     getMagazineInfo(params) {
-        return this.get({data: {
+        const infoPromise = this.get({data: {
             method: 'app.eBook.queryEBookByEId',
             method: 'app.eBook.queryEBookByEId',
             e_id: params[0]
             e_id: params[0]
-        }}).then((data) => {
-            if (data.code === 200) {
-                return data.data || {};
-            }
+        }});
+        const buyInfoPromise = this.get({data: {
+            method: 'app.eBook.querySubscriberInfo',
+            e_id: params[0]
+        }});
+
+        return Promise.all([infoPromise, buyInfoPromise]).then((infos)=> {
+            const [bookInfo, buyInfo] = infos;
+            let data = {};
 
 
-            return {};
+            if (bookInfo && bookInfo.code === 200) {
+                data = bookInfo.data;
+                data.subcribeCount = 0;
+                if (buyInfo && buyInfo.code === 200) {
+                    data.subcribeCount = buyInfo.data.total;
+                }
+            }
+            return data;
         });
         });
     }
     }
 }
 }

@@ -11,18 +11,25 @@
                 {{/ bookPreviewPicBoList}}
                 {{/ bookPreviewPicBoList}}
             </div>
             </div>
             <div class="swiper-pagination"></div>
             <div class="swiper-pagination"></div>
+            <div class="magazine-info-gradient">
                 <div class="magazine-info-block">
                 <div class="magazine-info-block">
                     <p class="m-time">{{bookNumber}}</p>
                     <p class="m-time">{{bookNumber}}</p>
                     <p class="m-title">{{title}}</p>
                     <p class="m-title">{{title}}</p>
                     
                     
-                <div class="m-order to-download">查看阅读
+                    <div class="magazine-info">
+                        <div class="m-order to-download">如何订阅
                             <i class="iconfont">&#xe614;</i>
                             <i class="iconfont">&#xe614;</i>
                         </div>
                         </div>
+                        {{#if subcribeCount }}
+                        <div class="m-buy-info">已有{{subcribeCount}}本订阅</div>
+                        {{/if}}
+                    </div>
                     
                     
                     <button class="buy-magazine-now" data-sku="{{sku}}" data-buy="{{buyFlag}}">立即购买</button>
                     <button class="buy-magazine-now" data-sku="{{sku}}" data-buy="{{buyFlag}}">立即购买</button>
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>
+    </div>
 
 
     <div class="magazine-detail-container">
     <div class="magazine-detail-container">
         <div class="touch-area"></div>
         <div class="touch-area"></div>

 {
 {
   "name": "yohobuywap-node",
   "name": "yohobuywap-node",
-  "version": "6.13.4",
+  "version": "6.13.9",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -127,10 +127,11 @@ new DragableElm($('.magazine-detail-container'));
 
 
 $('.to-download').on('click', function() {
 $('.to-download').on('click', function() {
     dialog.showDialog({
     dialog.showDialog({
-        dialogText: '请下载有货APP阅读电子刊',
+        dialogText: '请在微信搜索并关注“YOHO潮流志”公众号，阅读电子刊',
         hasFooter: {
         hasFooter: {
-            leftBtnText: '取消',
-            rightBtnText: '确定'
+            centerBtnText: '确定',
+
+            // rightBtnText: '确定'
         }
         }
     }, function() {
     }, function() {
         window.location.href = downloadPage;
         window.location.href = downloadPage;

@@ -3,6 +3,8 @@
 html,
 html,
 body {
 body {
     height: 100%;
     height: 100%;
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
 }
 }
 
 
 .main-wrap {
 .main-wrap {
@@ -33,11 +35,12 @@ body {
     }
     }
 
 
     .swiper-slide {
     .swiper-slide {
-        display: flex;
-        align-items: center;
-        position: relative;
-        box-sizing: border-box;
-        padding-bottom: 134px;
+        // display: flex;
+        // // align-items: center;
+        // justify-content: center;
+        // position: relative;
+        // box-sizing: border-box;
+        // // padding-bottom: 134px;
         overflow: hidden;
         overflow: hidden;
 
 
         .filter-bg {
         .filter-bg {
@@ -77,6 +80,25 @@ body {
         }
         }
     }
     }
 
 
+    .magazine-info-gradient {
+        width: 100%;
+        height: 60%;
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        z-index: 3;
+        background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 1) 100%,);
+    }
+
+    .magazine-info {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 40px;
+        padding-right: 2px;
+    }
+
     .magazine-info-block {
     .magazine-info-block {
         width: 100%;
         width: 100%;
         height: 0;
         height: 0;
@@ -87,14 +109,14 @@ body {
 
 
         .m-time {
         .m-time {
             font-size: 24px;
             font-size: 24px;
-            color: #ddd;
+            color: #fff;
             line-height: 1.2;
             line-height: 1.2;
         }
         }
 
 
         .m-title {
         .m-title {
             height: 100px;
             height: 100px;
             margin: 10px 0 40px;
             margin: 10px 0 40px;
-            font-size: 40px;
+            font-size: 36px;
             color: #fff;
             color: #fff;
             letter-spacing: 1px;
             letter-spacing: 1px;
             font-weight: 500;
             font-weight: 500;
@@ -102,17 +124,26 @@ body {
             overflow: hidden;
             overflow: hidden;
         }
         }
 
 
+        .m-buy-info {
+            color: #fff;
+            font-size: 24px;
+            font-weight: bold;
+        }
+
         .m-order {
         .m-order {
-            margin-bottom: 40px;
             color: #fff;
             color: #fff;
+            display: flex;
+            align-items: center;
+            font-weight: bold;
 
 
             &:before {
             &:before {
                 content: "";
                 content: "";
-                width: 26px;
-                height: 21px;
+                width: 28px;
+                height: 28px;
                 margin-right: 10px;
                 margin-right: 10px;
-                background-image: url("img/magazine/crown.png");
+                background-image: url("img/magazine/help-tip@2x.png");
                 background-size: 100% 100%;
                 background-size: 100% 100%;
+                background-repeat: no-repeat;
                 display: inline-block;
                 display: inline-block;
             }
             }
         }
         }