diff --git a/app/admin/controller/Useraddress.php b/app/admin/controller/Useraddress.php index eca82fb99..edb163907 100644 --- a/app/admin/controller/Useraddress.php +++ b/app/admin/controller/Useraddress.php @@ -66,7 +66,7 @@ class UserAddress extends Base 'data' => $data, // 加载地图api - 'is_load_map_api' => 1, + 'is_load_map_api' => MyC('home_user_address_map_status'), ]; // 编辑器文件存放地址 diff --git a/app/admin/view/default/admin/save_info.html b/app/admin/view/default/admin/save_info.html index 70e35d282..22ad4eb3e 100755 --- a/app/admin/view/default/admin/save_info.html +++ b/app/admin/view/default/admin/save_info.html @@ -10,26 +10,26 @@ 返回
- +
- +
- +
- +
{{include file="lib/gender" /}} {{if !isset($data['id']) or $admin['id'] neq $data['id']}}
- + {{foreach :MyConst('common_admin_status_list') as $v}} diff --git a/app/admin/view/default/appcenternav/save_info.html b/app/admin/view/default/appcenternav/save_info.html index 9bd3ffe08..99cdb5342 100755 --- a/app/admin/view/default/appcenternav/save_info.html +++ b/app/admin/view/default/appcenternav/save_info.html @@ -10,12 +10,12 @@ 返回
- +
- + + diff --git a/app/admin/view/default/apphomenav/save_info.html b/app/admin/view/default/apphomenav/save_info.html index c8927282e..a5d3c8782 100755 --- a/app/admin/view/default/apphomenav/save_info.html +++ b/app/admin/view/default/apphomenav/save_info.html @@ -10,12 +10,12 @@ 返回
- +
- + + diff --git a/app/admin/view/default/article/save_info.html b/app/admin/view/default/article/save_info.html index 2d036556e..d91452ca3 100755 --- a/app/admin/view/default/article/save_info.html +++ b/app/admin/view/default/article/save_info.html @@ -4,46 +4,66 @@
-
+ 文章{{if empty($data['id'])}}添加{{else /}}编辑{{/if}} 返回 -
- -
- - - - - +
+
+
+ +
+ + + + + +
+
+
+
+
+ + +
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
- - -
-
- - -
-
- - -
-
- - -
-
- +
@@ -71,7 +91,7 @@ {{include file="lib/seo" /}}
-
+
diff --git a/app/admin/view/default/articlecategory/index.html b/app/admin/view/default/articlecategory/index.html index f56e80b59..0765833eb 100755 --- a/app/admin/view/default/articlecategory/index.html +++ b/app/admin/view/default/articlecategory/index.html @@ -20,7 +20,7 @@
- +
diff --git a/app/admin/view/default/brand/save_info.html b/app/admin/view/default/brand/save_info.html index 93a2ee1d5..dc06775bd 100755 --- a/app/admin/view/default/brand/save_info.html +++ b/app/admin/view/default/brand/save_info.html @@ -4,54 +4,77 @@
- + 品牌{{if empty($data['id'])}}添加{{else /}}编辑{{/if}} 返回 -
- - -
-
- - +
+
+
+ + +
+
+
+
+ + +
+
-
- - +
+
+
+ + +
+
+
+
+ + +
+
-
- - -
- -
- -
    - {{if !empty($data['logo'])}} -
  • - - - × -
    • - {{/if}} -
-
+上传图片
-
-
- - -
-
- - +
+
+
+ +
    + {{if !empty($data['logo'])}} +
  • + + + × +
    • + {{/if}} +
+
+上传图片
+
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
@@ -78,7 +101,7 @@ {{include file="lib/seo" /}}
-
+
diff --git a/app/admin/view/default/brandcategory/index.html b/app/admin/view/default/brandcategory/index.html index 3c2c3d3f4..290e9d9a9 100755 --- a/app/admin/view/default/brandcategory/index.html +++ b/app/admin/view/default/brandcategory/index.html @@ -20,7 +20,7 @@
- +
diff --git a/app/admin/view/default/customview/save_info.html b/app/admin/view/default/customview/save_info.html index da823ae8f..9cb277517 100755 --- a/app/admin/view/default/customview/save_info.html +++ b/app/admin/view/default/customview/save_info.html @@ -10,7 +10,7 @@ 返回
- +
@@ -34,7 +34,7 @@
- +
diff --git a/app/admin/view/default/express/index.html b/app/admin/view/default/express/index.html index f159f7832..4c202de2b 100755 --- a/app/admin/view/default/express/index.html +++ b/app/admin/view/default/express/index.html @@ -31,9 +31,13 @@
+上传图片
- +
+
+ + +
diff --git a/app/admin/view/default/goods/save_info.html b/app/admin/view/default/goods/save_info.html index 8dabf70da..cbe99d4aa 100755 --- a/app/admin/view/default/goods/save_info.html +++ b/app/admin/view/default/goods/save_info.html @@ -4,13 +4,13 @@
- + 商品{{if empty($data['id'])}}添加{{else /}}编辑{{/if}} 返回 -
-
- - -
- - - - +
+
+
+ + +
+ + + + +
+
-
-
- - -
-
- - -
-
- -
- + {{if !empty($goods_category_list)}} + {{foreach $goods_category_list as $v}} + + {{if !empty($v['items'])}} + {{foreach $v.items as $vs}} + + {{if !empty($vs['items'])}} + {{foreach $vs.items as $kss=>$vss}} + + {{/foreach}} + {{/if}} {{/foreach}} {{/if}} {{/foreach}} {{/if}} - {{/foreach}} - {{/if}} - -
-
- -
- -
-
- -
- -
-
- - -
-
- -
-

订单完成自动将发放到用户锁定积分、再由脚本自动发放到有效积分

+ +
-
- - - - -
-
-
- - -
-
- - -
-
- -
-

1. 当前系统配置的站点类型为[ {{$common_site_type_list[$common_site_type]['name']}} ]

-

2. 如果商品类型未配置则跟随系统配置的站点类型

-

3. 当设置的商品类型不在系统设置的站点类型包含的时候，商品加入购物车功能将失效

-
- -
-
- -
    - {{if !empty($data['images'])}} -
  • - - - × -
    • - {{/if}} -
-
+上传图片
-
-
- - -
-
- -
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+
+ +
+ + + + +
+
+
+
+ +
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+
+
+ +
+

1. 当前系统配置的站点类型为[ {{$common_site_type_list[$common_site_type]['name']}} ]

+

2. 如果商品类型未配置则跟随系统配置的站点类型

+

3. 当设置的商品类型不在系统设置的站点类型包含的时候，商品加入购物车功能将失效

+
+ +
+
+
+
+
+
+ +
    + {{if !empty($data['images'])}} +
  • + + + × +
    • + {{/if}} +
+
+上传图片
+
+
+
+
+ + +
+
+ + +
+
+
+
+
-

商品规格必填

+

商品规格*

@@ -198,7 +239,7 @@
-

商品参数选填

+

商品参数

@@ -245,7 +286,7 @@
-

商品相册必传

+

商品相册*

@@ -272,7 +313,7 @@
-

商品视频选传

+

商品视频

@@ -297,7 +338,7 @@
-

手机详情选填

+

手机详情

@@ -310,11 +351,10 @@ data-required="1" data-images-name="content_app_images" data-content-name="content_app_text" - data-images-title="图片" - data-images-name="上传图片" + data-images-title="上传图片" data-content-title="文本内容" - data-delete-name="删除" - data-drag-name="拖拽排序" + data-delete-title="删除" + data-drag-title="拖拽排序" > {{if !empty($data['content_app'])}} {{foreach $data.content_app as $v}} @@ -338,8 +378,8 @@
- 删除 - 拖拽排序 + 删除 + 拖拽排序 {{/foreach}} {{/if}} @@ -352,7 +392,7 @@
-

电脑详情必填

+

电脑详情*

@@ -364,7 +404,7 @@
-

虚拟信息选填

+

虚拟信息

@@ -403,14 +443,14 @@
-

SEO信息选填

+

SEO信息

{{include file="lib/seo" /}}
-
+
diff --git a/app/admin/view/default/goodscategory/index.html b/app/admin/view/default/goodscategory/index.html index 1086bd5de..6a377f447 100755 --- a/app/admin/view/default/goodscategory/index.html +++ b/app/admin/view/default/goodscategory/index.html @@ -20,7 +20,7 @@
- +
  • @@ -31,7 +31,7 @@
    +上传图片
- +
  • @@ -49,7 +49,7 @@
