BUG修改

README.md

@@ -60,7 +60,7 @@ For a detailed explanation on how things work, check out the [guide](http://vuej
   账户：15062177566@163.com
   
   密码：Xcmg66966
-  
+  JPUSH_APPKEY
   开发环境：
   
     应用名称：徐工金服dev  com.xcmg.app.dev
@@ -77,7 +77,7 @@ For a detailed explanation on how things work, check out the [guide](http://vuej
  账户：15996971299
  
  密码：guo15996971299
- 
+ com.baidu.lbsapi.API_KEY
  开发环境：
  
     应用名称：徐工融租dev  com.xcmg.app.dev

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.xcmg.app" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>徐工金服</name>
+<widget id="com.xcmg.app.dev" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+    <name>徐工金服UAT</name>
     <description>
     正式环境版
   </description>
@@ -109,5 +109,5 @@
     <plugin name="cordova-plugin-device" spec="2.0.2" />
     <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
     <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
-    <engine name="android" spec="^6.2.0" />
+    <engine name="android" spec="~6.2.0" />
 </widget>

package-lock.json

@@ -2501,6 +2501,7 @@
       "version": "6.2.0",
       "resolved": "https://registry.npm.taobao.org/cordova-android/download/cordova-android-6.2.0.tgz",
       "integrity": "sha1-32iB29cuIzA8o9/e03KrAWFMAXM=",
+      "dev": true,
       "requires": {
         "cordova-common": "^2.0.1",
         "elementtree": "^0.1.6",
@@ -2512,27 +2513,33 @@
       "dependencies": {
         "abbrev": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "ansi": {
           "version": "0.3.1",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "balanced-match": {
           "version": "0.4.2",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "base64-js": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "big-integer": {
           "version": "1.6.17",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "bplist-parser": {
           "version": "0.1.1",
           "bundled": true,
+          "dev": true,
           "requires": {
             "big-integer": "^1.6.7"
           }
@@ -2540,6 +2547,7 @@
         "brace-expansion": {
           "version": "1.1.6",
           "bundled": true,
+          "dev": true,
           "requires": {
             "balanced-match": "^0.4.1",
             "concat-map": "0.0.1"
@@ -2547,11 +2555,13 @@
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "cordova-common": {
           "version": "2.0.1",
           "bundled": true,
+          "dev": true,
           "requires": {
             "ansi": "^0.3.1",
             "bplist-parser": "^0.1.0",
@@ -2570,11 +2580,13 @@
         },
         "cordova-registry-mapper": {
           "version": "1.1.15",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "elementtree": {
           "version": "0.1.7",
           "bundled": true,
+          "dev": true,
           "requires": {
             "sax": "1.1.4"
           }
@@ -2582,6 +2594,7 @@
         "glob": {
           "version": "5.0.15",
           "bundled": true,
+          "dev": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -2593,6 +2606,7 @@
         "inflight": {
           "version": "1.0.6",
           "bundled": true,
+          "dev": true,
           "requires": {
             "once": "^1.3.0",
             "wrappy": "1"
@@ -2600,15 +2614,18 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "lodash": {
           "version": "3.10.1",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "minimatch": {
           "version": "3.0.3",
           "bundled": true,
+          "dev": true,
           "requires": {
             "brace-expansion": "^1.0.0"
           }
@@ -2616,6 +2633,7 @@
         "nopt": {
           "version": "3.0.6",
           "bundled": true,
+          "dev": true,
           "requires": {
             "abbrev": "1"
           }
@@ -2623,21 +2641,25 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "dev": true,
           "requires": {
             "wrappy": "1"
           }
         },
         "os-homedir": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "os-tmpdir": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "osenv": {
           "version": "0.1.4",
           "bundled": true,
+          "dev": true,
           "requires": {
             "os-homedir": "^1.0.0",
             "os-tmpdir": "^1.0.0"
@@ -2645,11 +2667,13 @@
         },
         "path-is-absolute": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "plist": {
           "version": "1.2.0",
           "bundled": true,
+          "dev": true,
           "requires": {
             "base64-js": "0.0.8",
             "util-deprecate": "1.0.2",
@@ -2659,50 +2683,61 @@
         },
         "properties-parser": {
           "version": "0.2.3",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "q": {
           "version": "1.5.0",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "sax": {
           "version": "1.1.4",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "semver": {
           "version": "5.3.0",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "shelljs": {
           "version": "0.5.3",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "underscore": {
           "version": "1.8.3",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "unorm": {
           "version": "1.4.1",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         },
         "xmlbuilder": {
           "version": "4.0.0",
           "bundled": true,
+          "dev": true,
           "requires": {
             "lodash": "^3.5.0"
           }
         },
         "xmldom": {
           "version": "0.1.27",
-          "bundled": true
+          "bundled": true,
+          "dev": true
         }
       }
     },

package.json

@@ -15,7 +15,6 @@
   "dependencies": {
     "autosize": "^3.0.20",
     "better-scroll": "^1.10.3",
-    "cordova-android": "^6.2.0",
     "cordova-ios": "^5.1.1",
     "cordova-plugin-camera": "^2.4.1",
     "cordova-plugin-compat": "^1.2.0",
@@ -34,7 +33,8 @@
     "vue-router": "^3.0.1",
     "vuex": "^2.1.1",
     "vuex-i18n": "^1.3.1",
-    "vux": "^2.9.0"
+    "vux": "^2.9.0",
+    "cordova-android": "~6.2.0"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",
@@ -50,6 +50,7 @@
     "chalk": "^2.0.1",
     "connect-history-api-fallback": "^1.3.0",
     "copy-webpack-plugin": "^4.0.1",
+    "cordova-android": "^6.2.0",
     "cross-env": "^5.2.0",
     "css-loader": "^0.28.0",
     "eslint": "^4.15.0",

plugins/android.json

@@ -6,6 +6,99 @@
   "config_munge": {
     "files": {}
   },
-  "installed_plugins": {},
-  "dependent_plugins": {}
+  "installed_plugins": {
+    "com.handmobile.cordovaplugin.hotpatch": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-baidumaplocation": {
+      "ANDROID_KEY": "q4W0FynBkTd4v44ZM8m4MxUpuXBqGIqQ",
+      "IOS_KEY": "hhouKKwxALvC7MBZmnfwgSacHOfFOlNu",
+      "IOS_LOCATION_DESC": "请点击'好'以允许访问。",
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-camera": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-datepicker": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-device": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-dialogs": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-file": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-file-transfer": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-hls-cloudroom": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-hrms-faceidentify": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-image-picker": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-ionic-webview": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-jcore": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-media-capture": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-network-information": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-splashscreen": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-statusbar": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-touch-id": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-whitelist": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "IdCardPlugin": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "ionic-plugin-keyboard": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "jpush-phonegap-plugin": {
+      "APP_KEY": "bef4fd44dcf54b79b8ab27c3",
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    }
+  },
+  "dependent_plugins": {
+    "cordova-plugin-3dtouch": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-compat": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-contacts": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-fingerprint": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-themeablebrowser": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "cordova-plugin-x-toast": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    },
+    "es6-promise-plugin": {
+      "PACKAGE_NAME": "com.xcmg.app.dev"
+    }
+  }
 }

src/pages/contractCreate/creat-rent-info.vue

@@ -313,7 +313,6 @@
       <tab-button v-if="!isReadOnly && !calculeFlag" class="before" @click.native="save">计算</tab-button>
       <tab-button v-if="!isReadOnly && calculeFlag" class="before" @click.native="save">重新计算</tab-button>
       <tab-button v-if="isReadOnly" class="before" @click.native="$routeGo()">上一步</tab-button>
-      <!-- <tab-button class="before" @click.native="shibie()">识别</tab-button> -->
       <tab-button class="next" @click.native="next">下一步</tab-button>
     </bottom-tab>
     <SelectProduct
@@ -622,12 +621,6 @@ export default {
         }
       })
     },
-    shibie () {
-      cordova.plugins.IdCardPlugin.idCardIdentify({"idNum":"123213213123123123123213","idName":"张三","timeout":10000}, function (success) {alert(success);
-      }, function (reason) {
-          alert("Failed: " + reason);
-      });
-    },
     // 查看大图
     showBigPicture (pic) {
       let vm = this

src/pages/home/home-page.vue

@@ -130,7 +130,8 @@ export default {
           //   }, {enableHighAccuracy: true})
           // } else { // ios使用插件定位
           console.log('&&&&&&&&&&&&___ios')
-          baidumap_location.getCurrentPosition(function (result) {
+          if (!$config.isMobilePlatform) {
+            baidumap_location.getCurrentPosition(function (result) {
             if (window.localStorage.getItem('province')) {
               vm.city = window.localStorage.getItem('city')
               vm.province = window.localStorage.getItem('province')
@@ -142,8 +143,7 @@ export default {
             }
           }, function (error) {
           })
-          // if (!$config.isMobilePlatform) {
-          // }
+          }
           // }
           // setTimeout(vm.guessingQuery(), 0)
         },