Merge branch 'dev'

elmknot · May 9, 2019 · 9221157 · 9221157
2 parents c862b32 + 08e7d54
commit 9221157
Show file tree

Hide file tree

Showing 17 changed files with 185 additions and 190 deletions.
diff --git a/packages/uni-mp-baidu/dist/index.js b/packages/uni-mp-baidu/dist/index.js
@@ -144,33 +144,39 @@ function upx2px (number, newDeviceWidth) {
   return number < 0 ? -result : result
 }
 
-function normalize (fromArgs) {
-  let currentIndex = parseInt(fromArgs.current);
-  if (isNaN(currentIndex)) {
-    return
-  }
-  const urls = fromArgs.urls;
-  if (!Array.isArray(urls)) {
-    return
-  }
-  const len = urls.length;
-  if (!len) {
-    return
-  }
-  if (currentIndex < 0) {
-    currentIndex = 0;
-  } else if (currentIndex >= len) {
-    currentIndex = len - 1;
-  }
-  if (currentIndex > 0) {
-    fromArgs.current = urls[currentIndex];
-    fromArgs.urls = urls.filter(
-      (item, index) => index < currentIndex ? item !== urls[currentIndex] : true
-    );
-  } else {
-    fromArgs.current = urls[0];
+var previewImage = {
+  args (fromArgs) {
+    let currentIndex = parseInt(fromArgs.current);
+    if (isNaN(currentIndex)) {
+      return
+    }
+    const urls = fromArgs.urls;
+    if (!Array.isArray(urls)) {
+      return
+    }
+    const len = urls.length;
+    if (!len) {
+      return
+    }
+    if (currentIndex < 0) {
+      currentIndex = 0;
+    } else if (currentIndex >= len) {
+      currentIndex = len - 1;
+    }
+    if (currentIndex > 0) {
+      fromArgs.current = urls[currentIndex];
+      fromArgs.urls = urls.filter(
+        (item, index) => index < currentIndex ? item !== urls[currentIndex] : true
+      );
+    } else {
+      fromArgs.current = urls[0];
+    }
+    return {
+      indicator: false,
+      loop: false
+    }
   }
-}
+};
 
 // 不支持的 API 列表
 const todos = [
@@ -232,15 +238,7 @@ const protocols = {
       method: false
     }
   },
-  previewImage: {
-    args (fromArgs) {
-      normalize(fromArgs);
-      return {
-        indicator: false,
-        loop: false
-      }
-    }
-  },
+  previewImage,
   getRecorderManager: {
     returnValue (fromRet) {
       fromRet.onFrameRecorded = createTodoMethod('RecorderManager', 'onFrameRecorded');

diff --git a/packages/uni-mp-baidu/package.json b/packages/uni-mp-baidu/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-mp-baidu",
-	"version": "0.0.829",
+	"version": "0.0.830",
 	"description": "uni-app mp-baidu",
 	"main": "dist/index.js",
 	"scripts": {

diff --git a/packages/uni-mp-toutiao/dist/index.js b/packages/uni-mp-toutiao/dist/index.js
@@ -144,33 +144,39 @@ function upx2px (number, newDeviceWidth) {
   return number < 0 ? -result : result
 }
 
-function normalize (fromArgs) {
-  let currentIndex = parseInt(fromArgs.current);
-  if (isNaN(currentIndex)) {
-    return
-  }
-  const urls = fromArgs.urls;
-  if (!Array.isArray(urls)) {
-    return
-  }
-  const len = urls.length;
-  if (!len) {
-    return
-  }
-  if (currentIndex < 0) {
-    currentIndex = 0;
-  } else if (currentIndex >= len) {
-    currentIndex = len - 1;
-  }
-  if (currentIndex > 0) {
-    fromArgs.current = urls[currentIndex];
-    fromArgs.urls = urls.filter(
-      (item, index) => index < currentIndex ? item !== urls[currentIndex] : true
-    );
-  } else {
-    fromArgs.current = urls[0];
+var previewImage = {
+  args (fromArgs) {
+    let currentIndex = parseInt(fromArgs.current);
+    if (isNaN(currentIndex)) {
+      return
+    }
+    const urls = fromArgs.urls;
+    if (!Array.isArray(urls)) {
+      return
+    }
+    const len = urls.length;
+    if (!len) {
+      return
+    }
+    if (currentIndex < 0) {
+      currentIndex = 0;
+    } else if (currentIndex >= len) {
+      currentIndex = len - 1;
+    }
+    if (currentIndex > 0) {
+      fromArgs.current = urls[currentIndex];
+      fromArgs.urls = urls.filter(
+        (item, index) => index < currentIndex ? item !== urls[currentIndex] : true
+      );
+    } else {
+      fromArgs.current = urls[0];
+    }
+    return {
+      indicator: false,
+      loop: false
+    }
   }
-}
+};
 
 // 不支持的 API 列表
 const todos = [
@@ -265,15 +271,7 @@ const protocols = {
       sizeType: false
     }
   },
-  previewImage: {
-    args (fromArgs) {
-      normalize(fromArgs);
-      return {
-        indicator: false,
-        loop: false
-      }
-    }
-  },
+  previewImage,
   connectSocket: {
     args: {
       method: false

diff --git a/packages/uni-mp-toutiao/package.json b/packages/uni-mp-toutiao/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-mp-toutiao",
-	"version": "0.0.327",
+	"version": "0.0.328",
 	"description": "uni-app mp-toutiao",
 	"main": "dist/index.js",
 	"scripts": {

diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js
@@ -144,38 +144,42 @@ function upx2px (number, newDeviceWidth) {
   return number < 0 ? -result : result
 }
 
-function normalize (fromArgs) {
-  let currentIndex = parseInt(fromArgs.current);
-  if (isNaN(currentIndex)) {
-    return
-  }
-  const urls = fromArgs.urls;
-  if (!Array.isArray(urls)) {
-    return
-  }
-  const len = urls.length;
-  if (!len) {
-    return
-  }
-  if (currentIndex < 0) {
-    currentIndex = 0;
-  } else if (currentIndex >= len) {
-    currentIndex = len - 1;
-  }
-  if (currentIndex > 0) {
-    fromArgs.current = urls[currentIndex];
-    fromArgs.urls = urls.filter(
-      (item, index) => index < currentIndex ? item !== urls[currentIndex] : true
-    );
-  } else {
-    fromArgs.current = urls[0];
+var previewImage = {
+  args (fromArgs) {
+    let currentIndex = parseInt(fromArgs.current);
+    if (isNaN(currentIndex)) {
+      return
+    }
+    const urls = fromArgs.urls;
+    if (!Array.isArray(urls)) {
+      return
+    }
+    const len = urls.length;
+    if (!len) {
+      return
+    }
+    if (currentIndex < 0) {
+      currentIndex = 0;
+    } else if (currentIndex >= len) {
+      currentIndex = len - 1;
+    }
+    if (currentIndex > 0) {
+      fromArgs.current = urls[currentIndex];
+      fromArgs.urls = urls.filter(
+        (item, index) => index < currentIndex ? item !== urls[currentIndex] : true
+      );
+    } else {
+      fromArgs.current = urls[0];
+    }
+    return {
+      indicator: false,
+      loop: false
+    }
   }
-}
+};
 
 const protocols = {
-  previewImage: {
-    args: normalize
-  }
+  previewImage
 };
 const todos = [];
 const canIUses = [];

diff --git a/packages/uni-mp-weixin/package.json b/packages/uni-mp-weixin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-mp-weixin",
-	"version": "0.0.951",
+	"version": "0.0.952",
 	"description": "uni-app mp-weixin",
 	"main": "dist/index.js",
 	"scripts": {

diff --git a/src/core/helpers/index.js b/src/core/helpers/index.js
@@ -9,8 +9,10 @@ export function isPage (vm) {
   return false
 }
 
-export function normalizeDataset (dataset = {}) {
-  const result = Object.assign({}, dataset)
+export function normalizeDataset (dataset = {}) {
+  // ios8.x,9.x Object.assign({},dataset) 始终返回 {}
+  // http://ask.dcloud.net.cn/question/70246
+  const result = JSON.parse(JSON.stringify(dataset))
   if (__PLATFORM__ === 'h5') {
     const keys = Object.keys(result)
     const len = keys.length

diff --git a/src/platforms/h5/components/system-routes/choose-location/index.vue b/src/platforms/h5/components/system-routes/choose-location/index.vue
@@ -1,26 +1,26 @@
 <template>
   <div class="uni-system-choose-location">
-    <system-header
-      :confirm="!!data"
-      @back="_back"
+    <system-header
+      :confirm="!!data"
+      @back="_back"
       @confirm="_choose">选择位置</system-header>
     <div class="map-content">
-      <iframe
-        :src="src"
-        allow="geolocation"
-        seamless
-        sandbox="allow-scripts allow-same-origin allow-forms"
+      <iframe
+        :src="src"
+        allow="geolocation"
+        seamless
+        sandbox="allow-scripts allow-same-origin allow-forms"
         frameborder="0" />
     </div>
   </div>
 </template>
 <script>
-import SystemHeader from '../system-header'
+import SystemHeader from '../system-header'
 
 export default {
-  name: 'SystemChooseLocation',
-  components: {
-    SystemHeader
+  name: 'SystemChooseLocation',
+  components: {
+    SystemHeader
   },
   data () {
     return {
@@ -29,7 +29,7 @@ export default {
     }
   },
   mounted () {
-    var key = 'WXTBZ-6WERU-ECCVS-BZJCK-LW5OJ-SIBOS'
+    var key = __uniConfig.qqMapKey
     this.src = `https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=${key}&referer=uniapp`
     window.addEventListener('message', (event) => {
       var loc = event.data
@@ -81,4 +81,4 @@ export default {
 		width: 100%;
 		height: 100%;
 	}
-</style>
+</style>
diff --git a/src/platforms/h5/components/system-routes/open-location/index.vue b/src/platforms/h5/components/system-routes/open-location/index.vue
@@ -2,25 +2,25 @@
   <div class="uni-system-open-location">
     <system-header @back="_back">位置</system-header>
     <div class="map-content">
-      <iframe
-        ref="map"
-        :src="src"
-        allow="geolocation"
-        sandbox="allow-scripts allow-same-origin allow-forms"
+      <iframe
+        ref="map"
+        :src="src"
+        allow="geolocation"
+        sandbox="allow-scripts allow-same-origin allow-forms"
         frameborder="0"
         @load="_load" />
       <!-- 去这里 -->
-      <div
-        v-if="isPoimarkerSrc"
-        class="actTonav"
+      <div
+        v-if="isPoimarkerSrc"
+        class="actTonav"
         @click="_nav" />
     </div>
   </div>
 </template>
 <script>
 import SystemHeader from '../system-header'
 
-const key = 'WXTBZ-6WERU-ECCVS-BZJCK-LW5OJ-SIBOS'
+const key = __uniConfig.qqMapKey
 const referer = 'uniapp'
 const poimarkerSrc = 'https://apis.map.qq.com/tools/poimarker'
 
@@ -110,4 +110,4 @@ export default {
 		height: 60px;
 		border-radius: 60px;
 	}
-</style>
+</style>
diff --git a/src/platforms/h5/service/api/location.js b/src/platforms/h5/service/api/location.js
@@ -9,7 +9,7 @@ function wgs84ToGcj02 (coords, success, error) {
   /**
    * uniapp 内置key
    */
-  var key = 'WXTBZ-6WERU-ECCVS-BZJCK-LW5OJ-SIBOS'
+  var key = __uniConfig.qqMapKey
   var url = `https://apis.map.qq.com/ws/coord/v1/translate?locations=${coords.latitude},${coords.longitude}&type=1&key=${key}&output=jsonp`
   getJSONP(url, {}, (res) => {
     if ('locations' in res && res.locations.length) {
@@ -18,7 +18,7 @@ function wgs84ToGcj02 (coords, success, error) {
         latitude: res.locations[0].lat
       })
     } else {
-      error()
+      error(res)
     }
   }, error)
 }
@@ -48,9 +48,9 @@ export function getLocation ({
       if (type === 'WGS84') {
         callback(coords)
       } else {
-        wgs84ToGcj02(coords, callback, () => {
+        wgs84ToGcj02(coords, callback, (err) => {
           invoke(callbackId, {
-            errMsg: 'getLocation:fail'
+            errMsg: 'getLocation:fail ' + JSON.stringify(err)
           })
         })
       }