新增地图选择地址, 云商品地址全部使用新版地图选择

manifest.json

@@ -104,7 +104,8 @@
         "maps": {
           "amap": {
             "appkey_ios": "82af93ec51139c712c4118d84ba684ee",
-                        "appkey_android" : "0799f37420c0784f1e6cba230a68bdb1"
+            "appkey_android": "0799f37420c0784f1e6cba230a68bdb1",
+            "name": "amap_18982406440DFVLElaO"
           }
         },
         "payment": {
@@ -124,7 +125,8 @@
           "amap": {
             "__platform__": ["ios", "android"],
             "appkey_ios": "82af93ec51139c712c4118d84ba684ee",
-                        "appkey_android" : "0799f37420c0784f1e6cba230a68bdb1"
+            "appkey_android": "0799f37420c0784f1e6cba230a68bdb1",
+            "name": "amap_18982406440DFVLElaO"
           }
         },
         "oauth": {},
@@ -345,8 +347,10 @@
     "domain": "",
     "sdkConfigs": {
       "maps" : {
-                "qqmap" : {
+          "amap" : {
-                    "key" : "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
+              "key" : "275cd3601b1b2d6414f6c988e7911664",
+              "securityJsCode" : "d2d7c56801819e8bdf71b8a71846f235",
+              "serviceHost" : ""
           }
       }
     },
@@ -356,4 +360,3 @@
 }
 //拨打电话权限关闭
 /* ios打包配置 */
-

package-lock.json

@@ -7,20 +7,17 @@
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-      "dev": true
     },
     "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-      "dev": true
     },
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
       "requires": {
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
@@ -31,7 +28,6 @@
       "version": "6.26.3",
       "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
       "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
-      "dev": true,
       "requires": {
         "babel-code-frame": "^6.26.0",
         "babel-generator": "^6.26.0",
@@ -58,7 +54,6 @@
       "version": "6.26.1",
       "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
       "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
-      "dev": true,
       "requires": {
         "babel-messages": "^6.23.0",
         "babel-runtime": "^6.26.0",
@@ -74,7 +69,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
       "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
-      "dev": true,
       "requires": {
         "babel-runtime": "^6.22.0",
         "babel-template": "^6.24.1"
@@ -84,7 +78,6 @@
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dev": true,
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -93,7 +86,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
       "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
-      "dev": true,
       "requires": {
         "babel-core": "^6.26.0",
         "babel-runtime": "^6.26.0",
@@ -108,7 +100,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
       "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
@@ -118,7 +109,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
       "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dev": true,
       "requires": {
         "babel-runtime": "^6.26.0",
         "babel-traverse": "^6.26.0",
@@ -131,7 +121,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
       "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dev": true,
       "requires": {
         "babel-code-frame": "^6.26.0",
         "babel-messages": "^6.23.0",
@@ -148,7 +137,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
       "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dev": true,
       "requires": {
         "babel-runtime": "^6.26.0",
         "esutils": "^2.0.2",
@@ -159,20 +147,17 @@
     "babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
-      "dev": true
     },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-      "dev": true
     },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -182,7 +167,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
       "requires": {
         "ansi-styles": "^2.2.1",
         "escape-string-regexp": "^1.0.2",
@@ -194,14 +178,12 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-      "dev": true
     },
     "convert-source-map": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
       "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dev": true,
       "requires": {
         "safe-buffer": "~5.1.1"
       }
@@ -209,14 +191,12 @@
     "core-js": {
       "version": "2.6.11",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
+      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
-      "dev": true
     },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
       "requires": {
         "ms": "2.0.0"
       }
@@ -225,7 +205,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-      "dev": true,
       "requires": {
         "repeating": "^2.0.0"
       }
@@ -233,26 +212,22 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-      "dev": true
     },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
-      "dev": true
     },
     "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
-      "dev": true
     },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -261,7 +236,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
       "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-      "dev": true,
       "requires": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.1"
@@ -271,7 +245,6 @@
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
       "requires": {
         "loose-envify": "^1.0.0"
       }
@@ -279,38 +252,32 @@
     "is-finite": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="
-      "dev": true
     },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
-      "dev": true
     },
     "jsesc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s="
-      "dev": true
     },
     "json5": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
