Merge remote-tracking branch 'origin/master'

zengh

2021-06-23 4a30ac9d771c5b990a856fc0a4902b643b909704

 pages/loging/loging.vue

@@ -58,7 +58,7 @@
               }
               this.$store.commit('getUse', data)
               wx.reLaunch({
                  url: '/pages/workbench/workbench?login=' + data.userName
                  url: '/pages/alarm_list/alarm_list?login=' + data.userName
               })
            }
         },
@@ -101,7 +101,7 @@
               this.passwords = '******';
               uni.hideNavigationBarLoading();
               uni.reLaunch({
                  url: '../workbench/workbench'
                  url: '../alarm_list/alarm_list'
               })
               return '成功登入'
            } else {