需求497以及oss切换

This commit is contained in:
zhangguoping 2024-09-29 10:43:12 +08:00
parent 1c09dc931d
commit 7d2381306a
4 changed files with 42 additions and 4 deletions

View File

@ -519,8 +519,12 @@
this.maskshow = true; this.maskshow = true;
this.popboxshow = true; this.popboxshow = true;
this.popboxtype = '提示'; this.popboxtype = '提示';
if(gstatus === 23 && row.period_tips_text) {
this.tiptext = row.period_tips_text
} else {
this.tiptext = product_status(gstatus, row); this.tiptext = product_status(gstatus, row);
} }
}
}, },
//关闭,关闭弹框 //关闭,关闭弹框

View File

@ -11,7 +11,8 @@
<script type="text/javascript" src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/axios.js"></script> <script type="text/javascript" src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/axios.js"></script>
<script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api2_0.js?v=1000"></script> <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api2_0.js?v=1000"></script>
<script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/libs.js"></script> <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/libs.js"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/crypto-js/4.1.1/crypto-js.min.js"></script> <!-- <script src="https://cdn.bootcdn.net/ajax/libs/crypto-js/4.1.1/crypto-js.min.js"></script> -->
<script src="https://lsxd-market.oss-cn-chengdu.aliyuncs.com/crypto/crypto-js.min.js"></script>
</head> </head>
<body> <body>

View File

@ -35,6 +35,17 @@
-webkit-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
-ms-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;
}
</style> </style>
<body> <body>
@ -79,6 +90,8 @@
{{item.type==1?item.entity.product_name:item.entity.batch_goods_name}} {{item.type==1?item.entity.product_name:item.entity.batch_goods_name}}
<span v-if="item.entity.send_num>1&&item.type===2" class="send_num"> x{{item.entity.send_num}}</span> <span v-if="item.entity.send_num>1&&item.type===2" class="send_num"> x{{item.entity.send_num}}</span>
</div> </div>
<p class="period-item" v-if="item.period_tips_text">{{ item.period_tips_text }}</p>
</div> </div>
</div> </div>
</div> </div>
@ -500,8 +513,12 @@
this.maskshow = true; this.maskshow = true;
this.popboxshow = true; this.popboxshow = true;
this.popboxtype = '提示'; this.popboxtype = '提示';
if(gstatus === 23 && row.period_tips_text) {
this.tiptext = row.period_tips_text
} else {
this.tiptext = product_status(gstatus, row); this.tiptext = product_status(gstatus, row);
} }
}
}, },
//关闭,关闭弹框 //关闭,关闭弹框

View File

@ -36,6 +36,17 @@
-webkit-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
-ms-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;
}
</style> </style>
<body> <body>
@ -87,6 +98,7 @@
<span v-if="item.entity.send_num>1&&item.type===2" class="send_num"> <span v-if="item.entity.send_num>1&&item.type===2" class="send_num">
x{{item.entity.send_num}}</span> x{{item.entity.send_num}}</span>
</div> </div>
<p class="period-item" v-if="item.period_tips_text">{{ item.period_tips_text }}</p>
</div> </div>
</div> </div>
</div> </div>
@ -522,8 +534,12 @@
this.maskshow = true; this.maskshow = true;
this.popboxshow = true; this.popboxshow = true;
this.popboxtype = '提示'; this.popboxtype = '提示';
if(gstatus === 23 && row.period_tips_text) {
this.tiptext = row.period_tips_text
} else {
this.tiptext = product_status(gstatus, row); this.tiptext = product_status(gstatus, row);
} }
}
}, },
//关闭,关闭弹框 //关闭,关闭弹框