Browse Source

Merge branch 'devlop' of http://git.qniao.cn/qniao/print-package-app into devlop

devlop
mo-bai 4 years ago
parent
commit
3ead30c961
2 changed files with 7 additions and 4 deletions
  1. 4
      pages/mine/index.vue
  2. 7
      pages/page-view/index.vue

4
pages/mine/index.vue

@ -165,7 +165,9 @@ export default {
}) })
return return
} }
if (this.userInfo.fddEnterpriseStatus === fddEnterpriseStatus.UNCERTIFIED || this.userInfo.fddEnterpriseStatus === fddEnterpriseStatus.CERTIFIED_FAIL) {
if (
[fddEnterpriseStatus.UNCERTIFIED, fddEnterpriseStatus.CERTIFIED_ING, fddEnterpriseStatus.CERTIFIED_FAIL].includes(this.userInfo.fddEnterpriseStatus)
) {
getVerifyUrl({ enterpriseId: this.$store.state.companyInfo.id }).then((res) => { getVerifyUrl({ enterpriseId: this.$store.state.companyInfo.id }).then((res) => {
if (res) { if (res) {
console.log('res:', res) console.log('res:', res)

7
pages/page-view/index.vue

@ -35,6 +35,7 @@ export default {
}, },
created() { created() {
makeSocket({ pageInfo: 'page-view', retry: true }).then((res) => { makeSocket({ pageInfo: 'page-view', retry: true }).then((res) => {
this.destroySocket()
this.socket = res this.socket = res
this.socket.onMessage(this.getMessage) this.socket.onMessage(this.getMessage)
}) })
@ -70,9 +71,9 @@ export default {
}, },
destroyed() { destroyed() {
this.destroySocket() this.destroySocket()
},
onHide() {
this.destroySocket()
} }
// onHide() {
// this.destroySocket()
// }
} }
</script> </script>
Loading…
Cancel
Save