KoPKB/lelong-web-pembida
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ui

Browse Source
This commit is contained in:
Amir
2022-06-21 15:29:36 +08:00
parent 0471eb5fcb
commit c63869a8f1
9 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/BidHistory.vue
+4 -1
View File
@@ -11,9 +11,12 @@
<h1>Rekod Bidaan <i class="bi bi-receipt"></i></h1>
<!-- <div class="card"> -->
<div class="card-body">
<button @click="renderListBid" class="badge btn-secondary">
<button @click="renderListBid" class="badge btn-secondary mb-5">
Reload <i class="bi bi-arrow-clockwise"></i>
</button>
<br>
<label for="birthday">Pilih Tarikh:</label>
<input type="date" id="birthday" name="birthday">
<ListBid :key="ListBidComponent" />
</div>
<!-- </div> -->
src/components/Cart.vue
+11 -17
View File
@@ -84,7 +84,7 @@
<div class="m-t-sm">
<button
class="btn btn-outline-danger"
class="btn btn-danger"
data-bs-toggle="modal"
data-bs-target="#deleteModal"
@click="deleteModal(senaraiCart)"
@@ -111,7 +111,7 @@
style="width: 145.82px; text-align: center"
>
<button
class="btn btn-outline-warning"
class="btn btn-warning"
data-bs-toggle="modal"
data-bs-target="#editModal"
@click="editModal(senaraiCart)"
@@ -155,7 +155,7 @@
<span> Yuran </span> -->
<h2 class="font-bold">RM10.00</h2>
<hr />
<span class="text-muted small">
<span class="text-danger">
<i>*Anda perlu membayar yuran sebelum membuat bidaan.</i>
</span>
<div class="m-t-sm">
@@ -172,7 +172,7 @@
<button
data-bs-toggle="modal"
data-bs-target="#payModal"
class="btn btn-primary"
class="btn btn-success"
>
Bayar Yuran
</button>
@@ -209,7 +209,7 @@
<i class="bi bi-check2-circle"></i>
</h4>
<hr />
<span class="text-muted small">
<span class="fw-bold">
<i>*Anda boleh membuat bidaan.</i>
</span>
<!-- <div class="m-t-sm">
@@ -261,7 +261,7 @@
data-bs-target="#bidModal"
class="btn btn-primary"
>
Teruskan <i class="fa fa-shopping-cart"></i>
Daftar Bidaan <i class="fa fa-shopping-cart"></i>
</button>
</div>
<!-- <div class="btn-group">
@@ -406,7 +406,7 @@
Batal
</button>
<button type="submit" class="btn btn-success" @click="updateItem()">
Ubah
Terima
</button>
</div>
</div>
@@ -522,17 +522,17 @@
<div class="modal-footer">
<button
type="submit"
class="btn btn-secondary me-2"
class="btn btn-danger me-2"
data-bs-dismiss="modal"
>
Kembali
Batal
</button>
<button
type="submit"
class="btn btn-success"
@click="bidderSelectBidItem()"
>
Daftar Bidaan
Teruskan
</button>
<p
class="fst-italic mt-3 fw-lighter"
@@ -602,13 +602,7 @@
<button type="submit" class="btn btn-success" @click="feePayment()">
Bayar
</button>
<p
class="fst-italic mt-3 fw-lighter"
style="text-align: right; font-size: small"
>
*Pelayar akan dialihkan ke halaman pembayaran jika butang 'Bayar'
ditekan.
</p>
</div>
</div>
</div>
src/components/Login.vue
+1 -1
View File
@@ -161,7 +161,7 @@
class="w-100 mt-4 mb-5 btn btn-primary"
type="submit"
>
Enter
Masuk
</button>
</form>
<router-link to="/register">Daftar Akaun</router-link><br />
src/components/Navbar.vue
+3 -3
View File
@@ -25,13 +25,13 @@
<router-link class="nav-link" to="/cart">Cart</router-link>
</li> -->
<li class="nav-item">
<router-link class="nav-link" to="/bidhistory">Rekod Bidaan</router-link>
<router-link class="nav-link" to="/bid-history">Rekod Bidaan</router-link>
</li>
<li class="nav-item">
<router-link class="nav-link" to="/pay">Bayar</router-link>
</li>
<li class="nav-item">
<router-link class="nav-link" to="/paymenthistory">Rekod Bayaran</router-link>
<router-link class="nav-link" to="/payment-history">Rekod Bayaran</router-link>
</li>
<li class="nav-item">
<router-link class="nav-link" to="/profile">Profil</router-link>
@@ -56,7 +56,7 @@
type="submit"
@click="doLogout"
>
Logout
Log Keluar
</button>
</div>
</div>
src/components/bidhistory/ListBid.vue
+9 -3
View File
@@ -9,7 +9,7 @@
</div>
<div v-else class="">
<div class="container">
<p class="text-start">Jumlah Surat Bida: {{listBid.length}}</p>
<!-- <p class="text-start">Jumlah Surat Bida: {{listBid.length}}</p> -->
<!-- <div v-for="data in listBid" :key="data.id">
<div class="d-flex">
<p>Lelong ID:</p>
@@ -28,17 +28,23 @@
<thead>
<tr>
<th scope="col">#</th>
<th scope="col">Nilai Marhun</th>
<th scope="col">No Rujukan</th>
<th scope="col">Harga Asas</th>
<th scope="col">Harga Bida</th>
<th scope="col">Beza</th>
<th scope="col">Masa Bidaan</th>
<th scope="col">Status</th>
</tr>
</thead>
<tbody>
<tr v-for="(data, index) in listBid.slice().reverse()" :key="data.id">
<th scope="row">{{index + 1}}</th>
<td>RM{{data.nilaimarhun}}</td>
<td>tiada data</td>
<td></td>
<td>RM{{data.hargabida}}</td>
<td></td>
<td>{{data.masa_bidaan}}</td>
<td>{{data.status_bidder}}</td>
</tr>
</tbody>
</table>
src/components/dashboard/LelongNext.vue
+1 -3
View File
@@ -8,12 +8,11 @@
</div>
</div>
<table v-else class="table table-bordered table-hover">
<thead class="table-light">
<thead class="table-body">
<tr>
<th>Bil</th>
<th>Cawangan</th>
<th>Tarikh</th>
<th>Masa Mula</th>
</tr>
</thead>
<tbody v-if="responseData">
@@ -21,7 +20,6 @@
<td>{{ index + 1 }}</td>
<td>{{ data.caw_name }}</td>
<td>{{ data.tarikh_lelong }}</td>
<td>{{ data.masamula_lelong }}</td>
</tr>
</tbody>
<tbody v-else>
src/components/dashboard/LelongToday.vue
+1 -1
View File
@@ -8,7 +8,7 @@
</div>
</div>
<table v-else class="table table-bordered table-hover">
<thead class="table-light">
<thead class="table-body">
<tr>
<th>Bil</th>
<th>Cawangan</th>
src/components/result/ToPay.vue
+1 -8
View File
@@ -221,7 +221,7 @@
<p>ADAKAH ANDA PASTI?</p>
<h4 class="text-danger">
<i
>Caj tambahan RM1 akan dikenakan untuk setiap kali bayaran melalui Billplz.</i
>Fi pengurusan RM1 akan dikenakan untuk setiap kali bayaran melalui Billplz.</i
>
</h4>
@@ -249,13 +249,6 @@
<button type="submit" class="btn btn-success" @click="bidPayment()">
Bayar
</button>
<p
class="fst-italic mt-3 fw-lighter"
style="text-align: right; font-size: small"
>
*Pelayar akan dialihkan ke halaman pembayaran jika butang 'Bayar'
ditekan.
</p>
</div>
</div>
</div>
src/router/index.js
+5 -4
View File
@@ -1,4 +1,4 @@
import { createWebHistory, createRouter } from "vue-router";
import { createRouter, createWebHistory, createMemoryHistory } from "vue-router";
import Login from '../components/Login.vue';
import Register from '../components/Register.vue';
import Dashboard from './../components/Dashboard.vue';
@@ -62,14 +62,14 @@ const routes = [
},
{
path: '/bidhistory',
path: '/bid-history',
name: 'BidHistory',
component: BidHistory,
// meta: { requiresAuth: true }
},
{
path: '/paymenthistory',
path: '/payment-history',
name: 'PaymentHistory',
component: IndexPaymentHistory,
// meta: { requiresAuth: true }
@@ -90,7 +90,8 @@ const routes = [
]
const router = createRouter({
history: createWebHistory(process.env.BASE_URL),
// history: createWebHistory(process.env.BASE_URL),
history: createMemoryHistory(),
routes,
})