From 72313acbd341ba3f923ac527acb5fece8c9d4392 Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Thu, 27 Jan 2022 19:04:11 +0800
Subject: [PATCH] bug

---
 components/bussiness-components/packingStationItem.vue |  4 ++--
 pages/client-detail/index.vue                          |  9 +++++++--
 pages/mall/index.vue                                   |  4 ++--
 pages/mine/index.vue                                   | 10 +++++++++-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/components/bussiness-components/packingStationItem.vue b/components/bussiness-components/packingStationItem.vue
index 27fafe0..6bea694 100644
--- a/components/bussiness-components/packingStationItem.vue
+++ b/components/bussiness-components/packingStationItem.vue
@@ -70,7 +70,7 @@
 </template>
 
 <script>
-import { go2 } from '@/utils/hook.js'
+import { go2, loginGo2 } from '@/utils/hook.js'
 export default {
   props: {
     info: {
@@ -93,7 +93,7 @@ export default {
   },
   methods: {
     goDetail() {
-      go2('client-detail', { id: this.info.enterpriseId })
+      loginGo2('client-detail', { id: this.info.enterpriseId })
     },
     transformBusiness(business) {
       let text = business?.trim() || '未知'
diff --git a/pages/client-detail/index.vue b/pages/client-detail/index.vue
index d8afb64..f4fdfc9 100644
--- a/pages/client-detail/index.vue
+++ b/pages/client-detail/index.vue
@@ -83,20 +83,22 @@ export default {
     },
     // 客户授信
     onCustomerCredit() {
-      if (this.$store.state.supplierInfo == null) {
+      if (this.$store.state.supplierInfo.id == null) {
         // 未完善企业store 里面 supplierInfo == null
         this.dialogTitle = '您还未完善企业信息'
         this.dialogContent = '请先完善企业基本信息才能对客户进行'
         this.confirmText = '去完善'
         this.dialogType = 1
         this.$refs.popup.open()
-      } else if (this.$store.state.supplierInfo.fddEnterpriseStatus == 1) {
+        return
+      } else if (!this.$store.state.supplierInfo.fddEnterpriseStatus || this.$store.state.supplierInfo.fddEnterpriseStatus == 1) {
         // 未电子签 supplierInfo.fddEnterpriseStatus == 1
         this.dialogTitle = '未认证电子签约'
         this.dialogContent = '客户授信过程需要进行电子合同签订，请先进行认证'
         this.confirmText = '去认证'
         this.dialogType = 2
         this.$refs.popup.open()
+        return
       } else if (!this.$store.state.supplierInfo.isVip) {
         // 开通vip supplierInfo 新增了一个isVip字段
         this.dialogTitle = '未开通VIP'
@@ -104,6 +106,7 @@ export default {
         this.confirmText = '去开通'
         this.dialogType = 3
         this.$refs.popup.open()
+        return
       } else {
         let info = this.$refs.basicInformationRef.getCompanyInfo()
         if (info.id) {
@@ -137,10 +140,12 @@ export default {
           })
           break
         case 3:
+          go2('mine')
           break
         default:
           break
       }
+      this.$refs.popup.close()
     }
   }
 }
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 900b896..5559036 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -144,7 +144,7 @@ export default {
         supplierId: this.$store.state.supplierInfo.supplierId
       },
       listData: [],
-      logo: 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif',
+      logo: '/static/imgs/mine/user-avatar.png',
       backgroundStyle: 'background: url("/static/imgs/mall/top-bg.png") no-repeat;',
       storeInfo: ''
     }
@@ -185,7 +185,7 @@ export default {
             this.$set(this.storeInformation, 'currentProductNumber', res.currentProductNumber)
             this.$set(this.storeInformation, 'name', res.name)
             if (!res.logo) {
-              this.logo = 'bug 默认logo'
+              this.logo = '/static/imgs/mine/user-avatar.png'
             } else {
               this.logo = res.logo
             }
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index dd58a73..c72fcf6 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -32,7 +32,7 @@
           </view>
           <view class="operation">
             <view class="box" v-if="hasLogin">
-              <view class="container" @click="go2('message')">
+              <view class="container" v-if="hasCompany" @click="go2('message')">
                 <image class="icon" src="/static/imgs/mine/msg-icon.png"></image>
                 <view v-if="messageNum > 0" class="number">
                   <text class="text">{{ messageNum }}</text>
@@ -214,6 +214,13 @@ export default {
   methods: {
     // 企业法大大实名认证
     certifyCompany() {
+      if (!this.hasCompany) {
+        uni.showToast({
+          title: '您还没有企业信息，请先完善企业信息',
+          icon: 'none'
+        })
+        return
+      }
       if (this.userInfo.fddEnterpriseStatus === fddEnterpriseStatus.UNCERTIFIED || this.userInfo.fddEnterpriseStatus === fddEnterpriseStatus.CERTIFIED_FAIL) {
         getVerifyUrl({ enterpriseId: this.$store.state.supplierInfo.id }).then((res) => {
           if (res) {
@@ -241,6 +248,7 @@ export default {
           title: '您还没有企业，请先加入企业',
           icon: 'none'
         })
+        return
       }
       loginGo2(page)
     },