fe / YOHOBUYWAP · Commits

Go to a project

Authored by cailing
Commit 79ba7d4a0d42916d0f21658cef531300c8a084f7 1 parent 828f8c4b

jit修改

Inline Side-by-side
Showing 6 changed files with 136 additions and 55 deletions
... ... @@ -87,3 +87,6 @@ optHammer.on('tap', function(e) {
});
}
});
$(".owner-info").on('touchend',function(){
location.href='/home/address';
})
\ No newline at end of file
... ...
.jit-detail-page {
background-color: #f0f0f0;
.top, .middle, .bottom {
display: none;
background-color: #fff;
}
.top, .bottom {
height: 88px;
line-height: 88px;
color: #444;
padding: 0 20px;
}
.top {
margin-bottom: 1PX;
font-size: 34px;
}
.bottom {
font-size: 28px;
margin-bottom: 28px;
}
.swiper-container {
padding: 30px 0 0px;
width: 100%;
height: 209px;
overflow-y: hidden;
.swiper-wrapper-jit {
height: 209px;
}
.swiper-slide {
margin: 0 10px;
float: left;
width: 156px;
position: relative;
&:first-child {
margin-left: 30px;
}
&:last-child {
margin-right: 30px;
}
img {
width: 100%;
height: 208px;
}
.tag {
display: inline-block;
width: 100%;
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 0.8rem;
line-height: 0.8rem;
color: #fff;
text-align: center;
font-size: 12PX;
&.add {
background: #eb76aa;
}
&.gift {
background: #a1ce4e;
}
}
}
}
}
... ...
... ... @@ -197,7 +197,7 @@ class OrderModel
if (is_numeric($orderCode) && is_numeric($uid) && is_string($sessionKey)) {
$orderDetail = OrderData::viewOrderData($orderCode, $uid, $sessionKey);
print_r($orderDetail);
// print_r($orderDetail);
if (isset($orderDetail['data']['order_code'])) {
$count = 0;
... ... @@ -237,8 +237,8 @@ class OrderModel
$result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', array('orderCode' => $orderCode, 'sessionKey' => $sessionKey));
}
//测试
// $result['isJit'] = true;
// $result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', array('orderCode' => $orderCode, 'sessionKey' => $sessionKey));
$result['isJit'] = true;
$result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', array('orderCode' => $orderCode, 'sessionKey' => $sessionKey));
}
return $result;
... ...
... ... @@ -528,8 +528,8 @@ class CartModel
$result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', array('cartType' => $cartType, 'skuList' => $skuList));
}
//测试
// $result['isJit'] = true;
// $result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', array('cartType' => $cartType, 'skuList' => $skuList));
$result['isJit'] = true;
$result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', array('cartType' => $cartType, 'skuList' => $skuList));
$result['cartPayData'] = isset($orderCompute['promotion_formula_list']) ? $orderCompute['promotion_formula_list'] : $payReturn['shopping_cart_data']['promotion_formula_list'];
$price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount'];
$result['price'] = Helpers::transPrice($price, true);
... ...
... ... @@ -93,7 +93,8 @@ class DetailModel
$result['goodsPrice']['previousPrice'] = $baseInfo['productPriceBo']['formatMarketPrice'];
}
//商品返回Yoho币
$result['goodsPrice']['yohoCoinNum'] = $baseInfo['productPriceBo']['yohoCoinNum'];
// $result['goodsPrice']['yohoCoinNum'] = $baseInfo['productPriceBo']['yohoCoinNum'];
$result['goodsPrice']['yohoCoinNum'] = 100;
}
// VIP商品价格
if (isset($baseInfo['productPriceBo']['vipPrices'])) {
... ...
... ... @@ -545,55 +545,55 @@ class IndexController extends AbstractAction
// 返回地址
$returnUrl = Helpers::url('/home/orders');
// $data = array(
// 'jitDetailPage' => true,
// 'packages' => array(
// array(
// 'packageType' => 1,
// 'dispatchType' => '总仓发货',
// 'expressCost' => '3.00',
// 'discount' => '7.00',
// 'goods' => array(
// array(
// 'isGift' => true,
// 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
// ),
// array(
// 'isAdd' => true,
// 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
// ),
// )
// ),
// array(
// 'packageType' => 1,
// 'dispatchType' => '总仓发货',
// 'expressCost' => '3.00',
// 'discount' => '7.00',
// 'goods' => array(
// array(
// 'isAdd' => true,
// 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
// ),
// array(
// 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
// ),
// array(
// 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
// ),
// array(
// 'isGift' => true,
// 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
// ),
// array(
// 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
// ),
// array(
// 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
// )
// )
// )
// )
// );
$data = array(
'jitDetailPage' => true,
'packages' => array(
array(
'packageType' => 1,
'dispatchType' => '总仓发货',
'expressCost' => '3.00',
'discount' => '7.00',
'goods' => array(
array(
'isGift' => true,
'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
),
array(
'isAdd' => true,
'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
),
)
),
array(
'packageType' => 1,
'dispatchType' => '总仓发货',
'expressCost' => '3.00',
'discount' => '7.00',
'goods' => array(
array(
'isAdd' => true,
'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
),
array(
'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
),
array(
'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
),
array(
'isGift' => true,
'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
),
array(
'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
),
array(
'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
)
)
)
)
);
$this->setTitle('配送信息');
$this->setNavHeader('配送信息', $returnUrl, false); // 不显示右上角home按钮
... ...