From 7d2381306ad875c4f2c27799522e9029efb1ab5c Mon Sep 17 00:00:00 2001 From: zhangguoping Date: Sun, 29 Sep 2024 10:43:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82497=E4=BB=A5=E5=8F=8Aoss?= =?UTF-8?q?=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- homepage.html | 6 +++++- orderDetails/cardOrder.html | 3 ++- packkey/homepage.html | 19 ++++++++++++++++++- xw-pages/homepage.html | 18 +++++++++++++++++- 4 files changed, 42 insertions(+), 4 deletions(-) diff --git a/homepage.html b/homepage.html index f7df01f..9ccf678 100644 --- a/homepage.html +++ b/homepage.html @@ -519,7 +519,11 @@ this.maskshow = true; this.popboxshow = true; this.popboxtype = '提示'; - this.tiptext = product_status(gstatus, row); + if(gstatus === 23 && row.period_tips_text) { + this.tiptext = row.period_tips_text + } else { + this.tiptext = product_status(gstatus, row); + } } }, diff --git a/orderDetails/cardOrder.html b/orderDetails/cardOrder.html index 0b6546c..2d169e6 100644 --- a/orderDetails/cardOrder.html +++ b/orderDetails/cardOrder.html @@ -11,7 +11,8 @@ - + + diff --git a/packkey/homepage.html b/packkey/homepage.html index def111f..8f24dc0 100644 --- a/packkey/homepage.html +++ b/packkey/homepage.html @@ -35,6 +35,17 @@ -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } + + #rotation .period-item { + position: absolute; + bottom: -0.15rem; + left: -0.2rem; + width: 100%; + color: #c5c4c4; + font-size: 0.08rem; + text-align: center; + white-space: nowrap; + } @@ -79,6 +90,8 @@ {{item.type==1?item.entity.product_name:item.entity.batch_goods_name}} x{{item.entity.send_num}} + +

{{ item.period_tips_text }}

@@ -500,7 +513,11 @@ this.maskshow = true; this.popboxshow = true; this.popboxtype = '提示'; - this.tiptext = product_status(gstatus, row); + if(gstatus === 23 && row.period_tips_text) { + this.tiptext = row.period_tips_text + } else { + this.tiptext = product_status(gstatus, row); + } } }, diff --git a/xw-pages/homepage.html b/xw-pages/homepage.html index 9087814..72ca9b5 100644 --- a/xw-pages/homepage.html +++ b/xw-pages/homepage.html @@ -36,6 +36,17 @@ -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } + + #rotation .period-item { + position: absolute; + bottom: -0.15rem; + left: -0.2rem; + width: 100%; + color: #c5c4c4; + font-size: 0.08rem; + text-align: center; + white-space: nowrap; + } @@ -87,6 +98,7 @@ x{{item.entity.send_num}} +

{{ item.period_tips_text }}

@@ -522,7 +534,11 @@ this.maskshow = true; this.popboxshow = true; this.popboxtype = '提示'; - this.tiptext = product_status(gstatus, row); + if(gstatus === 23 && row.period_tips_text) { + this.tiptext = row.period_tips_text + } else { + this.tiptext = product_status(gstatus, row); + } } },