从 xghmall(云闪付版湘工游)迁移民票模块,改造为微信公众号 H5: - 技术栈沿用 uni-app + Vue2 + uView(含定制版日历组件) - 登录/支付独立成层(common/auth.js、common/pay.js): 一期假登录(测试手机号)+ 模拟支付,后端微信接口就绪后只换这两处 - 登录页重写:短信验证码 + 公众号网页授权(code 换用户信息)预留 - 门票列表页为入口页(进页必须登录),加订单悬浮按钮 - 支付成功页接通:查看订单/继续逛逛 + 订单状态轮询 - 详情页定位导航改用 uni.openLocation + 高德网页兜底 - 出行人页:身份证 18 位格式校验,删除死的删除按钮,修正证件类型回显笔误 - 清理云闪付 SDK、支付宝授权、死页面引用等残留 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
30 lines
789 B
JavaScript
30 lines
789 B
JavaScript
import deepClone from "./deepClone";
|
|
|
|
// JS对象深度合并
|
|
function deepMerge(target = {}, source = {}) {
|
|
target = deepClone(target);
|
|
if (typeof target !== 'object' || typeof source !== 'object') return false;
|
|
for (var prop in source) {
|
|
if (!source.hasOwnProperty(prop)) continue;
|
|
if (prop in target) {
|
|
if (typeof target[prop] !== 'object') {
|
|
target[prop] = source[prop];
|
|
} else {
|
|
if (typeof source[prop] !== 'object') {
|
|
target[prop] = source[prop];
|
|
} else {
|
|
if (target[prop].concat && source[prop].concat) {
|
|
target[prop] = target[prop].concat(source[prop]);
|
|
} else {
|
|
target[prop] = deepMerge(target[prop], source[prop]);
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
target[prop] = source[prop];
|
|
}
|
|
}
|
|
return target;
|
|
}
|
|
|
|
export default deepMerge; |