Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuy into release/4.4

@@ -184,7 +184,7 @@
 	{{#if packages}}
 	<div id="differentOrder" class="differentOrder">
 		<p class="warn">
-			温馨提示：你购买的商品<span class="red">分属不同的仓库</span>,需要调拨,将被拆分为多个包裹送达
+			温馨提示：您购买的商品<span class="red">分属不同的仓库</span>,需要调拨,将被拆分为多个包裹送达
 			<span class="why">
 			</span>
 		</p>

@@ -134,12 +134,17 @@
                         <span>电话号码：{{phone}}</span>
                     </div>
                 </div>
-                {{/ virtualPayMode}}
+                {{/ virtualPayMode}}               
+                <div class="good-list">
+                    <p class="sub-title">
+                        <span class="icon"></span>
+                        商品清单
+                    </p>
                 <!--订单不同包裹提示-->
 				{{#if packages}}
 				<div id="differentOrder" class="differentOrder">
 					<p class="warn">
-						温馨提示：你购买的商品<span class="red">分属不同的仓库</span>,需要调拨,将被拆分为多个包裹送达
+						温馨提示：您购买的商品<span class="red">分属不同的仓库</span>,需要调拨,将被拆分为多个包裹送达
 						<span class="why">
 						</span>
 					</p>
@@ -178,11 +183,6 @@
 					</div>
 				</div>
 				{{/if}}
-                <div class="good-list">
-                    <p class="sub-title">
-                        <span class="icon"></span>
-                        商品清单
-                    </p>
                     <div class="content">
                         <table>
                             <thead>

@@ -146,7 +146,7 @@
     .differentOrder{
         position: relative;
         width: 100%;
-
+        margin-top: 10px;
         .warn{
             text-align: center;
             background: #FEFBD5;
@@ -177,7 +177,7 @@
 	        border-left: 10px solid transparent;
 	        border-right:10px solid transparent;
 	        top:-10px;
-	        right:115px ;
+	        right:113px ;
 	    }
 	    .differentBag{
 		    display: none;

@@ -514,8 +514,8 @@
 	        border-bottom:10px solid #000000;
 	        border-left: 10px solid transparent;
 	        border-right:10px solid transparent;
-	        top:-10px;
-	        right:215px ;
+	        top: -10px;
+	        right: 219px;
 	    }
 	    .differentBag{
 		    display: none;

@@ -779,7 +779,7 @@ class CartModel
             $packageList = $cartInfo['package_list'];
             foreach ($packageList as $pk => $pv) {
                 $pIndex = $pk+1;
-                $packages[$pk]['title'] = ($pv['supplier_id'] == 0) ? '包裹'.$pIndex.':总仓库' : '包裹'.$pIndex.':异地调拨'; //仓库
+                $packages[$pk]['title'] = ($pv['supplier_id'] == 0) ? '包裹'.$pIndex.':总仓发货' : '包裹'.$pIndex.':异地调拨'; //仓库
                 $goodList = $pv['goods_list'];
                 foreach ($goodList as $glk => $glv) {
                     $packages[$pk]['goodlist'][$glk]['src'] = Images::getImageUrl($glv['goods_images'], 90, 90);