Authored by 陈峰

Merge branch 'feature/yoluck' into 'release/6.8.3'

Feature/yoluck



See merge request !1617
... ... @@ -25,4 +25,6 @@
<div class="js-luck-alert">
</div>
<div class="js-clipbroad"></div>
{{/result}}
... ...
... ... @@ -4,7 +4,7 @@
</div>
{{/ifcond}}
<img class="product_image" src="{{image2 cover_img w=760 h=470 q=60}}" alt="">
<img class="product_image" src="{{image2 cover_img w=760 h=470 q=60}}" alt="" data-id="{{id}}">
<div class="product_name">{{name}}</div>
<div class="product_lucky_bg">
... ...
{
"name": "yohobuywap-node",
"version": "6.8.53",
"version": "6.8.54",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...
... ... @@ -6,7 +6,7 @@
</div>
{{/ifcond}}
<img class="product_image" src="{{image2 cover_img w=760 h=470 q=60}}" alt="">
<img class="product_image" src="{{image2 cover_img w=760 h=470 q=60}}" alt="" data-id="{{id}}">
<div class="product_name">{{name}}</div>
<div class="product_lucky_bg">
... ...
... ... @@ -8,6 +8,7 @@ let YolukcApi = require('./yoluck/api');
let api = new YolukcApi();
let tip = require('js/plugin/tip');
let yoSdk = require('yoho-activity-sdk');
let yoho = require('js/yoho-app');
let Clipboard = require('clipboard');
let makeShareData = require('./yoluck/share');
... ... @@ -73,7 +74,9 @@ getUser();
function share() {
if (yoSdk.env === 'app') {
yoSdk.invokeMethod('go.showshareaction', shareData && shareData.app);
yoho.invokeMethod('go.showshareaction', shareData && shareData.app);
} else if (yoSdk.env === 'h5') {
$('.js-clipbroad').trigger('click');
}
}
... ... @@ -118,7 +121,7 @@ clipboardFellow.on('success', function(e) {
e.clearSelection();
});
let clipboardShare = new Clipboard('.js-share', {
let clipboardShare = new Clipboard('.js-clipbroad', {
text: function() {
return shareData && shareData.h5.link;
}
... ...
... ... @@ -256,7 +256,7 @@ $tabpanel.on('click', '.js-tab', function() {
});
$tabpanel
.on('click', '.js-prizeitem,.js-join', function() {
.on('click', '.js-prizeitem,.js-join,.product_image', function() {
let id = $(this).data('id');
let href = DETAIL_URI + '/' + id + '.html?t=1';
... ...