Merge remote-tracking branch 'origin/main'

xuxueyang

2024-07-08 db1e982d2e12a596b68a0f1ceafa219fdbbc61b9

 pages/home/supplier-home.vue

@@ -19,7 +19,7 @@
            <image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image>

            <view class="name">
               <view class="t1">{{currentInfo.nickName || currentInfo.loginName || '-'}}<span
               <view class="t1">{{ (!!currentInfo.supplierDTO?(currentInfo.supplierDTO.name):"") || currentInfo.nickName || currentInfo.loginName || '-'}}<span
                     v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
                     ({{currentInfo.supplierDTO?currentInfo.supplierDTO.statusStr:''}})</span>
               </view>