-      "dev": true
     },
     "lodash": {
       "version": "4.17.15",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-      "dev": true
     },
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
       "requires": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
@@ -319,7 +286,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -327,14 +293,12 @@
     "minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-      "dev": true
     },
     "mkdirp": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
       "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
       "requires": {
         "minimist": "^1.2.5"
       }
@@ -342,44 +306,37 @@
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-      "dev": true
     },
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
-      "dev": true
     },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-      "dev": true
     },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-      "dev": true
     },
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
-      "dev": true
     },
     "regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-      "dev": true
     },
     "repeating": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
       "requires": {
         "is-finite": "^1.0.0"
       }
@@ -387,26 +344,22 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-      "dev": true
     },
     "slash": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
-      "dev": true
     },
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-      "dev": true
     },
     "source-map-support": {
       "version": "0.4.18",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
       "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-      "dev": true,
       "requires": {
         "source-map": "^0.5.6"
       }
@@ -415,7 +368,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -423,25 +375,17 @@
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-      "dev": true
-    },
-    "tiny-pinyin": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmmirror.com/tiny-pinyin/-/tiny-pinyin-1.3.2.tgz",
-      "integrity": "sha512-uHNGu4evFt/8eNLldazeAM1M8JrMc1jshhJJfVRARTN3yT8HEEibofeQ7QETWQ5ISBjd6fKtTVBCC/+mGS6FpA=="
     },
     "to-fast-properties": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
-      "dev": true
     },
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
-      "dev": true
     }
   }
 }

package.json

@@ -13,7 +13,5 @@
             "通用组件"
         ]
     },
-    "dependencies": {
+    "dependencies": {}
-        "tiny-pinyin": "^1.3.2"
-    }
 }

pages.json

@@ -186,6 +186,14 @@
             "navigationBarTitleText" : "选择位置",
             "enablePullDownRefresh" : false
           }
