|
|
@@ -17,22 +17,20 @@
|
|
|
width="38"
|
|
|
height="38"
|
|
|
:radius="38"
|
|
|
- :class="{ activeAvatar: isLogin && userInfo.useCollectionPic }"
|
|
|
- :src="isLogin ? userInfo.avatar : require('@assets/img_default_photo.png')"
|
|
|
+ :src="companyInfo.logo || require('@assets/img_default_photo.png')"
|
|
|
></van-image>
|
|
|
- <div class="text1" :class="{ text3: isLogin }">{{ isLogin ? `${userInfo.nickname}!` : '探索者!' }}</div>
|
|
|
+ <div class="text1" :class="{ text3: isLogin }">{{ companyInfo.name }}</div>
|
|
|
</div>
|
|
|
<div class="welcom" v-else>
|
|
|
<div class="left">
|
|
|
<div class="text1">WELCOME</div>
|
|
|
- <div class="text2" :class="{ text3: isLogin }">{{ isLogin ? `${userInfo.nickname}!` : '探索者!' }}</div>
|
|
|
+ <div class="text2" :class="{ text3: isLogin }">{{ companyInfo.name }}</div>
|
|
|
</div>
|
|
|
<van-image
|
|
|
width="38"
|
|
|
height="38"
|
|
|
:radius="38"
|
|
|
- :class="{ activeAvatar: isLogin && userInfo.useCollectionPic }"
|
|
|
- :src="isLogin ? userInfo.avatar : require('@assets/img_default_photo.png')"
|
|
|
+ :src="companyInfo.logo || require('@assets/img_default_photo.png')"
|
|
|
></van-image>
|
|
|
</div>
|
|
|
|
|
|
@@ -112,7 +110,7 @@ export default {
|
|
|
ProductSmall
|
|
|
},
|
|
|
computed: {
|
|
|
- ...mapState(['userInfo', 'theme', 'companyId']),
|
|
|
+ ...mapState(['userInfo', 'theme', 'companyId', 'companyInfo']),
|
|
|
isNewCollections() {
|
|
|
let products = [...this.products];
|
|
|
let flag = false;
|