Merge remote-tracking branch 'origin/master'

rk

14 小时以前 fa4c7baec36d58b4bdca66159ece743b5a45a9c8

 app/pages/guide-page/guide-page.vue

@@ -68,6 +68,7 @@
                     url: '/pages/login/login'
                  })
               }
               uni.$emit('loginSuccessStartLocationPolling');
            })
         }
      }