diff --git a/application/index/view/default/buy/index.html b/application/index/view/default/buy/index.html index 6fdcbb630..7f5e5de71 100755 --- a/application/index/view/default/buy/index.html +++ b/application/index/view/default/buy/index.html @@ -12,10 +12,38 @@ {{include file="public/goods_category" /}} + +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_buy_top +
+{{/if}} +{{if !empty($plugins_view_buy_top_data) and is_array($plugins_view_buy_top_data)}} + {{foreach $plugins_view_buy_top_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} +{{/if}} +
-
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_buy_inside_top +
+ {{/if}} + {{if !empty($plugins_view_buy_inside_top_data) and is_array($plugins_view_buy_inside_top_data)}} + {{foreach $plugins_view_buy_inside_top_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} + +

确认收货地址

@@ -69,8 +97,22 @@ {{/if}}
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_buy_address_bottom +
+ {{/if}} + {{if !empty($plugins_view_buy_address_bottom_data) and is_array($plugins_view_buy_address_bottom_data)}} + {{foreach $plugins_view_buy_address_bottom_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} + -
+

选择支付

{{if !empty($payment_list)}}
    @@ -90,68 +132,76 @@ {{/if}}
- -
-
-

确认订单信息

- - {{if !empty($goods_list)}} - - - - - - - - - - - {{foreach $goods_list as $goods}} - - + + + + + {{/foreach}} + +
商品信息单价数量金额
-
- - - -
- {{$goods.title}} - {{if !empty($goods.spec)}} -
    - {{foreach $goods.spec as $spec}} -
  • {{$spec.type}}：{{$spec.value}}
    • - {{/foreach}} -
- {{/if}} -
-
-
- {{if $goods['original_price'] gt 0}} - ￥{{$goods.original_price}} + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_buy_payment_bottom +
+ {{/if}} + {{if !empty($plugins_view_buy_payment_bottom_data) and is_array($plugins_view_buy_payment_bottom_data)}} + {{foreach $plugins_view_buy_payment_bottom_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} + + +
+

商品明细

+ {{if !empty($goods_list)}} + + + + + + + + + + + {{foreach $goods_list as $goods}} + + - - - - - {{/foreach}} - -
商品信息单价数量金额
+
+ + + +
+ {{$goods.title}} + {{if !empty($goods.spec)}} +
    + {{foreach $goods.spec as $spec}} +
  • {{$spec.type}}：{{$spec.value}}
    • + {{/foreach}} +
{{/if}} - ￥{{$goods.price}} - x{{$goods.stock}}
-
+ +
{{if $goods['original_price'] gt 0}} -

￥{{$goods.original_price}}

+ ￥{{$goods.original_price}} {{/if}} -

￥{{$goods.price}}

-
- {{$goods.stock}} {{$goods.inventory_unit}} - - ￥{{$goods.total_price}} -
- {{/if}} - {{if empty($goods_list)}} -
没有商品
- {{/if}} + ￥{{$goods.price}} + x{{$goods.stock}} +
+
+ {{if $goods['original_price'] gt 0}} +

￥{{$goods.original_price}}

+ {{/if}} +

￥{{$goods.price}}

+ 		+ {{$goods.stock}} {{$goods.inventory_unit}} + + ￥{{$goods.total_price}} +
@@ -159,93 +209,178 @@ 合计 ￥{{$base.total_price}}

+ {{else /}} +
没有商品
+ {{/if}} +
- -
-
- -
-
- - - {{if !empty($extension_data)}} -
    - {{foreach $extension_data as $ext}} -
  • - {{$ext.name}} - {{$ext.tips}} -
    • - {{/foreach}} -
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_buy_goods_bottom +
+ {{/if}} + {{if !empty($plugins_view_buy_goods_bottom_data) and is_array($plugins_view_buy_goods_bottom_data)}} + {{foreach $plugins_view_buy_goods_bottom_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} {{/if}} - - -
-
-
-
- 实付款： - - ￥ - {{$base.actual_price}} - -
- -
-
- 寄送至： - - {{if !empty($base['address'])}} - {{$base.address.province_name}} {{$base.address.city_name}} {{$base.address.county_name}} {{$base.address.address}} - {{else /}} - ... - {{/if}} - -
-
- 收货人： - - {{if !empty($base['address'])}} - {{$base.address.name}} - {{else /}} - ... - {{/if}} - - - {{if !empty($base['address'])}} - {{$base.address.tel}} - {{else /}} - ... - {{/if}} - -
-
-
-
- - - - - - - - -
- -
-
+ {{/foreach}} + {{/if}} + + +
+
+
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_buy_user_note_bottom +
+ {{/if}} + {{if !empty($plugins_view_buy_user_note_bottom_data) and is_array($plugins_view_buy_user_note_bottom_data)}} + {{foreach $plugins_view_buy_user_note_bottom_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} + + + {{if !empty($extension_data)}} +
    + {{foreach $extension_data as $ext}} +
  • + {{$ext.name}} + {{$ext.tips}} +
    • + {{/foreach}} +
+ {{/if}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_buy_base_confirm_top +
+ {{/if}} + {{if !empty($plugins_view_buy_base_confirm_top_data) and is_array($plugins_view_buy_base_confirm_top_data)}} + {{foreach $plugins_view_buy_base_confirm_top_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} + + +
+
+
+
+ 实付款： + + ￥ + {{$base.actual_price}} + +
+ +
+
+ 寄送至： + + {{if !empty($base['address'])}} + {{$base.address.province_name}} {{$base.address.city_name}} {{$base.address.county_name}} {{$base.address.address}} + {{else /}} + ... + {{/if}} + +
+
+ 收货人： + + {{if !empty($base['address'])}} + {{$base.address.name}} + {{else /}} + ... + {{/if}} + + + {{if !empty($base['address'])}} + {{$base.address.tel}} + {{else /}} + ... + {{/if}} + +
+
+
+
+ + + + + + + + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_buy_form_inside +
+ {{/if}} + {{if !empty($plugins_view_buy_form_inside_data) and is_array($plugins_view_buy_form_inside_data)}} + {{foreach $plugins_view_buy_form_inside_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} +
+ +
+
+
+
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_buy_inside_bottom +
+ {{/if}} + {{if !empty($plugins_view_buy_inside_bottom_data) and is_array($plugins_view_buy_inside_bottom_data)}} + {{foreach $plugins_view_buy_inside_bottom_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}}
+ +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_buy_bottom +
+{{/if}} +{{if !empty($plugins_view_buy_bottom_data) and is_array($plugins_view_buy_bottom_data)}} + {{foreach $plugins_view_buy_bottom_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} +{{/if}} + {{include file="public/footer" /}} diff --git a/application/index/view/default/public/footer.html b/application/index/view/default/public/footer.html index a071193f5..c7fd13a78 100755 --- a/application/index/view/default/public/footer.html +++ b/application/index/view/default/public/footer.html @@ -97,11 +97,11 @@ {{/if}} {{if !empty($plugins_js_data) and is_array($plugins_js_data)}} {{foreach $plugins_js_data as $hook}} - {{if is_string($hook)}} + {{if !empty($hook) and is_string($hook)}} {{elseif is_array($hook) /}} {{foreach $hook as $hook_js}} - {{if is_string($hook_js)}} + {{if !empty($hook_js) and is_string($hook_js)}} {{/if}} {{/foreach}} diff --git a/application/index/view/default/public/header.html b/application/index/view/default/public/header.html index efa7d7533..de05b3b2b 100755 --- a/application/index/view/default/public/header.html +++ b/application/index/view/default/public/header.html @@ -35,11 +35,11 @@ {{if !empty($plugins_css_data) and is_array($plugins_css_data)}} {{foreach $plugins_css_data as $hook}} - {{if is_string($hook)}} + {{if !empty($hook) and is_string($hook)}} {{elseif is_array($hook) /}} {{foreach $hook as $hook_css}} - {{if is_string($hook_css)}} + {{if !empty($hook_css) and is_string($hook_css)}} {{/if}} {{/foreach}} diff --git a/application/tags.php b/application/tags.php index 15a4930e1..75ee49987 100755 --- a/application/tags.php +++ b/application/tags.php @@ -35,6 +35,27 @@ return array ( 'plugins_service_navigation_header_handle' => array ( 0 => 'app\\plugins\\answers\\Hook', + 1 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_css' => + array ( + 0 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_js' => + array ( + 0 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_service_users_center_left_menu_handle' => + array ( + 0 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_service_header_navigation_top_right_handle' => + array ( + 0 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_view_goods_detail_panel_bottom' => + array ( + 0 => 'app\\plugins\\coupon\\Hook', ), ); ?> \ No newline at end of file diff --git a/public/static/index/default/css/buy.css b/public/static/index/default/css/buy.css index 2376374b5..9d8ac8683 100755 --- a/public/static/index/default/css/buy.css +++ b/public/static/index/default/css/buy.css @@ -1,5 +1,7 @@ - /*地址管理*/ -.order-detail h3,.business-item h3{border-bottom: 3px solid #e3e3e3; margin-top:15px;} +/*页面*/ +.buy-items h3{border-bottom: 3px solid #e3e3e3; margin-top:15px;} + +/*地址管理*/ h3 { font-size: 14px;font-weight: 700;} .address h3 { border-bottom:none;} ul.address-list li{display:none;width:100%;padding:10px;position: relative;min-height:80px;} @@ -165,6 +167,7 @@ ul.address-list, .business-item ul { overflow: hidden; } /** * 商品列表 */ +.goods-items table.am-table tr th { font-weight: 500; } .goods-detail img { width: 80px; height: 80px; position: absolute; } .goods-detail { position: relative; min-height: 80px; } .goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; }