From 728c118fd41eba886c6dd08559d99459b8628927 Mon Sep 17 00:00:00 2001 From: liqianjin <949671634@qq.com> Date: Mon, 24 Apr 2023 13:40:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E5=90=8E=E5=BC=B9=E7=AA=97=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/ns-login/ns-login.vue | 17 +- .../register-reward/register-reward.vue | 275 +++++++++++++----- 2 files changed, 210 insertions(+), 82 deletions(-) diff --git a/components/ns-login/ns-login.vue b/components/ns-login/ns-login.vue index e8e9947..b25338e 100644 --- a/components/ns-login/ns-login.vue +++ b/components/ns-login/ns-login.vue @@ -403,7 +403,10 @@ export default { }); this.$refs.completeInfoPopup.close(); this.$store.commit('setBottomNavHidden', false); // 显示底部导航 - if (res.data.is_register) this.$refs.registerReward.open(); + // if (res.data.is_register) this.$refs.registerReward.open(); + this.$nextTick(()=>{ + this.$refs.registerReward.open(); + }) } else { this.isSub = false; this.getCaptcha(); @@ -464,7 +467,11 @@ export default { this.cancelCompleteInfo(); } }); - if (res.data.is_register) this.$refs.registerReward.open(); + // if (res.data.is_register) this.$refs.registerReward.open(); + + this.$nextTick(()=>{ + this.$refs.registerReward.open(); + }) } else { this.$util.showToast({ title: res.message }); } @@ -496,7 +503,11 @@ export default { success: () => { this.$store.dispatch('getCartNumber'); this.$store.commit('setToken', res.data.token); - if (res.data.is_register) this.$refs.registerReward.open(); + // if (res.data.is_register) this.$refs.registerReward.open(); + + this.$nextTick(()=>{ + this.$refs.registerReward.open(); + }) this.cancelCompleteInfo(); } }); diff --git a/components/register-reward/register-reward.vue b/components/register-reward/register-reward.vue index d8ed7c1..9b88718 100644 --- a/components/register-reward/register-reward.vue +++ b/components/register-reward/register-reward.vue @@ -1,76 +1,92 @@ @@ -87,7 +103,8 @@ export default { data() { return { reward: null, - back: '' + back: '', + newuser_points: '' }; }, created() { @@ -98,11 +115,12 @@ export default { }, open(back) { if (back) this.back = back; - if (this.addonIsExist.memberregister) { + // if (this.addonIsExist.memberregister) { + this.getFenxiaoBasics(); this.getRegisterReward(); - } else { - this.closeRewardPopup(); - } + // } else { + // this.closeRewardPopup(); + // } }, cancel() { this.$refs.registerReward.close(); @@ -116,14 +134,37 @@ export default { success: res => { if (res.code >= 0) { let data = res.data; - if (data.is_use == 1 && (data.value.point > 0 || data.value.balance > 0 || data.value.growth > 0 || data.value.coupon_list.length > 0)) { + // if (data.is_use == 1 && (data.value.point > 0 || data.value.balance > 0 || data.value.growth > 0 || data.value.coupon_list.length > 0)) { this.reward = data.value; setTimeout(()=> { this.$refs.registerReward.open(); }) - } else { - this.closeRewardPopup(); - } + // } else { + // this.closeRewardPopup(); + // } + } else { + this.closeRewardPopup(); + } + } + }); + }, + /** + * 获取新人礼配置 + */ + getFenxiaoBasics() { + this.$api.sendRequest({ + url: '/fenxiao/api/config/basics', + success: res => { + if (res.code >= 0) { + let data = res.data; + // if (data.is_use == 1 && (data.value.point > 0 || data.value.balance > 0 || data.value.growth > 0 || data.value.coupon_list.length > 0)) { + this.newuser_points = data.newuser_points; + // setTimeout(()=> { + // this.$refs.registerReward.open(); + // }) + // } else { + // this.closeRewardPopup(); + // } } else { this.closeRewardPopup(); } @@ -283,4 +324,80 @@ export default { } } } +.version-popup-content{ + .img{ + width: 580rpx; + left: -5rpx; + } + .title{ + position: absolute; + top: 68rpx; + left: 0; + right: 0; + margin: auto; + text-align: center; + font-size: large; + font-weight: 900; + color: white; + } + .con_title{ + margin-top: 44rpx; + //margin-bottom: 14rpx; + font-size: 44rpx; + font-weight: 900; + color: #B6634F; + } + .text{ + font-size: 36rpx; + color: #ffeed2; + line-height: 1.5; + position: absolute; + top: 300rpx; + left: 0; + right: 0; + margin: auto; + width: 400rpx; + text-align: center; + } + .jifen{ + + margin: auto; + display: flex; + position: absolute; + top: 400rpx; + width: 400rpx; + left: 0; + right: 0; + align-items: baseline; + justify-content: center; + .num{ + font-size: 88rpx; + color: #ffeed2; + line-height: 1.5; + text-align: center; + } + .jifen_text{ + font-size: 36rpx; + color: #ffeed2; + line-height: 1.5; + text-align: center; + } + } + .button_img{ + //background: url("./public/img/index/friend-farm-button.png"); + top: 590rpx; + width: 240rpx; + left: 0; + right: 0; + margin: auto; + position: absolute; + background-size: cover; + height: 80rpx; + font-size: 35rpx; + text-align: center; + font-weight: 900; + color: #e63c3d; + line-height: 80rpx; + } +}