diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue index a2437f60..45ea429b 100644 --- a/pages/goods-category/goods-category.vue +++ b/pages/goods-category/goods-category.vue @@ -2,13 +2,13 @@ - + - + @@ -204,13 +204,13 @@ - - + + - + {{ data_content.vice_name }} @@ -383,7 +383,7 @@ import componentUserBase from '../../components/user-base/user-base'; import componentNavMore from '../../components/nav-more/nav-more'; - var theme_static_url = app.globalData.get_static_url('goods'); + var theme_static_url = app.globalData.get_static_url('goods-category'); var common_static_url = app.globalData.get_static_url('common'); // 状态栏高度 var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0)); diff --git a/pages/plugins/points/index/index.css b/pages/plugins/points/index/index.css index 4ad3c9cc..a895100a 100644 --- a/pages/plugins/points/index/index.css +++ b/pages/plugins/points/index/index.css @@ -72,10 +72,14 @@ */ @media only screen and (min-width:960px) { .points-content { + /* #ifdef H5 */ padding-top: 51%; + /* #endif */ } .rule-btn { + /* #ifdef H5 */ top: 11%; + /* #endif */ } } \ No newline at end of file diff --git a/pages/plugins/realstore/index/index.css b/pages/plugins/realstore/index/index.css index bd621761..622dbed1 100644 --- a/pages/plugins/realstore/index/index.css +++ b/pages/plugins/realstore/index/index.css @@ -55,12 +55,16 @@ */ @media only screen and (min-width:960px) { .realstore-nav-bg { + /* #ifdef H5 */ background-size: cover; + /* #endif */ } } @media only screen and (max-width:960px) { .realstore-nav-bg { + /* #ifdef H5 */ background-size: auto 100%; + /* #endif */ } } \ No newline at end of file diff --git a/pages/plugins/signin/index-detail/index-detail.css b/pages/plugins/signin/index-detail/index-detail.css index ee328348..1400f7c3 100644 --- a/pages/plugins/signin/index-detail/index-detail.css +++ b/pages/plugins/signin/index-detail/index-detail.css @@ -177,12 +177,16 @@ */ @media only screen and (min-width:960px) { .signin-btn .content { + /* #ifdef H5 */ font-size: 64rpx; border-radius: 128rpx; padding: 24rpx 168rpx; + /* #endif */ } .signin-btn { + /* #ifdef H5 */ margin: -240rpx; + /* #endif */ } } \ No newline at end of file diff --git a/pages/plugins/wallet/user/user.css b/pages/plugins/wallet/user/user.css index 2130d1bf..1e20c850 100644 --- a/pages/plugins/wallet/user/user.css +++ b/pages/plugins/wallet/user/user.css @@ -51,6 +51,7 @@ height: 4px; bottom: 0; } + /* * 底部按钮 */ @@ -66,4 +67,15 @@ .submit-container button { height: 88rpx; line-height: 88rpx; +} + +/** +* 媒体查询 +*/ +@media only screen and (min-width:960px) { + .wallet-bg { + /* #ifdef H5 || APP */ + top: -540rpx !important; + /* #endif */ + } } \ No newline at end of file diff --git a/pages/user/user.vue b/pages/user/user.vue index 6817448a..beace47d 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -45,16 +45,16 @@ - + - + 会员码 - + 付款码 diff --git a/static/goods-bg/goods-black.png b/static/goods-bg/goods-black.png deleted file mode 100644 index bacf142d..00000000 Binary files a/static/goods-bg/goods-black.png and /dev/null differ diff --git a/static/goods-bg/goods-brown.png b/static/goods-bg/goods-brown.png deleted file mode 100644 index dd86a6e7..00000000 Binary files a/static/goods-bg/goods-brown.png and /dev/null differ diff --git a/static/goods-bg/goods-bule.png b/static/goods-bg/goods-bule.png deleted file mode 100644 index ec3f360c..00000000 Binary files a/static/goods-bg/goods-bule.png and /dev/null differ diff --git a/static/goods-bg/goods-green.png b/static/goods-bg/goods-green.png deleted file mode 100644 index a1960ca3..00000000 Binary files a/static/goods-bg/goods-green.png and /dev/null differ diff --git a/static/goods-bg/goods-orange.png b/static/goods-bg/goods-orange.png deleted file mode 100644 index a6ab0c44..00000000 Binary files a/static/goods-bg/goods-orange.png and /dev/null differ diff --git a/static/goods-bg/goods-purple.png b/static/goods-bg/goods-purple.png deleted file mode 100644 index 15276ef2..00000000 Binary files a/static/goods-bg/goods-purple.png and /dev/null differ diff --git a/static/goods-bg/goods-red.png b/static/goods-bg/goods-red.png deleted file mode 100644 index 97d3c9bd..00000000 Binary files a/static/goods-bg/goods-red.png and /dev/null differ diff --git a/static/goods-bg/goods-yellow.png b/static/goods-bg/goods-yellow.png deleted file mode 100644 index 5fa9b355..00000000 Binary files a/static/goods-bg/goods-yellow.png and /dev/null differ diff --git a/static/images/common/goods-level2-bg.png b/static/images/common/goods-level2-bg.png deleted file mode 100644 index 07124b34..00000000 Binary files a/static/images/common/goods-level2-bg.png and /dev/null differ diff --git a/static/images/common/membership-code.png b/static/images/common/membership-code.png deleted file mode 100644 index d425e89f..00000000 Binary files a/static/images/common/membership-code.png and /dev/null differ diff --git a/static/images/common/payment-code.png b/static/images/common/payment-code.png deleted file mode 100644 index dd7895d1..00000000 Binary files a/static/images/common/payment-code.png and /dev/null differ diff --git a/static/images/common/qrcod-bg.png b/static/images/common/qrcod-bg.png deleted file mode 100644 index 713b20cf..00000000 Binary files a/static/images/common/qrcod-bg.png and /dev/null differ diff --git a/static/images/common/type.png b/static/images/common/type.png deleted file mode 100644 index d8aae465..00000000 Binary files a/static/images/common/type.png and /dev/null differ