合并

MrShi

22 小时以前 825418425a91c4cf95e56c3fbaf06ea9fb5a37d8

 mini-program/pages/mall/mall.vue

@@ -8,7 +8,7 @@
               <text>商城</text>
               <view class="head-search-input">
                  <u-search placeholder="搜索商品" height="30" searchIconColor="#999999" borderColor="#eeeeee"
                     bgColor="rgba(255,255,255,0.9)" @custom="search" :showAction="false" v-model="form.goodsName" @search="search" />	
                     bgColor="rgba(255,255,255,0.9)" @clear="search" :showAction="false" v-model="form.goodsName" @search="search" />	
               </view>
            </view>
            <view class="head-tabs">
@@ -44,8 +44,9 @@
            </view>
         </view>
         <!-- 品牌 -->
         <view class="list" style="padding-top: 30rpx; box-sizing: border-box; justify-content: flex-start;" v-if="show === 2">
         <view class="list" style="padding-top: 30rpx; box-sizing: border-box;" v-if="show === 2">
            <view :class="item.active ? 'list-cate active' : 'list-cate'" v-for="(item, index) in pingpai" :key="index" @click="getXiLie(item.id, index)">{{item.name}}</view>
            <view style="width: 216rpx; height: 0;"></view>
         </view>
         <!-- 系列 -->
         <view class="list" v-if="show === 3">
@@ -83,7 +84,7 @@
            </view>
         </view>
      </view>
      <view class="cart">
      <view class="cart" @click="jumpCart">
         <view class="cart-box">
            <image src="/static/icon/ic_cart@2x.png" mode="widthFix"></image>
            <text>购物车</text>
@@ -99,7 +100,7 @@
   } from 'vuex'
   export default {
      computed: {
         ...mapState(['navHeight', 'statusbarHeight'])
         ...mapState(['navHeight', 'statusbarHeight', 'userInfo'])
      },
      watch: {
         paixu: {
@@ -165,14 +166,24 @@
         };
      },
      onLoad() {
         this.getCartNum()
         this.getLabels()
         this.getGoodsList()
      },
      async onShow() {
         await this.$onLaunched;
         if (this.userInfo) {
            this.getCartNum()
         }
      },
      onReachBottom() {
         this.getGoodsList()
      },
      methods: {
         jumpCart() {
            uni.navigateTo({
               url: '/pages/shopping-cart/shopping-cart'
            })
         },
         getCartNum() {
            this.$u.api.cartGoodsTypeNum()
               .then(res => {
@@ -528,10 +539,10 @@
               font-size: 28rpx;
               color: #333333;
               margin-bottom: 24rpx;
               margin-right: 20rpx;
               &:last-child {
                  margin-right: 0 !important;
               }
               // margin-right: 20rpx;
               // &:last-child {
               //    margin-right: 0 !important;
               // }
            }
            .red {
               text {