Merge remote-tracking branch 'origin/master'

doum

3 天以前 2da6cac0a9bab5ce7ad04ac17f73d456732f907e

 mini-program/pages/distributor/distributor.vue

@@ -13,7 +13,7 @@
         <view class="user">
            <view class="user-left">
               <view class="user-left-image">
                  <image :src="shop.imgurl||'/static/logo.png'" mode="widthFix"></image>
                  <image :src="shop.imgurl||'/static/icon/default3.png'" mode="widthFix"></image>
               </view>
               <view class="user-left-info">
                  <view class="user-left-info-title">{{shop.name||''}}</view>
@@ -107,7 +107,7 @@
         </view>
         <view class="title"  v-if="!show">待处理订单 ({{total}})</view>
         <view class="list"  v-if="!show">
            <view class="list-item" v-for="(item, index) in dataList" :key="index">
            <view class="list-item" v-for="(item, index) in dataList" :key="index"  @click="jumpOrderDetail(item.id)">
               <view class="a">
                  <view class="a-left">
                     <view class="a-left-tips">{{item.receiveType==1?'自提':'快递配送'}}</view>
@@ -350,6 +350,11 @@
               that.jumpShopLogin()
            } 
         },
         jumpOrderDetail(id){
            uni.navigateTo({
               url: '/pagesA/pages/order-details/order-details?userType=1&id='+id
            })
         },
         jumpShopLogin() {
            uni.navigateTo({
               url: '/pages/login/login'