Authored by 郝肖肖

代码回退

... ... @@ -38,9 +38,7 @@ function show(con, dur) {
content = con.toString();
duration = (dur && dur > 0) ? dur : 2000;
$tip.text(content).css({
left: ($(window).width() - $tip.width() - 30) / 2
}).show();
$tip.text(content).show();
tipItime = setTimeout(function() {
if ($tip.css('display') === 'block') {
... ...
var $ = require('jquery'),
IScroll = require('iscroll/iscroll-probe'),
Swiper = require('yoho.iswiper'),
ellipsis = require('yoho.mlellipsis'),
tip = require('../plugin/tip');
var appVersion = $('input[name="app_version"]').val();
ellipsis.init();
$(".coupon-content .receive-btn").closest('.swiper-slide').on('click', function(e) {
var that = this,
code = $(this).data('id') || '';
... ... @@ -59,8 +56,4 @@ $(function() {
slidesPerView: 'auto',
watchSlidesVisibility: true
});
$('.coupon-content .coupon-left-name').each(function() {
this.mlellipsis(2);
});
})
... ...
... ... @@ -151,6 +151,8 @@ iframe[height="0"] {
z-index:4;
border-radius: 10PX;
margin: 0 auto;
left: 50%;
transform: translateX(-50%);
}
.tap-hightlight {
... ...
... ... @@ -87,9 +87,12 @@
width: 150px;
height: 45px;
line-height: 24px;
display: table-cell;
vertical-align: middle;
padding-top: 2px;
overflow: hidden;
word-break: break-all;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
.coupon-right {
... ...
... ... @@ -621,9 +621,9 @@ class IndexController extends AbstractAction
$data['goodList']['cartUrl'] = Helpers::url('/cart/index/index', null);
$data['goodList'] += $condition;
$data['pageFooter'] = true;
$data['shopCoupons'] = ListModel::getShopCouponsList($shop['shops_id'], $uid);
$data['shopCouponsOne'] = count($data['shopCoupons']) === 1;
//基础模板,于水说APP没有,H5暂时不须要
// $data['shopCoupons'] = ListModel::getShopCouponsList($shop['shops_id'], $uid);
// $data['shopCouponsOne'] = count($data['shopCoupons']) === 1;
$this->setTitle($title);
$this->setNavHeader($title, true, SITE_MAIN);
... ...