Merge remote-tracking branch 'origin/develop' into feature/zjx

src/views/home/index.vue

@@ -90,7 +90,7 @@ export default {
             buttonPosition: 'RB'
           });
           geolocation.getCurrentPosition((status, result) => {
-            console.log('geolocation,', status, result);
+            console.log('geolocationgeolocation,', status, result);
             if (result.position) {
               storejs.set('geolocation', result.position);
             }