Browse Source

登录显示求购用户信息

yangc 7 years ago
parent
commit
8a02b7373c
2 changed files with 26 additions and 14 deletions
  1. 14 6
      components/applyPurchase/ApplyInfo.vue
  2. 12 8
      components/home/floor/FloorList.vue

+ 14 - 6
components/applyPurchase/ApplyInfo.vue

@@ -36,8 +36,8 @@
       <ul v-if="purchaseManList.content && purchaseManList.content.length">
         <li v-for="(purchaseMan, index) in purchaseManList.content" :class="{'active': purchaseMan.active}">
           <div>{{purchaseMan.date| date}}</div>
-          <div v-if="purchaseMan.inquiry.enterprise && purchaseMan.inquiry.enterprise.enName">{{purchaseMan.inquiry.enterprise.enName | enterpriseFilter}}</div>
-          <div v-else>{{purchaseMan.userName | userNameFilter}}</div>
+          <div v-if="purchaseMan.inquiry.enterprise && purchaseMan.inquiry.enterprise.enName" :title="user.logged ? purchaseMan.inquiry.enterprise.enName : null">{{[purchaseMan.inquiry.enterprise.enName, user] | enterpriseFilter}}</div>
+          <div v-else :title="user.logged ? purchaseMan.userName : null">{{[purchaseMan.userName, user] | userNameFilter}}</div>
           <div :title="purchaseMan.cmpCode">{{purchaseMan.cmpCode || '-'}}</div>
           <div :title="purchaseMan.inbrand">{{purchaseMan.inbrand || '-'}}</div>
           <div class="number-content"><img src="/images/applyPurchase/hot-fire.png" alt="" v-if="purchaseMan.offerAmount > 10"><span :style="purchaseMan.offerAmount > 10 ? 'color: #ff9a00': ''">{{purchaseMan.offerAmount || 0}}</span>&nbsp;条</div>
@@ -159,11 +159,19 @@
       phone: function (str) {
         return str.substring(0, 3) + '****' + str.substring(7, 11)
       },
-      enterpriseFilter (str) {
-        return str ? str.length > 4 ? str.substring(0, 2) + '**' + str.substring(str.length - 2, str.length) : str : '-'
+      enterpriseFilter ([str, user]) {
+        if (!user.logged) {
+          return str ? str.length > 4 ? str.substring(0, 2) + '**' + str.substring(str.length - 2, str.length) : str : '-'
+        } else {
+          return str || '-'
+        }
       },
-      userNameFilter (str) {
-        return str ? str.substring(0, 1) + '**' : '-'
+      userNameFilter ([str, user]) {
+        if (!user.logged) {
+          return str ? str.substring(0, 1) + '**' : '-'
+        } else {
+          return str || '-'
+        }
       }
     },
     computed: {

+ 12 - 8
components/home/floor/FloorList.vue

@@ -23,8 +23,8 @@
                   <li v-for="(purchaseMan, index) in purchaseManList.content" :style="'top: -' + 32 * timerIndex + 'px'">
                     <div>{{purchaseMan.date | date}}</div>
                     <div>
-                      <span v-if="purchaseMan.inquiry && purchaseMan.inquiry.enterprise && purchaseMan.inquiry.enterprise.enName">{{purchaseMan.inquiry.enterprise.enName | enterpriseFilter}}</span>
-                      <span v-else>{{purchaseMan.userName | userNameFilter}}</span>
+                      <span :title="user.logged ? purchaseMan.inquiry.enterprise.enName : null" v-if="purchaseMan.inquiry && purchaseMan.inquiry.enterprise && purchaseMan.inquiry.enterprise.enName">{{[purchaseMan.inquiry.enterprise.enName, user] | enterpriseFilter}}</span>
+                      <span :title="user.logged ? purchaseMan.userName : null" v-else>{{[purchaseMan.userName, user] | userNameFilter}}</span>
                     </div>
                     <div :title="purchaseMan.cmpCode">{{purchaseMan.cmpCode}}</div>
                     <div>
@@ -121,15 +121,19 @@
         const day = (new Date(date).getDate() - now)
         return day <= 0 ? '今天' : day + '天前'
       },
-      enterpriseFilter (str) {
-        if (str) {
-          return str.length > 4 ? str.substring(0, 2) + '**' + str.substring(str.length - 2, str.length) : str
+      enterpriseFilter ([str, user]) {
+        if (!user.logged) {
+          return str ? str.length > 4 ? str.substring(0, 2) + '**' + str.substring(str.length - 2, str.length) : str : '-'
         } else {
-          return '-'
+          return str || '-'
         }
       },
-      userNameFilter (str) {
-        return str ? str.substring(0, 1) + '**' : '-'
+      userNameFilter ([str, user]) {
+        if (!user.logged) {
+          return str ? str.substring(0, 1) + '**' : '-'
+        } else {
+          return str || '-'
+        }
       }
     },
     computed: {