Merge remote-tracking branch 'origin/master'

doum

9 小时以前 8dfc59832df6e86f1840857a5b497faa9061a2af

 mini-program/pages/mine/mine.vue

@@ -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>
@@ -102,7 +102,8 @@
            orderNum: null
         };
      },
      onLoad() {
      async onLoad() {
         await this.$onLaunched;
         this.getMyInfo()
         this.ordersStatistics()
      },
@@ -156,15 +157,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
            })
         }
      }
   }