+        },
+        {
+          "path" : "pages/select_address/select_address_n",
+          "style" : 
+          {
+            "navigationBarTitleText" : "选择位置",
+            "enablePullDownRefresh" : false
+          }
         }
     ],
 	"subPackages": [{

pages/nongKe/cloud_entrepot/indexb.vue

@@ -21,7 +21,7 @@
               </view>
             </view>
             <view style="display: flex;align-items: center;justify-content: right;margin-left: 20rpx;"
-              @click="showPicker=!showPicker">
+              @click="changeMap">
               <view class="town_name">{{street||'定位中'}}</view>
               <u--image :showLoading="true" src="/static/images/GXSC/XL.png" width="33.29rpx"
                 height="33.29rpx"></u--image>
@@ -127,7 +127,7 @@
       :status="status" /> -->
       
     <!-- 购物车 -->
-    <view class="card" :style="`bottom:${10}px`"
+    <view class="card" :style="`bottom:${30}px`"
       @click="navgo('/pages/order_addcart/order_addcart')">
       <view class="left">
         <view class="cart" style="position: relative;z-index: 9999999;">
@@ -698,7 +698,7 @@
       changeMerchant(item, type=false) {
         this.merchant = item;
         this.merchantTow = item.children[0];
-        this.storeParam.category_id = this.merchant.store_category_id;
+        this.storeParam.category_id = item.children[0].store_category_id;
         this.storeParam.page = 1;
         this.goodsList = [];
         if(type) this.$refs.allRef.close();
@@ -799,6 +799,21 @@
       // 获取规格名称
       getSkuName(item){
         return Object.keys(item.sku).join('/')||null;
+      },
+      // 选择位置
+      changeMap(){
+        uni.navigateTo({
+          url: `/pages/select_address/select_address_n`,
+          success:()=> {
+            uni.$once('changeAddress', (e)=>{
+              this.street_id = e.street.code;
+              this.street = e.street.name;
+              this.longitude = e.longitude;
+              this.latitude = e.latitude;
+              this.getStoreList(true);
+            })
+          }
+        })
       }
     },
     //刷新

pages/nongKe/cloud_entrepot/indexh.vue

@@ -17,8 +17,8 @@
               </view>
             </view>
             <view style="display: flex;align-items: center;justify-content: right;margin-left: 20rpx;"
-              @click="showPicker=!showPicker">
+              @click="changeMap">
-              <view class="town_name">{{street||'定位中'}}</view>
+              <view class="town_name" style="max-width: 200rpx;">{{street||'定位中'}}</view>
               <u--image :showLoading="true" src="/static/images/GXSC/XL.png" width="33.29rpx"
                 height="33.29rpx"></u--image>
             </view>
@@ -123,7 +123,7 @@
       :status="status" /> -->
       
     <!-- 购物车 -->
-    <view class="card" :style="`bottom:${10}px`"
+    <view class="card" :style="`bottom:${30}px`"
       @click="navgo('/pages/order_addcart/order_addcart?product_type=98&source=103')">
       <view class="left">
         <view class="cart" style="position: relative;z-index: 9999999;">
@@ -695,7 +695,7 @@
       changeMerchant(item, type=false) {
         this.merchant = item;
         this.merchantTow = item.children[0];
-        this.storeParam.category_id = this.merchant.store_category_id;
+        this.storeParam.category_id = item.children[0].store_category_id;
         this.storeParam.page = 1;
         this.goodsList = [];
         if(type) this.$refs.allRef.close();
@@ -718,7 +718,7 @@
         }
         cloudWarehouse({
           street_code: this.street_id,
-          // category_id: this.storeParam.category_id,
+          category_id: this.storeParam.category_id,
           order: this.storeParam.order,
           keyword: this.storeParam.keyword,
           page: this.storeParam.page,
@@ -801,6 +801,21 @@
       // 获取规格名称
       getSkuName(item){
         return Object.keys(item.sku).join('/')||null;
+      },
+      // 选择位置
+      changeMap(){
+        uni.navigateTo({
+          url: `/pages/select_address/select_address_n`,
+          success:()=> {
+            uni.$once('changeAddress', (e)=>{
+              this.street_id = e.street.code;
+              this.street = e.street.name;
+              this.longitude = e.longitude;
+              this.latitude = e.latitude;
+              this.getStoreList(true);
+            })
+          }
+        })
       }
     },
     //刷新

pages/nongKe/supply_chain/supplierB.vue

@@ -23,7 +23,7 @@
               	供销综合云商品
               </view>
             </view>
-            <view style="display: flex;align-items: center;justify-content: right;margin-left: 20rpx;" @click="showPicker=!showPicker">
+            <view style="display: flex;align-items: center;justify-content: right;margin-left: 20rpx;" @click="changeMap">
               <view class="town_name">{{street||'定位中'}}</view>
 							<u--image :showLoading="true" src="/static/images/GXSC/XL.png" width="33.29rpx"
 								height="33.29rpx"></u--image>
@@ -750,7 +750,7 @@
       		page: this.storeParam.page,
       		limit: 10,
       		order: this.storeParam.order,
-      		// store_category_id: this.storeParam.store_category_id,
+      		store_category_id: this.storeParam.store_category_id,
       		type_id: this.storeParam.type_id,
       		credit_buy: this.credit_buy,
       	}
@@ -870,6 +870,21 @@
             })
           }
         })
+      },
+      // 选择位置
+      changeMap(){
+        uni.navigateTo({
+          url: `/pages/select_address/select_address_n`,
+          success:()=> {
+            uni.$once('changeAddress', (e)=>{
+              this.street_id = e.street.code;
+              this.street = e.street.name;
+              this.longitude = e.longitude;
+              this.latitude = e.latitude;
+              this.storeMerchantList();
+            })
+          }
+        })
       }
 		},
 		//刷新

pages/select_address/select_address.vue

@@ -10,8 +10,16 @@
       </view>
     </u-sticky>
     <view style="background-color: #f4f4f4;height: 30rpx;"></view>
