From 3bb3912f72e57a487e5f27c267f6617fb5336687 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Fri, 2 Jun 2023 16:34:14 +0800 Subject: [PATCH] upload --- app.json | 4 +- components/banner/index.js | 3 +- ext.json | 8 --- pages/bannerdetail/bannerdetail.js | 12 ++++- pages/bannerdetail/bannerdetail.ttml | 51 +++++++++++--------- pages/freeBannerDetail/freeBannerDetail.js | 9 ++++ pages/freeBannerDetail/freeBannerDetail.json | 3 ++ pages/freeBannerDetail/freeBannerDetail.ttml | 1 + pages/freeBannerDetail/freeBannerDetail.ttss | 1 + project.private.config.json | 2 +- 10 files changed, 58 insertions(+), 36 deletions(-) create mode 100644 pages/freeBannerDetail/freeBannerDetail.js create mode 100644 pages/freeBannerDetail/freeBannerDetail.json create mode 100644 pages/freeBannerDetail/freeBannerDetail.ttml create mode 100644 pages/freeBannerDetail/freeBannerDetail.ttss diff --git a/app.json b/app.json index e26d55d..e90f09f 100644 --- a/app.json +++ b/app.json @@ -40,12 +40,12 @@ "pages/coupon/instructions/instructions", "ext://microapp-trade-plugin/order-confirm", "ext://microapp-trade-plugin/refund-apply", - "ext://microapp-trade-plugin/refund-detail" + "ext://microapp-trade-plugin/refund-detail", + "pages/freeBannerDetail/freeBannerDetail" ], "window": { "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#fff", "navigationBarTextStyle": "black" } - } \ No newline at end of file diff --git a/components/banner/index.js b/components/banner/index.js index 713f85b..aa26625 100644 --- a/components/banner/index.js +++ b/components/banner/index.js @@ -44,6 +44,7 @@ Component({ url: `/${e.currentTarget.dataset.data.pagePath}`, }) } else if (type == "wj") { + tt.navigateTo({ url: `/pages/questionnaire/questionnaire?id=` + id.split("=")[2], }) @@ -56,7 +57,7 @@ Component({ console.log('freeBannerDetail'); // 自由图文 tt.navigateTo({ - url: `/pages/freeBannerDetail/index?id=${e.currentTarget.dataset.id}` + url: `/pages/freeBannerDetail/freeBannerDetail?id=${e.currentTarget.dataset.id}` }); } else if (e.currentTarget.dataset.data.type == 4) { tt.navigateToMiniProgram({ diff --git a/ext.json b/ext.json index 1d36229..bd289e8 100644 --- a/ext.json +++ b/ext.json @@ -11,14 +11,6 @@ "navigationBarTextStyle": "black", "navigationBarBackgroundColor": "#fff" }, - "ttPlugins": { - "dependencies": { - "microapp-trade-plugin": { - "version": "1.1.2", - "isDynamic": true - } - } - }, "extAppid": "tt620e14b3fd30264101", "extEnable": true, "directCommit": false, diff --git a/pages/bannerdetail/bannerdetail.js b/pages/bannerdetail/bannerdetail.js index fec2c96..03207c2 100644 --- a/pages/bannerdetail/bannerdetail.js +++ b/pages/bannerdetail/bannerdetail.js @@ -15,12 +15,22 @@ Page({ hour: "", wmhome: imgurl.wmhome.url, minute: "", - nodes: '' + nodes: '', + mallTenantId: "" }, onLoad(options) { this.setData({ mouldType: app.globalData.mouldType, }) + + const mallTenantId = tt.getStorageSync('mallTenantId'); + + if (mallTenantId) { + this.setData({ + mallTenantId: mallTenantId + }) + } + let that = this; if (options.id) { Http.get({ diff --git a/pages/bannerdetail/bannerdetail.ttml b/pages/bannerdetail/bannerdetail.ttml index 1a53b8f..aedd53e 100644 --- a/pages/bannerdetail/bannerdetail.ttml +++ b/pages/bannerdetail/bannerdetail.ttml @@ -2,31 +2,32 @@ - + - {{data.title}} - {{data.subTitle}} - - 活动说明 - {{data.detail}} - + {{data.title}} + {{data.subTitle}} + + 活动说明 + {{data.detail}} - + - + @@ -40,7 +41,8 @@ 满¥{{item.usePriceStr}}可用 - + 仅限本店使用 @@ -54,19 +56,22 @@ 满¥{{item.usePriceStr}}可用 - + 仅限本店使用 - - + + - 免费领 - 马上购 - - + 免费领 + 马上购 + + diff --git a/pages/freeBannerDetail/freeBannerDetail.js b/pages/freeBannerDetail/freeBannerDetail.js new file mode 100644 index 0000000..03db4b5 --- /dev/null +++ b/pages/freeBannerDetail/freeBannerDetail.js @@ -0,0 +1,9 @@ +// c:\Users\Holy-Knight-IX\Desktop\Working Space\4.TikTok-MiniPro\ttc\pages\freeBannerDetail\freeBannerDetail.js +Page({ + data: { + + }, + onLoad: function (options) { + + } +}) \ No newline at end of file diff --git a/pages/freeBannerDetail/freeBannerDetail.json b/pages/freeBannerDetail/freeBannerDetail.json new file mode 100644 index 0000000..3928faa --- /dev/null +++ b/pages/freeBannerDetail/freeBannerDetail.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/freeBannerDetail/freeBannerDetail.ttml b/pages/freeBannerDetail/freeBannerDetail.ttml new file mode 100644 index 0000000..652b770 --- /dev/null +++ b/pages/freeBannerDetail/freeBannerDetail.ttml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pages/freeBannerDetail/freeBannerDetail.ttss b/pages/freeBannerDetail/freeBannerDetail.ttss new file mode 100644 index 0000000..f859ea6 --- /dev/null +++ b/pages/freeBannerDetail/freeBannerDetail.ttss @@ -0,0 +1 @@ +/* c:\Users\Holy-Knight-IX\Desktop\Working Space\4.TikTok-MiniPro\ttc\pages\freeBannerDetail\freeBannerDetail.ttss */ \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index 4b0a09e..0ead833 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -52,7 +52,7 @@ "id": 1685600905887, "name": "pages/coupon/detail/index", "pathName": "pages/coupon/detail/index", - "query": "couponChannelId=823002244776124416&couponId=822994443689451520&mallTenantId=1032", + "query": "couponChannelId=823002244776124416&couponId=822994443689451520", "scene": "011007", "launchFrom": "scan", "location": "audit"