Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

xuxueyang

2024-09-24 5525ed0398c496b43a09377d0c59d143e7ff3e98

 pages/home/supplier-home.vue

@@ -7,17 +7,35 @@
         我的
      </view> -->
      <!-- 背景图 -->
		
      <view class="top-bg" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
         <view class="title" style="position: relative;">
            首页

         </view>
         <view class="flex user-info" v-if="currentInfo&&(currentInfo.id)">
				
            <image class="user-icon" v-if="
               (currentInfo.customerDTO&&currentInfo.customerDTO.cover)
               ||(currentInfo.supplierDTO&&currentInfo.supplierDTO.cover)
               ||(currentInfo.partnerDTO&&currentInfo.partnerDTO.cover)
               || currentInfo.picture
               " :src="
               (currentInfo.customerDTO&&currentInfo.customerDTO.cover)
               ||(currentInfo.supplierDTO&&currentInfo.supplierDTO.cover)
               ||(currentInfo.partnerDTO&&currentInfo.partnerDTO.cover)
               || currentInfo.picture
               " mode="scaleToFill"></image>
					
            <image class="user-icon" v-else
               src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
               mode="scaleToFill"></image>
					
            <!-- 头像 -->
            <image class="user-icon" v-if="!currentInfo.picture"
         <!--    <image class="user-icon" v-if="!currentInfo.picture"
               src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
               mode="aspectFit"></image>
            <image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image>
            <image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image> -->

            <view class="name">
               <view class="t1">
@@ -29,6 +47,10 @@
                  <span v-if="!currentInfo.partnerDTO&&currentInfo.type==='partner'">(信息待完善)</span>
               </view>
               <view class="t2">{{currentInfo.tel || '暂无电话'}}</view>
               <view class="t2" v-if="currentInfo.partnerDTO && currentInfo.partnerDTO.id">
                 ID: {{ currentInfo.partnerDTO.id }}
               </view>

            </view>
         </view>

@@ -111,12 +133,12 @@
         <view class="tj-panel  pink flex1"
            @click="goto('/pages/order/order-delivery?status=PENDING&range=today',true)">
            <view class="name">今日待配送</view>
            <view class="title">{{tj.deliverCount||0}}单</view>
            <view class="title">{{tj.deliverCount||0}}扎</view>
         </view>
         <view class="tj-panel green flex1"
            @click="goto('/pages/order/order-delivery?range=today',true)">
            <view class="name green">今日配送汇总</view>
            <view class="title">{{tj.deliverTotal||0}}单</view>
            <view class="title">{{tj.deliverTotal||0}}扎</view>
         </view>
      </view>
      <view class="m-t-12" @click="getNoticeMore">
@@ -167,7 +189,7 @@
               </view>
               <view class="order-desc tg">加价配置</view>
            </view>
            <view class="nav row margin-tb" @click="goto('/sub_pages/supplier/order-sale/order-sale',true)">
            <view class="nav row margin-tb" @click="goto('/pages/order/order-sale/order-sale',true)">
               <view class="img-c">
                  <image class="icon margin-bottom order-icon shlp"
                     src="/static/images/supplier/user/user-icon-shlp.png" mode="scaleToFill" />
@@ -238,6 +260,7 @@
      },
      async onPullDownRefresh() {
         await this.$store.dispatch('getCurrentInfo')
         await getTj(true)
         uni.stopPullDownRefresh()
      },
      onLoad(options) {
@@ -245,7 +268,7 @@
         const urlcode = options.url && decodeURIComponent(options.url) || ''
      },
      onShow() {
         this.getTj()
         this.getTj(true)
      },
      created() {
         //公告
@@ -430,10 +453,10 @@
               },
            })
         },
         getTj() {
         getTj(refresh=false) {
            // /api/supplier/delivery   

            if (this.currentInfo.id && this.currentInfo.id !== this.cacheUserId) {
            if (this.currentInfo.id && (this.currentInfo.id !== this.cacheUserId || refresh)) {
               this.cacheUserId = this.currentInfo.id
               let that = this
               setTimeout(() => {