Merge branch 'dev_店铺优惠券' into test6.7
Showing
3 changed files
with
33 additions
and
11 deletions
| @@ -230,10 +230,17 @@ | @@ -230,10 +230,17 @@ | ||
| 230 | [[if couponType!=6]] | 230 | [[if couponType!=6]] |
| 231 | <option value="0">分类</option> | 231 | <option value="0">分类</option> |
| 232 | [[/if]] | 232 | [[/if]] |
| 233 | + [[if couponType!=6]] | ||
| 233 | <option value="2">店铺</option> | 234 | <option value="2">店铺</option> |
| 234 | - [[if couponType > 0]] | 235 | + [[/if]] |
| 236 | + [[if couponType > 0 && couponType != 6]] | ||
| 235 | <option value="3">商品</option> | 237 | <option value="3">商品</option> |
| 236 | [[/if]] | 238 | [[/if]] |
| 239 | + [[if couponType==6]] | ||
| 240 | + <option value="2">店铺（SKN除外）</option> | ||
| 241 | + <option value="3">店铺（指定商品）</option> | ||
| 242 | + [[/if]] | ||
| 243 | + | ||
| 237 | [[if couponType==1 || couponType==3]] | 244 | [[if couponType==1 || couponType==3]] |
| 238 | <option value="4">商品池</option> | 245 | <option value="4">商品池</option> |
| 239 | [[/if]] | 246 | [[/if]] |
| @@ -242,10 +249,10 @@ | @@ -242,10 +249,10 @@ | ||
| 242 | [[if useRange==1]] | 249 | [[if useRange==1]] |
| 243 | <a class="btn btn-primary btn-xs" href="javascript:;" id="addBrands">添加品牌</a> | 250 | <a class="btn btn-primary btn-xs" href="javascript:;" id="addBrands">添加品牌</a> |
| 244 | [[/if]] | 251 | [[/if]] |
| 245 | - [[if useRange==3]] | ||
| 246 | - <a class="btn btn-primary btn-xs" href="javascript:;" id="importPrds" [[if status==1]] disabled [[/if]]>导入商品</a> | ||
| 247 | - [[/if]] | ||
| 248 | - [[if useRange==2]] | 252 | + <!--[[if useRange==3]]--> |
| 253 | + <!--<a class="btn btn-primary btn-xs" href="javascript:;" id="importPrds" [[if status==1]] disabled [[/if]]>导入商品</a>--> | ||
| 254 | + <!--[[/if]]--> | ||
| 255 | + [[if useRange==2||useRange==3]] | ||
| 249 | <a class="btn btn-primary btn-xs" href="javascript:;" id="addShop">添加店铺</a> | 256 | <a class="btn btn-primary btn-xs" href="javascript:;" id="addShop">添加店铺</a> |
| 250 | [[/if]] | 257 | [[/if]] |
| 251 | [[if useRange==0&&couponType!=6]] | 258 | [[if useRange==0&&couponType!=6]] |
| @@ -298,6 +305,9 @@ | @@ -298,6 +305,9 @@ | ||
| 298 | <div class="col-sm-4"> | 305 | <div class="col-sm-4"> |
| 299 | <textarea name="productLimit" class="form-control observe" prompt="指定商品" data-field="productLimit" | 306 | <textarea name="productLimit" class="form-control observe" prompt="指定商品" data-field="productLimit" |
| 300 | placeholder="skn用英文逗号分隔" style="resize: none" [[if status==1]] disabled [[/if]]>[[productLimit]]</textarea> | 307 | placeholder="skn用英文逗号分隔" style="resize: none" [[if status==1]] disabled [[/if]]>[[productLimit]]</textarea> |
| 308 | + [[if useRange==3]] | ||
| 309 | + <a class="btn btn-primary btn-xs" href="javascript:;" id="importPrds" [[if status==1]] disabled [[/if]]>导入商品</a> | ||
| 310 | + [[/if]] | ||
| 301 | [[if status==2]] | 311 | [[if status==2]] |
| 302 | <a class="btn btn-primary btn-xs" style="margin:10px 0px 0px 200px;" href="javascript:;" id="cleanPrdLimit" [[if !productLimit]] disabled [[/if]]>清除所有</a> | 312 | <a class="btn btn-primary btn-xs" style="margin:10px 0px 0px 200px;" href="javascript:;" id="cleanPrdLimit" [[if !productLimit]] disabled [[/if]]>清除所有</a> |
| 303 | [[/if]] | 313 | [[/if]] |
| @@ -54,7 +54,7 @@ var g = new common.grid({ | @@ -54,7 +54,7 @@ var g = new common.grid({ | ||
| 54 | name:"offlineBrandIco", | 54 | name:"offlineBrandIco", |
| 55 | render: function(item) { | 55 | render: function(item) { |
| 56 | if (item.offlineBrandIco) { | 56 | if (item.offlineBrandIco) { |
| 57 | - return '<img src="' + item.offlineBrandIco + '" width="100" height="100" id="offline-logo-' + item.__index + '"/>'; | 57 | + return '<img src="' + item.offlineBrandIco + '" width="100" height="100" id="offline-logo-' + item.__index + '" class="offline-logo-image"/>'; |
| 58 | } | 58 | } |
| 59 | return '<div id="offline-logo-' + item.__index + '" style = "height : 100px;"/>'; | 59 | return '<div id="offline-logo-' + item.__index + '" style = "height : 100px;"/>'; |
| 60 | } | 60 | } |
| @@ -89,13 +89,19 @@ var g = new common.grid({ | @@ -89,13 +89,19 @@ var g = new common.grid({ | ||
| 89 | var images = $('.logo-image'); | 89 | var images = $('.logo-image'); |
| 90 | if(images) { | 90 | if(images) { |
| 91 | for(var i = 0; i < images.length; i++) { | 91 | for(var i = 0; i < images.length; i++) { |
| 92 | - new common.viewer(document.getElementById('logo-' + i), { | 92 | + new common.viewer(document.getElementById($(images[i]).attr('id')), { |
| 93 | navbar: 0, | 93 | navbar: 0, |
| 94 | title: 0, | 94 | title: 0, |
| 95 | toolbar: 0, | 95 | toolbar: 0, |
| 96 | movable: false | 96 | movable: false |
| 97 | }); | 97 | }); |
| 98 | - new common.viewer(document.getElementById('offline-logo-' + i), { | 98 | + } |
| 99 | + } | ||
| 100 | + | ||
| 101 | + var offlineimages = $('.offline-logo-image'); | ||
| 102 | + if(offlineimages) { | ||
| 103 | + for(var i = 0; i < offlineimages.length; i++) { | ||
| 104 | + new common.viewer(document.getElementById($(offlineimages[i]).attr('id')), { | ||
| 99 | navbar: 0, | 105 | navbar: 0, |
| 100 | title: 0, | 106 | title: 0, |
| 101 | toolbar: 0, | 107 | toolbar: 0, |
| @@ -58,7 +58,7 @@ webpackJsonp([21],[ | @@ -58,7 +58,7 @@ webpackJsonp([21],[ | ||
| 58 | name:"offlineBrandIco", | 58 | name:"offlineBrandIco", |
| 59 | render: function(item) { | 59 | render: function(item) { |
| 60 | if (item.offlineBrandIco) { | 60 | if (item.offlineBrandIco) { |
| 61 | - return '<img src="' + item.offlineBrandIco + '" width="100" height="100" id="offline-logo-' + item.__index + '"/>'; | 61 | + return '<img src="' + item.offlineBrandIco + '" width="100" height="100" id="offline-logo-' + item.__index + '" class="offline-logo-image"/>'; |
| 62 | } | 62 | } |
| 63 | return '<div id="offline-logo-' + item.__index + '"/>'; | 63 | return '<div id="offline-logo-' + item.__index + '"/>'; |
| 64 | } | 64 | } |
| @@ -93,13 +93,19 @@ webpackJsonp([21],[ | @@ -93,13 +93,19 @@ webpackJsonp([21],[ | ||
| 93 | var images = $('.logo-image'); | 93 | var images = $('.logo-image'); |
| 94 | if(images) { | 94 | if(images) { |
| 95 | for(var i = 0; i < images.length; i++) { | 95 | for(var i = 0; i < images.length; i++) { |
| 96 | - new common.viewer(document.getElementById('logo-' + i), { | 96 | + new common.viewer(document.getElementById($(images[i]).attr('id')), { |
| 97 | navbar: 0, | 97 | navbar: 0, |
| 98 | title: 0, | 98 | title: 0, |
| 99 | toolbar: 0, | 99 | toolbar: 0, |
| 100 | movable: false | 100 | movable: false |
| 101 | }); | 101 | }); |
| 102 | - new common.viewer(document.getElementById('offline-logo-' + i), { | 102 | + } |
| 103 | + } | ||
| 104 | + | ||
| 105 | + var offlineimages = $('.offline-logo-image'); | ||
| 106 | + if(offlineimages) { | ||
| 107 | + for(var i = 0; i < offlineimages.length; i++) { | ||
| 108 | + new common.viewer(document.getElementById($(offlineimages[i]).attr('id')), { | ||
| 103 | navbar: 0, | 109 | navbar: 0, |
| 104 | title: 0, | 110 | title: 0, |
| 105 | toolbar: 0, | 111 | toolbar: 0, |
-
Please register or login to post a comment