Skip to content

aws 배포 #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kjandgo merged 4 commits into from
Jan 5, 2026
Merged

aws 배포 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46af699
feat: #102 추천 프로모션,쿠폰 배포오류수정
huni2 Jan 4, 2026
a066d8b
Merge branch 'develop' of https://github.com/DevOops-final-be19/Renta…
huni2 Jan 5, 2026
9d70736
feat: #102 배포 수정
huni2 Jan 5, 2026
e20e84a
Merge pull request #107 from DevOops-final-be19/refact/hch-overdue
Kjandgo Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/components/dashboard/CampaignWorkbenchMock.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,18 @@
<span class="dot dot-high" aria-hidden="true"></span>

<div class="wb-text">
<div class="wb-main">{{ promotion.name }}</div>
<div class="wb-sub">대상: {{ promotion.segmentName }}</div>
<div v-if="promotion">
<div class="wb-main">{{ promotion.name }}</div>
<div class="wb-sub">대상: {{ promotion.segmentName }}</div>
</div>

<el-empty v-else description="추천 프로모션이 없습니다" />

</div>
</div>

<button
v-if="promotion"
class="wb-btn wb-btn--primary"
type="button"
@click.stop="go('PROMOTION_CREATE')"
Expand All @@ -40,7 +46,7 @@ import api from '@/api/axios';

const router = useRouter();
const loading = ref(false);
const promotion = ref([]);
const promotion = ref(null);

const fetchPromotionList = async () => {
loading.value = true;
Expand Down
12 changes: 9 additions & 3 deletions src/components/dashboard/CouponWorkbenchMock.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,18 @@
<span class="dot dot-mid" aria-hidden="true"></span>

<div class="wb-text">
<div class="wb-main">{{ coupon.name }}</div>
<div class="wb-sub">대상: {{ coupon.segmentName }}</div>
<div v-if="coupon">
<div class="wb-main">{{ coupon.name }}</div>
<div class="wb-sub">대상: {{ coupon.segmentName }}</div>
</div>

<el-empty v-else description="추천 쿠폰이 없습니다"/>

</div>
</div>

<button
v-if="coupon"
class="wb-btn"
type="button"
@click.stop="go('COUPON_CREATE')"
Expand All @@ -39,7 +45,7 @@ import api from '@/api/axios';

const router = useRouter();
const loading = ref(false);
const coupon = ref([]);
const coupon = ref(null);

const fetchCouponList = async () => {
loading.value = true;
Expand Down
5 changes: 0 additions & 5 deletions src/views/product/AsListView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,6 @@ const goDetail = (id) => {
showDetail.value = true
}

const formatDate = (iso) => {
if (!iso) return '';
return iso.slice(0, 10);
};

// API
const fetchSummary = async () => {
const { data } = await axios.get('/as/summary')
Expand Down
Loading