wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by xiaowei
Commit c5e1d87f137068d252cae35a1bf571e20d69920d 1 parent 5d5c8177

文案更改

Inline Side-by-side
Showing 3 changed files with 9 additions and 9 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>
@@ -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);