|
@@ -137,6 +137,7 @@ import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarBut
|
|
|
import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
|
|
import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
|
|
|
/*----------------------------------接口引入-----------------------------------*/
|
|
/*----------------------------------接口引入-----------------------------------*/
|
|
|
import { MeetingRoomList, MeetingRoomReservationList, deviceApi, signOnOut } from "@/api/business/meeting.js";
|
|
import { MeetingRoomList, MeetingRoomReservationList, deviceApi, signOnOut } from "@/api/business/meeting.js";
|
|
|
|
|
+import { oaScanCode } from "@/utils/oaScanCode.js";
|
|
|
/*----------------------------------组件引入-----------------------------------*/
|
|
/*----------------------------------组件引入-----------------------------------*/
|
|
|
import timeSlot from "./components/timeSlot.vue";
|
|
import timeSlot from "./components/timeSlot.vue";
|
|
|
import switchSlot from "./components/switchSlot.vue";
|
|
import switchSlot from "./components/switchSlot.vue";
|
|
@@ -314,10 +315,9 @@ function changeSheet(e) {
|
|
|
} else if (e.name == "我的会议") {
|
|
} else if (e.name == "我的会议") {
|
|
|
proxy.$tab.navigateTo(`/pages/business/meeting/my/index`).then(() => {});
|
|
proxy.$tab.navigateTo(`/pages/business/meeting/my/index`).then(() => {});
|
|
|
} else if (e.name == "扫一扫") {
|
|
} else if (e.name == "扫一扫") {
|
|
|
- uni.scanCode({
|
|
|
|
|
|
|
+ oaScanCode({
|
|
|
autoZoom: false,
|
|
autoZoom: false,
|
|
|
scanType: ["qrCode"],
|
|
scanType: ["qrCode"],
|
|
|
- // onlyFromCamera: true,
|
|
|
|
|
success: (res) => {
|
|
success: (res) => {
|
|
|
if (res.result == "会议空闲中") {
|
|
if (res.result == "会议空闲中") {
|
|
|
proxy.$modal.msg("当前无可参加的会议!");
|
|
proxy.$modal.msg("当前无可参加的会议!");
|