Skip to content

Commit

Permalink
Merge pull request #4 from hexschool/hotfix/works
Browse files Browse the repository at this point in the history
hotfix: 修正判斷
  • Loading branch information
hsiangfeng authored Oct 13, 2024
2 parents 9b77c0b + 024e8be commit 2f7c48c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
11 changes: 5 additions & 6 deletions deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ echo ${osStatus} "${lgreen}=====================================================
echo ${osStatus} " 目前遠端分支: ${originUrl} "
echo ${osStatus} "==============================================================${norm}"

sleep 1
# sleep 1s

split=${originUrl:0:5}
status='';
Expand Down Expand Up @@ -87,7 +87,7 @@ echo ${osStatus} " 將於五秒後建立 vue.config.js "
echo ${osStatus} " *如要停止動作請按下 CRTL + C or Control + C"
echo ${osStatus} "==============================================================${norm}"

sleep 5
# sleep 5s

touch $work_path

Expand All @@ -99,7 +99,7 @@ echo ${osStatus} " 詳細可見該檔案下註解。 "
echo ${osStatus} " *如要停止動作請按下 CRTL + C or Control + C"
echo ${osStatus} "==============================================================${norm}"

sleep 5
# sleep 5s

echo "// 該檔案生成的方式可以在 Vue Ui 中的「設定」->「Vue Cli」->「公開路徑」找到。
module.exports = {
Expand All @@ -125,8 +125,7 @@ echo ${osStatus} " 5 秒後開始編譯 Vue Cli "
echo ${osStatus} " *如要停止動作請按下 CRTL + C or Control + C"
echo ${osStatus} "==============================================================${norm}"

sleep 5

# sleep 5s
npm run build

echo
Expand Down Expand Up @@ -156,7 +155,7 @@ echo ${osStatus} " 5 秒後部署檔案到遠端分支 "
echo ${osStatus} " *如要停止動作請按下 CRTL + C or Control + C"
echo ${osStatus} "==============================================================${norm}"

sleep 5
# sleep 5s

git push -f $originUrl master:gh-pages

Expand Down
2 changes: 1 addition & 1 deletion src/components/Card.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="col-md-6 col-lg-4" v-if="cards.is_display === '' && cards['六角審核'] === 'TRUE'">
<div class="col-md-6 col-lg-4" v-if="cards.is_display === '' && cards['六角審核']">
<div class="card" @mouseover="hover = true" @mouseleave="hover = false">
<div class="position-relative" style="height: 312px;background-color: #d9d9d9;">
<template v-if="cards.thumbnail_small">
Expand Down

0 comments on commit 2f7c48c

Please sign in to comment.