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

config/dev.env.js

 'use strict'
 module.exports = {
-  NODE_ENV: '"production"',
+  NODE_ENV: '"development"',
   CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
   debug: true,
   isMobilePlatform: true,
@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"3.0.0"'
+  currentVersion: '"3.0.3"'
 }

config/uat.env.js

@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"3.0.0"'
+  currentVersion: '"3.0.3"'
 }

src/pages/home/home-page.vue

@@ -139,7 +139,7 @@ export default {
       console.log('&&&&&&&&&&&&___ios')
       // if (!$config.isMobilePlatform) {
       // }
-      /*baidumap_location.getCurrentPosition(function (result) {
+      baidumap_location.getCurrentPosition(function (result) {
         if (window.localStorage.getItem('province')) {
           vm.city = window.localStorage.getItem('city')
           vm.province = window.localStorage.getItem('province')
@@ -150,7 +150,7 @@ export default {
           vm.guessingQuery(result.city)
         }
       }, function (error) {
-      })*/
+      })
       // setTimeout(vm.guessingQuery(), 0)
     },
     goFunctionHome (data) {

src/pages/myInfo/setting.vue

@@ -135,11 +135,6 @@ export default {
             this.update_content,
             this.version_url
           )
-        } else {
-          this.hote_update_version(
-            this.update_content,
-            this.version_url
-          )
         }
       } else {
         this.hlsPopup.showLongCenter('您的版本是最新版')