wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit 4b945f8f29dfc565a83c93ea780c3af677fbcb2a 2 parents 991b9f1b 7993ea88

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

Inline Side-by-side
Showing 6 changed files with 13 additions and 13 deletions
@@ -184,7 +184,7 @@ @@ -184,7 +184,7 @@
184 {{#if packages}} 184 {{#if packages}}
185 <div id="differentOrder" class="differentOrder"> 185 <div id="differentOrder" class="differentOrder">
186 <p class="warn"> 186 <p class="warn">
187 - 温馨提示：你购买的商品<span class="red">分属不同的仓库</span>,需要调拨,将被拆分为多个包裹送达 187 + 温馨提示：您购买的商品<span class="red">分属不同的仓库</span>,需要调拨,将被拆分为多个包裹送达
188 <span class="why"> 188 <span class="why">
189 </span> 189 </span>
190 </p> 190 </p>
@@ -134,12 +134,17 @@ @@ -134,12 +134,17 @@
134 <span>电话号码：{{phone}}</span> 134 <span>电话号码：{{phone}}</span>
135 </div> 135 </div>
136 </div> 136 </div>
137 - {{/ virtualPayMode}} 137 + {{/ virtualPayMode}}
  138 + <div class="good-list">
  139 + <p class="sub-title">
  140 + <span class="icon"></span>
  141 + 商品清单
  142 + </p>
138 <!--订单不同包裹提示--> 143 <!--订单不同包裹提示-->
139 {{#if packages}} 144 {{#if packages}}
140 <div id="differentOrder" class="differentOrder"> 145 <div id="differentOrder" class="differentOrder">
141 <p class="warn"> 146 <p class="warn">
142 - 温馨提示：你购买的商品<span class="red">分属不同的仓库</span>,需要调拨,将被拆分为多个包裹送达 147 + 温馨提示：您购买的商品<span class="red">分属不同的仓库</span>,需要调拨,将被拆分为多个包裹送达
143 <span class="why"> 148 <span class="why">
144 </span> 149 </span>
145 </p> 150 </p>
@@ -178,11 +183,6 @@ @@ -178,11 +183,6 @@
178 </div> 183 </div>
179 </div> 184 </div>
180 {{/if}} 185 {{/if}}
181 - <div class="good-list">  
182 - <p class="sub-title">  
183 - <span class="icon"></span>  
184 - 商品清单  
185 - </p>  
186 <div class="content"> 186 <div class="content">
187 <table> 187 <table>
188 <thead> 188 <thead>
This diff could not be displayed because it is too large.
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
146 .differentOrder{ 146 .differentOrder{
147 position: relative; 147 position: relative;
148 width: 100%; 148 width: 100%;
149 - 149 + margin-top: 10px;
150 .warn{ 150 .warn{
151 text-align: center; 151 text-align: center;
152 background: #FEFBD5; 152 background: #FEFBD5;
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
177 border-left: 10px solid transparent; 177 border-left: 10px solid transparent;
178 border-right:10px solid transparent; 178 border-right:10px solid transparent;
179 top:-10px; 179 top:-10px;
180 - right:115px ; 180 + right:113px ;
181 } 181 }
182 .differentBag{ 182 .differentBag{
183 display: none; 183 display: none;
@@ -514,8 +514,8 @@ @@ -514,8 +514,8 @@
514 border-bottom:10px solid #000000; 514 border-bottom:10px solid #000000;
515 border-left: 10px solid transparent; 515 border-left: 10px solid transparent;
516 border-right:10px solid transparent; 516 border-right:10px solid transparent;
517 - top:-10px;  
518 - right:215px ; 517 + top: -10px;
  518 + right: 219px;
519 } 519 }
520 .differentBag{ 520 .differentBag{
521 display: none; 521 display: none;
@@ -779,7 +779,7 @@ class CartModel @@ -779,7 +779,7 @@ class CartModel
779 $packageList = $cartInfo['package_list']; 779 $packageList = $cartInfo['package_list'];
780 foreach ($packageList as $pk => $pv) { 780 foreach ($packageList as $pk => $pv) {
781 $pIndex = $pk+1; 781 $pIndex = $pk+1;
782 - $packages[$pk]['title'] = ($pv['supplier_id'] == 0) ? '包裹'.$pIndex.':总仓库' : '包裹'.$pIndex.':异地调拨'; //仓库 782 + $packages[$pk]['title'] = ($pv['supplier_id'] == 0) ? '包裹'.$pIndex.':总仓发货' : '包裹'.$pIndex.':异地调拨'; //仓库
783 $goodList = $pv['goods_list']; 783 $goodList = $pv['goods_list'];
784 foreach ($goodList as $glk => $glv) { 784 foreach ($goodList as $glk => $glv) {
785 $packages[$pk]['goodlist'][$glk]['src'] = Images::getImageUrl($glv['goods_images'], 90, 90); 785 $packages[$pk]['goodlist'][$glk]['src'] = Images::getImageUrl($glv['goods_images'], 90, 90);