diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index c4700a7..4090021 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -66,7 +66,7 @@
{{sku.sku_name}}
@@ -76,7 +76,7 @@
{{tool.filterTag(sku.display_tags,",",2,false)}}
- ⓘ预订须知>
@@ -87,7 +87,8 @@
- 预订
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index 39bb9fd..99fd590 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -1065,12 +1065,6 @@ line-height: 93rpx;
font-size: 37rpx;
color: #000000;
}
-
-.mask-content1 .date-box>view:nth-of-type(2){
- border: none !important;
- padding-top: 10rpx !important;
- height: auto !important;
-}
.mask-scroll-content{
flex: 1;
height: 100rpx;
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 4c17eb6..c6f7149 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -51,16 +51,23 @@ Component({
afterTom:util.formatHou(new Date()),
skuName:'',
monthList:[],
- scrollLeft: 0
+ scrollLeft: 0,
+ refundTag: "",
},
lifetimes: {
attached: function () {
console.log(app.globalData.product);
let skuName = app.globalData.product.sku.sku_name
+ let refundTag = "";
+ if (app.globalData.product&&app.globalData.product.sku&&app.globalData.product.sku.sku_model) {
+ if(app.globalData.product.sku.sku_model.is_auto_refund == 1) refundTag = "过期自动退";
+ if(app.globalData.product.sku.sku_model.is_auto_refund == 2) refundTag = "过期自动核销";
+ }
this.setData({
kjIdCom: app.globalData.kjId,
gpIdCom: app.globalData.gp_id || app.globalData.team_id,
- skuName
+ skuName,
+ refundTag: refundTag
})
// 在组件实例进入页面节点树时执行
let product = app.globalData.product, today = util.formatDate(new Date()), end_date = util.formatDate(new Date(new Date().getTime() + this.properties.endDays * 24 * 60 * 60 * 1000));
diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml
index 2e274ec..79ec513 100644
--- a/pages/order/components/date/index.wxml
+++ b/pages/order/components/date/index.wxml
@@ -23,7 +23,8 @@
-->
{{skuName}}
-
+ {{refundTag}}
+
使用日期
diff --git a/pages/order/components/date/index.wxss b/pages/order/components/date/index.wxss
index b954718..4c5d8e8 100644
--- a/pages/order/components/date/index.wxss
+++ b/pages/order/components/date/index.wxss
@@ -128,4 +128,18 @@
font-weight: 500;
font-size: 27rpx;
color: #000000;
+}
+.refund-tag{
+ margin-left: 20rpx;
+ background: rgba(241, 34, 34, 0.1);
+ border-radius: 7rpx;
+ height: 37rpx;
+ line-height: 37rpx;
+ padding: 0 10rpx;
+ font-weight: 500;
+ font-size: 24rpx;
+ color: #F12222;
+ width: fit-content;
+
+
}
\ No newline at end of file