- +
diff --git a/app/admin/view/default/lib/region_linkage.html b/app/admin/view/default/lib/region_linkage.html index 0dc73b5f7..3e2d8ba96 100755 --- a/app/admin/view/default/lib/region_linkage.html +++ b/app/admin/view/default/lib/region_linkage.html @@ -1,5 +1,5 @@
- + diff --git a/app/admin/view/default/link/index.html b/app/admin/view/default/link/index.html index 0e396bcc3..1df93bcf2 100755 --- a/app/admin/view/default/link/index.html +++ b/app/admin/view/default/link/index.html @@ -21,12 +21,12 @@
- +
- - + +
diff --git a/app/admin/view/default/navigation/index.html b/app/admin/view/default/navigation/index.html index 4813d21e6..1d0a0aa74 100755 --- a/app/admin/view/default/navigation/index.html +++ b/app/admin/view/default/navigation/index.html @@ -66,12 +66,12 @@
- +
- - + +
@@ -112,7 +112,7 @@
- +
- +
- +
- +
- +
- +
@@ -71,7 +71,7 @@
- +
{{include file="lib/is_show" /}}
diff --git a/app/admin/view/default/quicknav/save_info.html b/app/admin/view/default/quicknav/save_info.html index b655ecfd5..f2ec170e1 100755 --- a/app/admin/view/default/quicknav/save_info.html +++ b/app/admin/view/default/quicknav/save_info.html @@ -10,12 +10,12 @@ 返回
- +
- + {{foreach $common_app_event_type as $v}} @@ -40,7 +40,7 @@
- +
  • diff --git a/app/admin/view/default/region/index.html b/app/admin/view/default/region/index.html index fa059a15f..22ff66deb 100755 --- a/app/admin/view/default/region/index.html +++ b/app/admin/view/default/region/index.html @@ -20,7 +20,7 @@
    - +
    diff --git a/app/admin/view/default/role/save_info.html b/app/admin/view/default/role/save_info.html index 085fb87ea..99235164a 100755 --- a/app/admin/view/default/role/save_info.html +++ b/app/admin/view/default/role/save_info.html @@ -10,7 +10,7 @@ 返回
    - +
    diff --git a/app/admin/view/default/screeningprice/index.html b/app/admin/view/default/screeningprice/index.html index dac525a9d..83c256aa0 100755 --- a/app/admin/view/default/screeningprice/index.html +++ b/app/admin/view/default/screeningprice/index.html @@ -21,15 +21,15 @@
    - +
    - +
    - +
    diff --git a/app/admin/view/default/slide/save_info.html b/app/admin/view/default/slide/save_info.html index 52f4e671d..9d374e973 100755 --- a/app/admin/view/default/slide/save_info.html +++ b/app/admin/view/default/slide/save_info.html @@ -10,12 +10,12 @@ 返回
    - +
    - + @@ -50,7 +50,7 @@
    +上传图片
    -

    1. PC端建议尺寸：1920x500px

    +

    1. PC端建议尺寸：1920x480px

    2. 手机端建议尺寸：1200x360px

    diff --git a/app/admin/view/default/user/save_info.html b/app/admin/view/default/user/save_info.html index b047d30c1..84a9afe69 100755 --- a/app/admin/view/default/user/save_info.html +++ b/app/admin/view/default/user/save_info.html @@ -4,7 +4,7 @@
    - + 用户{{if empty($data['id'])}}添加{{else /}}编辑{{/if}} 返回 @@ -209,7 +209,7 @@ {{/if}} -
    +
    diff --git a/app/admin/view/default/useraddress/save_info.html b/app/admin/view/default/useraddress/save_info.html index 6d0920d39..b8af86ed3 100644 --- a/app/admin/view/default/useraddress/save_info.html +++ b/app/admin/view/default/useraddress/save_info.html @@ -4,7 +4,7 @@
    - + 用户地址{{if empty($data['id'])}}添加{{else /}}编辑{{/if}} 返回 @@ -22,26 +22,38 @@ {{/if}}
    - +
    -
    - - -
    -
    - - -
    -
    - - +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + +
    +
    {{include file="lib/region_linkage" /}}
    - +
    @@ -59,18 +71,18 @@
    - +
    - +
    {{if empty($data) or empty($data['user_id'])}}

    先关联用户后再上传身份证图片

    {{else /}}
    - +
      @@ -101,7 +113,7 @@ {{/if}}
    -
    +
    diff --git a/app/admin/view/default/warehouse/save_info.html b/app/admin/view/default/warehouse/save_info.html index d479af5b1..200045281 100644 --- a/app/admin/view/default/warehouse/save_info.html +++ b/app/admin/view/default/warehouse/save_info.html @@ -11,30 +11,30 @@
    - +
    - +
    - +
    - +
    - +
    {{include file="lib/region_linkage" /}}
    - +
    diff --git a/app/index/controller/Useraddress.php b/app/index/controller/Useraddress.php index aefe2b6f6..15d5b7827 100755 --- a/app/index/controller/Useraddress.php +++ b/app/index/controller/Useraddress.php @@ -79,7 +79,7 @@ class UserAddress extends Common 'is_footer' => 0, // 加载地图 - 'is_load_map_api' => 1, + 'is_load_map_api' => MyC('home_user_address_map_status'), // 编辑器文件存放地址 'editor_path_type' => ResourcesService::EditorPathTypeValue(UserAddressService::EditorAttachmentPathType($this->user['id'])), diff --git a/app/index/view/default/buy/index.html b/app/index/view/default/buy/index.html index 4f9a6c16b..8d212dc65 100755 --- a/app/index/view/default/buy/index.html +++ b/app/index/view/default/buy/index.html @@ -233,7 +233,7 @@ {{if !empty($buy_goods)}}
    {{foreach $buy_goods as $v}} -
    +
    {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} @@ -327,7 +327,7 @@ {{/php}}
    -
    +
    {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
    diff --git a/app/index/view/default/lib/region_linkage.html b/app/index/view/default/lib/region_linkage.html index 2ccd76204..71af953a6 100755 --- a/app/index/view/default/lib/region_linkage.html +++ b/app/index/view/default/lib/region_linkage.html @@ -1,5 +1,5 @@
    - + diff --git a/app/index/view/default/order/detail.html b/app/index/view/default/order/detail.html index a3ed51788..11f97f153 100755 --- a/app/index/view/default/order/detail.html +++ b/app/index/view/default/order/detail.html @@ -343,6 +343,14 @@ {{if !empty($data.express_name)}}{{$data.express_name}}{{/if}}
    + {{if !empty($data['express_website_url'])}} +
    +
    快递官网：
    +
    + {{$data.express_website_url}} +
    +
    + {{/if}} {{if !empty($data.express_number)}}
    快递单号：
    @@ -518,12 +526,19 @@
    {{$goods.title}} - {{if !empty($goods.spec)}} -
      - {{foreach $goods.spec as $spec}} -
    • {{$spec.type}}：{{$spec.value}}
      • - {{/foreach}} -
    + {{if !empty($goods.spec_text)}} +
    {{$goods.spec_text}}
    + {{/if}} + {{if ($data['is_can_launch_aftersale'] eq 1 or !empty($goods['orderaftersale'])) and !empty($goods['orderaftersale_btn_text'])}} +
    + + {{if empty($goods['orderaftersale'])}} + {{$goods.orderaftersale_btn_text}} + {{else /}} + {{$goods.orderaftersale_btn_text}} + {{/if}} + +
    {{/if}}
    diff --git a/app/index/view/default/order/module/goods.html b/app/index/view/default/order/module/goods.html index ed3c04a28..11f937c5f 100644 --- a/app/index/view/default/order/module/goods.html +++ b/app/index/view/default/order/module/goods.html @@ -118,17 +118,17 @@ 已退 {{$item.returned_quantity}} / {{$module_data.currency_data.currency_symbol}}{{$item.refund_price}} {{/if}} -
    - {{if ($module_data['is_can_launch_aftersale'] eq 1 or !empty($item['orderaftersale'])) and !empty($item['orderaftersale_btn_text'])}} - - {{if empty($item['orderaftersale'])}} - {{$item.orderaftersale_btn_text}} - {{else /}} - {{$item.orderaftersale_btn_text}} - {{/if}} - + {{if ($module_data['is_can_launch_aftersale'] eq 1 or !empty($item['orderaftersale'])) and !empty($item['orderaftersale_btn_text'])}} +
    + + {{if empty($item['orderaftersale'])}} + {{$item.orderaftersale_btn_text}} + {{else /}} + {{$item.orderaftersale_btn_text}} + {{/if}} + +
    {{/if}} -
    {{/foreach}} diff --git a/app/index/view/default/orderaftersale/detail.html b/app/index/view/default/orderaftersale/detail.html index d3ea3868b..9ea17e90f 100644 --- a/app/index/view/default/orderaftersale/detail.html +++ b/app/index/view/default/orderaftersale/detail.html @@ -14,7 +14,6 @@
    - {{include file="public/user_menu" /}} @@ -46,7 +45,7 @@ {{if !empty($goods)}} -
    +
    {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} @@ -87,12 +86,8 @@
    {{$goods.title}} - {{if !empty($goods.spec)}} -
      - {{foreach $goods.spec as $spec}} -
    • {{$spec.type}}：{{$spec.value}}
      • - {{/foreach}} -
    + {{if !empty($goods.spec_text)}} +
    {{$goods.spec_text}}
    {{/if}}
    @@ -130,7 +125,7 @@ -
    +
    {{if !empty($order.price)}}
    商品总价：
    @@ -231,7 +226,7 @@
    {{foreach $common_order_aftersale_type_list as $v}} -
    +
    diff --git a/app/index/view/default/orderaftersale/step.html b/app/index/view/default/orderaftersale/step.html index 2e874a7bd..482a48b7b 100644 --- a/app/index/view/default/orderaftersale/step.html +++ b/app/index/view/default/orderaftersale/step.html @@ -1,5 +1,5 @@ -
      +
        {{if !empty($step_data['step0'])}} {{foreach $step_data.step0 as $step}}
      • @@ -17,7 +17,7 @@
      -
        +
          {{if !empty($step_data['step1'])}} {{foreach $step_data.step1 as $step}}
        • diff --git a/app/index/view/default/public/header_nav.html b/app/index/view/default/public/header_nav.html index cd2adf079..aa182894a 100755 --- a/app/index/view/default/public/header_nav.html +++ b/app/index/view/default/public/header_nav.html @@ -115,7 +115,7 @@
          {{if MyC('home_navigation_main_quick_status') eq 1}} -
          +
          diff --git a/app/index/view/default/useraddress/save_info.html b/app/index/view/default/useraddress/save_info.html index 582b2b88f..730ac8c93 100755 --- a/app/index/view/default/useraddress/save_info.html +++ b/app/index/view/default/useraddress/save_info.html @@ -3,23 +3,35 @@
          - -
          - - -
          -
          - - -
          -
          - - + +
          +
          +
          +
          +
          + + +
          +
          +
          +
          + + +
          +
          +
          +
          +
          +
          + + +
          +
          {{include file="lib/region_linkage" /}}
          - + {{if MyC('home_user_address_map_status') eq 1}}
          @@ -81,7 +93,7 @@
          {{/if}} -
          +
          diff --git a/app/service/ExpressService.php b/app/service/ExpressService.php index 3acf5247b..2b896e732 100755 --- a/app/service/ExpressService.php +++ b/app/service/ExpressService.php @@ -23,7 +23,7 @@ use app\service\ResourcesService; class ExpressService { /** - * 获取地区名称 + * 获取快递名称 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 @@ -56,6 +56,40 @@ class ExpressService return (!empty($data) && is_array($data) && array_key_exists($express_ids, $data)) ? $data[$express_ids] : null; } + /** + * 获取快递信息 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-19 + * @desc description + * @param [array|int] $express_ids [快递id] + */ + public static function ExpressData($express_ids = 0) + { + if(empty($express_ids)) + { + return null; + } + + // 参数处理查询数据 + if(is_array($express_ids)) + { + $express_ids = array_filter(array_unique($express_ids)); + } + if(!empty($express_ids)) + { + $data = self::DataHandle(Db::name('Express')->where(['id'=>$express_ids])->column('id,name,website_url,icon', 'id')); + } + + // id数组则直接返回 + if(is_array($express_ids)) + { + return empty($data) ? [] : $data; + } + return (!empty($data) && is_array($data) && array_key_exists($express_ids, $data)) ? $data[$express_ids] : null; + } + /** * 快递列表 * @author Devil @@ -113,11 +147,8 @@ class ExpressService */ public static function ExpressNodeSon($params = []) { - // id $id = isset($params['id']) ? intval($params['id']) : 0; - - // 获取数据 - $field = 'id,pid,icon,name,sort,is_enable'; + $field = 'id,pid,icon,name,website_url,sort,is_enable'; $data = Db::name('Express')->field($field)->where(['pid'=>$id])->order('sort asc')->select()->toArray(); if(!empty($data)) { @@ -167,11 +198,12 @@ class ExpressService // 数据 $data = [ - 'name' => $params['name'], - 'pid' => isset($params['pid']) ? intval($params['pid']) : 0, - 'sort' => isset($params['sort']) ? intval($params['sort']) : 0, - 'is_enable' => isset($params['is_enable']) ? intval($params['is_enable']) : 0, - 'icon' => $attachment['data']['icon'], + 'pid' => isset($params['pid']) ? intval($params['pid']) : 0, + 'name' => $params['name'], + 'website_url' => empty($params['website_url']) ? '' : $params['website_url'], + 'sort' => isset($params['sort']) ? intval($params['sort']) : 0, + 'is_enable' => isset($params['is_enable']) ? intval($params['is_enable']) : 0, + 'icon' => $attachment['data']['icon'], ]; // 添加 diff --git a/app/service/GoodsService.php b/app/service/GoodsService.php index 90e30d377..613f4ddc8 100755 --- a/app/service/GoodsService.php +++ b/app/service/GoodsService.php @@ -491,7 +491,7 @@ class GoodsService * @desc description * @param [array] $ids [分类id数组] * @param [int] $is_enable [是否启用 null, 0否, 1是] - * @param [int] $level [指定级别 null, 整数、默认则全部下级] + * @param [int] $level [指定级别 null, 整数（1~3）、默认则全部上级] */ public static function GoodsCategoryParentIds($ids = [], $is_enable = null, $level = null) { diff --git a/app/service/OrderService.php b/app/service/OrderService.php index a98951ef4..a715a046e 100755 --- a/app/service/OrderService.php +++ b/app/service/OrderService.php @@ -1261,10 +1261,10 @@ class OrderService $user_list = UserService::GetUserViewInfo(array_column($data, 'user_id')); } - // 快递名称 + // 快递信息 if(in_array('express_id', $keys)) { - $express_list = ExpressService::ExpressName(array_column($data, 'express_id')); + $express_list = ExpressService::ExpressData(array_column($data, 'express_id')); } // 支付方式名称 @@ -1350,7 +1350,17 @@ class OrderService $v['pay_status_name'] = (in_array($v['status'], [2,3,4]) && $v['pay_status'] == 0) ? '待确认' : $order_pay_status[$v['pay_status']]['name']; // 快递公司 - $v['express_name'] = (!empty($express_list) && is_array($express_list) && array_key_exists($v['express_id'], $express_list)) ? $express_list[$v['express_id']] : null; + $express = (!empty($express_list) && is_array($express_list) && array_key_exists($v['express_id'], $express_list)) ? $express_list[$v['express_id']] : null; + if(empty($express)) + { + $v['express_name'] = ''; + $v['express_icon'] = ''; + $v['express_website_url'] = ''; + } else { + $v['express_name'] = $express['name']; + $v['express_icon'] = $express['icon']; + $v['express_website_url'] = $express['website_url']; + } // 支付方式 $v['payment_name'] = (!empty($payment_list) && is_array($payment_list) && array_key_exists($v['id'], $payment_list)) ? $payment_list[$v['id']] : null; diff --git a/public/static/admin/default/css/goods.css b/public/static/admin/default/css/goods.css index 7a6e3bbe0..af30b48dc 100755 --- a/public/static/admin/default/css/goods.css +++ b/public/static/admin/default/css/goods.css @@ -14,7 +14,7 @@ right:0; width:80px; position:fixed; - z-index:1000; + z-index:10001; border:1px solid #eee; border-right:0px; } @@ -149,7 +149,7 @@ ul { overflow:hidden; } .content-app-items > li { - border:3px dashed #eee; + border:1px dashed #eee; padding:10px; } ul li { diff --git a/public/static/admin/default/js/goods.js b/public/static/admin/default/js/goods.js index a7f16bf73..0fa1e18cd 100755 --- a/public/static/admin/default/js/goods.js +++ b/public/static/admin/default/js/goods.js @@ -501,7 +501,7 @@ $(function() html += ''; html += '
            '; html += '
          '; - html += '
          +'+$app_content.data('images-name')+'
          '; + html += '
          +'+$app_content.data('images-title')+'
          '; html += '
          '; // 右侧 @@ -512,8 +512,8 @@ $(function() html += '
          '; // 操作按钮 - html += '          '+$app_content.data('delete-name')+''; - html += ' '+$app_content.data('drag-name')+''; + html += ' '+$app_content.data('delete-title')+''; + html += ' '+$app_content.data('drag-title')+''; html += '
          • '; $app_content.append(html); $app_content.attr('index', index); diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index 65c4c95ef..9e8e8801f 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -2923,6 +2923,30 @@ function CommonGoodsChoiceSpecType() }); } +/** + * 二维码初始化 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2023-01-09 + * @desc description + */ +function ViewQrCodeInit() +{ + $('.view-qrcode-init').each(function() + { + var text = $(this).text(); + if(text !== '') + { + $(this).empty().qrcode({ + text: text, + width: parseInt($(this).data('width') || 100), + height: parseInt($(this).data('height') || 100) + }); + } + }); +} + // 公共数据操作 $(function() @@ -2933,6 +2957,9 @@ $(function() // 颜色选择器初始化 ColorPickerInit(); + // 二维码初始化 + ViewQrCodeInit(); + // 表格字段数据排序 $('.form-sort-container .sort-icon').on('click', function() { diff --git a/public/static/common/lib/assets/css/amazeui.css b/public/static/common/lib/assets/css/amazeui.css index cc784df99..9dbc55a03 100755 --- a/public/static/common/lib/assets/css/amazeui.css +++ b/public/static/common/lib/assets/css/amazeui.css @@ -7030,7 +7030,7 @@ a.am-close:hover { Component: Panel ============================================================================ */ .am-panel { - margin-bottom: 20px; + margin-bottom: 1.6rem; background-color: #fff; border: 1px solid transparent; } @@ -7405,1022 +7405,6 @@ img.am-thumbnail, .am-thumbnails > li { padding: 0 .5rem 1rem .5rem; } -/* ========================================================================== - Component: Utility - ============================================================================ */ -.am-scrollable-horizontal { - width: 100%; - overflow-y: hidden; - overflow-x: auto; - -ms-overflow-style: -ms-autohiding-scrollbar; - -webkit-overflow-scrolling: touch; -} -.am-scrollable-vertical { - height: 240px; - overflow-y: scroll; - -webkit-overflow-scrolling: touch; - resize: vertical; -} -/* Border-radius*/ -.am-square { - border-radius: 0; -} -.am-radius { - border-radius: 2px; -} -.am-round { - border-radius: 1000px; -} -.am-circle { - border-radius: 50%; -} -/* Float blocks*/ -.am-cf:before, -.am-cf:after { - content: " "; - display: table; -} -.am-cf:after { - clear: both; -} -.am-fl { - float: left; -} -.am-fr { - float: right; -} -.am-nbfc { - overflow: hidden; -} -.am-center { - display: block; - margin-left: auto; - margin-right: auto; -} -/* Display */ -.am-block { - display: block !important; -} -.am-inline { - display: inline !important; -} -.am-inline-block { - display: inline-block !important; -} -.am-hide { - display: none !important; - visibility: hidden !important; -} -/* -* Remove whitespace between child elements when using `inline-block` -*/ -.am-vertical-align { - font-size: 0.001px; -} -/* -* The `@{ns}vertical-align` container needs a specific height -*/ -.am-vertical-align:before { - content: ''; - display: inline-block; - height: 100%; - vertical-align: middle; -} -/* -* Sub-object which can have any height -* 1. Reset whitespace hack -*/ -.am-vertical-align-middle, -.am-vertical-align-bottom { - display: inline-block; - max-width: 100%; -} -.am-vertical-align-middle { - vertical-align: middle; -} -.am-vertical-align-bottom { - vertical-align: bottom; -} -.am-responsive-width { - -webkit-box-sizing: border-box; - box-sizing: border-box; - max-width: 100%; - height: auto; -} -/* Margin helpers */ -.am-margin { - margin: 1.6rem; -} -.am-margin-0 { - margin: 0!important; -} -.am-margin-xs { - margin: 0.5rem; -} -.am-margin-sm { - margin: 1rem; -} -.am-margin-lg { - margin: 2.4rem; -} -.am-margin-xl { - margin: 3.2rem; -} -.am-margin-horizontal { - margin-left: 1.6rem; - margin-right: 1.6rem; -} -.am-margin-horizontal-0 { - margin-left: 0!important; - margin-right: 0!important; -} -.am-margin-horizontal-xs { - margin-left: 0.5rem; - margin-right: 0.5rem; -} -.am-margin-horizontal-sm { - margin-left: 1rem; - margin-right: 1rem; -} -.am-margin-horizontal-lg { - margin-left: 2.4rem; - margin-right: 2.4rem; -} -.am-margin-horizontal-xl { - margin-left: 3.2rem; - margin-right: 3.2rem; -} -.am-margin-vertical { - margin-top: 1.6rem; - margin-bottom: 1.6rem; -} -.am-margin-vertical-0 { - margin-top: 0!important; - margin-bottom: 0!important; -} -.am-margin-vertical-xs { - margin-top: 0.5rem; - margin-bottom: 0.5rem; -} -.am-margin-vertical-sm { - margin-top: 1rem; - margin-bottom: 1rem; -} -.am-margin-vertical-lg { - margin-top: 2.4rem; - margin-bottom: 2.4rem; -} -.am-margin-vertical-xl { - margin-top: 3.2rem; - margin-bottom: 3.2rem; -} -.am-margin-top { - margin-top: 1.6rem; -} -.am-margin-top-0 { - margin-top: 0!important; -} -.am-margin-top-xs { - margin-top: 0.5rem; -} -.am-margin-top-sm { - margin-top: 1rem; -} -.am-margin-top-lg { - margin-top: 2.4rem; -} -.am-margin-top-xl { - margin-top: 3.2rem; -} -.am-margin-bottom { - margin-bottom: 1.6rem; -} -.am-margin-bottom-0 { - margin-bottom: 0!important; -} -.am-margin-bottom-xs { - margin-bottom: 0.5rem; -} -.am-margin-bottom-sm { - margin-bottom: 1rem; -} -.am-margin-bottom-lg { - margin-bottom: 2.4rem; -} -.am-margin-bottom-xl { - margin-bottom: 3.2rem; -} -.am-margin-left { - margin-left: 1.6rem; -} -.am-margin-left-0 { - margin-left: 0!important; -} -.am-margin-left-xs { - margin-left: 0.5rem; -} -.am-margin-left-sm { - margin-left: 1rem; -} -.am-margin-left-lg { - margin-left: 2.4rem; -} -.am-margin-left-xl { - margin-left: 3.2rem; -} -.am-margin-right { - margin-right: 1.6rem; -} -.am-margin-right-0 { - margin-right: 0!important; -} -.am-margin-right-xs { - margin-right: 0.5rem; -} -.am-margin-right-sm { - margin-right: 1rem; -} -.am-margin-right-lg { - margin-right: 2.4rem; -} -.am-margin-right-xl { - margin-right: 3.2rem; -} -/* Padding helpers */ -.am-padding { - padding: 1.6rem; -} -.am-padding-0 { - padding: 0!important; -} -.am-padding-xs { - padding: 0.5rem; -} -.am-padding-sm { - padding: 1rem; -} -.am-padding-lg { - padding: 2.4rem; -} -.am-padding-xl { - padding: 3.2rem; -} -.am-padding-horizontal { - padding-left: 1.6rem; - padding-right: 1.6rem; -} -.am-padding-horizontal-0 { - padding-left: 0!important; - padding-right: 0!important; -} -.am-padding-horizontal-xs { - padding-left: 0.5rem; - padding-right: 0.5rem; -} -.am-padding-horizontal-sm { - padding-left: 1rem; - padding-right: 1rem; -} -.am-padding-horizontal-lg { - padding-left: 2.4rem; - padding-right: 2.4rem; -} -.am-padding-horizontal-xl { - padding-left: 3.2rem; - padding-right: 3.2rem; -} -.am-padding-vertical { - padding-top: 1.6rem; - padding-bottom: 1.6rem; -} -.am-padding-vertical-0 { - padding-top: 0!important; - padding-bottom: 0!important; -} -.am-padding-vertical-xs { - padding-top: 0.5rem; - padding-bottom: 0.5rem; -} -.am-padding-vertical-sm { - padding-top: 1rem; - padding-bottom: 1rem; -} -.am-padding-vertical-lg { - padding-top: 2.4rem; - padding-bottom: 2.4rem; -} -.am-padding-vertical-xl { - padding-top: 3.2rem; - padding-bottom: 3.2rem; -} -.am-padding-top { - padding-top: 1.6rem; -} -.am-padding-top-0 { - padding-top: 0!important; -} -.am-padding-top-xs { - padding-top: 0.5rem; -} -.am-padding-top-sm { - padding-top: 1rem; -} -.am-padding-top-lg { - padding-top: 2.4rem; -} -.am-padding-top-xl { - padding-top: 3.2rem; -} -.am-padding-bottom { - padding-bottom: 1.6rem; -} -.am-padding-bottom-0 { - padding-bottom: 0!important; -} -.am-padding-bottom-xs { - padding-bottom: 0.5rem; -} -.am-padding-bottom-sm { - padding-bottom: 1rem; -} -.am-padding-bottom-lg { - padding-bottom: 2.4rem; -} -.am-padding-bottom-xl { - padding-bottom: 3.2rem; -} -.am-padding-left { - padding-left: 1.6rem; -} -.am-padding-left-0 { - padding-left: 0!important; -} -.am-padding-left-xs { - padding-left: 0.5rem; -} -.am-padding-left-sm { - padding-left: 1rem; -} -.am-padding-left-lg { - padding-left: 2.4rem; -} -.am-padding-left-xl { - padding-left: 3.2rem; -} -.am-padding-right { - padding-right: 1.6rem; -} -.am-padding-right-0 { - padding-right: 0!important; -} -.am-padding-right-xs { - padding-right: 0.5rem; -} -.am-padding-right-sm { - padding-right: 1rem; -} -.am-padding-right-lg { - padding-right: 2.4rem; -} -.am-padding-right-xl { - padding-right: 3.2rem; -} -/* small displays */ -@media only screen { - .am-show-sm-only, - .am-show-sm-up, - .am-show-sm, - .am-show-sm-down, - .am-hide-md-only, - .am-hide-md-up, - .am-hide-md, - .am-show-md-down, - .am-hide-lg-only, - .am-hide-lg-up, - .am-hide-lg, - .am-show-lg-down { - display: inherit !important; - } - .am-hide-sm-only, - .am-hide-sm-up, - .am-hide-sm, - .am-hide-sm-down, - .am-show-md-only, - .am-show-md-up, - .am-show-md, - .am-hide-md-down, - .am-show-lg-only, - .am-show-lg-up, - .am-show-lg, - .am-hide-lg-down { - display: none !important; - } - /* table */ - table.am-show-sm-only, - table.am-show-sm-up, - table.am-show-sm, - table.am-show-sm-down, - table.am-hide-md-only, - table.am-hide-md-up, - table.am-hide-md, - table.am-show-md-down, - table.am-hide-lg-only, - table.am-hide-lg-up, - table.am-hide-lg, - table.am-show-lg-down { - display: table !important; - } - thead.am-show-sm-only, - thead.am-show-sm-up, - thead.am-show-sm, - thead.am-show-sm-down, - thead.am-hide-md-only, - thead.am-hide-md-up, - thead.am-hide-md, - thead.am-show-md-down, - thead.am-hide-lg-only, - thead.am-hide-lg-up, - thead.am-hide-lg, - thead.am-show-lg-down { - display: table-header-group !important; - } - tbody.am-show-sm-only, - tbody.am-show-sm-up, - tbody.am-show-sm, - tbody.am-show-sm-down, - tbody.am-hide-md-only, - tbody.am-hide-md-up, - tbody.am-hide-md, - tbody.am-show-md-down, - tbody.am-hide-lg-only, - tbody.am-hide-lg-up, - tbody.am-hide-lg, - tbody.am-show-lg-down { - display: table-row-group !important; - } - tr.am-show-sm-only, - tr.am-show-sm-up, - tr.am-show-sm, - tr.am-show-sm-down, - tr.am-hide-md-only, - tr.am-hide-md-up, - tr.am-hide-md, - tr.am-show-md-down, - tr.am-hide-lg-only, - tr.am-hide-lg-up, - tr.am-hide-lg, - tr.am-show-lg-down { - display: table-row !important; - } - th.am-show-sm-only, - td.am-show-sm-only, - th.am-show-sm-up, - td.am-show-sm-up, - th.am-show-sm, - td.am-show-sm, - th.am-show-sm-down, - td.am-show-sm-down, - th.am-hide-md-only, - td.am-hide-md-only, - th.am-hide-md-up, - td.am-hide-md-up, - th.am-hide-md, - td.am-hide-md, - th.am-show-md-down, - td.am-show-md-down, - th.am-hide-lg-only, - td.am-hide-lg-only, - th.am-hide-lg-up, - td.am-hide-lg-up, - th.am-hide-lg, - td.am-hide-lg, - th.am-show-lg-down, - td.am-show-lg-down { - display: table-cell !important; - } -} -/* medium displays */ -@media only screen and (min-width:641px) { - .am-hide-sm-only, - .am-show-sm-up, - .am-hide-sm, - .am-hide-sm-down, - .am-show-md-only, - .am-show-md-up, - .am-show-md, - .am-show-md-down, - .am-hide-lg-only, - .am-hide-lg-up, - .am-hide-lg, - .am-show-lg-down { - display: inherit !important; - } - .am-show-sm-only, - .am-hide-sm-up, - .am-show-sm, - .am-show-sm-down, - .am-hide-md-only, - .am-hide-md-up, - .am-hide-md, - .am-hide-md-down, - .am-show-lg-only, - .am-show-lg-up, - .am-show-lg, - .am-hide-lg-down { - display: none !important; - } - table.am-hide-sm-only, - table.am-show-sm-up, - table.am-hide-sm, - table.am-hide-sm-down, - table.am-show-md-only, - table.am-show-md-up, - table.am-show-md, - table.am-show-md-down, - table.am-hide-lg-only, - table.am-hide-lg-up, - table.am-hide-lg, - table.am-show-lg-down { - display: table !important; - } - thead.am-hide-sm-only, - thead.am-show-sm-up, - thead.am-hide-sm, - thead.am-hide-sm-down, - thead.am-show-md-only, - thead.am-show-md-up, - thead.am-show-md, - thead.am-show-md-down, - thead.am-hide-lg-only, - thead.am-hide-lg-up, - thead.am-hide-lg, - thead.am-show-lg-down { - display: table-header-group !important; - } - tbody.am-hide-sm-only, - tbody.am-show-sm-up, - tbody.am-hide-sm, - tbody.am-hide-sm-down, - tbody.am-show-md-only, - tbody.am-show-md-up, - tbody.am-show-md, - tbody.am-show-md-down, - tbody.am-hide-lg-only, - tbody.am-hide-lg-up, - tbody.am-hide-lg, - tbody.am-show-lg-down { - display: table-row-group !important; - } - tr.am-hide-sm-only, - tr.am-show-sm-up, - tr.am-hide-sm, - tr.am-hide-sm-down, - tr.am-show-md-only, - tr.am-show-md-up, - tr.am-show-md, - tr.am-show-md-down, - tr.am-hide-lg-only, - tr.am-hide-lg-up, - tr.am-hide-lg, - tr.am-show-lg-down { - display: table-row !important; - } - th.am-hide-sm-only, - td.am-hide-sm-only, - th.am-show-sm-up, - td.am-show-sm-up, - th.am-hide-sm, - td.am-hide-sm, - th.am-hide-sm-down, - td.am-hide-sm-down, - th.am-show-md-only, - td.am-show-md-only, - th.am-show-md-up, - td.am-show-md-up, - th.am-show-md, - td.am-show-md, - th.am-show-md-down, - td.am-show-md-down, - th.am-hide-lg-only, - td.am-hide-lg-only, - th.am-hide-lg-up, - td.am-hide-lg-up, - th.am-hide-lg, - td.am-hide-lg, - th.am-show-lg-down, - td.am-show-lg-down { - display: table-cell !important; - } -} -/* large displays */ -@media only screen and (min-width:1025px) { - .am-hide-sm-only, - .am-show-sm-up, - .am-hide-sm, - .am-hide-sm-down, - .am-hide-md-only, - .am-show-md-up, - .am-hide-md, - .am-hide-md-down, - .am-show-lg-only, - .am-show-lg-up, - .am-show-lg, - .am-show-lg-down { - display: inherit !important; - } - .am-show-sm-only, - .am-hide-sm-up, - .am-show-sm, - .am-show-sm-down, - .am-show-md-only, - .am-hide-md-up, - .am-show-md, - .am-show-md-down, - .am-hide-lg-only, - .am-hide-lg-up, - .am-hide-lg, - .am-hide-lg-down { - display: none !important; - } - table.am-hide-sm-only, - table.am-show-sm-up, - table.am-hide-sm, - table.am-hide-sm-down, - table.am-hide-md-only, - table.am-show-md-up, - table.am-hide-md, - table.am-hide-md-down, - table.am-show-lg-only, - table.am-show-lg-up, - table.am-show-lg, - table.am-show-lg-down { - display: table !important; - } - thead.am-hide-sm-only, - thead.am-show-sm-up, - thead.am-hide-sm, - thead.am-hide-sm-down, - thead.am-hide-md-only, - thead.am-show-md-up, - thead.am-hide-md, - thead.am-hide-md-down, - thead.am-show-lg-only, - thead.am-show-lg-up, - thead.am-show-lg, - thead.am-show-lg-down { - display: table-header-group !important; - } - tbody.am-hide-sm-only, - tbody.am-show-sm-up, - tbody.am-hide-sm, - tbody.am-hide-sm-down, - tbody.am-hide-md-only, - tbody.am-show-md-up, - tbody.am-hide-md, - tbody.am-hide-md-down, - tbody.am-show-lg-only, - tbody.am-show-lg-up, - tbody.am-show-lg, - tbody.am-show-lg-down { - display: table-row-group !important; - } - tr.am-hide-sm-only, - tr.am-show-sm-up, - tr.am-hide-sm, - tr.am-hide-sm-down, - tr.am-hide-md-only, - tr.am-show-md-up, - tr.am-hide-md, - tr.am-hide-md-down, - tr.am-show-lg-only, - tr.am-show-lg-up, - tr.am-show-lg, - tr.am-show-lg-down { - display: table-row !important; - } - th.am-hide-sm-only, - td.am-hide-sm-only, - th.am-show-sm-up, - td.am-show-sm-up, - th.am-hide-sm, - td.am-hide-sm, - th.am-hide-sm-down, - td.am-hide-sm-down, - th.am-hide-md-only, - td.am-hide-md-only, - th.am-show-md-up, - td.am-show-md-up, - th.am-hide-md, - td.am-hide-md, - th.am-hide-md-down, - td.am-hide-md-down, - th.am-show-lg-only, - td.am-show-lg-only, - th.am-show-lg-up, - td.am-show-lg-up, - th.am-show-lg, - td.am-show-lg, - th.am-show-lg-down, - td.am-show-lg-down { - display: table-cell !important; - } -} -@media only screen and (orientation: landscape) { - .am-show-landscape, - .am-hide-portrait { - display: inherit !important; - } - .am-hide-landscape, - .am-show-portrait { - display: none !important; - } -} -@media only screen and (orientation: portrait) { - .am-show-portrait, - .am-hide-landscape { - display: inherit !important; - } - .am-hide-portrait, - .am-show-landscape { - display: none !important; - } -} -.am-sans-serif { - font-family: "Segoe UI", "Lucida Grande", Helvetica, Arial, "Microsoft YaHei", FreeSans, Arimo, "Droid Sans", "wenquanyi micro hei", "Hiragino Sans GB", "Hiragino Sans GB W3", "FontAwesome", sans-serif; -} -.am-serif { - font-family: Georgia, "Times New Roman", Times, SimSun, "FontAwesome", serif; -} -.am-kai { - font-family: Georgia, "Times New Roman", Times, Kai, "Kaiti SC", KaiTi, BiauKai, "FontAwesome", serif; -} -.am-monospace { - font-family: Monaco, Menlo, Consolas, "Courier New", "FontAwesome", monospace; -} -.am-text-white { - color: #fff; -} -.am-text-grey { - color: #b9b9b9; -} -.am-text-primary { - color: #0e90d2; -} -.am-text-secondary { - color: #3bb4f2; -} -.am-text-success { - color: #5eb95e; -} -.am-text-warning { - color: #F37B1D; -} -.am-text-danger { - color: #dd514c; -} -.am-link-muted { - color: #666; -} -.am-link-muted a { - color: #666; -} -.am-link-muted:hover, -.am-link-muted a:hover { - color: #555; -} -.am-text-default { - font-size: 1.6rem; -} -/* -.@{ns}text-xxs { - font-size: @font-size-xxs; -} -*/ -.am-text-xs { - font-size: 1.2rem; -} -.am-text-sm { - font-size: 1.4rem; -} -.am-text-lg { - font-size: 1.8rem; -} -.am-text-xl { - font-size: 2.4rem; -} -.am-text-xxl { - font-size: 3.2rem; -} -.am-text-xxxl { - font-size: 4.2rem; -} -.am-ellipsis, -.am-text-truncate { - word-wrap: normal; - /* for IE */ - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; -} -.am-text-break { - word-wrap: break-word; - -webkit-hyphens: auto; - -ms-hyphens: auto; - -moz-hyphens: auto; - hyphens: auto; -} -.am-text-nowrap { - white-space: nowrap; -} -[class*='am-align-'] { - margin-bottom: 1rem; -} -.am-align-left { - margin-right: 1rem; - float: left; -} -.am-align-right { - margin-left: 1rem; - float: right; -} -/** Only display content to screen readers - * See: http://a11yproject.com/posts/how-to-hide-content/ - */ -.am-sr-only { - position: absolute; - width: 1px; - height: 1px; - margin: -1px; - padding: 0; - overflow: hidden; - clip: rect(0, 0, 0, 0); - border: 0; -} -/* Text Image Replacement */ -.am-text-ir { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} -/* Text align */ -@media only screen { - .am-text-left { - text-align: left !important; - } - .am-text-right { - text-align: right !important; - } - .am-text-center { - text-align: center !important; - } - .am-text-justify { - text-align: justify !important; - } -} -@media only screen and (max-width: 640px) { - .am-sm-only-text-left { - text-align: left !important; - } - .am-sm-only-text-right { - text-align: right !important; - } - .am-sm-only-text-center { - text-align: center !important; - } - .am-sm-only-text-justify { - text-align: justify !important; - } -} -@media only screen and (min-width:641px) and (max-width:1024px) { - .am-md-only-text-left { - text-align: left !important; - } - .am-md-only-text-right { - text-align: right !important; - } - .am-md-only-text-center { - text-align: center !important; - } - .am-md-only-text-justify { - text-align: justify !important; - } -} -@media only screen and (min-width:641px) { - .am-md-text-left { - text-align: left !important; - } - .am-md-text-right { - text-align: right !important; - } - .am-md-text-center { - text-align: center !important; - } - .am-md-text-justify { - text-align: justify !important; - } -} -@media only screen and (min-width:1025px) { - .am-lg-text-left { - text-align: left !important; - } - .am-lg-text-right { - text-align: right !important; - } - .am-lg-text-center { - text-align: center !important; - } - .am-lg-text-justify { - text-align: justify !important; - } -} -.am-text-top { - vertical-align: top !important; -} -.am-text-middle { - vertical-align: middle !important; -} -.am-text-bottom { - vertical-align: bottom !important; -} -.am-angle { - position: absolute; -} -.am-angle:before, -.am-angle:after { - position: absolute; - display: block; - content: ""; - width: 0; - height: 0; - border: 8px dashed transparent; - z-index: 1; -} -.am-angle-up { - top: 0; -} -.am-angle-up:before, -.am-angle-up:after { - border-bottom-style: solid; - border-width: 0 8px 8px; -} -.am-angle-up:before { - border-bottom-color: rgba(0,0,0,.06); - bottom: 0; -} -.am-angle-up:after { - border-bottom-color: #fff; - bottom: -1px; -} -.am-angle-down { - bottom: -9px; -} -.am-angle-down:before, -.am-angle-down:after { - border-top-style: solid; - border-width: 8px 8px 0; -} -.am-angle-down:before { - border-top-color: rgba(0,0,0,.06); - bottom: 0; -} -.am-angle-down:after { - border-top-color: #fff; - bottom: 1px; -} -.am-angle-left { - left: -9px; -} -.am-angle-left:before, -.am-angle-left:after { - border-right-style: solid; - border-width: 8px 8px 8px 0; -} -.am-angle-left:before { - border-right-color: rgba(0,0,0,.06); - left: 0; -} -.am-angle-left:after { - border-right-color: #fff; - left: 1px; -} -.am-angle-right { - right: 0; -} -.am-angle-right:before, -.am-angle-right:after { - border-left-style: solid; - border-width: 8px 0 8px 8px; -} -.am-angle-right:before { - border-left-color: rgba(0,0,0,.06); - left: 0; -} -.am-angle-right:after { - border-left-color: #fff; - left: -1px; -} /* ========================================================================== Component: Alert Plugin ============================================================================ */ @@ -14541,3 +13525,1022 @@ tbody.am-collapse.am-in { margin-top: 1rem; margin-bottom: 1rem; } +/* ========================================================================== + Component: Utility + ============================================================================ */ +.am-scrollable-horizontal { + width: 100%; + overflow-y: hidden; + overflow-x: auto; + -ms-overflow-style: -ms-autohiding-scrollbar; + -webkit-overflow-scrolling: touch; +} +.am-scrollable-vertical { + height: 240px; + overflow-y: scroll; + -webkit-overflow-scrolling: touch; + resize: vertical; +} +/* Border-radius*/ +.am-square { + border-radius: 0; +} +.am-radius { + border-radius: 2px; +} +.am-round { + border-radius: 1000px; +} +.am-circle { + border-radius: 50%; +} +/* Float blocks*/ +.am-cf:before, +.am-cf:after { + content: " "; + display: table; +} +.am-cf:after { + clear: both; +} +.am-fl { + float: left; +} +.am-fr { + float: right; +} +.am-nbfc { + overflow: hidden; +} +.am-center { + display: block; + margin-left: auto; + margin-right: auto; +} +/* Display */ +.am-block { + display: block !important; +} +.am-inline { + display: inline !important; +} +.am-inline-block { + display: inline-block !important; +} +.am-hide { + display: none !important; + visibility: hidden !important; +} +/* +* Remove whitespace between child elements when using `inline-block` +*/ +.am-vertical-align { + font-size: 0.001px; +} +/* +* The `@{ns}vertical-align` container needs a specific height +*/ +.am-vertical-align:before { + content: ''; + display: inline-block; + height: 100%; + vertical-align: middle; +} +/* +* Sub-object which can have any height +* 1. Reset whitespace hack +*/ +.am-vertical-align-middle, +.am-vertical-align-bottom { + display: inline-block; + max-width: 100%; +} +.am-vertical-align-middle { + vertical-align: middle; +} +.am-vertical-align-bottom { + vertical-align: bottom; +} +.am-responsive-width { + -webkit-box-sizing: border-box; + box-sizing: border-box; + max-width: 100%; + height: auto; +} +/* Margin helpers */ +.am-margin { + margin: 1.6rem; +} +.am-margin-0 { + margin: 0!important; +} +.am-margin-xs { + margin: 0.5rem; +} +.am-margin-sm { + margin: 1rem; +} +.am-margin-lg { + margin: 2.4rem; +} +.am-margin-xl { + margin: 3.2rem; +} +.am-margin-horizontal { + margin-left: 1.6rem; + margin-right: 1.6rem; +} +.am-margin-horizontal-0 { + margin-left: 0!important; + margin-right: 0!important; +} +.am-margin-horizontal-xs { + margin-left: 0.5rem; + margin-right: 0.5rem; +} +.am-margin-horizontal-sm { + margin-left: 1rem; + margin-right: 1rem; +} +.am-margin-horizontal-lg { + margin-left: 2.4rem; + margin-right: 2.4rem; +} +.am-margin-horizontal-xl { + margin-left: 3.2rem; + margin-right: 3.2rem; +} +.am-margin-vertical { + margin-top: 1.6rem; + margin-bottom: 1.6rem; +} +.am-margin-vertical-0 { + margin-top: 0!important; + margin-bottom: 0!important; +} +.am-margin-vertical-xs { + margin-top: 0.5rem; + margin-bottom: 0.5rem; +} +.am-margin-vertical-sm { + margin-top: 1rem; + margin-bottom: 1rem; +} +.am-margin-vertical-lg { + margin-top: 2.4rem; + margin-bottom: 2.4rem; +} +.am-margin-vertical-xl { + margin-top: 3.2rem; + margin-bottom: 3.2rem; +} +.am-margin-top { + margin-top: 1.6rem; +} +.am-margin-top-0 { + margin-top: 0!important; +} +.am-margin-top-xs { + margin-top: 0.5rem; +} +.am-margin-top-sm { + margin-top: 1rem; +} +.am-margin-top-lg { + margin-top: 2.4rem; +} +.am-margin-top-xl { + margin-top: 3.2rem; +} +.am-margin-bottom { + margin-bottom: 1.6rem; +} +.am-margin-bottom-0 { + margin-bottom: 0!important; +} +.am-margin-bottom-xs { + margin-bottom: 0.5rem; +} +.am-margin-bottom-sm { + margin-bottom: 1rem; +} +.am-margin-bottom-lg { + margin-bottom: 2.4rem; +} +.am-margin-bottom-xl { + margin-bottom: 3.2rem; +} +.am-margin-left { + margin-left: 1.6rem; +} +.am-margin-left-0 { + margin-left: 0!important; +} +.am-margin-left-xs { + margin-left: 0.5rem; +} +.am-margin-left-sm { + margin-left: 1rem; +} +.am-margin-left-lg { + margin-left: 2.4rem; +} +.am-margin-left-xl { + margin-left: 3.2rem; +} +.am-margin-right { + margin-right: 1.6rem; +} +.am-margin-right-0 { + margin-right: 0!important; +} +.am-margin-right-xs { + margin-right: 0.5rem; +} +.am-margin-right-sm { + margin-right: 1rem; +} +.am-margin-right-lg { + margin-right: 2.4rem; +} +.am-margin-right-xl { + margin-right: 3.2rem; +} +/* Padding helpers */ +.am-padding { + padding: 1.6rem; +} +.am-padding-0 { + padding: 0!important; +} +.am-padding-xs { + padding: 0.5rem; +} +.am-padding-sm { + padding: 1rem; +} +.am-padding-lg { + padding: 2.4rem; +} +.am-padding-xl { + padding: 3.2rem; +} +.am-padding-horizontal { + padding-left: 1.6rem; + padding-right: 1.6rem; +} +.am-padding-horizontal-0 { + padding-left: 0!important; + padding-right: 0!important; +} +.am-padding-horizontal-xs { + padding-left: 0.5rem; + padding-right: 0.5rem; +} +.am-padding-horizontal-sm { + padding-left: 1rem; + padding-right: 1rem; +} +.am-padding-horizontal-lg { + padding-left: 2.4rem; + padding-right: 2.4rem; +} +.am-padding-horizontal-xl { + padding-left: 3.2rem; + padding-right: 3.2rem; +} +.am-padding-vertical { + padding-top: 1.6rem; + padding-bottom: 1.6rem; +} +.am-padding-vertical-0 { + padding-top: 0!important; + padding-bottom: 0!important; +} +.am-padding-vertical-xs { + padding-top: 0.5rem; + padding-bottom: 0.5rem; +} +.am-padding-vertical-sm { + padding-top: 1rem; + padding-bottom: 1rem; +} +.am-padding-vertical-lg { + padding-top: 2.4rem; + padding-bottom: 2.4rem; +} +.am-padding-vertical-xl { + padding-top: 3.2rem; + padding-bottom: 3.2rem; +} +.am-padding-top { + padding-top: 1.6rem; +} +.am-padding-top-0 { + padding-top: 0!important; +} +.am-padding-top-xs { + padding-top: 0.5rem; +} +.am-padding-top-sm { + padding-top: 1rem; +} +.am-padding-top-lg { + padding-top: 2.4rem; +} +.am-padding-top-xl { + padding-top: 3.2rem; +} +.am-padding-bottom { + padding-bottom: 1.6rem; +} +.am-padding-bottom-0 { + padding-bottom: 0!important; +} +.am-padding-bottom-xs { + padding-bottom: 0.5rem; +} +.am-padding-bottom-sm { + padding-bottom: 1rem; +} +.am-padding-bottom-lg { + padding-bottom: 2.4rem; +} +.am-padding-bottom-xl { + padding-bottom: 3.2rem; +} +.am-padding-left { + padding-left: 1.6rem; +} +.am-padding-left-0 { + padding-left: 0!important; +} +.am-padding-left-xs { + padding-left: 0.5rem; +} +.am-padding-left-sm { + padding-left: 1rem; +} +.am-padding-left-lg { + padding-left: 2.4rem; +} +.am-padding-left-xl { + padding-left: 3.2rem; +} +.am-padding-right { + padding-right: 1.6rem; +} +.am-padding-right-0 { + padding-right: 0!important; +} +.am-padding-right-xs { + padding-right: 0.5rem; +} +.am-padding-right-sm { + padding-right: 1rem; +} +.am-padding-right-lg { + padding-right: 2.4rem; +} +.am-padding-right-xl { + padding-right: 3.2rem; +} +/* small displays */ +@media only screen { + .am-show-sm-only, + .am-show-sm-up, + .am-show-sm, + .am-show-sm-down, + .am-hide-md-only, + .am-hide-md-up, + .am-hide-md, + .am-show-md-down, + .am-hide-lg-only, + .am-hide-lg-up, + .am-hide-lg, + .am-show-lg-down { + display: inherit !important; + } + .am-hide-sm-only, + .am-hide-sm-up, + .am-hide-sm, + .am-hide-sm-down, + .am-show-md-only, + .am-show-md-up, + .am-show-md, + .am-hide-md-down, + .am-show-lg-only, + .am-show-lg-up, + .am-show-lg, + .am-hide-lg-down { + display: none !important; + } + /* table */ + table.am-show-sm-only, + table.am-show-sm-up, + table.am-show-sm, + table.am-show-sm-down, + table.am-hide-md-only, + table.am-hide-md-up, + table.am-hide-md, + table.am-show-md-down, + table.am-hide-lg-only, + table.am-hide-lg-up, + table.am-hide-lg, + table.am-show-lg-down { + display: table !important; + } + thead.am-show-sm-only, + thead.am-show-sm-up, + thead.am-show-sm, + thead.am-show-sm-down, + thead.am-hide-md-only, + thead.am-hide-md-up, + thead.am-hide-md, + thead.am-show-md-down, + thead.am-hide-lg-only, + thead.am-hide-lg-up, + thead.am-hide-lg, + thead.am-show-lg-down { + display: table-header-group !important; + } + tbody.am-show-sm-only, + tbody.am-show-sm-up, + tbody.am-show-sm, + tbody.am-show-sm-down, + tbody.am-hide-md-only, + tbody.am-hide-md-up, + tbody.am-hide-md, + tbody.am-show-md-down, + tbody.am-hide-lg-only, + tbody.am-hide-lg-up, + tbody.am-hide-lg, + tbody.am-show-lg-down { + display: table-row-group !important; + } + tr.am-show-sm-only, + tr.am-show-sm-up, + tr.am-show-sm, + tr.am-show-sm-down, + tr.am-hide-md-only, + tr.am-hide-md-up, + tr.am-hide-md, + tr.am-show-md-down, + tr.am-hide-lg-only, + tr.am-hide-lg-up, + tr.am-hide-lg, + tr.am-show-lg-down { + display: table-row !important; + } + th.am-show-sm-only, + td.am-show-sm-only, + th.am-show-sm-up, + td.am-show-sm-up, + th.am-show-sm, + td.am-show-sm, + th.am-show-sm-down, + td.am-show-sm-down, + th.am-hide-md-only, + td.am-hide-md-only, + th.am-hide-md-up, + td.am-hide-md-up, + th.am-hide-md, + td.am-hide-md, + th.am-show-md-down, + td.am-show-md-down, + th.am-hide-lg-only, + td.am-hide-lg-only, + th.am-hide-lg-up, + td.am-hide-lg-up, + th.am-hide-lg, + td.am-hide-lg, + th.am-show-lg-down, + td.am-show-lg-down { + display: table-cell !important; + } +} +/* medium displays */ +@media only screen and (min-width:641px) { + .am-hide-sm-only, + .am-show-sm-up, + .am-hide-sm, + .am-hide-sm-down, + .am-show-md-only, + .am-show-md-up, + .am-show-md, + .am-show-md-down, + .am-hide-lg-only, + .am-hide-lg-up, + .am-hide-lg, + .am-show-lg-down { + display: inherit !important; + } + .am-show-sm-only, + .am-hide-sm-up, + .am-show-sm, + .am-show-sm-down, + .am-hide-md-only, + .am-hide-md-up, + .am-hide-md, + .am-hide-md-down, + .am-show-lg-only, + .am-show-lg-up, + .am-show-lg, + .am-hide-lg-down { + display: none !important; + } + table.am-hide-sm-only, + table.am-show-sm-up, + table.am-hide-sm, + table.am-hide-sm-down, + table.am-show-md-only, + table.am-show-md-up, + table.am-show-md, + table.am-show-md-down, + table.am-hide-lg-only, + table.am-hide-lg-up, + table.am-hide-lg, + table.am-show-lg-down { + display: table !important; + } + thead.am-hide-sm-only, + thead.am-show-sm-up, + thead.am-hide-sm, + thead.am-hide-sm-down, + thead.am-show-md-only, + thead.am-show-md-up, + thead.am-show-md, + thead.am-show-md-down, + thead.am-hide-lg-only, + thead.am-hide-lg-up, + thead.am-hide-lg, + thead.am-show-lg-down { + display: table-header-group !important; + } + tbody.am-hide-sm-only, + tbody.am-show-sm-up, + tbody.am-hide-sm, + tbody.am-hide-sm-down, + tbody.am-show-md-only, + tbody.am-show-md-up, + tbody.am-show-md, + tbody.am-show-md-down, + tbody.am-hide-lg-only, + tbody.am-hide-lg-up, + tbody.am-hide-lg, + tbody.am-show-lg-down { + display: table-row-group !important; + } + tr.am-hide-sm-only, + tr.am-show-sm-up, + tr.am-hide-sm, + tr.am-hide-sm-down, + tr.am-show-md-only, + tr.am-show-md-up, + tr.am-show-md, + tr.am-show-md-down, + tr.am-hide-lg-only, + tr.am-hide-lg-up, + tr.am-hide-lg, + tr.am-show-lg-down { + display: table-row !important; + } + th.am-hide-sm-only, + td.am-hide-sm-only, + th.am-show-sm-up, + td.am-show-sm-up, + th.am-hide-sm, + td.am-hide-sm, + th.am-hide-sm-down, + td.am-hide-sm-down, + th.am-show-md-only, + td.am-show-md-only, + th.am-show-md-up, + td.am-show-md-up, + th.am-show-md, + td.am-show-md, + th.am-show-md-down, + td.am-show-md-down, + th.am-hide-lg-only, + td.am-hide-lg-only, + th.am-hide-lg-up, + td.am-hide-lg-up, + th.am-hide-lg, + td.am-hide-lg, + th.am-show-lg-down, + td.am-show-lg-down { + display: table-cell !important; + } +} +/* large displays */ +@media only screen and (min-width:1025px) { + .am-hide-sm-only, + .am-show-sm-up, + .am-hide-sm, + .am-hide-sm-down, + .am-hide-md-only, + .am-show-md-up, + .am-hide-md, + .am-hide-md-down, + .am-show-lg-only, + .am-show-lg-up, + .am-show-lg, + .am-show-lg-down { + display: inherit !important; + } + .am-show-sm-only, + .am-hide-sm-up, + .am-show-sm, + .am-show-sm-down, + .am-show-md-only, + .am-hide-md-up, + .am-show-md, + .am-show-md-down, + .am-hide-lg-only, + .am-hide-lg-up, + .am-hide-lg, + .am-hide-lg-down { + display: none !important; + } + table.am-hide-sm-only, + table.am-show-sm-up, + table.am-hide-sm, + table.am-hide-sm-down, + table.am-hide-md-only, + table.am-show-md-up, + table.am-hide-md, + table.am-hide-md-down, + table.am-show-lg-only, + table.am-show-lg-up, + table.am-show-lg, + table.am-show-lg-down { + display: table !important; + } + thead.am-hide-sm-only, + thead.am-show-sm-up, + thead.am-hide-sm, + thead.am-hide-sm-down, + thead.am-hide-md-only, + thead.am-show-md-up, + thead.am-hide-md, + thead.am-hide-md-down, + thead.am-show-lg-only, + thead.am-show-lg-up, + thead.am-show-lg, + thead.am-show-lg-down { + display: table-header-group !important; + } + tbody.am-hide-sm-only, + tbody.am-show-sm-up, + tbody.am-hide-sm, + tbody.am-hide-sm-down, + tbody.am-hide-md-only, + tbody.am-show-md-up, + tbody.am-hide-md, + tbody.am-hide-md-down, + tbody.am-show-lg-only, + tbody.am-show-lg-up, + tbody.am-show-lg, + tbody.am-show-lg-down { + display: table-row-group !important; + } + tr.am-hide-sm-only, + tr.am-show-sm-up, + tr.am-hide-sm, + tr.am-hide-sm-down, + tr.am-hide-md-only, + tr.am-show-md-up, + tr.am-hide-md, + tr.am-hide-md-down, + tr.am-show-lg-only, + tr.am-show-lg-up, + tr.am-show-lg, + tr.am-show-lg-down { + display: table-row !important; + } + th.am-hide-sm-only, + td.am-hide-sm-only, + th.am-show-sm-up, + td.am-show-sm-up, + th.am-hide-sm, + td.am-hide-sm, + th.am-hide-sm-down, + td.am-hide-sm-down, + th.am-hide-md-only, + td.am-hide-md-only, + th.am-show-md-up, + td.am-show-md-up, + th.am-hide-md, + td.am-hide-md, + th.am-hide-md-down, + td.am-hide-md-down, + th.am-show-lg-only, + td.am-show-lg-only, + th.am-show-lg-up, + td.am-show-lg-up, + th.am-show-lg, + td.am-show-lg, + th.am-show-lg-down, + td.am-show-lg-down { + display: table-cell !important; + } +} +@media only screen and (orientation: landscape) { + .am-show-landscape, + .am-hide-portrait { + display: inherit !important; + } + .am-hide-landscape, + .am-show-portrait { + display: none !important; + } +} +@media only screen and (orientation: portrait) { + .am-show-portrait, + .am-hide-landscape { + display: inherit !important; + } + .am-hide-portrait, + .am-show-landscape { + display: none !important; + } +} +.am-sans-serif { + font-family: "Segoe UI", "Lucida Grande", Helvetica, Arial, "Microsoft YaHei", FreeSans, Arimo, "Droid Sans", "wenquanyi micro hei", "Hiragino Sans GB", "Hiragino Sans GB W3", "FontAwesome", sans-serif; +} +.am-serif { + font-family: Georgia, "Times New Roman", Times, SimSun, "FontAwesome", serif; +} +.am-kai { + font-family: Georgia, "Times New Roman", Times, Kai, "Kaiti SC", KaiTi, BiauKai, "FontAwesome", serif; +} +.am-monospace { + font-family: Monaco, Menlo, Consolas, "Courier New", "FontAwesome", monospace; +} +.am-text-white { + color: #fff; +} +.am-text-grey { + color: #b9b9b9; +} +.am-text-primary { + color: #0e90d2; +} +.am-text-secondary { + color: #3bb4f2; +} +.am-text-success { + color: #5eb95e; +} +.am-text-warning { + color: #F37B1D; +} +.am-text-danger { + color: #dd514c; +} +.am-link-muted { + color: #666; +} +.am-link-muted a { + color: #666; +} +.am-link-muted:hover, +.am-link-muted a:hover { + color: #555; +} +.am-text-default { + font-size: 1.6rem; +} +/* +.@{ns}text-xxs { + font-size: @font-size-xxs; +} +*/ +.am-text-xs { + font-size: 1.2rem; +} +.am-text-sm { + font-size: 1.4rem; +} +.am-text-lg { + font-size: 1.8rem; +} +.am-text-xl { + font-size: 2.4rem; +} +.am-text-xxl { + font-size: 3.2rem; +} +.am-text-xxxl { + font-size: 4.2rem; +} +.am-ellipsis, +.am-text-truncate { + word-wrap: normal; + /* for IE */ + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} +.am-text-break { + word-wrap: break-word; + -webkit-hyphens: auto; + -ms-hyphens: auto; + -moz-hyphens: auto; + hyphens: auto; +} +.am-text-nowrap { + white-space: nowrap; +} +[class*='am-align-'] { + margin-bottom: 1rem; +} +.am-align-left { + margin-right: 1rem; + float: left; +} +.am-align-right { + margin-left: 1rem; + float: right; +} +/** Only display content to screen readers + * See: http://a11yproject.com/posts/how-to-hide-content/ + */ +.am-sr-only { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; +} +/* Text Image Replacement */ +.am-text-ir { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} +/* Text align */ +@media only screen { + .am-text-left { + text-align: left !important; + } + .am-text-right { + text-align: right !important; + } + .am-text-center { + text-align: center !important; + } + .am-text-justify { + text-align: justify !important; + } +} +@media only screen and (max-width: 640px) { + .am-sm-only-text-left { + text-align: left !important; + } + .am-sm-only-text-right { + text-align: right !important; + } + .am-sm-only-text-center { + text-align: center !important; + } + .am-sm-only-text-justify { + text-align: justify !important; + } +} +@media only screen and (min-width:641px) and (max-width:1024px) { + .am-md-only-text-left { + text-align: left !important; + } + .am-md-only-text-right { + text-align: right !important; + } + .am-md-only-text-center { + text-align: center !important; + } + .am-md-only-text-justify { + text-align: justify !important; + } +} +@media only screen and (min-width:641px) { + .am-md-text-left { + text-align: left !important; + } + .am-md-text-right { + text-align: right !important; + } + .am-md-text-center { + text-align: center !important; + } + .am-md-text-justify { + text-align: justify !important; + } +} +@media only screen and (min-width:1025px) { + .am-lg-text-left { + text-align: left !important; + } + .am-lg-text-right { + text-align: right !important; + } + .am-lg-text-center { + text-align: center !important; + } + .am-lg-text-justify { + text-align: justify !important; + } +} +.am-text-top { + vertical-align: top !important; +} +.am-text-middle { + vertical-align: middle !important; +} +.am-text-bottom { + vertical-align: bottom !important; +} +.am-angle { + position: absolute; +} +.am-angle:before, +.am-angle:after { + position: absolute; + display: block; + content: ""; + width: 0; + height: 0; + border: 8px dashed transparent; + z-index: 1; +} +.am-angle-up { + top: 0; +} +.am-angle-up:before, +.am-angle-up:after { + border-bottom-style: solid; + border-width: 0 8px 8px; +} +.am-angle-up:before { + border-bottom-color: rgba(0,0,0,.06); + bottom: 0; +} +.am-angle-up:after { + border-bottom-color: #fff; + bottom: -1px; +} +.am-angle-down { + bottom: -9px; +} +.am-angle-down:before, +.am-angle-down:after { + border-top-style: solid; + border-width: 8px 8px 0; +} +.am-angle-down:before { + border-top-color: rgba(0,0,0,.06); + bottom: 0; +} +.am-angle-down:after { + border-top-color: #fff; + bottom: 1px; +} +.am-angle-left { + left: -9px; +} +.am-angle-left:before, +.am-angle-left:after { + border-right-style: solid; + border-width: 8px 8px 8px 0; +} +.am-angle-left:before { + border-right-color: rgba(0,0,0,.06); + left: 0; +} +.am-angle-left:after { + border-right-color: #fff; + left: 1px; +} +.am-angle-right { + right: 0; +} +.am-angle-right:before, +.am-angle-right:after { + border-left-style: solid; + border-width: 8px 0 8px 8px; +} +.am-angle-right:before { + border-left-color: rgba(0,0,0,.06); + left: 0; +} +.am-angle-right:after { + border-left-color: #fff; + left: -1px; +} +.am-decoration-none { + text-decoration: none !important; +} \ No newline at end of file diff --git a/public/static/index/default/css/order.css b/public/static/index/default/css/order.css index ea5c9c111..301bc028d 100755 --- a/public/static/index/default/css/order.css +++ b/public/static/index/default/css/order.css @@ -139,7 +139,7 @@ ul.progress li.current .title { float: left; } .order-base { - border: 1px solid #ddd; + border: 1px solid #f0f0f0; } .order-base .am-panel-default { border-color: #fff; @@ -149,7 +149,7 @@ ul.progress li.current .title { margin: 0; } .order-base .base-left { - border-right: 1px solid #ddd; + border-right: 1px solid #f0f0f0; } .order-base .base-right { padding-top: 0; @@ -157,7 +157,7 @@ ul.progress li.current .title { } @media only screen and (max-width: 641px) { .order-base .base-right { - border: 1px solid #ddd; + border: 1px solid #f0f0f0; } }