diff --git a/.env.development b/.env.development
index 975fccb..a28ecd3 100755
--- a/.env.development
+++ b/.env.development
@@ -6,4 +6,4 @@ VITE_USE_COMPRESS=false
VITE_USE_REPORT=false
-VITE_BASE_API_URL='http://139.224.10.234:8088'
\ No newline at end of file
+VITE_BASE_API_URL='http://192.168.2.107:8088'
\ No newline at end of file
diff --git a/src/views/sale/index.vue b/src/views/sale/index.vue
index 84e5e3b..536c3fe 100755
--- a/src/views/sale/index.vue
+++ b/src/views/sale/index.vue
@@ -31,7 +31,7 @@
@@ -41,16 +41,16 @@
剩余:{{ item.nums }}份
- 我要报名
-
+ {{ !item.state ? '我要报名' : '去核销' }}
@@ -105,12 +105,13 @@
>
{{ isSuccess ? '核销成功' : '报名成功' }}
{{ selItem.giftName }}
- {{ isSuccess ? '' : selItem.activityRules }}
+
+ 礼品发放以线下库存为准 先到先得
{
if (!token.value) return (location.href = handleWxRedict());
// 001Mol1000Yj4R1raU100kCKRM0Mol1G
- if (selId.value) {
+ console.log('🚀 ~ file: index.vue:197 ~ item:', item);
+ // state 领取状态,true已领取,false未领取
+ if (item.state) {
+ selId.value = item.id;
selItem.value = item;
show.value = true;
isSuccess.value = false;
+ iptShow.value = true;
return;
}
const { result, code } = await queryCouponLog({ id: item.id, openId: userInfo.value.openid });
@@ -289,9 +294,9 @@
userInfo.value = JSON.parse(user);
}
}
+ getCoupon();
};
- getCoupon();
init();
onMounted(async () => {
@@ -302,8 +307,10 @@
if (val) {
checkCode.value = '';
} else {
- getCoupon();
- selId.value && (iptShow.value = true);
+ getCoupon()
+ setTimeout(() => {
+ selId.value && (iptShow.value = true);
+ },200)
}
});
@@ -346,6 +353,7 @@
}
.nut-input-box input {
color: #000;
+ padding-left: 14px;
}
}