diff --git a/common/js/golbalConfig.js b/common/js/golbalConfig.js index 7fb19c9..4dcb2fa 100644 --- a/common/js/golbalConfig.js +++ b/common/js/golbalConfig.js @@ -247,6 +247,15 @@ export default { } }, + /** + * 金额格式化输出 + * @param {Object} money + */ + moneyFormat(money) { + if (isNaN(parseFloat(money))) return money; + return parseFloat(money).toFixed(2); + }, + /** * 重新定向到登录授权 * @param {String} backUrl @@ -255,7 +264,11 @@ export default { redirectTologin(backUrl = '', params = {}) { setTimeout(() => { this.$nextTick(() => { - this.$refs?.login?.open(backUrl, 'redirectTo'); + let mode = 'navigateTo'; + // #ifdef H5 + mode = 'redirectTo'; + // #endif + this.$refs?.login?.open(backUrl, mode); }); }, 0); } diff --git a/components/mescroll/my-list-mescroll.vue b/components/mescroll/my-list-mescroll.vue index d0d2935..6449ae4 100644 --- a/components/mescroll/my-list-mescroll.vue +++ b/components/mescroll/my-list-mescroll.vue @@ -77,7 +77,7 @@ export default { // 鸿蒙下 ArkUI 对 slot 内 Vue 响应式更新失效,数据加载后强制重建 slot DOM // 通过把 listSlotKey 自增,使 :key 变化,触发整个 slot 子树销毁重建 const oldUpCallback = this.upCallback; - this.upCallback = function() { + this.upCallback = () => { const ret = oldUpCallback.apply(this, arguments); // 数据回来后 200ms 自增 key,强制 slot DOM 重建 setTimeout(() => { diff --git a/components/ns-login/ns-login.vue b/components/ns-login/ns-login.vue index da40ebb..1dd27ed 100644 --- a/components/ns-login/ns-login.vue +++ b/components/ns-login/ns-login.vue @@ -254,6 +254,7 @@ export default { // 打开弹窗 open(url = '', mode = 'navigateTo') { + console.log(`------> ns-login.open`, url); if (url) this.url = url; // #ifdef MP-WEIXIN this.getCode(authData => { diff --git a/pages_goods/public/js/cart.js b/pages_goods/public/js/cart.js index 8f00852..6c6636c 100644 --- a/pages_goods/public/js/cart.js +++ b/pages_goods/public/js/cart.js @@ -576,10 +576,6 @@ export default { else if (disX < 0) cartIndex.edit = false; this.$forceUpdate(); }, - moneyFormat(money) { - if (isNaN(parseFloat(money))) return money; - return parseFloat(money).toFixed(2); - }, refreshSkuDetail(goodsSkuDetail) { this.goodsSkuDetail = goodsSkuDetail; }, diff --git a/pages_order/_components/common-payment/payment.js b/pages_order/_components/common-payment/payment.js index 2db5377..834aa5e 100644 --- a/pages_order/_components/common-payment/payment.js +++ b/pages_order/_components/common-payment/payment.js @@ -1065,11 +1065,5 @@ export default { } }); } - }, - filters: { - // 金额格式化输出 - moneyFormat(money) { - return parseFloat(money).toFixed(2); - } } } \ No newline at end of file diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue index b147a68..e3f7e41 100644 --- a/pages_promotion/fenxiao/index.vue +++ b/pages_promotion/fenxiao/index.vue @@ -422,10 +422,6 @@ export default { } }); }, - moneyFormat(money) { - if (isNaN(parseFloat(money))) return money; - return parseFloat(money).toFixed(2); - }, openTips(data) { this.tips = data.tips; this.$refs.tips.open(); diff --git a/pages_promotion/fenxiao/level.vue b/pages_promotion/fenxiao/level.vue index 6a42b4a..08db8d3 100644 --- a/pages_promotion/fenxiao/level.vue +++ b/pages_promotion/fenxiao/level.vue @@ -283,10 +283,6 @@ swiperChange(e) { this.curr = e.detail.current; }, - moneyFormat(money) { - if (isNaN(parseFloat(money))) return money; - return parseFloat(money).toFixed(2); - }, openTips(data) { this.tips = data.tips; this.$refs.tips.open(); diff --git a/pages_promotion/point/public/js/payment.js b/pages_promotion/point/public/js/payment.js index 8e5d139..eeb3cd5 100644 --- a/pages_promotion/point/public/js/payment.js +++ b/pages_promotion/point/public/js/payment.js @@ -571,11 +571,5 @@ export default { this.getOrderPaymentData(); } } - }, - filters: { - // 金额格式化输出 - moneyFormat(money) { - return parseFloat(money).toFixed(2); - } } } \ No newline at end of file diff --git a/pages_tool/pay/cashier.vue b/pages_tool/pay/cashier.vue index df4cc78..ce611fd 100644 --- a/pages_tool/pay/cashier.vue +++ b/pages_tool/pay/cashier.vue @@ -288,15 +288,6 @@ export default { this.getPayInfo(); } } - }, - filters: { - /** - * 金额格式化输出 - * @param {Object} money - */ - moneyFormat(money) { - return parseFloat(money).toFixed(2); - } } };