Merge branch 'master' of http://bj.gitlab.cnlive.com/w-front-end/select_good

王强
2 parents 15771acd d7bb2900
Showing 2 changed files with 11 additions and 6 deletions
src/components/tabBox/tabBox.vue
src/pages/mall/mall.vue
@@ -8,14 +8,14 @@
           <div class="tabBox_main"  ref="tabsSwiperBox">
               <div class="tabbar" v-for="(item, index) in tabbaromponents&&tabbaromponents.ads" :key="index">
                   <!-- 关爱屋简介 -->
-                  <div class="skeleton brief" ref="brief">
+                  <div :style="{backgroundColor:tabbar[0].color || tabbarBackgroud}" class="skeleton brief" ref="brief">
                       <html-box
                           v-if="item.style === '14'"
                           :htmls="item.content">
                       </html-box>
                   </div>
                   <!-- 精品推荐 -->
-                  <div class="skeleton boutique" ref="boutique">
+                  <div :style="{backgroundColor:tabbar[1].color || tabbarBackgroud}" class="skeleton boutique" ref="boutique">
                       <img-list-box
                           v-if="item.style === '12'"
                           @detail="toDetail"
@@ -41,7 +41,7 @@
                       </style-7>
                   </div>
                   <!-- 商品推荐 -->
-                  <div class="skeleton commodity" ref="commodity">
+                  <div :style="{backgroundColor:tabbar[2].color || tabbarBackgroud}" class="skeleton commodity" ref="commodity">
                       <!--infinite-scroll-immediate-check="true"可避免上拉多次调用接口问题-->
                       <div class="column-commodity-list" infinite-scroll-immediate-check="true" v-infinite-scroll="loadCommodity" infinite-scroll-disabled="paging.commodity.loading" :infinite-scroll-distance="paging.distance">
                           <column-commodity-list-box
@@ -84,7 +84,7 @@
           }
       }
     },
-    props:["tabbar"],
+    props:["tabbar","tabbarBackgroud"],
     components: {
         htmlBox,
         imgListBox,
@@ -42,7 +42,7 @@
                         :styles="item">
                     </style-7>
                 </div>
-                <tabBox v-if="tabbar" :tabbar="tabbar"></tabBox>
+                <tabBox v-if="tabbar" :tabbar="tabbar" :tabbarBackgroud="tabbarBackgroud"></tabBox>
             </div>
         <!-- </van-pull-refresh> -->
     </div>
@@ -69,7 +69,8 @@
                 banner:null,            // banner
                 navs: null,             // 导航
                 ads: null,               // 列表
-                tabbar:null              // tabbar嵌套组件
+                tabbar:null,              // tabbar嵌套组件
+                tabbarBackgroud:null      // 整体tabbar背景
             }
         },
         components:{
@@ -157,6 +158,10 @@
                     if (datas.tabbar && datas.tabbar.length) {
                         this.$set(this, "tabbar", datas.tabbar);
                     }
+                    // 设置tabbarBackgroud数据
+                    if (datas.color && datas.color.length) {
+                        this.$set(this, "tabbarBackgroud", datas.color);
+                    }
                     /* 获取优选库精选活动数据 结束 */
                 } else if (res.code == 400) {