-    <view class="address-box" v-if="current==0">
+    <view class="address-box" v-if="current==0" style="padding: 0;">
-      <view class="head_item">
+      <map 
+        style="width: 750rpx;height: 750rpx;"
+        :longitude="longitude"
+        :latitude="latitude"
+        show-location
+        @controltap="handleMapTap"
+      ></map>
+      <!-- <Amap></Amap> -->
+      <view class="head_item" style="padding: 20rpx;">
         <view class="re-location">
           <view class="re-title">当前位置: </view>
           <view>{{street}}</view>
@@ -20,12 +28,6 @@
           <image class="re-address-img" src="@/static/images/re_address.png"></image>重新定位
         </view>
       </view>
-      <view class="head_item_tips">
-        <view>附近地址</view>
-      </view>
-      <view class="address-list">商业宾馆（春雨路二段）</view>
-      <view class="address-list">商业宾馆（春雨路二段）</view>
-      <view class="address-list">商业宾馆（春雨路二段）</view>
     </view>
     <view class="address-box" v-if="current==1">
       <view class="head_item_tips">
@@ -64,18 +66,22 @@
     getArea,
     getStreet
   } from "@/api/article.js";
-  import pinyin from "tiny-pinyin";
+  import { Toast } from '@/libs/uniApi';
+  // import Amap from "./map.nvue";
   export default {
+    // components:{
+    //   Amap
+    // },
     data() {
       return {
         tabsList: [{
-          name: '附近地址',
+          name: '地图定位',
         }, {
           name: '泸州区县',
         }, ],
-        current: 1,
+        current: 0,
-        latitude: '',
+        latitude: '28.87',
-        longitude: '',
+        longitude: '105.44',
         town: '',
         street_id: '',
         street: '',
@@ -122,7 +128,6 @@
               this.town = res.data.address_reference.town.title
               this.street_id = res.data.address_reference.town.id
               this.street = res.data.address_reference.town.title;
-
             }).catch(err => {
               uni.showToast({
                 title: err,
@@ -168,10 +173,9 @@
       },
       initPinyin() {
         this.mapList = {};
-        if (pinyin.isSupported()) {
         this.streetList.forEach((item) => {
-            let str = pinyin.convertToPinyin(item.name[0]);
+          let str = item.pinyin?.toUpperCase();
-            str = str[0] ? str[0] : '#';
+          str = str ? str : '#';
           if (this.mapList[str]) {
             this.mapList[str].push(item);
           } else {
@@ -179,14 +183,12 @@
             this.mapList[str].push(item)
           }
         })
-        } else {
-          this.mapList['#'] = this.streetList;
-        }
       },
       changeArea(item) {
         this.area_change = item.code;
         this.loadStreet(this.area_change);
       },
+      // 选择位置
       changeStreet(item){
         uni.navigateBack({
           success: () => {
@@ -196,6 +198,11 @@
             })
           }
         })
+      },
+      // 点击地图
+      handleMapTap(e){
+        console.log('点击', e);
+        
       }
     },
     onPullDownRefresh() {

pages/select_address/select_address_n.nvue

@@ -0,0 +1,411 @@
+<template>
+  <view class="" style="background-color: #fff;">
+   <u-sticky customNavHeight="0">
+      <view class="head_top">
+       <!-- <u-search placeholder="搜索小区、办公楼等" @custom="searchMap"></u-search>
+        <view style="height: 20rpx;"></view> -->
+        <u-tabs :list="tabsList" itemStyle="font-size: 32rpx;height: 74rpx;" :current="current" @change="changeCurrent"
+          lineColor="#FF6D20" lineWidth="105rpx" height="7rpx"></u-tabs>
+        </u-tabs>
+      </view>
+    </u-sticky>
+    <view style="background-color: #f4f4f4;height: 30rpx;"></view>
+    <view class="address-box" v-if="current==0" style="padding: 0;">
+      <map style="width: 750rpx;height: 750rpx;" :longitude="longitude" :latitude="latitude" :markers="[markers]"
+        show-location @tap="handleMapTap"></map>
+      <view class="head_item" style="padding: 10rpx 20rpx;">
+        <view class="re-location">
+          <view style="width: 120rpx;"><text class="text">当前位置: </text></view>
+          <view style="flex: 1;">
+            <text
+              class="text">{{locationInfo.formatted_addresses?locationInfo.formatted_addresses.recommend:locationInfo.address}}</text>
+          </view>
+        </view>
+        <view class="re-btn" @click="reGetLocation">
+          <image class="re-address-img" src="@/static/images/re_address.png"></image><text class="text">重新定位</text>
+        </view>
+      </view>
+      <u-button text="确认" @click="submitAddress"></u-button>
+    </view>
+    <view class="address-box" v-if="current==1">
+      <view class="head_item_tips">
+        <view><text class="text">泸州区县</text></view>
+      </view>
+      <view class="area">
+        <view class="area-item" :class="{'area-item-on': item.code==area_change}" v-for="(item, index) in areaList"
+          :key="index" @click="changeArea(item)">
+          <text class="text">{{item.name}}</text>
+        </view>
+      </view>
+      <view class="head_item_tips">
+        <view><text class="text">选择街道/镇</text></view>
+      </view>
+      <view class="street">
+        <view class="letter-item" v-for="key in mapKey" :key="key">
+          <view class="letter"><text class="text">{{key}}</text></view>
+          <view class="item-box">
+            <view class="street-item" v-for="item in mapList[key]" :key="item.code" @click="changeStreet(item)">
+              <text class="text">{{item.name}}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import {
+    getGeocoder,
+    merClassifly,
+    getProductslist
+  } from '@/api/store.js';
+  import {
+    getArea,
+    getStreet
+  } from "@/api/article.js";
+  import { Toast } from '@/libs/uniApi';
+  export default {
+    data() {
+      return {
+        tabsList: [{
+          name: '地图定位',
+        }, {
+          name: '泸州区县',
+        }],
+        current: 0,
+        latitude: '28.87',
+        longitude: '105.44',
+        markers: {
+          id: 1,
+          longitude: '28.87',
+          latitude: '105.44',
+          iconPath: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/cbbd5202311241523412538.png',
+          width: 28,
+          height: 28
+        },
+        locationInfo: {},
+        town: '',
+        street_id: '',
+        street: '',
+        areaList: [],
+        streetList: [],
+        mapList: {},
+        area_change: '',
+        street_change: '',
+      }
+    },
+    onLoad(options) {
+      this.getLoaction();
+      this.loadArea();
+    },
+    onShow() {},
+    computed: {
+      mapKey() {
+        return Object.keys(this.mapList).sort()
+      }
+    },
+    methods: {
+      changeCurrent(e) {
+        this.current = e.index;
+      },
+      getLoaction() {
+        this.street = '定位中'
+        this.locationInfo = {};
+        this.locationInfo.formatted_addresses = {};
+        this.locationInfo.formatted_addresses.recommend = '定位中'
+        uni.getLocation({
+          type: 'wgs84',
+          timeout: '4',
+          success: (res) => {
+            let latitude, longitude;
+            latitude = res.latitude.toString();
+            longitude = res.longitude.toString();
+            this.latitude = res.latitude.toFixed(6);
+            this.longitude = res.longitude.toFixed(6);
+            this.$store.commit('setLocation', {
+              lat: res.latitude.toFixed(6),
+              long: res.longitude.toFixed(6),
+            });
+            getGeocoder({
+              lat: latitude,
+              long: longitude
+            }).then(res => {
+              this.locationInfo = res.data;
+              this.town = res.data.address_reference.town.title
+              this.street_id = res.data.address_reference.town.id
+              this.street = res.data.address_reference.town.title;
+            }).catch(err => {
+              uni.showToast({
+                title: err,
+                icon: 'none'
+              })
+              this.street = '定位失败'
+            })
+          },
+          fail: (err) => {
+            console.log('定位失败');
+            this.isshow = false
+            Toast('定位失败,请检查定位权限是否开启')
+            this.street = '定位失败'
+            this.locationInfo.formatted_addresses.recommend = '定位失败'
+
+            // uni.showToast({
+            // 	title: "获取定位超时",
+            // 	icon: 'none',
+            // 	duration: 2000
+            // });
+          }
+        });
+      },
+      reGetLocation() {
+        this.getLoaction()
+      },
+      loadArea() {
+        getArea({
+          city_code: 510500
+        }).then((res) => {
+          this.areaList = res.data;
+          this.changeArea(this.areaList[0]);
+        })
+      },
+      loadStreet(area_code) {
+        this.street_change = '';
+        getStreet({
+          area_code
+        }).then((res) => {
+          this.streetList = res.data;
+          this.initPinyin();
+        })
+      },
+      initPinyin() {
+        this.mapList = {};
+        this.streetList.forEach((item) => {
+          let str = item.pinyin?.toUpperCase();
+          str = str ? str : '#';
+          if (this.mapList[str]) {
+            this.mapList[str].push(item);
+          } else {
+            this.mapList[str] = [];
+            this.mapList[str].push(item)
+          }
+        })
+      },
+      changeArea(item) {
+        this.area_change = item.code;
+        this.loadStreet(this.area_change);
+      },
+      // 选择位置
+      changeStreet(item) {
+        uni.navigateBack({
+          success: () => {
+            uni.$emit('changeAddress', {
+              area: this.area_change,
+              street: item
+            })
+          }
+        })
+      },
+      // 点击地图
+      handleMapTap(e) {
+        // console.log('点击地图', e);
+        // #ifdef H5
+        return Toast('H5暂不支持选择坐标');
+        // #endif
+        let longitude = e.detail.longitude;
+        let latitude = e.detail.latitude;
+        this.markers.longitude = longitude;
+        this.markers.latitude = latitude;
+        // console.log('修改成功', this.markers);
+        getGeocoder({
+          lat: latitude,
+          long: longitude
+        }).then(res => {
+          // console.log(res);
+          this.locationInfo = res.data;
+        }).catch(err => {
+          uni.showToast({
+            title: err,
+            icon: 'none'
+          })
+          this.locationInfo = {};
+          this.locationInfo.formatted_addresses = {};
+          this.locationInfo.formatted_addresses.recommend = '定位失败'
+        })
+      },
+      submitAddress() {
+        console.log(this.locationInfo);
+        try {
+          this.town = this.locationInfo.address_reference.town.title;
+          this.street_id = this.locationInfo.address_reference.town.id;
+          this.street = this.locationInfo.address_reference.town.title;
+          let obj = {
+            area: this.locationInfo.ad_info.adcode,
+            street: {
+              name: this.street,
+              code: this.street_id
+            },
+            latitude: this.latitude,
+            longitude: this.longitude
+          }
+          uni.navigateBack({
+            success: () => {
+              uni.$emit('changeAddress', obj)
+            }
+          })
+        } catch (e) {
+          return Toast('地址有误,请重新选择')
+        }
+      },
+      searchMap(){
+        uni.request({
+          url: 'https://restapi.amap.com/v3/place/text?keywords=北京大学&city=beijing&offset=20&page=1&key=0799f37420c0784f1e6cba230a68bdb1&extensions=all',
+          success: (res) => {
+            console.log(res);
+          },
+          fail: (e) => {
+            console.log(e);
+          }
+        })
+      }
+    },
+    onPullDownRefresh() {
+      uni.stopPullDownRefresh()
+    }
+  }
+</script>
+
+<style>
+  /* page {
+    background-color: #fff;
+  } */
+
+  .text {
+    font-size: 28rpx;
+    white-space: normal;
+  }
+
+  .head_top {
+    background-color: #fff;
+    padding: 28rpx;
+  }
+
+  .address-box {
+    border-radius: 21rpx 21rpx 0rpx 0rpx;
+    padding: 30rpx 28rpx;
+    width: 750rpx;
+  }
+
+  .head_item {
+    width: 750rpx;
+    flex-direction: row;
+    justify-content: space-between;
+    padding-bottom: 28rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #333333;
+  }
+
+  .re-location {
+    flex-direction: row;
+    flex-wrap: nowrap;
+    width: 480rpx;
+    align-items: center;
+  }
+
+  .re-address-img {
+    width: 38.55rpx;
+    height: 38.55rpx;
+    margin-right: 10rpx;
+  }
+
+  .re-btn {
+    flex-direction: row;
+    padding-left: 10rpx;
+    width: 200rpx;
+    height: 100rpx;
+    align-items: center;
+  }
+
+  .head_item_tips {
+    height: 44rpx;
+    font-size: 32rpx;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #737373;
+  }
+
+  .address-list {
+    font-size: 28rpx;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #333333;
+    height: 80rpx;
+    line-height: 75rpx;
+    border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
+  }
+
+  .area {
+    flex-direction: row;
+    flex-wrap: wrap;
+    padding-top: 30rpx;
+    justify-content: flex-start;
+  }
+
+  .area-item {
+    height: 64rpx;
+    /* width: 100px; */
+    background-color: #fff;
+    border-radius: 11rpx 11rpx 11rpx 11rpx;
+    border: 2rpx solid #B3B3B3;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    padding: 0 20rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #737373;
+    margin-bottom: 22rpx;
+    margin-right: 22rpx;
+  }
+
+  .area-item-on {
+    color: #ff6d20;
+    border: 2rpx solid #ff6d20;
+  }
+
+  .street {
+    padding-top: 28rpx;
+
+
+  }
+
+  .letter-item {
+    flex-direction: row;
+  }
+
+  .letter {
+    margin-right: 28rpx;
+    font-size: 25rpx;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 400;
+    width: 40rpx;
+    text-align: center;
+    color: #737373;
+  }
+
+  .item-box {
+    flex: 1;
+  }
+
+  .street-item {
+    width: 100%;
+    padding-bottom: 28rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 400;
+    color: #333333;
+  }
+</style>

pages/store/merchantDetails/index.vue

@@ -6,19 +6,18 @@
 				恭喜，您的申请已通过！
 			</view>
 		</view>
-		<!-- <view class="msg" v-if="mer_id > 0 && resData.login_url">
+		<view class="msg" v-if="mer_id > 0 && resData.login_url">
-			<view class="url">
+			<view class="url" @click="copyTBL(resData.login_url, '登录地址')">
 				<text class="head">登录地址：</text>
 				<text class="content">{{resData.login_url}}</text>
 			</view>
-			<view class="phone">
+			<view class="phone" @click="copyTBL(resData.phone, '商户账号')">
 				<view class="">
 					<text class="head">商户账号：</text>
 					<text class="content">{{resData.phone}}</text>
 				</view>
-				<text class="cope" @click="copyTBL()">复制</text>
 			</view>
-		</view> -->
+		</view>
 		<view class="btn" v-if="mer_id > 0">
 			<view class="">
 				温馨提示：初始密码默认为手机号后六位，请初次登录后及时修改
@@ -59,21 +58,20 @@
 					this.resData = res.data
 				})
 			},
