Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/views/Public/BusNavbar.vue

@@ -144,18 +144,12 @@ export default {
             this.navcode.push(newList);
           }
           // 交易状态信息
-          const arr = []
-          arr.push(
-            this.model.selbut.dsppndclm, 
-            this.model.selbut.dsppndram, 
-            this.model.selbut.dspamenbr, 
-            this.model.selbut.dspclsdat, 
-            this.model.dspgcdclsdat
-          )
-          this.tState = arr.filter(s => {
-            const v = s.trim()
-            return v !== ""
-          })
+          const selbut = this.model.selbut ?? {}
+          const arr = Object.keys(selbut)
+                            .filter(key => key.startsWith("dsp"))
+                            .map(key => selbut[key] || "")
+                            .filter(s => s.trim()!== "")
+          this.tState = arr
         } else {
           this.navcode = [];
           this.$notify.error({ title: "错误", message: "服务请求失败！" });