Merge remote-tracking branch 'origin/master'

doum

2 天以前 daa9adbc0e2fded884ea9e51fbe44cd22f6756a1

 mini-program/pages/mall/mall.vue

@@ -88,9 +88,10 @@
         <view class="cart-box">
            <image src="/static/icon/ic_cart@2x.png" mode="widthFix"></image>
            <text>购物车</text>
            <view class="cart-num">{{cardTotal}}</view>
            <view class="cart-num" v-if="cardTotal>0">{{cardTotal}}</view>
         </view>
      </view>
      <Login ref="login" />
   </view>
</template>

@@ -98,7 +99,9 @@
   import {
      mapState
   } from 'vuex'
   import Login from '@/components/login/login.vue'
   export default {
      components: { Login },
      computed: {
         ...mapState(['navHeight', 'statusbarHeight', 'userInfo'])
      },
@@ -180,6 +183,10 @@
      },
      methods: {
         jumpCart() {
            if (!this.userInfo) {
               this.$refs.login.open()
               return;
            }
            uni.navigateTo({
               url: '/pages/shopping-cart/shopping-cart'
            })
@@ -199,6 +206,10 @@
            this.getGoodsList()
         },
         addCard(e) {
            if (!this.userInfo) {
               this.$refs.login.open()
               return;
            }
            this.$u.api.addCart({
               goodsId: e.id,
               goodsSkuId: e.skuResponsesList[0].id,