damao
/
marketingsystem_temp_h5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update @接口字段联调

This commit is contained in:
huangzhen 2024-09-13 16:21:59 +08:00
parent 3fea2931ad
commit 4a3e41d759
7 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/datas.ts
View File

@ -1,7 +1,7 @@
/**
* 商品公共状态 err_code
*/
export const { iconMap, btnMap, btnHighLight, receivingCode, btnPoll } = {
export const { iconMap, btnMap, btnHighLight, btnPoll, successCode } = {
iconMap: new Map([
[12006, 'https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/jijiangkaishi.png'], // 即将开始
[14001, 'https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/yiduiwan.png'], // 已兑完
@ -16,11 +16,11 @@ export const { iconMap, btnMap, btnHighLight, receivingCode, btnPoll } = {
[14001, '已兑完'],
[14003, '领取中'], // 已兑换，充值中 (隐藏轮询)
[14004, '重新领取'], // 已兑换，充值失败（暂时直接轮询） // todo 清空授权逻辑
[14005, '立即兑换'], // 已兑换，充值成功（非"已兑完"-继续领取）
[14005, '继续兑换'], // 已兑换，充值成功（非"已兑完"-继续领取）
]),
btnHighLight: [14004, 14005], // 高亮按钮，点击不提示
receivingCode: 14003, // 已兑换，充值中
btnPoll: [14004], // 直接轮询code
successCode: [14001, 14005], // 成功code
};

39
src/views/pages/comProduct/index.vue
View File

@ -14,7 +14,12 @@
<p @click.stop="receiveAll('top', pageData.get(item), item)" :style="{ color: listCss.get(item)?.btnTextColor, opacity: !detailType ? 1 : 0 }" class="topBtn">一键领取 ></p>
<ul class="listBox">
<li v-for="(i, j) in pageData.get(item)" :key="j" class="listContent">
<p v-if="i.goods.err_code" class="tipText">{{ i.goods.reson }}</p>
<p
v-if="i.goods.err_code && i.goods.err_code !== 14003"
:class="['tipText', successCode.includes(i.goods.err_code) && 'tipTextSuccess' ]"
>
{{ i.goods.reson }}
</p>
<div v-if="listCss.get(item)?.text" class="leftInfo" :style="{ backgroundColor: listCss.get(item)?.infoBgc }">
<p class="infoIcon" :style="{ backgroundImage: `url(${listCss.get(item)?.textIcon})` }">{{ listCss.get(item)?.text }}</p>
<p class="amountInfo" :style="{ color: listCss.get(item)?.textColor }">
@ -37,13 +42,7 @@
@click.stop="receiveAll('one', [i], item, j)"
>
{{
i.goods.type === 3
?
btnMap.get(i.goods.err_code)
? (i.info.send_num > 1) ? `${btnMap.get(i.goods.err_code)} ${(i.goods.exchange_times || 0)}/${i.info.send_num || 0}` : btnMap.get(i.goods.err_code)
: (i.info.send_num > 1) ? `立即兑换 ${(i.goods.exchange_times || 0)}/${i.info.send_num || 0}` : '立即兑换'
:
btnMap.get(i.goods.err_code) ? btnMap.get(i.goods.err_code) : '立即兑换'
btnMap.get(i.goods.err_code) ? btnMap.get(i.goods.err_code) : '立即兑换'
}}
<img v-if="i.goods.err_code === 14003" class="loadingBtn" src="./img/loading.png" alt="">
</p>
@ -100,7 +99,7 @@
<script lang="ts">
import { QUERY, EXCHANGE, ORDER_QUERY, GET_SMS } from "@/router/api";
import { btnHighLight, btnMap, btnPoll } from "@/utils/datas";
import { btnHighLight, btnMap, btnPoll, successCode } from "@/utils/datas";
import { channelJudge } from "@/utils/empower";
import { phoneRegex, startsWith, urlToLocal } from "@/utils/methods";
@ -202,6 +201,7 @@ export default {
btnMap: new Map([ ...btnMap ]),
btnHighLight: [ ... btnHighLight ],
btnPoll: [ ...btnPoll ],
successCode: [ ...successCode ],
}
},
async created() {
@ -298,10 +298,10 @@ export default {
}
this.loadingStatus = false;
if (this.orderData.length) { // 存在待轮询订单
if (type === 'start') {
this.dialogText = '已有领取中的商品';
}
return await this.orderPolling();
// if (type === 'start') {
// this.dialogText = '已有领取中的商品';
// }
return this.pollTime = setTimeout(() => { this.orderPolling() }, 3000);
}
if (sessionStorage.getItem('autoReceive') === 'is') {
sessionStorage.setItem('autoReceive', 'no');
@ -610,6 +610,18 @@ export default {
box-sizing: border-box;
background-color: rgba(255, 102, 102, 0.20);
}
.tipTextSuccess {
color: rgb(127, 190, 122);
background-color: rgb(222, 255, 219);
animation-name: tipTextSuccessDH;
animation-duration: 3s;
animation-fill-mode: forwards; /* 保持动画结束状态 */
}
@keyframes tipTextSuccessDH {
0% { opacity:1; }
99% { opacity:1; }
100% { opacity:0; }
}
.leftInfo {
width: 51px;
height: 47px;
@ -710,7 +722,6 @@ export default {
margin-left: 3px;
animation: loadingBtnRotate 3s linear infinite;
}
@keyframes loadingBtnRotate {
from {
transform: rotate(0deg);

6
src/views/templates/cmsCash/index.vue
View File

@ -88,9 +88,9 @@ export default {
pollTime: null,
dialogType: '',
dialogText: '',
btnMap: btnMap,
btnHighLight: btnHighLight,
btnPoll: btnPoll,
btnMap: new Map([ ...btnMap ]),
btnHighLight: [ ... btnHighLight ],
btnPoll: [ ...btnPoll ],
};
},
created() {

6
src/views/templates/cmsDetail/index.vue
View File

@ -109,9 +109,9 @@ export default {
popComStatus: false,
dialogType: '',
dialogText: '',
btnMap: btnMap,
btnHighLight: btnHighLight,
btnPoll: btnPoll,
btnMap: new Map([ ...btnMap ]),
btnHighLight: [ ... btnHighLight ],
btnPoll: [ ...btnPoll ],
}
},
created() {

1
src/views/templates/cmsList/index.scss
View File

@ -51,6 +51,7 @@
color: #242533;
font-size: 10px;
margin-top: 10px;
white-space: nowrap;
}
}
}

5
src/views/templates/cmsList/index.vue
View File

@ -152,6 +152,7 @@ export default {
// 处理公共数据
this.btnMap.set(14003, '立即兑换');
this.btnMap.set(14004, '立即兑换');
this.btnMap.set(14005, '立即兑换');
this.btnHighLight.push(14003);
this.getData()
} else {
@ -161,7 +162,7 @@ export default {
watch: {
formData: {
handler(newVal: any) {
console.log('---list-watch---', newVal);
// console.log('---list-watch---', newVal);
this.cssData = {
...this.cssData,
...newVal
@ -244,7 +245,7 @@ export default {
},
onSlideChange(swiper: any) {
this.initialSlide = swiper.realIndex;
console.log('---onSlideChange---', this.pageData[this.initialSlide]);
// console.log('---onSlideChange---', this.pageData[this.initialSlide]);
},
jumpBanner() {
if (this.comType === 2) return;

6
src/views/templates/cmsVoucher/index.vue
View File

@ -81,9 +81,9 @@ export default {
pollTime: null,
dialogType: '',
dialogText: '',
btnMap: btnMap,
btnHighLight: btnHighLight,
btnPoll: btnPoll,
btnMap: new Map([ ...btnMap ]),
btnHighLight: [ ... btnHighLight ],
btnPoll: [ ...btnPoll ],
};
},
created() {