diff --git a/src/App.vue b/src/App.vue index 65fde69..01059e3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -144,6 +144,13 @@ export default { methods: { async _initTabbar() { + if (isDevEnv()) { + tabbar.forEach((item, index) => { + setTabbarItem(index, item, true) + }) + return + } + const launchParam = getLaunchParam() console.log("tabbar launch 启动路径参数", launchParam) diff --git a/src/pages/tabbar/flowStatistics.vue b/src/pages/tabbar/flowStatistics.vue index a7bf028..414bc77 100644 --- a/src/pages/tabbar/flowStatistics.vue +++ b/src/pages/tabbar/flowStatistics.vue @@ -21,7 +21,7 @@ - + @@ -58,33 +58,33 @@ {{ v.day }} - - - + + + 流水金额 ¥ {{ hooks.useMoney(v.totalPayPrice) }} - + 流水次数 {{ v.totalPayCount }} - - + + 盈利金额 ¥ {{ hooks.useMoney(v.totalProfitPrice) }} - + 盈利次数 {{ v.totalProfitCount }} - + 退款金额 ¥ {{ hooks.useMoney(v.totalRefundPrice) }} - + 退款次数 {{ v.totalRefundCount || 0 }} @@ -133,7 +133,7 @@ const query = (page: number, pagesize: number) => { // 时间范围选择器确认 const datePickerConfirm = (date: any) => { - state.pa.createTimeList = date.map((v: any) => hooks.useTime(v, "{y}-{m}-{d}")) + state.pa.createTimeList = formatVal.value.split("~") pageRef.value.reload(false) } diff --git a/src/pages/tabbar/individualOrder.vue b/src/pages/tabbar/individualOrder.vue index ff7b785..5114f29 100644 --- a/src/pages/tabbar/individualOrder.vue +++ b/src/pages/tabbar/individualOrder.vue @@ -38,11 +38,11 @@ - + {{ v.username }} {{ v.userMobile }} - + 下单时间 {{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }} @@ -50,7 +50,7 @@ - {{ hooks.useEnum("hardwareRefundStatusEnum", v.refundStatus) }} + {{ hooks.useEnum("hardwareRefundStatusEnum", v.refundStatus) }} 共 {{ v.carList.length }} 件 ¥ {{ hooks.useMoney(v.totalPrice) }} diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index b6bad22..51a9a85 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -350,10 +350,15 @@ const doChangeRole = () => { const initMenuConfig = () => { if (isDevEnv()) { state.menuList.push({ - text: "测试登录", + text: "测试-登录", icon: "/static/icon/login.png", router: "/pages/test/login", }) + state.menuList.push({ + text: "测试-角色选择", + icon: "/static/icon/login.png", + router: "/pages/user/userRole", + }) } // 根据启动参数添加扫一扫菜单项