diff --git a/.env.development b/.env.development index e37f400d..71411a27 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +7,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' diff --git a/src/common/common.js b/src/common/common.js index 15175f2e..735507f6 100644 --- a/src/common/common.js +++ b/src/common/common.js @@ -14,7 +14,14 @@ function msg(title, duration = 1000) { }); } +let isShowConfirm = false function show(title, msg, showCancel = true, cancelText = '取消', confirmText = '确定') { + if(isShowConfirm) { + return new Promise((resolve, reject) => { + reject(res); + }); + } + isShowConfirm = true return new Promise((resolve, reject) => { // 创建通用参数对象 const dialogOptions = { @@ -26,7 +33,9 @@ function show(title, msg, showCancel = true, cancelText = '取消', confirmText success: (res) => { // 统一处理成功回调,解析为布尔值 resolve(!!res.confirm); - } + isShowConfirm = false + }, + }; // #ifdef APP-PLUS if (getPhoneEnvBool('AND')) { @@ -35,6 +44,7 @@ function show(title, msg, showCancel = true, cancelText = '取消', confirmText ...dialogOptions, cancel: () => { console.log('用户点击取消'); + isShowConfirm = false resolve(false); // 取消时也返回Promise结果 } }); @@ -43,6 +53,7 @@ function show(title, msg, showCancel = true, cancelText = '取消', confirmText uni.showModal({ ...dialogOptions, fail: (res) => { + isShowConfirm = false reject(res); } }); @@ -52,6 +63,7 @@ function show(title, msg, showCancel = true, cancelText = '取消', confirmText uni.showModal({ ...dialogOptions, fail: (res) => { + isShowConfirm = false reject(res); } }); @@ -59,6 +71,9 @@ function show(title, msg, showCancel = true, cancelText = '取消', confirmText }); } +const closeStatus = () => { + isShowConfirm = false +} const loading = (title = '加载中', mask = true) => uni.showLoading({ title: title, mask: mask diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue index aa9dee44..fec97659 100644 --- a/src/pages/sparring/tip.vue +++ b/src/pages/sparring/tip.vue @@ -290,6 +290,7 @@ const showModelComfirm = ref(false) const reconcatNum = ref(0) const answerText = ref('') const touchBtnCallBack = ref(null) +const stopAnswerCallBack = ref(false) let isLeave = false const initsocketTask = () => { let _src = isPreview.value ? '/trapractice/previewsocket/open' : '/trapractice/partnersocket/open' @@ -310,7 +311,7 @@ const initsocketTask = () => { if (watchFlag.value === 1 || showModelComfirm.value) return if (reconcatNum.value === 5) { common.msg('系统网络异常,请稍后再试!') - common.redirectTo(`/pages/index/dialog`) + common.reLaunch(`/pages/index/dialog`) return } showModelComfirm.value = true @@ -473,6 +474,7 @@ const initsocketTask = () => { watchFlag.value += 1 } const goBack = () => { + console.log(222,detailInfo.value.traInterTyp === '01') if (detailInfo.value.traInterTyp === '01') { overTalking() } else { @@ -585,6 +587,7 @@ onMounted(() => { // getDetailInfo() }) onBackPress(res => { + console.log(1111) if (res.from === 'backbutton') { goBack() return true