Authored by wangwei

Merge branch 'dev_店铺优惠券' into test6.7

... ... @@ -230,10 +230,17 @@
[[if couponType!=6]]
<option value="0">分类</option>
[[/if]]
[[if couponType!=6]]
<option value="2">店铺</option>
[[if couponType > 0]]
[[/if]]
[[if couponType > 0 && couponType != 6]]
<option value="3">商品</option>
[[/if]]
[[if couponType==6]]
<option value="2">店铺(SKN除外)</option>
<option value="3">店铺(指定商品)</option>
[[/if]]
[[if couponType==1 || couponType==3]]
<option value="4">商品池</option>
[[/if]]
... ... @@ -242,10 +249,10 @@
[[if useRange==1]]
<a class="btn btn-primary btn-xs" href="javascript:;" id="addBrands">添加品牌</a>
[[/if]]
[[if useRange==3]]
<a class="btn btn-primary btn-xs" href="javascript:;" id="importPrds" [[if status==1]] disabled [[/if]]>导入商品</a>
[[/if]]
[[if useRange==2]]
<!--[[if useRange==3]]-->
<!--<a class="btn btn-primary btn-xs" href="javascript:;" id="importPrds" [[if status==1]] disabled [[/if]]>导入商品</a>-->
<!--[[/if]]-->
[[if useRange==2||useRange==3]]
<a class="btn btn-primary btn-xs" href="javascript:;" id="addShop">添加店铺</a>
[[/if]]
[[if useRange==0&&couponType!=6]]
... ... @@ -298,6 +305,9 @@
<div class="col-sm-4">
<textarea name="productLimit" class="form-control observe" prompt="指定商品" data-field="productLimit"
placeholder="skn用英文逗号分隔" style="resize: none" [[if status==1]] disabled [[/if]]>[[productLimit]]</textarea>
[[if useRange==3]]
<a class="btn btn-primary btn-xs" href="javascript:;" id="importPrds" [[if status==1]] disabled [[/if]]>导入商品</a>
[[/if]]
[[if status==2]]
<a class="btn btn-primary btn-xs" style="margin:10px 0px 0px 200px;" href="javascript:;" id="cleanPrdLimit" [[if !productLimit]] disabled [[/if]]>清除所有</a>
[[/if]]
... ...
... ... @@ -54,7 +54,7 @@ var g = new common.grid({
name:"offlineBrandIco",
render: function(item) {
if (item.offlineBrandIco) {
return '<img src="' + item.offlineBrandIco + '" width="100" height="100" id="offline-logo-' + item.__index + '"/>';
return '<img src="' + item.offlineBrandIco + '" width="100" height="100" id="offline-logo-' + item.__index + '" class="offline-logo-image"/>';
}
return '<div id="offline-logo-' + item.__index + '" style = "height : 100px;"/>';
}
... ... @@ -89,13 +89,19 @@ var g = new common.grid({
var images = $('.logo-image');
if(images) {
for(var i = 0; i < images.length; i++) {
new common.viewer(document.getElementById('logo-' + i), {
new common.viewer(document.getElementById($(images[i]).attr('id')), {
navbar: 0,
title: 0,
toolbar: 0,
movable: false
});
new common.viewer(document.getElementById('offline-logo-' + i), {
}
}
var offlineimages = $('.offline-logo-image');
if(offlineimages) {
for(var i = 0; i < offlineimages.length; i++) {
new common.viewer(document.getElementById($(offlineimages[i]).attr('id')), {
navbar: 0,
title: 0,
toolbar: 0,
... ...
... ... @@ -58,7 +58,7 @@ webpackJsonp([21],[
name:"offlineBrandIco",
render: function(item) {
if (item.offlineBrandIco) {
return '<img src="' + item.offlineBrandIco + '" width="100" height="100" id="offline-logo-' + item.__index + '"/>';
return '<img src="' + item.offlineBrandIco + '" width="100" height="100" id="offline-logo-' + item.__index + '" class="offline-logo-image"/>';
}
return '<div id="offline-logo-' + item.__index + '"/>';
}
... ... @@ -93,13 +93,19 @@ webpackJsonp([21],[
var images = $('.logo-image');
if(images) {
for(var i = 0; i < images.length; i++) {
new common.viewer(document.getElementById('logo-' + i), {
new common.viewer(document.getElementById($(images[i]).attr('id')), {
navbar: 0,
title: 0,
toolbar: 0,
movable: false
});
new common.viewer(document.getElementById('offline-logo-' + i), {
}
}
var offlineimages = $('.offline-logo-image');
if(offlineimages) {
for(var i = 0; i < offlineimages.length; i++) {
new common.viewer(document.getElementById($(offlineimages[i]).attr('id')), {
navbar: 0,
title: 0,
toolbar: 0,
... ...