")
+ .append("")
+ .append("
")
+ .append("
");
+ }
+
+ if (tableCount < 1) {
+ throw new BaseException("Excel文件中没有可导入的表格内容");
+ }
+ return html.toString();
+ } catch (BaseException e) {
+ throw e;
+ } catch (Exception e) {
+ log.error("Excel转换HTML异常", e);
+ throw new BaseException("Excel文件读取失败，请确认文件格式正确且未损坏");
+ }
+ }
+
+ /**
+ * 将单个非空页签转换为HTML表格，合并单元格使用rowspan和colspan还原。
+ */
+ private String buildSheetHtml(Workbook workbook, Sheet sheet, DataFormatter formatter,
+ FormulaEvaluator evaluator) {
+ List") + .append(Strings.escapeHtml(sheet.getSheetName())) + .append("
") + .append("")
+ .append(tableHtml)
+ .append("
").replace("\n", "
"); + } + + private String buildCellHtml(Cell cell, DataFormatter formatter, FormulaEvaluator evaluator, + List
").append(textHtml).append("
");
+ }
+ for (String imageUrl : imageUrls) {
+ html.append("
-
+
+
-
+
@@ -76,7 +77,7 @@
src="https://webapi.amap.com/maps?v=2.0&key=57f0d098ba1b881ecc436c4cfd23bbbf&plugin=AMap.PolyEditor,AMap.Geolocation"
>-->
-
+
-->
-
+
-
diff --git a/src/main/resources/views/platform/zhghh5/welfare/select/index.html b/src/main/resources/views/platform/zhghh5/welfare/select/index.html
index 6c561fb..f411cad 100644
--- a/src/main/resources/views/platform/zhghh5/welfare/select/index.html
+++ b/src/main/resources/views/platform/zhghh5/welfare/select/index.html
@@ -255,24 +255,102 @@ layout("/layouts/platform_h5.html"){
}
.welfare-detail-popup {
- padding: 20px;
- max-height: 70vh;
- overflow-y: auto;
- min-height: 300px;
+ height: 82vh;
+ padding: 16px 12px 12px;
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
}
.welfare-detail-title {
font-size: 18px;
font-weight: bold;
- margin-bottom: 15px;
+ margin: 0 40px 10px;
color: var(--text-primary);
text-align: center;
+ flex-shrink: 0;
+ }
+
+ .welfare-detail-toolbar {
+ height: 36px;
+ margin-bottom: 8px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 8px;
+ flex-shrink: 0;
+ }
+
+ .welfare-detail-toolbar .van-button {
+ width: 36px;
+ height: 32px;
+ padding: 0;
+ }
+
+ .welfare-detail-scale {
+ width: 58px;
+ color: var(--text-secondary);
+ font-size: 13px;
+ text-align: center;
+ }
+
+ .welfare-detail-viewport {
+ flex: 1;
+ min-height: 0;
+ overflow: auto;
+ border: 1px solid var(--border-color);
+ background: #fff;
+ -webkit-overflow-scrolling: touch;
+ touch-action: pan-x pan-y;
+ }
+
+ .welfare-detail-stage {
+ position: relative;
+ min-width: 100%;
+ min-height: 100%;
}
.welfare-detail-content {
+ position: absolute;
+ top: 0;
+ left: 0;
+ min-width: 100%;
+ padding: 8px;
+ box-sizing: border-box;
font-size: 14px;
line-height: 1.6;
color: var(--text-secondary);
+ transform-origin: 0 0;
+ }
+
+ .welfare-detail-content table {
+ width: max-content !important;
+ min-width: 860px !important;
+ table-layout: auto !important;
+ }
+
+ .welfare-detail-content td,
+ .welfare-detail-content th {
+ min-width: 70px;
+ box-sizing: border-box;
+ }
+
+ .welfare-detail-content td img {
+ width: 140px !important;
+ max-width: 180px !important;
+ max-height: 220px !important;
+ height: auto !important;
+ object-fit: contain;
+ margin: 6px auto !important;
+ }
+
+ .welfare-detail-content > img,
+ .welfare-detail-content > p > img,
+ .welfare-detail-content > div > p > img {
+ width: auto;
+ max-width: 100% !important;
+ height: auto !important;
}
.welfare-tag {
@@ -545,7 +623,7 @@ layout("/layouts/platform_h5.html"){
-
+ :close-on-click-overlay="false"
+ @click-close-icon="closeOptionDetail"
+ @closed="resetDetailZoom"
+ :style="{ height: '82vh' }">
@@ -830,6 +933,14 @@ layout("/layouts/platform_h5.html"){
hasSubmittedBefore: false, // 是否之前提交过
showOptionDetailDialog: false, // 选项详情弹窗
selectedOption: null, // 当前选中的选项
+ popupHistoryOwner: "welfare-select-" + Date.now(),
+ detailScale: 1,
+ detailMinScale: 0.5,
+ detailMaxScale: 3,
+ detailContentWidth: 0,
+ detailContentHeight: 0,
+ detailPinchStartDistance: 0,
+ detailPinchStartScale: 1,
mobileError: false, // 手机号错误标记
userNameError: false, // 收货人错误标记
formData: {
@@ -890,6 +1001,20 @@ layout("/layouts/platform_h5.html"){
const diffHours = (endTime - now) / (1000 * 60 * 60)
return diffHours > 0 && diffHours < 24
+ },
+
+ detailStageStyle() {
+ return {
+ width: Math.ceil(this.detailContentWidth * this.detailScale) + "px",
+ height: Math.ceil(this.detailContentHeight * this.detailScale) + "px"
+ }
+ },
+
+ detailContentStyle() {
+ return {
+ width: this.detailContentWidth > 0 ? this.detailContentWidth + "px" : "100%",
+ transform: "scale(" + this.detailScale + ")"
+ }
}
},
@@ -1100,6 +1225,7 @@ layout("/layouts/platform_h5.html"){
if (res.code === 0) {
this.$toast.success("选择成功")
setTimeout(() => {
+ this.clearPopupHistory()
this.$pjaxReplace("/platform/h5/welfare/userSelect/success")
}, 1500)
} else {
@@ -1195,7 +1321,8 @@ layout("/layouts/platform_h5.html"){
this.showConfirmDialog = true
},
- async openChoose(row) {
+ openChoose(row) {
+ this.clearPopupHistory()
this.$pjaxReplace("/platform/h5/welfare/userChoose/index?id=" + row.id)
},
@@ -1221,10 +1348,127 @@ layout("/layouts/platform_h5.html"){
// 显示选项详情
showOptionDetail(option) {
- // 阻止事件冒泡，避免触发父元素的点击事件
- event.stopPropagation()
this.selectedOption = option
this.showOptionDetailDialog = true
+ this.detailScale = 1
+ this.detailContentWidth = 0
+ this.detailContentHeight = 0
+ this.$nextTick(() => {
+ this.measureDetailContent()
+ })
+ if (window.mobilePopupHistory) {
+ window.mobilePopupHistory.open(this.popupHistoryOwner, "optionDetail")
+ }
+ },
+
+ closeOptionDetail() {
+ if (window.mobilePopupHistory) {
+ window.mobilePopupHistory.close(this.popupHistoryOwner, "optionDetail")
+ } else {
+ this.showOptionDetailDialog = false
+ }
+ },
+
+ closePopupFromHistory(popupId) {
+ if (popupId === "optionDetail") {
+ this.showOptionDetailDialog = false
+ }
+ },
+
+ handlePageBack() {
+ if (window.mobilePopupHistory && window.mobilePopupHistory.hasOpen(this.popupHistoryOwner)) {
+ window.history.back()
+ return
+ }
+ this.historyBack()
+ },
+
+ clearPopupHistory() {
+ if (window.mobilePopupHistory) {
+ window.mobilePopupHistory.clear(this.popupHistoryOwner)
+ }
+ },
+
+ measureDetailContent() {
+ this.$nextTick(() => {
+ const viewport = this.$refs.detailViewport
+ const content = this.$refs.detailContent
+ if (!viewport || !content) return
+ this.detailContentWidth = Math.max(viewport.clientWidth, content.scrollWidth)
+ this.detailContentHeight = Math.max(viewport.clientHeight, content.scrollHeight)
+ Array.from(content.querySelectorAll("img")).forEach((image) => {
+ if (!image.complete) {
+ image.addEventListener("load", () => {
+ this.measureDetailContent()
+ }, {once: true})
+ }
+ })
+ })
+ },
+
+ resetDetailZoom() {
+ this.detailScale = 1
+ this.detailPinchStartDistance = 0
+ this.$nextTick(() => {
+ this.measureDetailContent()
+ const viewport = this.$refs.detailViewport
+ if (viewport) {
+ viewport.scrollLeft = 0
+ viewport.scrollTop = 0
+ }
+ })
+ },
+
+ changeDetailScale(delta) {
+ const viewport = this.$refs.detailViewport
+ if (!viewport) return
+ this.setDetailScale(this.detailScale + delta, viewport.clientWidth / 2, viewport.clientHeight / 2)
+ },
+
+ setDetailScale(scale, centerX, centerY) {
+ const viewport = this.$refs.detailViewport
+ if (!viewport) return
+ const oldScale = this.detailScale
+ const newScale = Math.min(this.detailMaxScale, Math.max(this.detailMinScale, scale))
+ if (Math.abs(newScale - oldScale) < 0.001) return
+ const contentX = (viewport.scrollLeft + centerX) / oldScale
+ const contentY = (viewport.scrollTop + centerY) / oldScale
+ this.detailScale = newScale
+ this.$nextTick(() => {
+ viewport.scrollLeft = Math.max(0, contentX * newScale - centerX)
+ viewport.scrollTop = Math.max(0, contentY * newScale - centerY)
+ })
+ },
+
+ getTouchDistance(touches) {
+ const deltaX = touches[0].clientX - touches[1].clientX
+ const deltaY = touches[0].clientY - touches[1].clientY
+ return Math.sqrt(deltaX * deltaX + deltaY * deltaY)
+ },
+
+ onDetailTouchStart(event) {
+ if (event.touches.length !== 2) return
+ this.detailPinchStartDistance = this.getTouchDistance(event.touches)
+ this.detailPinchStartScale = this.detailScale
+ },
+
+ onDetailTouchMove(event) {
+ if (event.touches.length !== 2 || this.detailPinchStartDistance <= 0) return
+ event.preventDefault()
+ const viewport = this.$refs.detailViewport
+ const rect = viewport.getBoundingClientRect()
+ const centerX = (event.touches[0].clientX + event.touches[1].clientX) / 2 - rect.left
+ const centerY = (event.touches[0].clientY + event.touches[1].clientY) / 2 - rect.top
+ const distance = this.getTouchDistance(event.touches)
+ this.setDetailScale(this.detailPinchStartScale * distance / this.detailPinchStartDistance,
+ centerX, centerY)
+ },
+
+ onDetailTouchEnd(event) {
+ if (event.touches.length < 2) {
+ this.detailPinchStartDistance = 0
+ this.detailPinchStartScale = this.detailScale
+ }
},
// 重置签名
@@ -1247,6 +1491,7 @@ layout("/layouts/platform_h5.html"){
// 跳转到地址管理页面
goToAddressManage() {
+ this.clearPopupHistory()
this.$pjaxReplace("/platform/h5/welfare/address/list")
},
@@ -1291,11 +1536,12 @@ layout("/layouts/platform_h5.html"){
},
// 获取收货地址
- async getAddress() {
- const resp = await this.$axios.post("/platform/welfare/addressManage/selectUserAddress")
- if (resp.code === 0) {
- this.addressOptions = resp.data
- }
+ getAddress() {
+ this.$axios.post("/platform/welfare/addressManage/selectUserAddress").then((resp) => {
+ if (resp.code === 0) {
+ this.addressOptions = resp.data
+ }
+ })
}
},
@@ -1337,21 +1583,34 @@ layout("/layouts/platform_h5.html"){
}
},
- async created() {
+ created() {
+ if (window.mobilePopupHistory) {
+ window.mobilePopupHistory.register(this.popupHistoryOwner, (popupId) => {
+ this.closePopupFromHistory(popupId)
+ })
+ }
this.projectId = GetQueryString("id")
if (this.projectId) {
- // 先获取字典数据
- this.welfareProvideMode = await this.$businessTool.getDictOptions("welfareProvideMode")
- this.welfareSignMode = await this.$businessTool.getDictOptions("welfareSignMode")
-
- // 然后获取项目信息和用户选择
- this.getProjectInfo()
+ Promise.all([
+ this.$businessTool.getDictOptions("welfareProvideMode"),
+ this.$businessTool.getDictOptions("welfareSignMode")
+ ]).then((results) => {
+ this.welfareProvideMode = results[0]
+ this.welfareSignMode = results[1]
+ this.getProjectInfo()
+ })
} else {
this.$toast.fail("参数错误")
setTimeout(() => {
this.historyBack()
}, 1500)
}
+ },
+
+ beforeDestroy() {
+ if (window.mobilePopupHistory) {
+ window.mobilePopupHistory.unregister(this.popupHistoryOwner)
+ }
}
})
{{ selectedOption.optionName }}
-
+
+