Authored by weiqingting

订单详情合并

@@ -167,14 +167,12 @@ @@ -167,14 +167,12 @@
167 167
168 <div class="order-selection select-express"> 168 <div class="order-selection select-express">
169 <h2>选择快递:</h2> 169 <h2>选择快递:</h2>
  170 + {{#each carriagelist}}
170 <div class="express-list"> 171 <div class="express-list">
171 - <input class="radio" type="radio" name="" id="common-express"/>  
172 - <label for="common-express">普通快递:&nbsp;&nbsp;运费 0.00</label>  
173 - </div>  
174 - <div class="express-list">  
175 - <input class="radio" type="radio" name="" id="sf-express"/>  
176 - <label for="sf-express">顺丰速运:&nbsp;&nbsp;运费 5.00 (仅支持顺丰可配送的地区)</label> 172 + <input class="radio" type="radio" name="carriagegroup" id="common-{id}" value="{{value}}"/>
  173 + <label for="common-express">{{name}}:&nbsp;&nbsp;运费 {{value}} {{desc}}</label>
177 </div> 174 </div>
  175 + {{/each}}
178 <div class="express-list express-tips">注:配送会由于天气,交通等不可抗拒的客观因素造成您收货时间延迟,请您知悉。</div> 176 <div class="express-list express-tips">注:配送会由于天气,交通等不可抗拒的客观因素造成您收货时间延迟,请您知悉。</div>
179 </div> 177 </div>
180 </div> 178 </div>
@@ -61,6 +61,8 @@ var Order = { @@ -61,6 +61,8 @@ var Order = {
61 } 61 }
62 }); 62 });
63 63
  64 +
  65 +
64 /*初始化价格*/ 66 /*初始化价格*/
65 this.render(); 67 this.render();
66 68
@@ -225,7 +227,8 @@ var Order = { @@ -225,7 +227,8 @@ var Order = {
225 e: { 227 e: {
226 $juanok: $('#juansubmit'), 228 $juanok: $('#juansubmit'),
227 $juantip: $('.errtip', '.play-juan-pan'), 229 $juantip: $('.errtip', '.play-juan-pan'),
228 - $biok: $('#bisubmit') 230 + $biok: $('#bisubmit'),
  231 + $carriageGroup: $('input[name="carriagegroup"]')
229 }, 232 },
230 init: function() { 233 init: function() {
231 var e = this.e, 234 var e = this.e,
@@ -234,6 +237,11 @@ var Order = { @@ -234,6 +237,11 @@ var Order = {
234 u = Order.UI; 237 u = Order.UI;
235 var options; 238 var options;
236 239
  240 + e.$carriageGroup.change(function(){
  241 + //d.carriage=parseFloat(/\d+(\.\d+)?/i.exec($(this).next("label").html()));
  242 + d.carriage=parseFloat($(this).val());
  243 + u.render();
  244 + });
237 /*点击 优惠卷支付 确认按钮*/ 245 /*点击 优惠卷支付 确认按钮*/
238 e.$juanok.click(function() { 246 e.$juanok.click(function() {
239 var code = $('input[name="juangroup"]:checked').val(); 247 var code = $('input[name="juangroup"]:checked').val();
@@ -55,6 +55,10 @@ class SaveController extends AbstractAction @@ -55,6 +55,10 @@ class SaveController extends AbstractAction
55 'src' => 'http://static.yohobuy.com/images/bankico/BOC.gif' 55 'src' => 'http://static.yohobuy.com/images/bankico/BOC.gif'
56 ) 56 )
57 ), 57 ),
  58 + 'carriagelist'=>array(
  59 + array('name'=>'普通快递','value'=>'0.00',"desc"=>''),
  60 + array('name'=>'普通快递','value'=>'5.00',"desc"=>'(仅支持顺丰可配送的地区)')
  61 + ),
58 'orderProducts'=>array( 62 'orderProducts'=>array(
59 array('name' =>"Eight Guys 破洞束口牛仔裤",'tip'=>"颜色:蓝色 尺码:L",'src'=>$src,'href'=>'','price'=>'179.00','coin'=>'0','count'=>'1'), 63 array('name' =>"Eight Guys 破洞束口牛仔裤",'tip'=>"颜色:蓝色 尺码:L",'src'=>$src,'href'=>'','price'=>'179.00','coin'=>'0','count'=>'1'),
60 array('name' =>"Eight Guys 破洞束口牛仔裤",'tip'=>"颜色:蓝色 尺码:L",'src'=>$src,'href'=>'','price'=>'179.00','coin'=>'0','count'=>'1') 64 array('name' =>"Eight Guys 破洞束口牛仔裤",'tip'=>"颜色:蓝色 尺码:L",'src'=>$src,'href'=>'','price'=>'179.00','coin'=>'0','count'=>'1')