From 9c50a6a7cf6f40af955672f7b38950aa61a5484f Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 25 Dec 2021 09:32:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/arcNavBar/index.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/components/arcNavBar/index.vue b/src/components/arcNavBar/index.vue
index e5f21e2..8ec562e 100644
--- a/src/components/arcNavBar/index.vue
+++ b/src/components/arcNavBar/index.vue
@@ -175,6 +175,7 @@
var imgArr = result.tpurl.split(',')
var tabOne = res.data.data[0].jx.split(',')
+ var tabTwo = res.data.data[0].sh.split(',')
this.$store.commit('SET_POPUPBGURL', imgArr[0])
this.$store.commit('SET_POPUPQRURL', result.codeurl)
@@ -190,7 +191,12 @@
} else {
this.$store.commit('SET_TEACHLIST', [])
}
- this.$store.commit('SET_LIVELIST', [])
+
+ if (res.data.data[0].sh != '') {
+ this.$store.commit('SET_LIVELIST', tabTwo)
+ } else {
+ this.$store.commit('SET_LIVELIST', [])
+ }
this.newPopup(result)
this.viewer.flyToPosition(
--
Gitblit v1.9.3