Merge remote-tracking branch 'origin/master'

doum

13 小时以前 b613bb368d4e678b42d25e94397d0aab3e213438

 mini-program/pages/mine/mine.vue

@@ -26,19 +26,19 @@
            </view>
         </view>
         <view class="cate">
            <view class="cate-item">
            <view class="cate-item" @click="jumpTo(1)">
               <text>{{objNum ? objNum.cartTypeNum : 0}}</text>
               <text>购物车</text>
            </view>
            <view class="cate-item">
            <view class="cate-item" @click="jumpTo(2)">
               <text>{{objNum ? objNum.member.integral : 0}}</text>
               <text>积分</text>
            </view>
            <view class="cate-item">
            <view class="cate-item" @click="jumpTo(3)">
               <text>{{objNum ? objNum.couponNum : 0}}</text>
               <text>优惠券</text>
            </view>
            <view class="cate-item">
            <view class="cate-item" @click="jumpTo(4)">
               <text>{{objNum ? objNum.collectNum : 0}}</text>
               <text>收藏</text>
            </view>
@@ -46,24 +46,24 @@
         <view class="func">
            <view class="func-top">
               <view class="func-top-title">我的订单</view>
               <view class="func-top-to" @click="jumpOrder">
               <view class="func-top-to" @click="jumpOrder(0)">
                  全部订单
                  <image src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
               </view>
            </view>
            <view class="func-list">
               <view class="func-list-item" @click="jumpOrder(0)">
               <view class="func-list-item" @click="jumpOrder(1)">
                  <view class="func-list-item-num" v-if="orderNum && orderNum.waitPayOrders > 0">{{orderNum.waitPayOrders}}</view>
                  <image src="/static/icon/mine_ic_daifukuan@2x.png" mode="widthFix"></image>
                  <text>待支付</text>
               </view>
               <view class="func-list-item" @click="jumpOrder(1)">
               <view class="func-list-item" @click="jumpOrder(2)">
                  <view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitOrders}}</view>
                  <image src="/static/icon/mine_ic_daifahuo@2x.png" mode="widthFix"></image>
                  <text>待发货/自提</text>
               </view>
               <view class="func-list-item" @click="jumpOrder(2)">
                  <view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitReceivedOrders}}</view>
               <view class="func-list-item" @click="jumpOrder(3)">
                  <view class="func-list-item-num" v-if="orderNum && orderNum.waitReceivedOrders > 0">{{orderNum.waitReceivedOrders}}</view>
                  <image src="/static/icon/mine_ic_daishouhuo@2x.png" mode="widthFix"></image>
                  <text>待收货</text>
               </view>
@@ -108,6 +108,25 @@
         this.ordersStatistics()
      },
      methods: {
         jumpTo(type) {
            if (type === 1) {
               uni.navigateTo({
                  url: '/pages/shopping-cart/shopping-cart'
               })
            } else if (type === 2) {
               uni.navigateTo({
                  url: '/pages/my-points/my-points'
               })
            } else if (type === 3) {
               uni.navigateTo({
                  url: '/pages/coupon/coupon'
               })
            } else if (type === 4) {
               uni.navigateTo({
                  url: '/pages/my-collection/my-collection'
               })
            }
         },
         jump() {
            uni.navigateTo({
               url: '/pages/login/login'
@@ -157,15 +176,9 @@
         },
         // 跳转订单列表
         jumpOrder(status) {
            if (status >= 0) {
               uni.navigateTo({
                  url: '/pages/order/order?status=' + status
               })
            } else {
               uni.navigateTo({
                  url: '/pages/order/order'
               })
            }
            uni.navigateTo({
               url: '/pagesA/pages/order/order?userType=0&status=' + status
            })
         }
      }
   }