-			copyTBL(url) {
+			copyTBL(url, str="") {
-				let copeData = `登录地址:${this.resData.login_url} 商户账号:${this.resData.phone}`
 				// #ifdef MP || APP-PLUS
 				uni.setClipboardData({
-					data: copeData,
+					data: url,
 					success: function() {
 						uni.showToast({
-							title: '复制成功',
+							title: str+'复制成功',
 							duration: 1000
 						});
 					}
 				});
 				// #endif
 				// #ifdef H5
-				this.copyText(copeData)
+				this.copyText(url, str)
 				// #endif
 			},
 			//H5复制方法
@@ -94,7 +92,7 @@
 				document.body.removeChild(transfer);
 			},
 			// 兼容版一键复制
-			copyText(text) {
+			copyText(text, str="") {
 				// 需要转化成字符串
 				const textString = text.toString();
 				let input = document.querySelector('#copy-input');
@@ -113,7 +111,7 @@
 				if (document.execCommand('copy')) {
 					document.execCommand('copy');
 					this.$util.Tips({
-						title: '复制成功'
+						title: str + '复制成功'
 					});
 				}
 				input.blur();
@@ -162,10 +160,10 @@
 		.msg {
 			width: 85%;
 			padding: 30rpx;
-			height: 150rpx;
+			height: 190rpx;
 			margin: 70rpx 70rpx;
 			background-color: #F6F6F6;
-			border-radius: 8rpx;
+			border-radius: 10rpx;
 			.url {
 				display: flex;
 				flex-wrap: nowrap;