From d13d70a5218543c0cabd2d9c7db8dd4368959468 Mon Sep 17 00:00:00 2001
From: buffeyu <yeqingyu@dimine.net>
Date: Thu, 27 Jan 2022 15:06:36 +0800
Subject: [PATCH] up

---
 pages/mall/index.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 84ad048..1f98fdb 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <view v-if="hasCompany" class="wrapper">
+    <view v-if="hasCompany && hasLogin" class="wrapper">
       <uni-nav-bar :fixed="true" color="#ffffff" background-color="#ffffff" :status-bar="true">
         <view slot="left" class="left-title">纸商城</view>
         <view slot="right" class="right-title" @tap="shareTap">分享</view>
@@ -68,9 +68,10 @@
       <uni-nav-bar :fixed="true" :status-bar="true">
         <view slot="left" style="font-size: 40rpx; color: #000000">纸商城</view>
       </uni-nav-bar>
-      <view class="flex-col-center-center" style="margin-top: 100rpx">
+      <view v-if="!hasCompany" class="flex-col-center-center" style="margin-top: 100rpx">
         <text style="font-size: 30rpx; text-align: center; font-weight: 600">请先完善企业基本信息</text>
       </view>
+	  <view class="" v-if="!hasLogin"><not-logged @loginChange="loginChange()"></not-logged></view>
     </view>
     <view class="share-area" v-if="visible" @click="closeShare">
       <view class="share-content">
@@ -91,13 +92,14 @@
 </template>
 
 <script>
+	import notLogged from '@/components/not-logged/not-logged.vue'
 import uGap from '@/components/u-gap/u-gap.vue'
 import { back, go2, loginGo2, screenShot } from '@/utils/hook.js'
 import { SupplierList, productStatus, storeDetail, getSupplierQrCode } from '@/apis/add-paper.js'
 import { getTimer } from '@/utils/index.js'
 import noData from './no-data.vue'
 export default {
-  components: { uGap, noData },
+  components: { uGap, noData, notLogged },
   filters: {
     timeFilter(value) {
       var abs = ''
@@ -150,7 +152,10 @@ export default {
   computed: {
     hasCompany() {
       return this.$store.state.supplierInfo.id != null
-    }
+    },
+	hasLogin() {
+	  return this.$store.state.qnToken != ''
+	}
   },
   onShow() {
     if (this.hasCompany) {