diff --git a/packages/uni-mp-baidu/dist/index.js b/packages/uni-mp-baidu/dist/index.js
index db93ea193db7a8a01a32dd335a8cec343fb5027c..6bdf4e3cb939a17f86e6e47bc381787e5a63ebb3 100644
--- 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
index aada5ec907426cf4ace78302d6f01967a6fc095d..7f1254f58815d3a7cc2e796fdc42ba94b13bdbb2 100644
--- 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
index d56308da39deb02ed3cac4b53dc115ef660f25fd..6add7ff27bb4bfaea72f53c24f97a54f2325ed5c 100644
--- 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
index 6a934b8a506d50f559a8c3ec0aeccfe08580050f..88e1d85d5f5ebc815ab8e6b5e995ab1ec1014f0e 100644
--- 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
index 63da3c6ffa4fe28f71ed4ed7662eb8ed4b73321c..e6eab42a263bd2f2d728d7cbce16174f07c7c555 100644
--- 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
index c574a5ab72daeca0233ba23c9b515bec3241e6a3..f22169b4c8263121ae57633c15089241e4e7b511 100644
--- 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
index 53cad34d2adb22db545ce474fb41e0f9107fad01..44e260976acc6cdd26aa30ed24e2530ab12dcda9 100644
--- 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
index 2420500cded5435c9ff9ac80d8d83ddc042f1b26..d6041a01ccf13f889be5e797c823b134b0b7fdda 100644
--- 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 @@