diff --git a/common/util.js b/common/util.js index 9c014e1..098b295 100644 --- a/common/util.js +++ b/common/util.js @@ -191,6 +191,37 @@ const getQueryObject = (url)=> { return obj; } +export function isPlainObject(obj){ + return typeof obj === 'object' && Object.prototype.toString.call(obj) === '[object Object]' +} + +export function isPlainArray(obj){ + return typeof obj === 'object' && Object.prototype.toString.call(obj) === '[object Array]' +} + +export function deepAssign() { + let len = arguments.length, target = arguments[0] + if (!isPlainObject(target)) { + target = {} + } + for (let i = 1; i < len; i++) { + let source = arguments[i] + if (isPlainObject(source)) { + for (let s in source) { + if (s === '__proto__' || target === source[s]) { + continue + } + if (isPlainObject(source[s])) { + target[s] = deepAssign(target[s], source[s]) + } else { + target[s] = source[s] + } + } + } + } + return target +} + export { getAddressDetail, setAddresModalParam, diff --git a/components/tpx-select/tpx-select.vue b/components/tpx-select/tpx-select.vue index b806f83..e4b94c2 100644 --- a/components/tpx-select/tpx-select.vue +++ b/components/tpx-select/tpx-select.vue @@ -15,6 +15,7 @@ + @@ -30,6 +31,7 @@ + diff --git a/pages/address/list.vue b/pages/address/list.vue index 1541693..4d9f483 100644 --- a/pages/address/list.vue +++ b/pages/address/list.vue @@ -112,9 +112,7 @@ tab: tabList[0].val, // 当前tab type: '', // 'choose' 选择操作 }, - resData: { - list: [] - } + resData: { list: [] } } }, onShareAppMessage() { @@ -197,7 +195,7 @@ position: relative; } .pgb-cont{ - padding: 30rpx; + padding: 30rpx 30rpx 0 30rpx; } .data-list-item{ diff --git a/pages/post/post.vue b/pages/post/post.vue index 755cbd5..bbeab32 100644 --- a/pages/post/post.vue +++ b/pages/post/post.vue @@ -81,6 +81,14 @@ @onChange="handleYueJieSelect" placeholder="请选择月结账户" > +