Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart

@@ -41,7 +41,7 @@
 
 
         <section class="block">
         <section class="block">
             <ul class="sale-invoice">
             <ul class="sale-invoice">
-                {{# coupon}}
+                {{#if coupon}}
                     <li class="coupon">
                     <li class="coupon">
                         <a href="/shoppingCart/selectCoupon">
                         <a href="/shoppingCart/selectCoupon">
                         <!-- <a href="{{url}}"> -->
                         <!-- <a href="{{url}}"> -->
@@ -65,7 +65,7 @@
                             {{/if}}
                             {{/if}}
                         </a>
                         </a>
                     </li>
                     </li>
-                {{/ coupon}}
+                {{/if}}
 
 
                 {{# yohoCoin}}
                 {{# yohoCoin}}
                     <li class="coin" data-yoho-coin="{{.}}">
                     <li class="coin" data-yoho-coin="{{.}}">
@@ -79,16 +79,16 @@
                 {{/ yohoCoin}}
                 {{/ yohoCoin}}
 
 
                 {{#if invoice}}
                 {{#if invoice}}
-                    <li class="invoice">
+                    <li class="invoice {{#if needInvoice}}focus{{/if}}">
                         <span class="title">发票</span>
                         <span class="title">发票</span>
-                        <span class="iconfont checkbox icon-checkbox"></span>
+                        <span class="iconfont checkbox {{#if needInvoice}}icon-cb-checked{{else}}icon-checkbox{{/if}}"></span>
                         <form id="invoice">
                         <form id="invoice">
-                            <input type="text" name="invoice-title" value="" placeholder="发票抬头">
+                            <input type="text" name="invoice-title" value="{{invoiceText}}" placeholder="发票抬头">
                             <label>
                             <label>
                                 发票类型
                                 发票类型
                                 <select class="invoice-type" name="invoice-type">
                                 <select class="invoice-type" name="invoice-type">
                                     {{# invoice}}
                                     {{# invoice}}
-                                    <option value="{{id}}">{{name}}</option>
+                                    <option value="{{id}}" {{#if isSelected}}selected{{/if}}>{{name}}</option>
                                     {{/ invoice}}
                                     {{/ invoice}}
                                 </select>
                                 </select>
                             </label>
                             </label>
@@ -98,7 +98,7 @@
             </ul>
             </ul>
 
 
             <form id="msg" action="" method="post">
             <form id="msg" action="" method="post">
-                <input type="text" name="msg" value="" placeholder="留言">
+                <input type="text" name="msg" value="{{msg}}" placeholder="留言">
             </form>
             </form>
         </section>
         </section>
 
 

@@ -449,13 +449,21 @@ class CartModel
 					$one = array();
 					$one = array();
 					$one['id'] = $inv['invoices_type_id'];
 					$one['id'] = $inv['invoices_type_id'];
 					$one['name'] = $inv['invoices_type_name'];
 					$one['name'] = $inv['invoices_type_name'];
+                    $one['id'] == $orderInfo['invoiceType'] && $one['isSelected'] = true;
 
 
 					$result['invoice'][] = $one;
 					$result['invoice'][] = $one;
 				}
 				}
+
+                // 发票信息需要记录
+                $result['needInvoice'] = $orderInfo['invoice'];
+                $result['invoiceText'] = $orderInfo['invoiceText'];
 			}
 			}
 
 
+            // 留言
+            $result['msg'] = $orderInfo['msg'];
+
 			// 优惠券数据
 			// 优惠券数据
-			$coupons = array('notUsed' => true);
+			$coupons = array();
 			!empty($orderCompute['coupon_amount']) && $coupons['value'] = $orderInfo['couponValue'];
 			!empty($orderCompute['coupon_amount']) && $coupons['value'] = $orderInfo['couponValue'];
 			$coupons += self::getCouponList($uid, 0, 1, true);
 			$coupons += self::getCouponList($uid, 0, 1, true);
 			$result['coupon'] = $coupons;
 			$result['coupon'] = $coupons;