diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php index d5afe79ce..f2e98f246 100755 --- a/application/api/controller/Index.php +++ b/application/api/controller/Index.php @@ -15,6 +15,7 @@ use app\service\GoodsService; use app\service\BannerService; use app\service\AppHomeNavService; use app\service\BuyService; +use app\service\LayoutService; /** * 首页 @@ -47,11 +48,19 @@ class Index extends Common */ public function Index() { + // 数据模式 + if(MyC('home_index_floor_data_type', 0, true) == 2) + { + $data_list = LayoutService::LayoutConfigData('home'); + } else { + $data_list = GoodsService::HomeFloorList(); + } + // 返回数据 $result = [ 'navigation' => AppHomeNavService::AppHomeNav(), 'banner_list' => BannerService::Banner(), - 'data_list' => GoodsService::HomeFloorList(), + 'data_list' => $data_list, 'common_cart_total' => BuyService::UserCartTotal(['user'=>$this->user]), ]; return SystemBaseService::DataReturn($result); diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php index a0c343ca9..0e8112db7 100755 --- a/application/index/controller/Index.php +++ b/application/index/controller/Index.php @@ -71,7 +71,7 @@ class Index extends Common // 设计配置数据 $layout_data = LayoutService::LayoutConfigAdminData('home'); - $this->assign('layout_data', $layout_data['data']); + $this->assign('layout_data', $layout_data); // 页面列表 $pages_list = BaseLayout::PagesList(); @@ -112,7 +112,7 @@ class Index extends Common { // 设计配置数据 $layout_data = LayoutService::LayoutConfigData('home'); - $this->assign('layout_data', $layout_data['data']); + $this->assign('layout_data', $layout_data); // 加载布局样式 $this->assign('is_load_layout', 1); diff --git a/application/service/SystemBaseService.php b/application/service/SystemBaseService.php index 0eeb4282f..9f7cf2b49 100644 --- a/application/service/SystemBaseService.php +++ b/application/service/SystemBaseService.php @@ -114,6 +114,7 @@ class SystemBaseService 'home_footer_info' => MyC('home_footer_info', null, true), // 首页设置参数 + 'home_index_floor_data_type' => (int) MyC('home_index_floor_data_type', 0, true), 'home_index_banner_left_status' => (int) MyC('home_index_banner_left_status', 1), 'home_index_banner_right_status' => (int) MyC('home_index_banner_right_status', 1), diff --git a/application/service/UserService.php b/application/service/UserService.php index ef887b64f..605d9bbbd 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -48,8 +48,8 @@ class UserService // web用户session $user = session(self::$user_login_key); - // token仅小程序浏览器环境和api接口环境中有效 - if(empty($user) && !empty($params['token']) && in_array(MiniAppEnv(), config('shopxo.mini_app_type_list'))) + // 用户信息为空，指定了token则设置登录信息 + if(empty($user) && !empty($params['token'])) { $user = self::UserTokenData($params['token']); if($user !== null && isset($user['id'])) @@ -420,14 +420,13 @@ class UserService * @version 0.0.1 * @datetime 2017-03-09T11:37:43+0800 * @param [int] $user_id [用户id] - * @param [boolean] $is_app [是否为app] * @return [boolean] [记录成功true, 失败false] */ - public static function UserLoginRecord($user_id = 0, $is_app = false) + public static function UserLoginRecord($user_id = 0) { if(!empty($user_id)) { - $user = Db::name('User')->field('*')->find($user_id); + $user = Db::name('User')->find($user_id); if(!empty($user)) { // 用户数据处理 @@ -442,8 +441,8 @@ class UserService 'user_id' => $user_id ]); - // 非app则存储session - if($is_app == false) + // web端设置session + if(APPLICATION == 'web') { // 存储session session(self::$user_login_key, $user); @@ -516,6 +515,9 @@ class UserService $user['avatar'] = config('shopxo.attachment_host').'/static/index/'.strtolower(config('DEFAULT_THEME', 'default')).'/images/default-user-avatar.jpg'; } + // 移除特殊数据 + unset($user['pwd'], $user['salt']); + return $user; } @@ -603,10 +605,8 @@ class UserService ]; if(Db::name('User')->where(['id'=>$params['user']['id']])->update($data)) { - if(APPLICATION == 'web') - { - self::UserLoginRecord($params['user']['id']); - } + // 设置session + self::UserLoginRecord($params['user']['id']); return DataReturn('上传成功', 0); } return DataReturn('上传失败', -100); @@ -1878,19 +1878,18 @@ class UserService public static function AppUserInfoHandle($user_id = null, $where_field = null, $where_value = null, $user = []) { // 获取用户信息 - $field = 'id,username,nickname,mobile,email,avatar,status,alipay_openid,weixin_openid,weixin_unionid,weixin_web_openid,baidu_openid,toutiao_openid,qq_openid,qq_unionid,integral,locking_integral,referrer,add_time'; if(!empty($user_id)) { - $user = self::UserInfo('id', $user_id, $field); + $user = self::UserInfo('id', $user_id); } elseif(!empty($where_field) && !empty($where_value) && empty($user)) { - $user = self::UserInfo($where_field, $where_value, $field); + $user = self::UserInfo($where_field, $where_value); } if(!empty($user)) { // 用户信息处理 - $user = self::GetUserViewInfo(0, $user); + $user = self::UserHandle($user); // 是否强制绑定手机号码 $user['is_mandatory_bind_mobile'] = intval(MyC('common_user_is_mandatory_bind_mobile')); @@ -1901,16 +1900,7 @@ class UserService // 非token数据库校验，则重新生成token更新到数据库 if($where_field != 'token') { - // token生成并存储缓存 - $user['token'] = self::CreatedUserToken($user['id']); - Db::name('User')->where(['id'=>$user['id']])->update(['token'=>$user['token'], 'upd_time'=>time()]); - cache(config('shopxo.cache_user_info').$user['token'], $user); - } - - // 用户登录纪录处理 - if(in_array(APPLICATION_CLIENT_TYPE, ['pc', 'h5'])) - { - self::UserLoginRecord($user['id'], true); + $user = self::UserTokenUpdate($user['id'], $user); } } @@ -1929,6 +1919,40 @@ class UserService return $user; } + /** + * 用户 token更新 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-07-01 + * @desc description + * @param [int] $user_id [用户id] + * @param [array] $user [指定用户信息] + */ + public static function UserTokenUpdate($user_id, $user = []) + { + // 未指定用户则读取用户信息、并处理数据 + if(empty($user)) + { + $user = self::UserHandle(self::UserInfo('id', $user_id)); + } + if(!empty($user)) + { + // token生成并存储缓存 + $user['token'] = self::CreatedUserToken($user_id); + if(Db::name('User')->where(['id'=>$user_id])->update(['token'=>$user['token'], 'upd_time'=>time()])) + { + cache(config('shopxo.cache_user_info').$user['token'], $user); + } + + // web端用户登录纪录处理 + self::UserLoginRecord($user_id); + } + + // 返回用户信息 + return $user; + } + /** * 用户token生成 * @author Devil diff --git a/sourcecode/weixin/default/app.js b/sourcecode/weixin/default/app.js index 3829ebd38..c7ba7fc73 100755 --- a/sourcecode/weixin/default/app.js +++ b/sourcecode/weixin/default/app.js @@ -73,7 +73,7 @@ App({ // 请求地址 request_url: "{{request_url}}", - // request_url: 'http://shopxo.com/', + request_url: 'http://shopxo.com/', // request_url: 'https://dev.shopxo.net/', // 基础信息 diff --git a/sourcecode/weixin/default/components/layout/layout.js b/sourcecode/weixin/default/components/layout/layout.js new file mode 100755 index 000000000..739c2e2bb --- /dev/null +++ b/sourcecode/weixin/default/components/layout/layout.js @@ -0,0 +1,66 @@ +const app = getApp(); +Component({ + data: { + // 基础配置 + is_first: 1, + currency_symbol: app.data.currency_symbol, + + // 轮播基础配置 + indicator_color: 'rgba(0, 0, 0, .3)', + indicator_active_color: '#e31c55', + circular: true, + }, + properties: { + propData: Array + }, + lifetimes: { + // 在组件实例进入页面节点树时执行 + attached: function() { + this.init_config(); + }, + }, + pageLifetimes: { + // 页面被展示 + show: function() { + this.init_config(); + + // 非首次进入则重新初始化配置接口 + if(this.data.is_first == 0) { + app.init_config(); + } + this.setData({is_first: 0}); + }, + }, + methods: { + // 初始化配置 + init_config(status) { + if((status || false) == true) { + this.setData({ + currency_symbol: app.get_config('currency_symbol') || app.data.currency_symbol + }); + } else { + app.is_config(this, 'init_config'); + } + }, + + // 链接地址事件 + layout_url_event(e) { + var value = e.currentTarget.dataset.value || null; + if(value != null) + { + var temp = value.substr(0, 6); + if(temp == 'http:/' || temp == 'https:') + { + app.open_web_view(value); + } else { + if (app.is_tabbar_pages(value)) + { + wx.switchTab({ url: value }); + } else { + wx.navigateTo({ url: value }); + } + } + } + }, + }, +}); \ No newline at end of file diff --git a/sourcecode/weixin/default/components/layout/layout.json b/sourcecode/weixin/default/components/layout/layout.json new file mode 100755 index 000000000..32640e0dc --- /dev/null +++ b/sourcecode/weixin/default/components/layout/layout.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/sourcecode/weixin/default/components/layout/layout.wxml b/sourcecode/weixin/default/components/layout/layout.wxml new file mode 100755 index 000000000..48af681c9 --- /dev/null +++ b/sourcecode/weixin/default/components/layout/layout.wxml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{item.title}} + {{currency_symbol}}{{item.price}} + + + + + + + + + + + + + + + {{item.title}} + {{currency_symbol}}{{item.price}} + + + + + + + + + + + + {{vss.config.title}} + {{vss.config.title_vice}} + + {{vss.config.title_more}} > + + + + + + + + + + + + + diff --git a/sourcecode/weixin/default/components/layout/layout.wxss b/sourcecode/weixin/default/components/layout/layout.wxss new file mode 100755 index 000000000..d547fb310 --- /dev/null +++ b/sourcecode/weixin/default/components/layout/layout.wxss @@ -0,0 +1,707 @@ +/** + * 布局基础 + */ +.layout-content-children,.layout-content-container{overflow:hidden;} + +/** + * 模块类型样式 - 数据列表 + */ +.module-list-content .item{float:left} +.module-list-content-avg-1{width:calc(100% + 1px);margin-left:-1px;margin-top:-1px;} +.module-list-content-avg-2{width:calc(100% + 2px);margin-left:-2px;margin-top:-2px;} +.module-list-content-avg-3{width:calc(100% + 3px);margin-left:-3px;margin-top:-3px;} +.module-list-content-avg-4{width:calc(100% + 4px);margin-left:-4px;margin-top:-4px;} +.module-list-content-avg-5{width:calc(100% + 5px);margin-left:-5px;margin-top:-5px;} +.module-list-content-avg-6{width:calc(100% + 6px);margin-left:-6px;margin-top:-6px;} +.module-list-content-avg-7{width:calc(100% + 7px);margin-left:-7px;margin-top:-7px;} +.module-list-content-avg-8{width:calc(100% + 8px);margin-left:-8px;margin-top:-8px;} +.module-list-content-avg-9{width:calc(100% + 9px);margin-left:-9px;margin-top:-9px;} +.module-list-content-avg-10{width:calc(100% + 10px);margin-left:-10px;margin-top:-10px;} +.module-list-content-avg-11{width:calc(100% + 11px);margin-left:-11px;margin-top:-11px;} +.module-list-content-avg-12{width:calc(100% + 12px);margin-left:-12px;margin-top:-12px;} +.module-list-content-avg-13{width:calc(100% + 13px);margin-left:-13px;margin-top:-13px;} +.module-list-content-avg-14{width:calc(100% + 14px);margin-left:-14px;margin-top:-14px;} +.module-list-content-avg-15{width:calc(100% + 15px);margin-left:-15px;margin-top:-15px;} +.module-list-content-avg-16{width:calc(100% + 16px);margin-left:-16px;margin-top:-16px;} +.module-list-content-avg-17{width:calc(100% + 17px);margin-left:-17px;margin-top:-17px;} +.module-list-content-avg-18{width:calc(100% + 18px);margin-left:-18px;margin-top:-18px;} +.module-list-content-avg-19{width:calc(100% + 19px);margin-left:-19px;margin-top:-19px;} +.module-list-content-avg-20{width:calc(100% + 20px);margin-left:-20px;margin-top:-20px;} +.module-list-content-avg-21{width:calc(100% + 21px);margin-left:-21px;margin-top:-21px;} +.module-list-content-avg-22{width:calc(100% + 22px);margin-left:-22px;margin-top:-22px;} +.module-list-content-avg-23{width:calc(100% + 23px);margin-left:-23px;margin-top:-23px;} +.module-list-content-avg-24{width:calc(100% + 24px);margin-left:-24px;margin-top:-24px;} +.module-list-content-avg-25{width:calc(100% + 25px);margin-left:-25px;margin-top:-25px;} +.module-list-content-avg-26{width:calc(100% + 26px);margin-left:-26px;margin-top:-26px;} +.module-list-content-avg-27{width:calc(100% + 27px);margin-left:-27px;margin-top:-27px;} +.module-list-content-avg-28{width:calc(100% + 28px);margin-left:-28px;margin-top:-28px;} +.module-list-content-avg-29{width:calc(100% + 29px);margin-left:-29px;margin-top:-29px;} +.module-list-content-avg-30{width:calc(100% + 30px);margin-left:-30px;margin-top:-30px;} +.module-list-sm-1 .item{width:100%;} +.module-list-sm-2 .item{width:50%;} +.module-list-sm-3 .item{width:33.33%;} +.module-list-sm-4 .item{width:25%;} +.module-list-sm-5 .item{width:20%;} +.module-list-sm-6 .item{width:16.66%;} +.module-list-sm-7 .item{width:14.28%;} +.module-list-sm-8 .item{width:12.5%;} +.module-list-sm-9 .item{width:11.11%;} +.module-list-sm-10 .item{width:10%;} +.module-list-sm-11 .item{width:9.09%;} +.module-list-sm-12 .item{width:8.33%;} + +/** + * 商品列表 + */ +.module-goods-content .module-item{background:#fff} +.module-goods-content .module-item .item-bottom{margin-top:5px} +.module-goods-content .module-item .module-title{margin-bottom:5px;max-width:100%;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;min-height:38px;line-height:20px;font-size:12px;white-space:initial} +.module-goods-content .module-item .module-price{color:#f40;font-weight:bold;word-wrap:normal;text-overflow:ellipsis;white-space:nowrap;font-size:14px;} + + +/** + * 布局圆角 + */ +.layout-sm-border-radius-1{border-radius:1px;} +.layout-sm-border-radius-2{border-radius:2px;} +.layout-sm-border-radius-3{border-radius:3px;} +.layout-sm-border-radius-4{border-radius:4px;} +.layout-sm-border-radius-5{border-radius:5px;} +.layout-sm-border-radius-6{border-radius:6px;} +.layout-sm-border-radius-7{border-radius:7px;} +.layout-sm-border-radius-8{border-radius:8px;} +.layout-sm-border-radius-9{border-radius:9px;} +.layout-sm-border-radius-10{border-radius:10px;} +.layout-sm-border-radius-11{border-radius:11px;} +.layout-sm-border-radius-12{border-radius:12px;} +.layout-sm-border-radius-13{border-radius:13px;} +.layout-sm-border-radius-14{border-radius:14px;} +.layout-sm-border-radius-15{border-radius:15px;} +.layout-sm-border-radius-16{border-radius:16px;} +.layout-sm-border-radius-17{border-radius:17px;} +.layout-sm-border-radius-18{border-radius:18px;} +.layout-sm-border-radius-19{border-radius:19px;} +.layout-sm-border-radius-20{border-radius:20px;} +.layout-sm-border-radius-21{border-radius:21px;} +.layout-sm-border-radius-22{border-radius:22px;} +.layout-sm-border-radius-23{border-radius:23px;} +.layout-sm-border-radius-24{border-radius:24px;} +.layout-sm-border-radius-25{border-radius:25px;} +.layout-sm-border-radius-26{border-radius:26px;} +.layout-sm-border-radius-27{border-radius:27px;} +.layout-sm-border-radius-28{border-radius:28px;} +.layout-sm-border-radius-29{border-radius:29px;} +.layout-sm-border-radius-30{border-radius:30px;} + +/** + * 布局样式 - 边线大小 + */ +.layout-sm-border-top-1{border-top:1px;} +.layout-sm-border-top-2{border-top:2px;} +.layout-sm-border-top-3{border-top:3px;} +.layout-sm-border-top-4{border-top:4px;} +.layout-sm-border-top-5{border-top:5px;} +.layout-sm-border-top-6{border-top:6px;} +.layout-sm-border-top-7{border-top:7px;} +.layout-sm-border-top-8{border-top:8px;} +.layout-sm-border-top-9{border-top:9px;} +.layout-sm-border-top-10{border-top:10px;} + +.layout-sm-border-right-1{border-right:1px;} +.layout-sm-border-right-2{border-right:2px;} +.layout-sm-border-right-3{border-right:3px;} +.layout-sm-border-right-4{border-right:4px;} +.layout-sm-border-right-5{border-right:5px;} +.layout-sm-border-right-6{border-right:6px;} +.layout-sm-border-right-7{border-right:7px;} +.layout-sm-border-right-8{border-right:8px;} +.layout-sm-border-right-9{border-right:9px;} +.layout-sm-border-right-10{border-right:10px;} + +.layout-sm-border-bottom-1{border-bottom:1px;} +.layout-sm-border-bottom-2{border-bottom:2px;} +.layout-sm-border-bottom-3{border-bottom:3px;} +.layout-sm-border-bottom-4{border-bottom:4px;} +.layout-sm-border-bottom-5{border-bottom:5px;} +.layout-sm-border-bottom-6{border-bottom:6px;} +.layout-sm-border-bottom-7{border-bottom:7px;} +.layout-sm-border-bottom-8{border-bottom:8px;} +.layout-sm-border-bottom-9{border-bottom:9px;} +.layout-sm-border-bottom-10{border-bottom:10px;} + +.layout-sm-border-left-1{border-left:1px;} +.layout-sm-border-left-2{border-left:2px;} +.layout-sm-border-left-3{border-left:3px;} +.layout-sm-border-left-4{border-left:4px;} +.layout-sm-border-left-5{border-left:5px;} +.layout-sm-border-left-6{border-left:6px;} +.layout-sm-border-left-7{border-left:7px;} +.layout-sm-border-left-8{border-left:8px;} +.layout-sm-border-left-9{border-left:9px;} +.layout-sm-border-left-10{border-left:10px;} + +/** + * 布局边线 - 边线类型 + */ +.layout-sm-border-top-solid{border-top-style:solid;} +.layout-sm-border-top-dashed{border-top-style:dashed;} +.layout-sm-border-top-dotted{border-top-style:dotted;} +.layout-sm-border-top-double{border-top-style:double;} + +.layout-sm-border-right-solid{border-right-style:solid;} +.layout-sm-border-right-dashed{border-right-style:dashed;} +.layout-sm-border-right-dotted{border-right-style:dotted;} +.layout-sm-border-right-double{border-right-style:double;} + +.layout-sm-border-bottom-solid{border-bottom-style:solid;} +.layout-sm-border-bottom-dashed{border-bottom-style:dashed;} +.layout-sm-border-bottom-dotted{border-bottom-style:dotted;} +.layout-sm-border-bottom-double{border-bottom-style:double;} + +.layout-sm-border-left-solid{border-left-style:solid;} +.layout-sm-border-left-dashed{border-left-style:dashed;} +.layout-sm-border-left-dotted{border-left-style:dotted;} +.layout-sm-border-left-double{border-left-style:double;} + +/** + * 布局外边距 + */ +.layout-sm-margin-top-1{margin-top:1px;} +.layout-sm-margin-top-2{margin-top:2px;} +.layout-sm-margin-top-3{margin-top:3px;} +.layout-sm-margin-top-4{margin-top:4px;} +.layout-sm-margin-top-5{margin-top:5px;} +.layout-sm-margin-top-6{margin-top:6px;} +.layout-sm-margin-top-7{margin-top:7px;} +.layout-sm-margin-top-8{margin-top:8px;} +.layout-sm-margin-top-9{margin-top:9px;} +.layout-sm-margin-top-10{margin-top:10px;} +.layout-sm-margin-top-11{margin-top:11px;} +.layout-sm-margin-top-12{margin-top:12px;} +.layout-sm-margin-top-13{margin-top:13px;} +.layout-sm-margin-top-14{margin-top:14px;} +.layout-sm-margin-top-15{margin-top:15px;} +.layout-sm-margin-top-16{margin-top:16px;} +.layout-sm-margin-top-17{margin-top:17px;} +.layout-sm-margin-top-18{margin-top:18px;} +.layout-sm-margin-top-19{margin-top:19px;} +.layout-sm-margin-top-20{margin-top:20px;} +.layout-sm-margin-top-21{margin-top:21px;} +.layout-sm-margin-top-22{margin-top:22px;} +.layout-sm-margin-top-23{margin-top:23px;} +.layout-sm-margin-top-24{margin-top:24px;} +.layout-sm-margin-top-25{margin-top:25px;} +.layout-sm-margin-top-26{margin-top:26px;} +.layout-sm-margin-top-27{margin-top:27px;} +.layout-sm-margin-top-28{margin-top:28px;} +.layout-sm-margin-top-29{margin-top:29px;} +.layout-sm-margin-top-30{margin-top:30px;} +.layout-sm-margin-top-31{margin-top:31px;} +.layout-sm-margin-top-32{margin-top:32px;} +.layout-sm-margin-top-33{margin-top:33px;} +.layout-sm-margin-top-34{margin-top:34px;} +.layout-sm-margin-top-35{margin-top:35px;} +.layout-sm-margin-top-36{margin-top:36px;} +.layout-sm-margin-top-37{margin-top:37px;} +.layout-sm-margin-top-38{margin-top:38px;} +.layout-sm-margin-top-39{margin-top:39px;} +.layout-sm-margin-top-40{margin-top:40px;} +.layout-sm-margin-top-41{margin-top:41px;} +.layout-sm-margin-top-42{margin-top:42px;} +.layout-sm-margin-top-43{margin-top:43px;} +.layout-sm-margin-top-44{margin-top:44px;} +.layout-sm-margin-top-45{margin-top:45px;} +.layout-sm-margin-top-46{margin-top:46px;} +.layout-sm-margin-top-47{margin-top:47px;} +.layout-sm-margin-top-48{margin-top:48px;} +.layout-sm-margin-top-49{margin-top:49px;} +.layout-sm-margin-top-50{margin-top:50px;} +.layout-sm-margin-top-51{margin-top:51px;} +.layout-sm-margin-top-52{margin-top:52px;} +.layout-sm-margin-top-53{margin-top:53px;} +.layout-sm-margin-top-54{margin-top:54px;} +.layout-sm-margin-top-55{margin-top:55px;} +.layout-sm-margin-top-56{margin-top:56px;} +.layout-sm-margin-top-57{margin-top:57px;} +.layout-sm-margin-top-58{margin-top:58px;} +.layout-sm-margin-top-59{margin-top:59px;} +.layout-sm-margin-top-60{margin-top:60px;} + +.layout-sm-margin-right-1{margin-right:1px;} +.layout-sm-margin-right-2{margin-right:2px;} +.layout-sm-margin-right-3{margin-right:3px;} +.layout-sm-margin-right-4{margin-right:4px;} +.layout-sm-margin-right-5{margin-right:5px;} +.layout-sm-margin-right-6{margin-right:6px;} +.layout-sm-margin-right-7{margin-right:7px;} +.layout-sm-margin-right-8{margin-right:8px;} +.layout-sm-margin-right-9{margin-right:9px;} +.layout-sm-margin-right-10{margin-right:10px;} +.layout-sm-margin-right-11{margin-right:11px;} +.layout-sm-margin-right-12{margin-right:12px;} +.layout-sm-margin-right-13{margin-right:13px;} +.layout-sm-margin-right-14{margin-right:14px;} +.layout-sm-margin-right-15{margin-right:15px;} +.layout-sm-margin-right-16{margin-right:16px;} +.layout-sm-margin-right-17{margin-right:17px;} +.layout-sm-margin-right-18{margin-right:18px;} +.layout-sm-margin-right-19{margin-right:19px;} +.layout-sm-margin-right-20{margin-right:20px;} +.layout-sm-margin-right-21{margin-right:21px;} +.layout-sm-margin-right-22{margin-right:22px;} +.layout-sm-margin-right-23{margin-right:23px;} +.layout-sm-margin-right-24{margin-right:24px;} +.layout-sm-margin-right-25{margin-right:25px;} +.layout-sm-margin-right-26{margin-right:26px;} +.layout-sm-margin-right-27{margin-right:27px;} +.layout-sm-margin-right-28{margin-right:28px;} +.layout-sm-margin-right-29{margin-right:29px;} +.layout-sm-margin-right-30{margin-right:30px;} +.layout-sm-margin-right-31{margin-right:31px;} +.layout-sm-margin-right-32{margin-right:32px;} +.layout-sm-margin-right-33{margin-right:33px;} +.layout-sm-margin-right-34{margin-right:34px;} +.layout-sm-margin-right-35{margin-right:35px;} +.layout-sm-margin-right-36{margin-right:36px;} +.layout-sm-margin-right-37{margin-right:37px;} +.layout-sm-margin-right-38{margin-right:38px;} +.layout-sm-margin-right-39{margin-right:39px;} +.layout-sm-margin-right-40{margin-right:40px;} +.layout-sm-margin-right-41{margin-right:41px;} +.layout-sm-margin-right-42{margin-right:42px;} +.layout-sm-margin-right-43{margin-right:43px;} +.layout-sm-margin-right-44{margin-right:44px;} +.layout-sm-margin-right-45{margin-right:45px;} +.layout-sm-margin-right-46{margin-right:46px;} +.layout-sm-margin-right-47{margin-right:47px;} +.layout-sm-margin-right-48{margin-right:48px;} +.layout-sm-margin-right-49{margin-right:49px;} +.layout-sm-margin-right-50{margin-right:50px;} +.layout-sm-margin-right-51{margin-right:51px;} +.layout-sm-margin-right-52{margin-right:52px;} +.layout-sm-margin-right-53{margin-right:53px;} +.layout-sm-margin-right-54{margin-right:54px;} +.layout-sm-margin-right-55{margin-right:55px;} +.layout-sm-margin-right-56{margin-right:56px;} +.layout-sm-margin-right-57{margin-right:57px;} +.layout-sm-margin-right-58{margin-right:58px;} +.layout-sm-margin-right-59{margin-right:59px;} +.layout-sm-margin-right-60{margin-right:60px;} + +.layout-sm-margin-bottom-1{margin-bottom:1px;} +.layout-sm-margin-bottom-2{margin-bottom:2px;} +.layout-sm-margin-bottom-3{margin-bottom:3px;} +.layout-sm-margin-bottom-4{margin-bottom:4px;} +.layout-sm-margin-bottom-5{margin-bottom:5px;} +.layout-sm-margin-bottom-6{margin-bottom:6px;} +.layout-sm-margin-bottom-7{margin-bottom:7px;} +.layout-sm-margin-bottom-8{margin-bottom:8px;} +.layout-sm-margin-bottom-9{margin-bottom:9px;} +.layout-sm-margin-bottom-10{margin-bottom:10px;} +.layout-sm-margin-bottom-11{margin-bottom:11px;} +.layout-sm-margin-bottom-12{margin-bottom:12px;} +.layout-sm-margin-bottom-13{margin-bottom:13px;} +.layout-sm-margin-bottom-14{margin-bottom:14px;} +.layout-sm-margin-bottom-15{margin-bottom:15px;} +.layout-sm-margin-bottom-16{margin-bottom:16px;} +.layout-sm-margin-bottom-17{margin-bottom:17px;} +.layout-sm-margin-bottom-18{margin-bottom:18px;} +.layout-sm-margin-bottom-19{margin-bottom:19px;} +.layout-sm-margin-bottom-20{margin-bottom:20px;} +.layout-sm-margin-bottom-21{margin-bottom:21px;} +.layout-sm-margin-bottom-22{margin-bottom:22px;} +.layout-sm-margin-bottom-23{margin-bottom:23px;} +.layout-sm-margin-bottom-24{margin-bottom:24px;} +.layout-sm-margin-bottom-25{margin-bottom:25px;} +.layout-sm-margin-bottom-26{margin-bottom:26px;} +.layout-sm-margin-bottom-27{margin-bottom:27px;} +.layout-sm-margin-bottom-28{margin-bottom:28px;} +.layout-sm-margin-bottom-29{margin-bottom:29px;} +.layout-sm-margin-bottom-30{margin-bottom:30px;} +.layout-sm-margin-bottom-31{margin-bottom:31px;} +.layout-sm-margin-bottom-32{margin-bottom:32px;} +.layout-sm-margin-bottom-33{margin-bottom:33px;} +.layout-sm-margin-bottom-34{margin-bottom:34px;} +.layout-sm-margin-bottom-35{margin-bottom:35px;} +.layout-sm-margin-bottom-36{margin-bottom:36px;} +.layout-sm-margin-bottom-37{margin-bottom:37px;} +.layout-sm-margin-bottom-38{margin-bottom:38px;} +.layout-sm-margin-bottom-39{margin-bottom:39px;} +.layout-sm-margin-bottom-40{margin-bottom:40px;} +.layout-sm-margin-bottom-41{margin-bottom:41px;} +.layout-sm-margin-bottom-42{margin-bottom:42px;} +.layout-sm-margin-bottom-43{margin-bottom:43px;} +.layout-sm-margin-bottom-44{margin-bottom:44px;} +.layout-sm-margin-bottom-45{margin-bottom:45px;} +.layout-sm-margin-bottom-46{margin-bottom:46px;} +.layout-sm-margin-bottom-47{margin-bottom:47px;} +.layout-sm-margin-bottom-48{margin-bottom:48px;} +.layout-sm-margin-bottom-49{margin-bottom:49px;} +.layout-sm-margin-bottom-50{margin-bottom:50px;} +.layout-sm-margin-bottom-51{margin-bottom:51px;} +.layout-sm-margin-bottom-52{margin-bottom:52px;} +.layout-sm-margin-bottom-53{margin-bottom:53px;} +.layout-sm-margin-bottom-54{margin-bottom:54px;} +.layout-sm-margin-bottom-55{margin-bottom:55px;} +.layout-sm-margin-bottom-56{margin-bottom:56px;} +.layout-sm-margin-bottom-57{margin-bottom:57px;} +.layout-sm-margin-bottom-58{margin-bottom:58px;} +.layout-sm-margin-bottom-59{margin-bottom:59px;} +.layout-sm-margin-bottom-60{margin-bottom:60px;} + +.layout-sm-margin-left-1{margin-left:1px;} +.layout-sm-margin-left-2{margin-left:2px;} +.layout-sm-margin-left-3{margin-left:3px;} +.layout-sm-margin-left-4{margin-left:4px;} +.layout-sm-margin-left-5{margin-left:5px;} +.layout-sm-margin-left-6{margin-left:6px;} +.layout-sm-margin-left-7{margin-left:7px;} +.layout-sm-margin-left-8{margin-left:8px;} +.layout-sm-margin-left-9{margin-left:9px;} +.layout-sm-margin-left-10{margin-left:10px;} +.layout-sm-margin-left-11{margin-left:11px;} +.layout-sm-margin-left-12{margin-left:12px;} +.layout-sm-margin-left-13{margin-left:13px;} +.layout-sm-margin-left-14{margin-left:14px;} +.layout-sm-margin-left-15{margin-left:15px;} +.layout-sm-margin-left-16{margin-left:16px;} +.layout-sm-margin-left-17{margin-left:17px;} +.layout-sm-margin-left-18{margin-left:18px;} +.layout-sm-margin-left-19{margin-left:19px;} +.layout-sm-margin-left-20{margin-left:20px;} +.layout-sm-margin-left-21{margin-left:21px;} +.layout-sm-margin-left-22{margin-left:22px;} +.layout-sm-margin-left-23{margin-left:23px;} +.layout-sm-margin-left-24{margin-left:24px;} +.layout-sm-margin-left-25{margin-left:25px;} +.layout-sm-margin-left-26{margin-left:26px;} +.layout-sm-margin-left-27{margin-left:27px;} +.layout-sm-margin-left-28{margin-left:28px;} +.layout-sm-margin-left-29{margin-left:29px;} +.layout-sm-margin-left-30{margin-left:30px;} +.layout-sm-margin-left-31{margin-left:31px;} +.layout-sm-margin-left-32{margin-left:32px;} +.layout-sm-margin-left-33{margin-left:33px;} +.layout-sm-margin-left-34{margin-left:34px;} +.layout-sm-margin-left-35{margin-left:35px;} +.layout-sm-margin-left-36{margin-left:36px;} +.layout-sm-margin-left-37{margin-left:37px;} +.layout-sm-margin-left-38{margin-left:38px;} +.layout-sm-margin-left-39{margin-left:39px;} +.layout-sm-margin-left-40{margin-left:40px;} +.layout-sm-margin-left-41{margin-left:41px;} +.layout-sm-margin-left-42{margin-left:42px;} +.layout-sm-margin-left-43{margin-left:43px;} +.layout-sm-margin-left-44{margin-left:44px;} +.layout-sm-margin-left-45{margin-left:45px;} +.layout-sm-margin-left-46{margin-left:46px;} +.layout-sm-margin-left-47{margin-left:47px;} +.layout-sm-margin-left-48{margin-left:48px;} +.layout-sm-margin-left-49{margin-left:49px;} +.layout-sm-margin-left-50{margin-left:50px;} +.layout-sm-margin-left-51{margin-left:51px;} +.layout-sm-margin-left-52{margin-left:52px;} +.layout-sm-margin-left-53{margin-left:53px;} +.layout-sm-margin-left-54{margin-left:54px;} +.layout-sm-margin-left-55{margin-left:55px;} +.layout-sm-margin-left-56{margin-left:56px;} +.layout-sm-margin-left-57{margin-left:57px;} +.layout-sm-margin-left-58{margin-left:58px;} +.layout-sm-margin-left-59{margin-left:59px;} +.layout-sm-margin-left-60{margin-left:60px;} + +/** + * 布局内边距 + */ +.layout-sm-padding-top-1{padding-top:1px;} +.layout-sm-padding-top-2{padding-top:2px;} +.layout-sm-padding-top-3{padding-top:3px;} +.layout-sm-padding-top-4{padding-top:4px;} +.layout-sm-padding-top-5{padding-top:5px;} +.layout-sm-padding-top-6{padding-top:6px;} +.layout-sm-padding-top-7{padding-top:7px;} +.layout-sm-padding-top-8{padding-top:8px;} +.layout-sm-padding-top-9{padding-top:9px;} +.layout-sm-padding-top-10{padding-top:10px;} +.layout-sm-padding-top-11{padding-top:11px;} +.layout-sm-padding-top-12{padding-top:12px;} +.layout-sm-padding-top-13{padding-top:13px;} +.layout-sm-padding-top-14{padding-top:14px;} +.layout-sm-padding-top-15{padding-top:15px;} +.layout-sm-padding-top-16{padding-top:16px;} +.layout-sm-padding-top-17{padding-top:17px;} +.layout-sm-padding-top-18{padding-top:18px;} +.layout-sm-padding-top-19{padding-top:19px;} +.layout-sm-padding-top-20{padding-top:20px;} +.layout-sm-padding-top-21{padding-top:21px;} +.layout-sm-padding-top-22{padding-top:22px;} +.layout-sm-padding-top-23{padding-top:23px;} +.layout-sm-padding-top-24{padding-top:24px;} +.layout-sm-padding-top-25{padding-top:25px;} +.layout-sm-padding-top-26{padding-top:26px;} +.layout-sm-padding-top-27{padding-top:27px;} +.layout-sm-padding-top-28{padding-top:28px;} +.layout-sm-padding-top-29{padding-top:29px;} +.layout-sm-padding-top-30{padding-top:30px;} +.layout-sm-padding-top-31{padding-top:31px;} +.layout-sm-padding-top-32{padding-top:32px;} +.layout-sm-padding-top-33{padding-top:33px;} +.layout-sm-padding-top-34{padding-top:34px;} +.layout-sm-padding-top-35{padding-top:35px;} +.layout-sm-padding-top-36{padding-top:36px;} +.layout-sm-padding-top-37{padding-top:37px;} +.layout-sm-padding-top-38{padding-top:38px;} +.layout-sm-padding-top-39{padding-top:39px;} +.layout-sm-padding-top-40{padding-top:40px;} +.layout-sm-padding-top-41{padding-top:41px;} +.layout-sm-padding-top-42{padding-top:42px;} +.layout-sm-padding-top-43{padding-top:43px;} +.layout-sm-padding-top-44{padding-top:44px;} +.layout-sm-padding-top-45{padding-top:45px;} +.layout-sm-padding-top-46{padding-top:46px;} +.layout-sm-padding-top-47{padding-top:47px;} +.layout-sm-padding-top-48{padding-top:48px;} +.layout-sm-padding-top-49{padding-top:49px;} +.layout-sm-padding-top-50{padding-top:50px;} +.layout-sm-padding-top-51{padding-top:51px;} +.layout-sm-padding-top-52{padding-top:52px;} +.layout-sm-padding-top-53{padding-top:53px;} +.layout-sm-padding-top-54{padding-top:54px;} +.layout-sm-padding-top-55{padding-top:55px;} +.layout-sm-padding-top-56{padding-top:56px;} +.layout-sm-padding-top-57{padding-top:57px;} +.layout-sm-padding-top-58{padding-top:58px;} +.layout-sm-padding-top-59{padding-top:59px;} +.layout-sm-padding-top-60{padding-top:60px;} + +.layout-sm-padding-right-1{padding-right:1px;} +.layout-sm-padding-right-2{padding-right:2px;} +.layout-sm-padding-right-3{padding-right:3px;} +.layout-sm-padding-right-4{padding-right:4px;} +.layout-sm-padding-right-5{padding-right:5px;} +.layout-sm-padding-right-6{padding-right:6px;} +.layout-sm-padding-right-7{padding-right:7px;} +.layout-sm-padding-right-8{padding-right:8px;} +.layout-sm-padding-right-9{padding-right:9px;} +.layout-sm-padding-right-10{padding-right:10px;} +.layout-sm-padding-right-11{padding-right:11px;} +.layout-sm-padding-right-12{padding-right:12px;} +.layout-sm-padding-right-13{padding-right:13px;} +.layout-sm-padding-right-14{padding-right:14px;} +.layout-sm-padding-right-15{padding-right:15px;} +.layout-sm-padding-right-16{padding-right:16px;} +.layout-sm-padding-right-17{padding-right:17px;} +.layout-sm-padding-right-18{padding-right:18px;} +.layout-sm-padding-right-19{padding-right:19px;} +.layout-sm-padding-right-20{padding-right:20px;} +.layout-sm-padding-right-21{padding-right:21px;} +.layout-sm-padding-right-22{padding-right:22px;} +.layout-sm-padding-right-23{padding-right:23px;} +.layout-sm-padding-right-24{padding-right:24px;} +.layout-sm-padding-right-25{padding-right:25px;} +.layout-sm-padding-right-26{padding-right:26px;} +.layout-sm-padding-right-27{padding-right:27px;} +.layout-sm-padding-right-28{padding-right:28px;} +.layout-sm-padding-right-29{padding-right:29px;} +.layout-sm-padding-right-30{padding-right:30px;} +.layout-sm-padding-right-31{padding-right:31px;} +.layout-sm-padding-right-32{padding-right:32px;} +.layout-sm-padding-right-33{padding-right:33px;} +.layout-sm-padding-right-34{padding-right:34px;} +.layout-sm-padding-right-35{padding-right:35px;} +.layout-sm-padding-right-36{padding-right:36px;} +.layout-sm-padding-right-37{padding-right:37px;} +.layout-sm-padding-right-38{padding-right:38px;} +.layout-sm-padding-right-39{padding-right:39px;} +.layout-sm-padding-right-40{padding-right:40px;} +.layout-sm-padding-right-41{padding-right:41px;} +.layout-sm-padding-right-42{padding-right:42px;} +.layout-sm-padding-right-43{padding-right:43px;} +.layout-sm-padding-right-44{padding-right:44px;} +.layout-sm-padding-right-45{padding-right:45px;} +.layout-sm-padding-right-46{padding-right:46px;} +.layout-sm-padding-right-47{padding-right:47px;} +.layout-sm-padding-right-48{padding-right:48px;} +.layout-sm-padding-right-49{padding-right:49px;} +.layout-sm-padding-right-50{padding-right:50px;} +.layout-sm-padding-right-51{padding-right:51px;} +.layout-sm-padding-right-52{padding-right:52px;} +.layout-sm-padding-right-53{padding-right:53px;} +.layout-sm-padding-right-54{padding-right:54px;} +.layout-sm-padding-right-55{padding-right:55px;} +.layout-sm-padding-right-56{padding-right:56px;} +.layout-sm-padding-right-57{padding-right:57px;} +.layout-sm-padding-right-58{padding-right:58px;} +.layout-sm-padding-right-59{padding-right:59px;} +.layout-sm-padding-right-60{padding-right:60px;} + +.layout-sm-padding-bottom-1{padding-bottom:1px;} +.layout-sm-padding-bottom-2{padding-bottom:2px;} +.layout-sm-padding-bottom-3{padding-bottom:3px;} +.layout-sm-padding-bottom-4{padding-bottom:4px;} +.layout-sm-padding-bottom-5{padding-bottom:5px;} +.layout-sm-padding-bottom-6{padding-bottom:6px;} +.layout-sm-padding-bottom-7{padding-bottom:7px;} +.layout-sm-padding-bottom-8{padding-bottom:8px;} +.layout-sm-padding-bottom-9{padding-bottom:9px;} +.layout-sm-padding-bottom-10{padding-bottom:10px;} +.layout-sm-padding-bottom-11{padding-bottom:11px;} +.layout-sm-padding-bottom-12{padding-bottom:12px;} +.layout-sm-padding-bottom-13{padding-bottom:13px;} +.layout-sm-padding-bottom-14{padding-bottom:14px;} +.layout-sm-padding-bottom-15{padding-bottom:15px;} +.layout-sm-padding-bottom-16{padding-bottom:16px;} +.layout-sm-padding-bottom-17{padding-bottom:17px;} +.layout-sm-padding-bottom-18{padding-bottom:18px;} +.layout-sm-padding-bottom-19{padding-bottom:19px;} +.layout-sm-padding-bottom-20{padding-bottom:20px;} +.layout-sm-padding-bottom-21{padding-bottom:21px;} +.layout-sm-padding-bottom-22{padding-bottom:22px;} +.layout-sm-padding-bottom-23{padding-bottom:23px;} +.layout-sm-padding-bottom-24{padding-bottom:24px;} +.layout-sm-padding-bottom-25{padding-bottom:25px;} +.layout-sm-padding-bottom-26{padding-bottom:26px;} +.layout-sm-padding-bottom-27{padding-bottom:27px;} +.layout-sm-padding-bottom-28{padding-bottom:28px;} +.layout-sm-padding-bottom-29{padding-bottom:29px;} +.layout-sm-padding-bottom-30{padding-bottom:30px;} +.layout-sm-padding-bottom-31{padding-bottom:31px;} +.layout-sm-padding-bottom-32{padding-bottom:32px;} +.layout-sm-padding-bottom-33{padding-bottom:33px;} +.layout-sm-padding-bottom-34{padding-bottom:34px;} +.layout-sm-padding-bottom-35{padding-bottom:35px;} +.layout-sm-padding-bottom-36{padding-bottom:36px;} +.layout-sm-padding-bottom-37{padding-bottom:37px;} +.layout-sm-padding-bottom-38{padding-bottom:38px;} +.layout-sm-padding-bottom-39{padding-bottom:39px;} +.layout-sm-padding-bottom-40{padding-bottom:40px;} +.layout-sm-padding-bottom-41{padding-bottom:41px;} +.layout-sm-padding-bottom-42{padding-bottom:42px;} +.layout-sm-padding-bottom-43{padding-bottom:43px;} +.layout-sm-padding-bottom-44{padding-bottom:44px;} +.layout-sm-padding-bottom-45{padding-bottom:45px;} +.layout-sm-padding-bottom-46{padding-bottom:46px;} +.layout-sm-padding-bottom-47{padding-bottom:47px;} +.layout-sm-padding-bottom-48{padding-bottom:48px;} +.layout-sm-padding-bottom-49{padding-bottom:49px;} +.layout-sm-padding-bottom-50{padding-bottom:50px;} +.layout-sm-padding-bottom-51{padding-bottom:51px;} +.layout-sm-padding-bottom-52{padding-bottom:52px;} +.layout-sm-padding-bottom-53{padding-bottom:53px;} +.layout-sm-padding-bottom-54{padding-bottom:54px;} +.layout-sm-padding-bottom-55{padding-bottom:55px;} +.layout-sm-padding-bottom-56{padding-bottom:56px;} +.layout-sm-padding-bottom-57{padding-bottom:57px;} +.layout-sm-padding-bottom-58{padding-bottom:58px;} +.layout-sm-padding-bottom-59{padding-bottom:59px;} +.layout-sm-padding-bottom-60{padding-bottom:60px;} + +.layout-sm-padding-left-1{padding-left:1px;} +.layout-sm-padding-left-2{padding-left:2px;} +.layout-sm-padding-left-3{padding-left:3px;} +.layout-sm-padding-left-4{padding-left:4px;} +.layout-sm-padding-left-5{padding-left:5px;} +.layout-sm-padding-left-6{padding-left:6px;} +.layout-sm-padding-left-7{padding-left:7px;} +.layout-sm-padding-left-8{padding-left:8px;} +.layout-sm-padding-left-9{padding-left:9px;} +.layout-sm-padding-left-10{padding-left:10px;} +.layout-sm-padding-left-11{padding-left:11px;} +.layout-sm-padding-left-12{padding-left:12px;} +.layout-sm-padding-left-13{padding-left:13px;} +.layout-sm-padding-left-14{padding-left:14px;} +.layout-sm-padding-left-15{padding-left:15px;} +.layout-sm-padding-left-16{padding-left:16px;} +.layout-sm-padding-left-17{padding-left:17px;} +.layout-sm-padding-left-18{padding-left:18px;} +.layout-sm-padding-left-19{padding-left:19px;} +.layout-sm-padding-left-20{padding-left:20px;} +.layout-sm-padding-left-21{padding-left:21px;} +.layout-sm-padding-left-22{padding-left:22px;} +.layout-sm-padding-left-23{padding-left:23px;} +.layout-sm-padding-left-24{padding-left:24px;} +.layout-sm-padding-left-25{padding-left:25px;} +.layout-sm-padding-left-26{padding-left:26px;} +.layout-sm-padding-left-27{padding-left:27px;} +.layout-sm-padding-left-28{padding-left:28px;} +.layout-sm-padding-left-29{padding-left:29px;} +.layout-sm-padding-left-30{padding-left:30px;} +.layout-sm-padding-left-31{padding-left:31px;} +.layout-sm-padding-left-32{padding-left:32px;} +.layout-sm-padding-left-33{padding-left:33px;} +.layout-sm-padding-left-34{padding-left:34px;} +.layout-sm-padding-left-35{padding-left:35px;} +.layout-sm-padding-left-36{padding-left:36px;} +.layout-sm-padding-left-37{padding-left:37px;} +.layout-sm-padding-left-38{padding-left:38px;} +.layout-sm-padding-left-39{padding-left:39px;} +.layout-sm-padding-left-40{padding-left:40px;} +.layout-sm-padding-left-41{padding-left:41px;} +.layout-sm-padding-left-42{padding-left:42px;} +.layout-sm-padding-left-43{padding-left:43px;} +.layout-sm-padding-left-44{padding-left:44px;} +.layout-sm-padding-left-45{padding-left:45px;} +.layout-sm-padding-left-46{padding-left:46px;} +.layout-sm-padding-left-47{padding-left:47px;} +.layout-sm-padding-left-48{padding-left:48px;} +.layout-sm-padding-left-49{padding-left:49px;} +.layout-sm-padding-left-50{padding-left:50px;} +.layout-sm-padding-left-51{padding-left:51px;} +.layout-sm-padding-left-52{padding-left:52px;} +.layout-sm-padding-left-53{padding-left:53px;} +.layout-sm-padding-left-54{padding-left:54px;} +.layout-sm-padding-left-55{padding-left:55px;} +.layout-sm-padding-left-56{padding-left:56px;} +.layout-sm-padding-left-57{padding-left:57px;} +.layout-sm-padding-left-58{padding-left:58px;} +.layout-sm-padding-left-59{padding-left:59px;} +.layout-sm-padding-left-60{padding-left:60px;} + + +/** + * 模块基础样式 + */ +.module-content, +.module-images-container, +.module-slider-container, +.module-video-container, +.module-title-container, +.module-goods-container, +.module-list-content, +.module-list-content .item .module-item, +.module-list-content .item .module-item .module-title, +.module-list-content .item .module-item .module-price {overflow: hidden;} + +/** + * 模块类型样式 - 标题 + */ +.module-title-container .module-title-content{position:relative} +.module-title-container .title-main{font-size:16px;font-weight:600;color:#666} +.module-title-container .title-vice{color:#999;font-size:12px;margin-left:10px} +.module-title-container .more-content{position:absolute;top:calc(50% - 8px);right:0} + +/** + * 模块内容基础样式 + */ +.layout-content image, +.layout-content video{display:block;max-width:100%;max-height:100%} + +/** + * 不展示滚动导航点 + */ +.layout-content .slides-rolling-not-dot{margin-bottom:0px} + +/** + * 媒体文件固定大小 + */ +.module-fixed-doc{display:block;overflow:hidden;} +.module-fixed-doc-ent-width{width:100% !important;} +.module-fixed-doc-ent-height{height:100% !important;} +.module-fixed-doc-ent-auto{margin:0 auto !important;} +.module-fixed-doc-ent-cover{object-fit:cover !important;} + +/** + * 滚动列表 + */ +.module-list-rolling{width:100%;white-space:nowrap;box-sizing:border-box} +.module-list-rolling .item{display:inline-block;position:relative} \ No newline at end of file diff --git a/sourcecode/weixin/default/pages/index/index.js b/sourcecode/weixin/default/pages/index/index.js index 781716ea3..2ec1e988e 100755 --- a/sourcecode/weixin/default/pages/index/index.js +++ b/sourcecode/weixin/default/pages/index/index.js @@ -11,6 +11,7 @@ Page({ // 基础配置 currency_symbol: app.data.currency_symbol, common_shop_notice: null, + home_index_floor_data_type: 0, common_app_is_enable_search: 0, common_app_is_enable_answer: 0, common_app_is_header_nav_fixed: 0, @@ -44,6 +45,7 @@ Page({ this.setData({ currency_symbol: app.get_config('currency_symbol'), common_shop_notice: app.get_config('config.common_shop_notice'), + home_index_floor_data_type: app.get_config('config.home_index_floor_data_type'), common_app_is_enable_search: app.get_config('config.common_app_is_enable_search'), common_app_is_enable_answer: app.get_config('config.common_app_is_enable_answer'), common_app_is_header_nav_fixed: app.get_config('config.common_app_is_header_nav_fixed'), diff --git a/sourcecode/weixin/default/pages/index/index.json b/sourcecode/weixin/default/pages/index/index.json index 56fe01f9c..58b626d20 100755 --- a/sourcecode/weixin/default/pages/index/index.json +++ b/sourcecode/weixin/default/pages/index/index.json @@ -7,6 +7,7 @@ "usingComponents": { "component-quick-nav": "/components/quick-nav/quick-nav", "component-icon-nav": "/components/icon-nav/icon-nav", - "component-banner": "/components/slider/slider" + "component-banner": "/components/slider/slider", + "component-layout": "/components/layout/layout" } } \ No newline at end of file diff --git a/sourcecode/weixin/default/pages/index/index.wxml b/sourcecode/weixin/default/pages/index/index.wxml index d33c96e19..460079375 100755 --- a/sourcecode/weixin/default/pages/index/index.wxml +++ b/sourcecode/weixin/default/pages/index/index.wxml @@ -12,11 +12,14 @@ {{common_shop_notice}} - - + + + + - - + + + @@ -25,39 +28,47 @@ - - - - - {{floor.name}} - - - - - - - {{icv.name}} - - - - {{floor.describe}} - - - + + + + + + + + + + + + {{floor.name}} - - - - - - {{goods.title}} - {{currency_symbol}}{{goods.min_price}} - + + + + + + {{icv.name}} + + + + {{floor.describe}} + + + + + + + + {{goods.title}} + {{currency_symbol}}{{goods.min_price}} + + + + - +