diff --git a/pages_app/idcardAuth/idcardAuth.vue b/pages_app/idcardAuth/idcardAuth.vue index 1300005..e2eee70 100644 --- a/pages_app/idcardAuth/idcardAuth.vue +++ b/pages_app/idcardAuth/idcardAuth.vue @@ -297,7 +297,7 @@ const onNextStep = async () => { } } catch (error) { console.error('身份验证失败:', error); - uni.showToast({ title: '网络错误，请重试', icon: 'none' }); + uni.showToast({ title: res.message, icon: 'none' }); isLoading.value = false; } } else if (currentStep.value === 2) { diff --git a/pages_app/myAccount/billDetail.vue b/pages_app/myAccount/billDetail.vue index 395c5f9..a41f6dc 100644 --- a/pages_app/myAccount/billDetail.vue +++ b/pages_app/myAccount/billDetail.vue @@ -96,7 +96,13 @@ onMounted(() => { } .detail-content { - margin-top: calc(var(--status-bar-height) + 44px); + position: fixed; + left: 0; + right: 0; + top: calc(var(--status-bar-height) + 44px); + bottom: 0; + overflow-y: auto; + box-sizing: border-box; background: #ffffff; padding: 0 24rpx; } @@ -110,14 +116,14 @@ onMounted(() => { } .label { - font-size: 38rpx; + font-size: 30rpx; color: #2c2c2c; } .value { flex: 1; text-align: right; - font-size: 38rpx; + font-size: 30rpx; color: #666666; margin-left: 20rpx; word-break: break-all; diff --git a/pages_app/myAccount/billDetails.vue b/pages_app/myAccount/billDetails.vue index d308c20..fe1edca 100644 --- a/pages_app/myAccount/billDetails.vue +++ b/pages_app/myAccount/billDetails.vue @@ -231,7 +231,7 @@ onMounted(() => { border-bottom: 1rpx solid #ccc; .header-cell { - font-size: 28rpx; + font-size: 30rpx; color: #333; font-weight: 500; @@ -281,7 +281,7 @@ onMounted(() => { border-bottom: 1rpx solid #e5e5e5; .cell { - font-size: 26rpx; + font-size: 30rpx; &.business-type { flex: 1; diff --git a/pages_app/myFlower/myFlower.vue b/pages_app/myFlower/myFlower.vue index 6c5fd05..189c5c8 100644 --- a/pages_app/myFlower/myFlower.vue +++ b/pages_app/myFlower/myFlower.vue @@ -450,7 +450,8 @@ $card: #ffffff; justify-content: space-between; align-items: center; padding: 26rpx 30rpx; - border-bottom: 2rpx solid #f2f2f2; + background: #fff; + border-bottom: 2rpx solid #ccc; font-size: 28rpx; color: #333; @@ -458,8 +459,8 @@ $card: #ffffff; .name { text-align: left; } .time { text-align: center; color: #666; } .qty { text-align: center; } - .qty.plus { color: #2dbd85; } - .qty.minus { color: #e34d4d; } + .qty.plus { color: #333; } + .qty.minus { color: #333; } } .empty-wrap { padding-top: 200rpx; display: flex; flex-direction: column; align-items: center; color: #bdbdbd; } diff --git a/pages_app/myPatient/myPatient.vue b/pages_app/myPatient/myPatient.vue index f2cc54d..d58b080 100644 --- a/pages_app/myPatient/myPatient.vue +++ b/pages_app/myPatient/myPatient.vue @@ -1,10 +1,10 @@ diff --git a/pages_app/ppt/ppt.vue b/pages_app/ppt/ppt.vue index 2957411..82d06df 100644 --- a/pages_app/ppt/ppt.vue +++ b/pages_app/ppt/ppt.vue @@ -113,17 +113,17 @@ @@ -160,6 +160,7 @@ const page = ref(1); const pageSize = ref(10); const pptConfirm=()=>{ + saveContactImgToAlbum(); pptVisible.value=false; //feedBack(); } diff --git a/pages_app/pptDetail/pptDetail.vue b/pages_app/pptDetail/pptDetail.vue index 8e8670d..9f73e08 100644 --- a/pages_app/pptDetail/pptDetail.vue +++ b/pages_app/pptDetail/pptDetail.vue @@ -168,7 +168,8 @@ const nativeDownloadPopupInfo = ref({ imageLeft: 0, imageSize: 0, buttonTop: 0, - buttonH: 0 + buttonH: 0, + leftButtonW: 0 }); let downloadLongPressTimer = null; let downloadLongPressTriggered = false; @@ -289,6 +290,7 @@ function createNativeDownloadPopup() { const dialogTop = Math.round((screenH - dialogH) / 2); const buttonH = uni.upx2px(96); const buttonTop = dialogH - buttonH; + const leftButtonW = Math.round(dialogW / 2); const titleTop = uni.upx2px(46); const imageSize = uni.upx2px(280); const imageTop = titleTop + uni.upx2px(72); @@ -306,7 +308,8 @@ function createNativeDownloadPopup() { imageLeft, imageSize, buttonTop, - buttonH + buttonH, + leftButtonW }; nativeDownloadMaskView.value = new plus.nativeObj.View('native-download-mask', { @@ -394,10 +397,29 @@ function createNativeDownloadPopup() { height: '1px' }); - nativeDownloadPopupView.value.drawText('知道了', { + nativeDownloadPopupView.value.drawRect({ color: '#F0F0F0' }, { + left: leftButtonW + 'px', + top: buttonTop + 'px', + width: '1px', + height: buttonH + 'px' + }); + + nativeDownloadPopupView.value.drawText('取消', { left: '0px', top: buttonTop + 'px', - width: dialogW + 'px', + width: leftButtonW + 'px', + height: buttonH + 'px' + }, { + size: uni.upx2px(32) + 'px', + color: '#666666', + align: 'center', + verticalAlign: 'middle' + }); + + nativeDownloadPopupView.value.drawText('保存二维码', { + left: leftButtonW + 'px', + top: buttonTop + 'px', + width: (dialogW - leftButtonW) + 'px', height: buttonH + 'px' }, { size: uni.upx2px(32) + 'px', @@ -433,18 +455,25 @@ function createNativeDownloadPopup() { downloadLongPressTriggered = false; return; } - const { relativeY } = point; + const { relativeX, relativeY } = point; if (relativeY >= info.buttonTop) { - closeNativeDownloadPopup(); + if (relativeX >= info.leftButtonW) { + // 点击“保存二维码” + saveNativePopupImageToAlbum(); + closeNativeDownloadPopup(); + } else { + // 点击“取消” + closeNativeDownloadPopup(); + } } }; nativeDownloadMaskView.value.addEventListener('click', handleDownloadMaskClick, false); nativeDownloadMaskView.value.addEventListener('touchstart', handleDownloadMaskClick, false); nativeDownloadPopupView.value.addEventListener('click', handleDownloadPanelClick, false); - nativeDownloadPopupView.value.addEventListener('touchstart', handleDownloadPanelTouchStart, false); - nativeDownloadPopupView.value.addEventListener('touchend', handleDownloadPanelTouchEnd, false); - nativeDownloadPopupView.value.addEventListener('touchcancel', handleDownloadPanelTouchEnd, false); + // nativeDownloadPopupView.value.addEventListener('touchstart', handleDownloadPanelTouchStart, false); + // nativeDownloadPopupView.value.addEventListener('touchend', handleDownloadPanelTouchEnd, false); + // nativeDownloadPopupView.value.addEventListener('touchcancel', handleDownloadPanelTouchEnd, false); // #endif } diff --git a/pages_chat/editAddress/editAddress.vue b/pages_chat/editAddress/editAddress.vue index c318f8f..95edb4c 100644 --- a/pages_chat/editAddress/editAddress.vue +++ b/pages_chat/editAddress/editAddress.vue @@ -7,7 +7,7 @@ 医院 * - + {{ h.name }} @@ -229,7 +229,9 @@ onLoad((options) => { .value-text { font-size: 30rpx; color: #333; } .value-text.placeholder { color: #999; } .input { width: 100%; font-size: 30rpx; color: #333; } - +.hospital-input{ + padding-left:24rpx; +} .suggestion { position: absolute; top: 84rpx; left: 0; right: 0; background: #fff; border: 2rpx solid #eee; border-radius: 10rpx; max-height: 480rpx; overflow-y: auto; z-index: 10; } .suggestion-item { padding: 20rpx 24rpx; font-size: 28rpx; color: #333; border-bottom: 2rpx solid #f5f5f5; } .suggestion-item:last-child { border-bottom: 0; } diff --git a/pages_chat/outManage/outManage.vue b/pages_chat/outManage/outManage.vue index 7aa601d..640fc54 100644 --- a/pages_chat/outManage/outManage.vue +++ b/pages_chat/outManage/outManage.vue @@ -238,6 +238,7 @@ const addOutPatient=async()=>{ title: '发布成功', icon: 'none' }) + uni.$emit('updateOutPatient'); uni.navigateBack() } diff --git a/pages_chat/outPatient/outPatient.vue b/pages_chat/outPatient/outPatient.vue index db5e1a1..45a5ee1 100644 --- a/pages_chat/outPatient/outPatient.vue +++ b/pages_chat/outPatient/outPatient.vue @@ -402,6 +402,7 @@ const getTypeText = (type) => { } // 方法 const goBack = () => { + console.log(isEdit.value); if(isEdit.value){ noticeVisible.value = true; }else{ @@ -558,6 +559,7 @@ onShow(() => { fetchList(); uni.$on('updateOutPatient',()=>{ isEdit.value = true; + console.log('更新'); }) }) diff --git a/pages_chat/stopPatient/stopPatient.vue b/pages_chat/stopPatient/stopPatient.vue index 6f6db07..b0c090b 100644 --- a/pages_chat/stopPatient/stopPatient.vue +++ b/pages_chat/stopPatient/stopPatient.vue @@ -176,6 +176,7 @@ const addStopPatient = async () => { note: remark.value }) if(res.code==200){ + uni.$emit('updateOutPatient') uni.showToast({ title: '发布成功', icon: 'none' }) uni.navigateBack() } @@ -254,7 +255,8 @@ const submit = () => { } } .rowbox{ - width: 250rpx; + flex:1; + margin-left: 30rpx; } .stop-page { min-height: 100vh; background: #fff; @@ -295,12 +297,12 @@ const submit = () => { .title-text { font-size: 32rpx; color: #8B2316; } .required { color: #8B2316; margin-left: 6rpx; font-size: 28rpx; } -.reason-row { display: flex; gap: 20rpx; flex-wrap: wrap; } -.reason-btn { flex: 1; text-align: center; height: 80rpx; line-height: 80rpx; border: 2rpx solid #ddd; border-radius: 10rpx; color: #666; } +.reason-row { display: flex; flex-wrap: wrap; justify-content: space-between;} +.reason-btn { width:150rpx; text-align: center; height: 80rpx; line-height: 80rpx; border: 2rpx solid #ddd; border-radius: 10rpx; color: #666; } .reason-btn.active { border-color: #8B2316; color: #8B2316; background: url('@/static/addoutpa_true.png') right bottom/39rpx 39rpx no-repeat; } .add-more { color: #8B2316; font-size: 28rpx; } -.range-row { display: flex; align-items: center; gap: 20rpx; margin-bottom: 20rpx; } +.range-row { display: flex; align-items: center; margin-bottom: 20rpx; } .date-input { flex: 1; height: 80rpx; border: 2rpx solid #ddd; border-radius: 10rpx; display: flex; align-items: center; padding: 0 24rpx; color: #333; } .placeholder { color: #999; } .to-text { color: #666; } diff --git a/static/sendgroup_tishi_big.png b/static/sendgroup_tishi_big.png new file mode 100644 index 0000000..2f5812a Binary files /dev/null and b/static/sendgroup_tishi_big.png differ