Authored by biao

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -241,14 +241,14 @@ $('.used-coin').on('click', '.modify', function() { @@ -241,14 +241,14 @@ $('.used-coin').on('click', '.modify', function() {
241 }); 241 });
242 242
243 // 添加备注-是否打印价格 243 // 添加备注-是否打印价格
244 -$printPrice.printPrice = false; // 默认为false 244 +$printPrice.printPrice = 'N'; // 默认为false
245 245
246 $('.print-price-radio').check({ 246 $('.print-price-radio').check({
247 type: 'radio', 247 type: 'radio',
248 group: 'print-price', 248 group: 'print-price',
249 onChange: function(el, checked, value) { 249 onChange: function(el, checked, value) {
250 if (checked) { 250 if (checked) {
251 - $printPrice.isPrintPrice = value === 1 ? true : false; 251 + $printPrice.isPrintPrice = value === 1 ? 'Y' : 'N';
252 } 252 }
253 } 253 }
254 }); 254 });
1 .blk-cart-page { 1 .blk-cart-page {
  2 + .checkbox {
  3 + cursor: pointer;
  4 + }
  5 +
2 .cart-header { 6 .cart-header {
3 margin: 10px auto; 7 margin: 10px auto;
4 width: 100%; 8 width: 100%;