Skip to content

Commit

Permalink
Merge pull request #265 from traPtitech/issue-260
Browse files Browse the repository at this point in the history
ダッシュボードにリンクを置く
  • Loading branch information
nagatea authored Nov 28, 2019
2 parents 563a503 + 123b660 commit 9340313
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions client/src/components/DashBoard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<v-toolbar-title>あなたが借りている物品</v-toolbar-title>
<v-spacer />
<v-btn @click="returnItems" :disabled="!returnCart.length">まとめて返却</v-btn>
<v-btn @click="type='month'">Month</v-btn>
</v-toolbar>
</v-sheet>
<v-sheet height="600">
Expand Down Expand Up @@ -70,13 +69,14 @@
</v-toolbar>
<br>
<div class="text-center">
<v-img v-if="selectedItem.img_url" contain :src="selectedItem.img_url.length ? selectedItem.img_url : '/img/no-image.svg'" height="194" />
<v-img contain :src="selectedItem.img_url ? selectedItem.img_url : '/img/no-image.svg'" height="194" />
</div>
<v-card-text>
<span>{{ selectedItem.description }}</span>
</v-card-text>
<v-card-actions>
<v-btn
block
text
color="secondary"
@click="click2Cart(selectedItem)"
Expand All @@ -85,6 +85,16 @@
>
返却するものにまとめる
</v-btn>
<v-btn
block
text
color="secondary"
@click.stop="$router.push({path: `/items/${selectedItem.ID}`})"
outlined
v-else
>
詳細
</v-btn>
</v-card-actions>
</v-card>
</v-menu>
Expand Down

0 comments on commit 9340313

Please sign in to comment.