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 0000000..814c135 Binary files /dev/null and b/pages_order/static/activity/icon-double-arrow-left.png differ diff --git a/pages_order/static/activity/icon-double-arrow-right.png b/pages_order/static/activity/icon-double-arrow-right.png new file mode 100644 index 0000000..36251e7 Binary files /dev/null and b/pages_order/static/activity/icon-double-arrow-right.png differ