hmy_farmer-main.git

			@@ -13,11 +13,28 @@

			</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">
			@@ -111,12 +128,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">