diff --git a/common/css/lib.css b/common/css/lib.css index a7855c97..8b428b7d 100644 --- a/common/css/lib.css +++ b/common/css/lib.css @@ -1003,6 +1003,110 @@ margin-left: 20rpx; margin-right: 20rpx; } -/** - * font-size 字体大小 - */ \ No newline at end of file + +/** + * 主要类样式 + */ +.margin-main { + margin: 24rpx; +} +.margin-top-main { + margin-top: 24rpx; +} +.margin-right-main { + margin-right: 24rpx; +} +.margin-bottom-main { + margin-bottom: 24rpx; +} +.margin-left-main { + margin-left: 24rpx; +} +.margin-horizontal-main { + margin-left: 24rpx; + margin-right: 24rpx; +} +.margin-vertical-main { + margin-top: 24rpx; + margin-bottom: 24rpx; +} +.padding-main { + padding: 24rpx; +} +.padding-top-main { + padding-top: 24rpx; +} +.padding-right-main { + padding-right: 24rpx; +} +.padding-bottom-main { + padding-bottom: 24rpx; +} +.padding-left-main { + padding-left: 24rpx; +} +.padding-horizontal-main { + padding-left: 24rpx; + padding-right: 24rpx; +} +.padding-vertical-main { + padding-top: 24rpx; + padding-bottom: 24rpx; +} +.border-radius-main { + border-radius: 16rpx; +} +.border-radius-left-main { + border-top-left-radius: 16rpx; + border-bottom-left-radius: 16rpx; +} +.border-radius-right-main { + border-top-right-radius: 16rpx; + border-bottom-right-radius: 16rpx; +} +.border-radius-top-main { + border-top-left-radius: 16rpx; + border-top-right-radius: 16rpx; +} +.border-radius-bottom-main { + border-bottom-left-radius: 16rpx; + border-bottom-right-radius: 16rpx; +} +.border-radius-xs { + border-radius: 4rpx; +} +.border-radius-left-xs { + border-top-left-radius: 4rpx; + border-bottom-left-radius: 4rpx; +} +.border-radius-right-xs { + border-top-right-radius: 4rpx; + border-bottom-right-radius: 4rpx; +} +.border-radius-top-xs { + border-top-left-radius: 4rpx; + border-top-right-radius: 4rpx; +} +.border-radius-bottom-xs { + border-bottom-left-radius: 4rpx; + border-bottom-right-radius: 4rpx; +} +.border-radius-sm { + border-radius: 8rpx; +} +.border-radius-left-sm { + border-top-left-radius: 8rpx; + border-bottom-left-radius: 8rpx; +} +.border-radius-right-sm { + border-top-right-radius: 8rpx; + border-bottom-right-radius: 8rpx; +} +.border-radius-top-sm { + border-top-left-radius: 8rpx; + border-top-right-radius: 8rpx; +} +.border-radius-bottom-sm { + border-bottom-left-radius: 8rpx; + border-bottom-right-radius: 8rpx; +} \ No newline at end of file diff --git a/common/css/page.css b/common/css/page.css index 95d306f3..e11b2496 100644 --- a/common/css/page.css +++ b/common/css/page.css @@ -336,113 +336,6 @@ button:before { padding-bottom: 120rpx !important; } -/** - * 主要类样式 - */ -.margin-main { - margin: 24rpx; -} -.margin-top-main { - margin-top: 24rpx; -} -.margin-right-main { - margin-right: 24rpx; -} -.margin-bottom-main { - margin-bottom: 24rpx; -} -.margin-left-main { - margin-left: 24rpx; -} -.margin-horizontal-main { - margin-left: 24rpx; - margin-right: 24rpx; -} -.margin-vertical-main { - margin-top: 24rpx; - margin-bottom: 24rpx; -} -.padding-main { - padding: 24rpx; -} -.padding-top-main { - padding-top: 24rpx; -} -.padding-right-main { - padding-right: 24rpx; -} -.padding-bottom-main { - padding-bottom: 24rpx; -} -.padding-left-main { - padding-left: 24rpx; -} -.padding-horizontal-main { - padding-left: 24rpx; - padding-right: 24rpx; -} -.padding-vertical-main { - padding-top: 24rpx; - padding-bottom: 24rpx; -} -.border-radius-main { - border-radius: 16rpx; -} -.border-radius-left-main { - border-top-left-radius: 16rpx; - border-bottom-left-radius: 16rpx; -} -.border-radius-right-main { - border-top-right-radius: 16rpx; - border-bottom-right-radius: 16rpx; -} -.border-radius-top-main { - border-top-left-radius: 16rpx; - border-top-right-radius: 16rpx; -} -.border-radius-bottom-main { - border-bottom-left-radius: 16rpx; - border-bottom-right-radius: 16rpx; -} -.border-radius-xs { - border-radius: 4rpx; -} -.border-radius-left-xs { - border-top-left-radius: 4rpx; - border-bottom-left-radius: 4rpx; -} -.border-radius-right-xs { - border-top-right-radius: 4rpx; - border-bottom-right-radius: 4rpx; -} -.border-radius-top-xs { - border-top-left-radius: 4rpx; - border-top-right-radius: 4rpx; -} -.border-radius-bottom-xs { - border-bottom-left-radius: 4rpx; - border-bottom-right-radius: 4rpx; -} -.border-radius-sm { - border-radius: 8rpx; -} -.border-radius-left-sm { - border-top-left-radius: 8rpx; - border-bottom-left-radius: 8rpx; -} -.border-radius-right-sm { - border-top-right-radius: 8rpx; - border-bottom-right-radius: 8rpx; -} -.border-radius-top-sm { - border-top-left-radius: 8rpx; - border-top-right-radius: 8rpx; -} -.border-radius-bottom-sm { - border-bottom-left-radius: 8rpx; - border-bottom-right-radius: 8rpx; -} - /** * 价格 */ diff --git a/pages/plugins/ask/detail/detail.vue b/pages/plugins/ask/detail/detail.vue index d0f299cf..57bd6dda 100644 --- a/pages/plugins/ask/detail/detail.vue +++ b/pages/plugins/ask/detail/detail.vue @@ -58,7 +58,7 @@ - + {{ $t('goods-detail.goods-detail.7ulh8b') }} diff --git a/pages/plugins/ask/index/index.vue b/pages/plugins/ask/index/index.vue index 51ae7eaa..314c7055 100644 --- a/pages/plugins/ask/index/index.vue +++ b/pages/plugins/ask/index/index.vue @@ -50,7 +50,7 @@ - + {{ $t('goods-detail.goods-detail.7ulh8b') }} diff --git a/pages/plugins/blog/detail/detail.vue b/pages/plugins/blog/detail/detail.vue index 14d9df00..1727dc6f 100644 --- a/pages/plugins/blog/detail/detail.vue +++ b/pages/plugins/blog/detail/detail.vue @@ -75,7 +75,7 @@ - + {{$t('detail.detail.fn3w01')}}{{ blog_main_name }} @@ -132,9 +132,9 @@ // 调用公共事件方法 app.globalData.page_event_onload_handle(params); - // 设置参数 - this.setData({ - params: app.globalData.launch_params_handle(params), + // 设置参数 + this.setData({ + params: app.globalData.launch_params_handle(params), }); // 初始化配置 diff --git a/pages/plugins/blog/index/index.vue b/pages/plugins/blog/index/index.vue index b0e5e837..d17d178d 100644 --- a/pages/plugins/blog/index/index.vue +++ b/pages/plugins/blog/index/index.vue @@ -103,7 +103,7 @@ - + {{$t('detail.detail.fn3w01')}}{{ blog_main_name }} diff --git a/pages/plugins/blog/search/search.vue b/pages/plugins/blog/search/search.vue index 91a84a58..34796a4c 100644 --- a/pages/plugins/blog/search/search.vue +++ b/pages/plugins/blog/search/search.vue @@ -43,7 +43,7 @@ - + {{$t('detail.detail.fn3w01')}}{{ blog_main_name }} @@ -95,9 +95,9 @@ onLoad(params) { // 调用公共事件方法 - app.globalData.page_event_onload_handle(params); - - // 参数处理 + app.globalData.page_event_onload_handle(params); + + // 参数处理 params = app.globalData.launch_params_handle(params); // 设置参数