From 30891f6171c7c54baf91195f4d845d4f8fab9c05 Mon Sep 17 00:00:00 2001 From: Fox-33 <1466778434@qq.com> Date: Wed, 29 Oct 2025 19:00:57 +0800 Subject: [PATCH] feat: h5; --- pages.json | 5 ++- pages_order/growing/activity/applyEmail.vue | 3 +- pages_order/growing/activity/export.vue | 10 ++--- pages_order/growing/activity/index.vue | 47 ++++++++++++++++++--- .../static/activity/icon-double-arrow-left.png | Bin 0 -> 483 bytes .../static/activity/icon-double-arrow-right.png | Bin 0 -> 498 bytes 6 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 pages_order/static/activity/icon-double-arrow-left.png create mode 100644 pages_order/static/activity/icon-double-arrow-right.png diff --git a/pages.json b/pages.json index d4b3d6e..1a12479 100644 --- a/pages.json +++ b/pages.json @@ -148,7 +148,10 @@ "style": { "navigationBarTextStyle": "black", "navigationBarTitleText": "行后报告", - "navigationBarBackgroundColor": "#DAF3FF" + "navigationBarBackgroundColor": "#DAF3FF", + "mp-weixin": { + "pageOrientation":"landscape" + } } }, { diff --git a/pages_order/growing/activity/applyEmail.vue b/pages_order/growing/activity/applyEmail.vue index 0e5b151..3ba0b75 100644 --- a/pages_order/growing/activity/applyEmail.vue +++ b/pages_order/growing/activity/applyEmail.vue @@ -95,8 +95,9 @@ } }, onLoad(arg) { - const { id } = arg + const { id, pdfUrl } = arg this.id = id + console.log('pdfUrl', pdfUrl) }, methods: { async onSubmit() { diff --git a/pages_order/growing/activity/export.vue b/pages_order/growing/activity/export.vue index 517d989..a38dd1c 100644 --- a/pages_order/growing/activity/export.vue +++ b/pages_order/growing/activity/export.vue @@ -13,20 +13,20 @@ imageData: '', } }, - onLoad({ id }) { + onLoad({ id, mode}) { this.id = id // this.h5Url = `https://adminh5.kjetax.com/#/?id=${id}&token=${uni.getStorageSync('token')}` - this.h5Url = `https://192.168.10.100:8080/#/?id=${id}&token=${uni.getStorageSync('token')}` + this.h5Url = `https://192.168.10.100:8080/#/?id=${id}&mode=${mode}&token=${uni.getStorageSync('token')}` console.log('url', this.h5Url) - console.log('...') + console.log('mode', mode) }, methods: { message(e) { const url = e.detail.data[0] - console.log('pdf', url) - this.downloadFile(url) + console.log('pdfUrl', url) + // this.downloadFile(url) }, downloadFile(url) { console.log('downloadFile', url) diff --git a/pages_order/growing/activity/index.vue b/pages_order/growing/activity/index.vue index 6d5c3d3..5bdb039 100644 --- a/pages_order/growing/activity/index.vue +++ b/pages_order/growing/activity/index.vue @@ -67,9 +67,13 @@ 行后报告 - - - + + + + + 点击查看详情 + + @@ -84,7 +88,7 @@ - + @@ -170,7 +174,10 @@ this.$refs.posterPopup.open(path) }, onApplyEmail() { - this.$utils.navigateTo(`/pages_order/growing/activity/applyEmail?id=${this.id}`) + uni.navigateTo({ + url: `/pages_order/growing/activity/export?id=${this.id}&mode=export` + }) + // this.$utils.navigateTo(`/pages_order/growing/activity/applyEmail?id=${this.id}`) }, jumpToExport() { uni.navigateTo({ @@ -292,6 +299,32 @@ .report { margin-top: 24rpx; + + &-card { + width: 100%; + border-radius: 64rpx; + overflow: hidden; + font-size: 0; + } + + &-cover { + width: 100%; + height: auto; + } + + &-btn { + width: 100%; + padding: 32rpx 0; + column-gap: 16rpx; + color: #252545; + font-size: 28rpx; + background: #E5E4EB; + + .icon { + width: 40rpx; + height: auto; + } + } } .bottom { @@ -299,8 +332,8 @@ left: 0; bottom: 0; z-index: 999; - justify-content: space-between; - column-gap: 32rpx; + // justify-content: space-between; + // column-gap: 32rpx; width: 100vw; padding: 32rpx 40rpx; padding-bottom: calc(env(safe-area-inset-bottom) + 32rpx); diff --git a/pages_order/static/activity/icon-double-arrow-left.png b/pages_order/static/activity/icon-double-arrow-left.png new file mode 100644 index 0000000000000000000000000000000000000000..814c1353eade0fa7279312bd8b0cadde58d9159c GIT binary patch literal 483 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i8oCO|{#S9FJ79h;%I?XTvD9BhG z1qilUsqbAPzl^M0TA+KNqJt*o-t5C6l@?yq#)RMr*optG&{ ztm`T>SCxWAiLYa}PG2#%`R_8*#SgFDTKsg~+-}nkw+v zwD0Ww9-i`G3a9t>$%efXS3KQhQ4mp6pR+x5_T>ss-RVuoFM01^tZkK^V9vb!aQ&sN z$=1TETbFXF%l&dP_R%eEO^dR5!FhIv%@x5}mCOl$7qV`vxF#EwqFi@&p=+7$`s<5* zeGK@7wib81^;Vb4Uy>E+uGP!#8v=q;19VDtaepZ9gS&B>?{H* z?Cfsdn+1a-+11d(?VV$D2XBGwYEa>#DBj#QVDFro9306apiN8F^|RZ2evcx(xpUgO z&1gTi86nxV;KC}W(m@KVTuKKkta2zFw6IFObnwC|<rf>2x~SqS)@ouBytie2tME6TR@&k9+j84w4-zC9?nDz3yWvW_WgE&*$PZ zMs`f(P3!T%UAJ``&%uVyJ`(Y3DZR2jEfJ(z)~_IerCippA_1jd)~_Ui%=ExW7J*(%H^W1-2X27uYJqRWFB-T7va7*2;`_dD o^|d}P85qeD5fKp)5fOp@09S-CT=A|Gi2wiq07*qoM6N<$f