Merge branch 'master' of http://192.168.0.105:10010/r/school-web

shuishen

2022-01-20 3ea790ec7b0280a55cc406d2c3dc9fa5411a7471

 src/components/arcNavBar/index.vue

@@ -19,7 +19,7 @@
                     @click="closeModel">
            </div>
            <div class="content">
                <div class="tab">
                <div class="tab" v-show="false">
                    <ul>
                        <li :class="{'on': item.flag}"
                            v-for="(item, index) in titleList"
@@ -180,8 +180,6 @@
                this.$store.commit('CLEAR_ALL', null)

                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)
@@ -195,13 +193,15 @@
                if (result.videourl && result.videourl != '') {
                    this.$store.commit('SET_MONITORURL', result.videourl)
                }
                if (res.data.data[0].jx != '') {
                if (res.data.data[0].jx != undefined && res.data.data[0].jx != '') {
                    var tabOne = res.data.data[0].jx.split(',')
                    this.$store.commit('SET_TEACHLIST', tabOne)
                } else {
                    this.$store.commit('SET_TEACHLIST', [])
                }

                if (res.data.data[0].sh != '') {
                if (res.data.data[0].sh != undefined && res.data.data[0].sh != '') {
                    var tabTwo = res.data.data[0].sh.split(',')
                    this.$store.commit('SET_LIVELIST', tabTwo)
                } else {
                    this.$store.commit('SET_LIVELIST', [])