commit

@@ -51,7 +51,7 @@ module.exports = {
     appName: 'yohobuywap-node',
     port: 6001,
     siteUrl: '//m.yohobuy.com',
-    assetUrl: '//localhost:5001/yohobuywap-node/',
+    assetUrl: '//m.yohobuy.com:5001/yohobuywap-node/',
     testCode: 'yoho4946abcdef#$%&!@',
     domains: domains,
 

 import 'scss/activity/yoluck/yoluck-detail.page.scss';
 
+const cookie = require('yoho-cookie');
 let Swiper = require('yoho-swiper');
+const loading = require('js/plugin/loading');
 let timeCountDownTpl = require('hbs/activity/yoluck/time-countdown.hbs');
 let luckAlertTpl = require('hbs/activity/yoluck/luck-alert.hbs');
 let formatCountDown = require('./yoluck/formatCountDown');
@@ -23,7 +25,7 @@ require('js/plugin/modal.alert');
 let store = {
     running: false,
     shareUid: window.queryString.shareUid || '',
-    currentVersion: window.queryString.app_version,
+    currentVersion: cookie.get('app_version'),
     targetVersion: '6.8.3',
 };
 
@@ -35,6 +37,7 @@ let id = $product.data('id');
 let user;
 let shareData;
 
+loading.init($(document.body));
 new Swiper('.swiper-container', {
     direction: 'vertical',
     lazyLoading: true,
@@ -86,7 +89,14 @@ function share() {
             return;
         }
 
-        yoho.invokeMethod('go.showshareaction', shareData && shareData.app);
+        loading.showLoading();
+        getUser().then(() => {
+            yoho.invokeMethod('go.showshareaction', shareData && shareData.app);
+            loading.hideLoading();
+        });
+        setTimeout(() => {
+            loading.hideLoading();
+        }, 4000);
     } else if (yoSdk.env === 'h5') {
         $('.js-clipbroad').trigger('click');
     }
@@ -117,9 +127,7 @@ let luckAlert = {
         });
 
         this.$el.on('click', '.share', function() {
-            getUser().then(() => {
-                share();
-            });
+            share();
         });
     }
 };
@@ -187,8 +195,6 @@ $('.action-bar-comp').on('click', '.js-join', function() {
 
 // 分享
 $('.action-bar-comp').on('click', '.js-share', function() {
-    getUser().then(() => {
-        share();
-    });
+    share();
 });
 

 import 'scss/activity/yoluck/yoluck-list.page.scss';
 
+const cookie = require('yoho-cookie');
+const loading = require('js/plugin/loading');
 let $ = require('yoho-jquery');
 let Api = require('./yoluck/api');
 let productTpl = require('hbs/activity/yoluck/product-item.hbs');
@@ -17,6 +19,7 @@ let versionCompare = require('./yoluck/version');
 
 require('js/plugin/modal.alert');
 
+loading.init($(document.body));
 let footerText = ['内容加载中...', '暂无更多内容'];
 
 let store = {
@@ -49,7 +52,7 @@ let tabpanelStore = {
     footer: null
 };
 
-let currentVersion = window.queryString.app_version;
+let currentVersion = cookie.get('app_version');
 let targetVersion = '6.8.3';
 
 function initStore() {
@@ -226,7 +229,14 @@ function share($el) {
             alertVersion();
             return;
         }
-        yoho.invokeMethod('go.showshareaction', store.shareData && store.shareData.app);
+        loading.showLoading();
+        getUser().then(() => {
+            yoho.invokeMethod('go.showshareaction', store.shareData && store.shareData.app);
+            loading.hideLoading();
+        });
+        setTimeout(() => {
+            loading.hideLoading();
+        }, 4000);
     } else if (yoSdk.env === 'h5') {
         $('.js-clipbroad').trigger('click');
     }
@@ -294,9 +304,7 @@ $tabpanel
         return false;
     })
     .on('click', '.js-share', function() {
-        getUser().then(() => {
-            share($(this));
-        });
+        share($(this));
         return false;
     })
     .on('click', '.js-fellow', function() {

@@ -17,11 +17,17 @@ function h5Name(name) {
 }
 
 function shareData({name, imgUrl, price, shareUid, actPrizeId}) {
+    let urls = imgUrl.split('?');
+    let shareImg = urls[0] || imgUrl;
+
+    if (urls[0]) {
+        shareImg = `${shareImg}?imageView2/2/w/375/h/235/q/60`;
+    }
     return {
         app: {
             shareType: 'yoluck',
             title: name,
-            imgUrl: imgUrl,
+            imgUrl: shareImg,
             market_price: price,
             miniProgramUrl: miniPath(shareUid, actPrizeId),
             miniProgramQCodeUrl: miniQrcode(shareUid, actPrizeId),

@@ -9,6 +9,7 @@
 @import "time-countdown";
 @import "luck-alert";
 @import "~scss/layout/modal";
+@import "~scss/layout/loading";
 
 .line {
     height: 20px;
@@ -36,14 +37,14 @@
     position: fixed;
     width: 100%;
     top: 0;
-    z-index: 10;
+    z-index: 8;
 }
 
 .action-bar {
     position: fixed;
     width: 100%;
     bottom: 0;
-    z-index: 10;
+    z-index: 8;
 }
 
 .foot {

@@ -5,6 +5,7 @@
 @import "tabs";
 @import "time-countdown";
 @import "~scss/layout/modal";
+@import "~scss/layout/loading";
 
 .product {
     display: block;