diff --git a/.env b/.env index 7612733..5d55bdf 100644 --- a/.env +++ b/.env @@ -33,12 +33,12 @@ VITE_OAUTH2_SOCIAL_CLIENT='social:social' # 是否开启websocket 消息接受, VITE_WEBSOCKET_ENABLE = true # --------------------------- start 开发环境 start ---------------------------------- -VITE_APP_DEV_SERVICE = https://www.zianxin.com/api -# VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc +# VITE_APP_DEV_SERVICE = https://www.zianxin.com/api +VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 -VITE_IMAGE_DEV_PATH = https://www.zianxin.com/api -# VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc +# VITE_IMAGE_DEV_PATH = https://www.zianxin.com/api +VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc # VITE_IMAGE_DEV_PATH = http://127.0.0.1:9999 # ----------------------------- end 开发环境 end ------------------------------------ diff --git a/src/manifest.json b/src/manifest.json index 3bdc785..8f21990 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name" : "资安信", "appid" : "__UNI__1BFE88F", "description" : "资安信后勤管理系统", - "versionName" : "1.5.06", - "versionCode" : 1506, + "versionName" : "1.5.08", + "versionCode" : 1508, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/pages.json b/src/pages.json index 5a42dd1..c612e9e 100644 --- a/src/pages.json +++ b/src/pages.json @@ -265,6 +265,20 @@ "disableScroll": true } }, + { + "path": "daily-menu-confirm", + "style": { + "navigationBarTitleText": "订餐", + "disableScroll": true + } + }, + { + "path": "guardian-ward-menu", + "style": { + "navigationBarTitleText": "被监护人菜谱", + "disableScroll": true + } + }, { "path": "confirm", "style": { diff --git a/src/pages/merchant/rserve-total.vue b/src/pages/merchant/rserve-total.vue index be9f8cb..d8d574d 100644 --- a/src/pages/merchant/rserve-total.vue +++ b/src/pages/merchant/rserve-total.vue @@ -83,13 +83,13 @@ {{ dateGroup.payUserCount - }}人次 + }}人次 {{ dateGroup.timeCount - }}次数 + }}次数 {{ dateGroup.payCount - }}份数 + }}份数 {{ - formatPrice(dateGroup.totalPrice) }}金额 + formatPrice(dateGroup.totalPrice) }}金额 @@ -117,7 +117,7 @@ {{ numberValue(row.payUserCount) - }} + }} 人数 @@ -141,53 +141,49 @@ - - - - 快捷日期 - - - {{ preset.label }} - - - - 自定义日期 - - - {{ filterDraft.startDate }} - - 至 - - {{ filterDraft.endDate }} - - - 单次最多查询 {{ MAX_RANGE_DAYS }} 天 - - 用餐时间段 - - - - {{ item.label }} - + + + + 快捷日期 + + + {{ preset.label }} - - - - + + + + + + diff --git a/src/pages/order/guardian-ward-menu.vue b/src/pages/order/guardian-ward-menu.vue new file mode 100644 index 0000000..21193bc --- /dev/null +++ b/src/pages/order/guardian-ward-menu.vue @@ -0,0 +1,512 @@ + + + + + diff --git a/src/pages/pay/pay-complete.vue b/src/pages/pay/pay-complete.vue index 29ea4c1..c452242 100644 --- a/src/pages/pay/pay-complete.vue +++ b/src/pages/pay/pay-complete.vue @@ -28,6 +28,10 @@ const state = reactive({ backBtnType: 'back', orderDetail: {}, failMessage: "", + /** 批量订餐接口返回的整批实付金额，单位为分；其他支付场景保持为空并展示单笔订单金额。 */ + batchTotalPayPrice: null as number | null, + /** 本次批量支付创建的订单数量，单订单入口保持为 1。 */ + batchOrderCount: 1, }) const titleText = computed(() => { @@ -37,7 +41,11 @@ const titleText = computed(() => { const descText = computed(() => { if (state.phase === "loading") return "正在查询订单状态，请稍候..." - if (state.phase === "success") return "支付金额已到账，可前往钱包查看最新余额" + if (state.phase === "success") { + return state.batchOrderCount > 1 + ? `已完成 ${state.batchOrderCount} 笔订餐订单，可前往订单列表查看` + : "支付金额已到账，可前往钱包查看最新余额" + } return state.failMessage || "未查询到本次支付结果，请稍后在支付记录中确认" }) @@ -58,7 +66,7 @@ const currentAnimationSize = computed(() => { return { width: "280rpx", height: "280rpx" } }) -const payOrderAmount = computed(() => Number(state.orderDetail?.payPrice || 0)) +const payOrderAmount = computed(() => state.batchTotalPayPrice ?? Number(state.orderDetail?.payPrice || 0)) const mchNameText = computed(() => state.orderDetail?.merchantName || "--") @@ -110,6 +118,14 @@ const getOrder = async (polling = false) => { } onLoad((options: any) => { + const batchTotalPayPrice = Number(options.totalPayPrice) + if (options.totalPayPrice !== undefined && Number.isFinite(batchTotalPayPrice) && batchTotalPayPrice >= 0) { + state.batchTotalPayPrice = batchTotalPayPrice + } + const batchOrderCount = Number(options.orderCount) + if (Number.isInteger(batchOrderCount) && batchOrderCount > 0) { + state.batchOrderCount = batchOrderCount + } if (options.orderId) { state.orderId = options.orderId || "" state.mchId = options.mchId || "" diff --git a/src/pages/tabbar/canteen.vue b/src/pages/tabbar/canteen.vue index 1410d58..350c0c7 100644 --- a/src/pages/tabbar/canteen.vue +++ b/src/pages/tabbar/canteen.vue @@ -49,7 +49,12 @@ const query = (page: number, pagesize: number) => { const toDetail = async (v: any) => { const isLogin = await hooks.useCheckLogin() if (isLogin) { - router.jump("/pages/canteen/detail", { id: v.id }) + const mchTableReservationModeCodeEnum = constant.serviceEnum.mchTableReservationModeCodeEnum + if (v.types == '1' && v.tableReservationConf.mode === mchTableReservationModeCodeEnum.DAILY_MENU) { + router.jump("/pages/order/daily-menu-confirm", { merchantId: v.id }) + } else { + router.jump("/pages/canteen/detail", { id: v.id }) + } } } @@ -88,40 +93,17 @@ const inputClear = () => {