diff --git a/src/components/base-dialog/index.vue b/src/components/base-dialog/index.vue
index 5f5cfc6..49dc357 100644
--- a/src/components/base-dialog/index.vue
+++ b/src/components/base-dialog/index.vue
@@ -8,7 +8,7 @@
:showConfirmButton="false"
v-bind:close="close"
>
-
+
{{ title || '温馨提示' }}
{{ text }}
{{ confirmTxt }}
diff --git a/src/views/pages/comProduct/index.vue b/src/views/pages/comProduct/index.vue
index ab0006c..09e0aaa 100644
--- a/src/views/pages/comProduct/index.vue
+++ b/src/views/pages/comProduct/index.vue
@@ -58,11 +58,23 @@
-
-
+
+
-
活动规则
-
+
商品说明
+
+ 生效时间段
+ {{ groupInfo.start_time }} - {{ groupInfo.end_time }}
+
+
+ 领取时间段
+ {{ groupInfo.recive_start }} - {{ groupInfo.recive_end }}
+
+
+ 使用规则
+
+
+
@@ -231,6 +243,10 @@ export default {
await this.getData('start');
},
computed: {
+ getProDesc() { // 商品说明
+ const groupInfo = this.groupInfo;
+ return groupInfo && ((groupInfo.is_active_time_show === 1) || (groupInfo.recive_type === 2) || groupInfo.desc)
+ },
getModalTitle() { // 直充(非平台) + 红包/立减金(支付-账号领取/云闪付)
const obj = this.selectedPro[0];
if (this.selectedPro.length === 1) {
@@ -282,6 +298,16 @@ export default {
methods: {
changePopComStatus() {
this.popComStatus = !this.popComStatus;
+ if (this.popComStatus) { // 弹窗禁止滑动穿透
+ const scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
+ document.body.style.position = 'fixed';
+ document.body.style.top = `-${scrollTop}px`;
+ } else {
+ const top = document.body.style.top;
+ document.body.style.position = '';
+ document.body.style.top = '';
+ document.body.scrollTop = document.documentElement.scrollTop = -parseInt(top);
+ }
},
async getData(type: string) {
if (!this.groupId) return showToast('组合商品ID不能为空');
@@ -584,8 +610,8 @@ export default {
position: fixed;
display: block;
top: 40px;
- right: 0;
- width: 30px;
+ right: -6.5px;;
+ width: 40px;
height: auto;
cursor: pointer;
}
@@ -615,6 +641,27 @@ export default {
align-items: center;
font-weight: 700;
font-size: 16px;
+ margin-bottom: 20px;
+ }
+ .timeTitle, .descTitle {
+ font-size: 14px;
+ color: #171717;
+ padding: 0 20px;
+ margin-top: 10px;
+ line-height: 24px;
+ }
+ .time, .descText {
+ line-height: 20px;
+ color: #a8a8a8;
+ font-size: 12px;
+ margin-top: 10px;
+ padding: 0 20px;
+ }
+ .descImg {
+ display: block;
+ width: 345px;
+ height: auto;
+ margin: 10px auto 0;
}
}
.typeBox {
@@ -763,6 +810,12 @@ export default {
}
.contentInfo {
flex: auto;
+ p {
+ max-width: 170px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
.contentInfoTop {
height: 16px;
font-family: Source Han Sans, Source Han Sans;
@@ -778,10 +831,6 @@ export default {
font-size: 11px;
color: #939393;
line-height: 16px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- max-width: 129px;
margin-top: 5px;
}
}
diff --git a/src/views/templates/cmsDetail/index.vue b/src/views/templates/cmsDetail/index.vue
index 9980093..ce1e72e 100644
--- a/src/views/templates/cmsDetail/index.vue
+++ b/src/views/templates/cmsDetail/index.vue
@@ -55,7 +55,7 @@
-
活动规则
+
活动说明
diff --git a/src/views/templates/cmsList/index.vue b/src/views/templates/cmsList/index.vue
index 1a666c2..adcb560 100644
--- a/src/views/templates/cmsList/index.vue
+++ b/src/views/templates/cmsList/index.vue
@@ -71,7 +71,7 @@
-
活动规则
+
活动说明