Authored by zhangxiaoru

order

2.6 KB | W: | H:

5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -249,9 +249,8 @@ @@ -249,9 +249,8 @@
249 margin: 50px 0 30px; 249 margin: 50px 0 30px;
250 background: resolve('product/yoho_icon.png') no-repeat; 250 background: resolve('product/yoho_icon.png') no-repeat;
251 padding-left: 68px; 251 padding-left: 68px;
252 - height: 60px;  
253 - line-height: 60px;  
254 - font-size: 30px; 252 + font-size: 28px;
  253 + height: 52px;
255 } 254 }
256 } 255 }
257 256
@@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
178 <span>¥{{price}}</span> 178 <span>¥{{price}}</span>
179 </div> 179 </div>
180 180
181 - {{#if yohoCoinNum}} 181 + {{#if returnYohoCoin}}
182 <div class="yoho-coin"> 182 <div class="yoho-coin">
183 共返有货币: {{yohoCoinNum}}个 183 共返有货币: {{yohoCoinNum}}个
184 </div> 184 </div>
@@ -579,6 +579,7 @@ class CartModel @@ -579,6 +579,7 @@ class CartModel
579 //有货币 579 //有货币
580 if($payReturn['shopping_cart_data']['gain_yoho_coin'] > 0) { 580 if($payReturn['shopping_cart_data']['gain_yoho_coin'] > 0) {
581 $result['yohoCoinNum'] = $payReturn['shopping_cart_data']['gain_yoho_coin']; 581 $result['yohoCoinNum'] = $payReturn['shopping_cart_data']['gain_yoho_coin'];
  582 + $result['returnYohoCoin'] = true;
582 } 583 }
583 } 584 }
584 585
@@ -618,7 +619,7 @@ class CartModel @@ -618,7 +619,7 @@ class CartModel
618 $result['coupon'] = $coupons; 619 $result['coupon'] = $coupons;
619 } 620 }
620 while (false); 621 while (false);
621 - 622 +
622 return $result; 623 return $result;
623 } 624 }
624 625