Merge branch 'dev-sws' into dev

pages/goods-category/goods-category.vue

@@ -2,13 +2,13 @@
     <view>
         <view class="pr" :class="is_single_page == 1 ? 'margin-top-xxxl single-page-top' : ''">
             <view class="goods-top-bg pa top-0 left-0 right-0 wh-auto">
-                <image :src="theme_static_url + 'goods-top-bg.png'" mode="scaleToFill" class="wh-auto ht-auto"></image>
+                <image :src="theme_static_url + 'top-bg.png'" mode="scaleToFill" class="wh-auto ht-auto"></image>
             </view>
             <!-- 搜索框 -->
             <block v-if="is_single_page == 0">
                 <view class="nav-search padding-horizontal-main pr" :style="'padding-top:' + (status_bar_height + 5) + 'px;'">
                     <view class="goods-top-search-bg pa top-0 left-0 right-0 bottom-0 wh-auto">
-                        <image :src="theme_static_url + 'goods-top-bg.png'" mode="scaleToFill" class="wh-auto ht-auto"></image>
+                        <image :src="theme_static_url + 'top-bg.png'" mode="scaleToFill" class="wh-auto ht-auto"></image>
                     </view>
                     <block v-if="is_goods_category_search_alone == 1">
                         <component-search propPlaceholder="输入商品名称搜索"></component-search>
@@ -204,13 +204,13 @@
                                     <view class="padding-top-main padding-horizontal-main">
                                         <!-- 一级基础信息 -->
                                         <block v-if="data_content.id === '1'">
-                                            <view class="one-content border-radius-main cp spacing-mb" :data-value="data_content.id" @tap="category_event">
-                                                <image src="/static/images/common/type.png" mode="scaleToFill" class="wh-auto radius"></image>
+                                            <view v-if="(data_content.banner_images || null) !== null" class="one-content border-radius-main cp spacing-mb" :data-value="data_content.id" @tap="category_event">
+                                                <image :src="data_content.banner_images" mode="scaleToFill" class="wh-auto radius"></image>
                                             </view>
                                         </block>
                                         <block v-else>
                                             <view v-if="(data_content.vice_name || null) != null || (data_content.describe || null) != null" class="one-content border-radius-main cp spacing-mb pr" :data-value="data_content.id" @tap="category_event">
-                                                <image src="/static/images/common/goods-level2-bg.png" mode="scaleToFill" class="wh-auto ht-auto radius pa top-0 left-0"></image>
+                                                <image :src="theme_static_url + 'level2-content-bg.png'" mode="scaleToFill" class="wh-auto ht-auto radius pa top-0 left-0"></image>
                                                 <view class="pr padding-main">
                                                     <view v-if="(data_content.vice_name || null) != null" class="text-size-md fw-b" :style="'color:' + data_content.bg_color + ';'">
                                                         {{ 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));

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 */
     }
 }

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 */
     }
 }

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 */
     }
 }

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 */
+    }
 }

pages/user/user.vue

@@ -45,16 +45,16 @@
                     </view>
                     <!-- 会员码 付款码 -->
                     <view v-if="(payment_page_url || null) !== null || (membership_page_url || null) !== null" class="qrcode padding-horizontal-main pr">
-                        <view class="qrcode-content flex-row align-c text-size-md" style="background-image: url(/static/images/common/qrcod-bg.png)" :class="(payment_page_url || null) == null || (membership_page_url || null) == null ? 'jc-sb' : 'jc-sa divider-r'">
+                        <view class="qrcode-content flex-row align-c text-size-md" :style="'background-image: url(' + static_url + 'qrcode-bg.png)'" :class="(payment_page_url || null) == null || (membership_page_url || null) == null ? 'jc-sb' : 'jc-sa divider-r'">
                             <view class="tc flex-width-half" v-if="(membership_page_url || null) != null" :data-value="membership_page_url" @tap="url_event">
                                 <view class="item pr top-lg dis-inline-block">
-                                    <image class="icon" src="@/static/images/common/membership-code.png" mode="widthFix"></image>
+                                    <image class="icon" :src="static_url + 'membership-code.png'" mode="widthFix"></image>
                                 </view>
                                 会员码
                             </view>
                             <view class="tc flex-width-half" v-if="(payment_page_url || null) != null" :data-value="payment_page_url" @tap="url_event">
                                 <view class="item pr top-lg dis-inline-block">
-                                    <image class="icon" src="@/static/images/common/payment-code.png" mode="widthFix"></image>
+                                    <image class="icon" :src="static_url + 'payment-code.png'" mode="widthFix"></image>
                                 </view>
                                 <text>付款码</text>
                             </view>