Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !58

src/views/home/index.vue

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