diff --git a/src/views/demo/payment/cashier/Cashier.vue b/src/views/demo/payment/cashier/Cashier.vue index 40b806328..768949c19 100644 --- a/src/views/demo/payment/cashier/Cashier.vue +++ b/src/views/demo/payment/cashier/Cashier.vue @@ -145,14 +145,14 @@ { img: new URL('./imgs/wechat/wx_bar.svg', import.meta.url), title: '微信条码', payInfo: { payChannel: 2, payWay: 5 } }, // { img: new URL('./imgs/wechat/wx_jsapi.svg', import.meta.url), title: '公众号/小程序', payInfo: { payChannel: 2, payWay: 23 } } ]) - let aggregationPayList = [ + let aggregationPayList = $ref([ { img: new URL('./imgs/qr/qr_cashier.svg', import.meta.url).href, title: '聚合扫码(用户扫商家)', payInfo: { payChannel: 99, payWay: 4 }, }, { img: new URL('./imgs/qr/auto_bar.svg', import.meta.url).href, title: '聚合条码(商家扫用户)', payInfo: { payChannel: 99, payWay: 5 } }, - ] + ]) let payMoneyList = [ // 支付金额列表 { label: '0.01', value: 0.01 }, @@ -274,6 +274,7 @@ } // 当前选择的支付类型 function handleActive(payInfo) { + console.log(payInfo) currentActive = payInfo } // 关闭 diff --git a/src/views/modules/system/scope/UserScopeModal.vue b/src/views/modules/system/scope/UserScopeModal.vue index 58bb054af..e5e21c67a 100644 --- a/src/views/modules/system/scope/UserScopeModal.vue +++ b/src/views/modules/system/scope/UserScopeModal.vue @@ -30,7 +30,7 @@ import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue' import { $ref } from '@vue-macros/reactivity-transform/macros' import { DataScopeUser, deleteBatchUserAssign, findUsersByDataScopeId, saveUserAssign } from '/@/views/modules/system/scope/DataScope.api' - import { BUserSelectModal } from '/@/components/Bootx/UserSelectModal/BUserSelectModal.vue' + import BUserSelectModal from '/@/components/Bootx/UserSelectModal/BUserSelectModal.vue' import { VxeTableInstance } from 'vxe-table' let loading = $ref(false) @@ -57,7 +57,7 @@ } // 多选变动事件 function checkboxChange() { - selectIds = xTable.getCheckboxRecords().map((res) => res.id) + selectIds = xTable?.getCheckboxRecords().map((res) => res.id) as string[] } // 选中用户, 进行保存 function selectUser(userIds) {