fe / YOHOBUYWAP · Commits

Go to a project

Authored by 郭成尧
Commit 43320ee86d0641eb4759eb4c288228c5d5fe3844 2 parents 79e15e61 ad11ad67

Merge branch 'feature/jitmodified' into release/5.4.1

Inline Side-by-side
Showing 5 changed files with 11 additions and 6 deletions
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 } 14 }
15 .help { 15 .help {
16 padding: 30px 30px; 16 padding: 30px 30px;
17 - font-size: 26px; 17 + font-size: 20px;
18 line-height: 1.5; 18 line-height: 1.5;
19 color: #444; 19 color: #444;
20 } 20 }
@@ -15,6 +15,9 @@ @@ -15,6 +15,9 @@
15 .top { 15 .top {
16 margin-bottom: 1PX; 16 margin-bottom: 1PX;
17 font-size: 34px; 17 font-size: 34px;
  18 + overflow: hidden;
  19 + text-overflow:ellipsis;
  20 + white-space: nowrap;
18 } 21 }
19 22
20 .bottom { 23 .bottom {
@@ -2,8 +2,9 @@ @@ -2,8 +2,9 @@
2 <div class="jit-detail-page yoho-page"> 2 <div class="jit-detail-page yoho-page">
3 {{#each packages}} 3 {{#each packages}}
4 <div class="top"> 4 <div class="top">
5 - <span class="package-type">包裹{{packageType}}:</span>  
6 - <span class="package-title">{{dispatchType}}</span> 5 + {{packageType}}
  6 +<!-- <span class="package-type">包裹{{packageType}}:</span>-->
  7 +<!-- <span class="package-title">{{dispatchType}}</span>-->
7 </div> 8 </div>
8 <div class="middle"> 9 <div class="middle">
9 <div class="swiper-container"> 10 <div class="swiper-container">
1 <section class="block more-jit"> 1 <section class="block more-jit">
2 <a href="{{jitDetailUrl}}"> 2 <a href="{{jitDetailUrl}}">
3 <div class="more-jit"> 3 <div class="more-jit">
4 - <span>商品需要分仓调拨</span> 4 + <span>{{packageTitle}}</span>
5 <span class="iconfont icon-right-arrow">&#xe614;</span> 5 <span class="iconfont icon-right-arrow">&#xe614;</span>
6 </div> 6 </div>
7 </a> 7 </a>
@@ -602,6 +602,7 @@ class CartModel @@ -602,6 +602,7 @@ class CartModel
602 //传递相关参数 602 //传递相关参数
603 $param = array_merge(array('cartType' => $cartType, 'skuList' => $skuList), $jitInfo); 603 $param = array_merge(array('cartType' => $cartType, 'skuList' => $skuList), $jitInfo);
604 $result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', $param); 604 $result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', $param);
  605 + $result['packageTitle'] = $payReturn['shopping_cart_data']['package_title'];
605 } 606 }
606 $result['cartPayData'] = isset($orderCompute['promotion_formula_list']) ? $orderCompute['promotion_formula_list'] : $payReturn['shopping_cart_data']['promotion_formula_list']; 607 $result['cartPayData'] = isset($orderCompute['promotion_formula_list']) ? $orderCompute['promotion_formula_list'] : $payReturn['shopping_cart_data']['promotion_formula_list'];
607 $price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount']; 608 $price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount'];
@@ -1189,8 +1190,8 @@ class CartModel @@ -1189,8 +1190,8 @@ class CartModel
1189 } 1190 }
1190 // 拆单数据 1191 // 拆单数据
1191 foreach ($packageList as $pk => $pv) { 1192 foreach ($packageList as $pk => $pv) {
1192 - $result['packages'][$pk]['packageType'] = $pk + 1;  
1193 - $result['packages'][$pk]['dispatchType'] = ($pv['supplier_id'] == 0) ? '总仓发货' : '异地调拨'; //仓库 1193 + $result['packages'][$pk]['packageType'] = '包裹' . ($pk + 1) . ':' . $pv['title'];
  1194 +// $result['packages'][$pk]['dispatchType'] = $pv['title'];
1194 $goodList = $pv['goods_list']; 1195 $goodList = $pv['goods_list'];
1195 foreach ($goodList as $glk => $glv) { 1196 foreach ($goodList as $glk => $glv) {
1196 $result['packages'][$pk]['goods'][$glk]['thumb'] = Images::getImageUrl($glv['goods_images'], 235, 314); 1197 $result['packages'][$pk]['goods'][$glk]['thumb'] = Images::getImageUrl($glv['goods_images'], 235, 314);