1

src/views/SellerDashboard/BrandProfile/index.vue

@@ -25,8 +25,8 @@
 	<div class="and-profile-footer">
 		<template v-if="isEdit">
 			<div class="btns">
-				<button class="cancel" @click="onCancel">Cancel</button>
+				<button class="cancel" @click="onCancel()">Cancel</button>
-				<button class="submit" @click="onSubmit">Save Change</button>
+				<button class="submit" @click="onSubmit()">Save Change</button>
 			</div>
 			<p class="tip">Changes will be reflected on your Stylish Parade brand page.</p>
 		</template>
@@ -47,6 +47,7 @@
 	import ImageClipDialog from "./image-clip-dialog.vue"
 	import { useStore } from "vuex"
 	const store = useStore()
+	store.dispatch("seller/get_designerInfo")
 	const designerInfo = computed(() => store.state.seller.designerInfo)
 	const avatar = computed(() => designerInfo.value.avatar)
 	const banner = computed(() => designerInfo.value.brandBanner)
@@ -141,6 +142,7 @@
 			margin-bottom: 6rem;
 			> .bg {
 				position: relative;
+				min-height: 15rem;
 				> img {
 					width: 100%;
 					height: auto;

src/views/SellerDashboard/MyOrders/index.vue

@@ -65,7 +65,9 @@
 					</div>
 				</div>
 			</div>
-			<div class="null" v-show="list.length === 0 && !loading && finish">no data</div>
+			<div class="null" v-show="list.length === 0 && !loading && finish">
+				<img src="@/assets/images/homePage/null_img.png" alt="" />
+			</div>
 			<div class="placeholder" ref="placeholderRef" v-show="!loading"></div>
 			<div class="footer" :class="{ null: list.length === 0 }" v-if="!finish">
 				<a-spin :delay="0.5" v-show="loading" />
@@ -120,28 +122,33 @@
 			size: size.value
 		}
 		if (nameOrId.value) data.keyword = nameOrId.value
-		Https.axiosGet(Https.httpUrls.getSellerOrderList, { params: data }).then((res) => {
+		Https.axiosGet(Https.httpUrls.getSellerOrderList, { params: data })
-			res.content?.forEach((v) => {
+			.then((res) => {
-				const obj = {
+				res.content?.forEach((v) => {
-					orderId: v.orderId,
+					const obj = {
-					items: v.items.map((item) => ({
+						orderId: v.orderId,
-						id: item.productId,
+						items: v.items.map((item) => ({
-						url: item.thumbnailUrl,
+							id: item.productId,
-						title: item.productName
+							url: item.thumbnailUrl,
-					})),
+							title: item.productName
-					price: "HK$ " + v.price,
+						})),
-					username: v.buyerUsername,
+						price: "HK$ " + v.price,
-					date: v.date,
+						username: v.buyerUsername,
-					time: v.date
+						date: v.date,
-				}
+						time: v.date
-				list.value.push(obj)
+					}
-			})
+					list.value.push(obj)
+				})
 
-			total.value = res.total
+				total.value = res.total
-			page.value++
+				page.value++
-			finish.value = page.value > total.value / size.value
+				finish.value = page.value > total.value / size.value
-			loading.value = false
+				loading.value = false
-		})
+			})
+			.catch(() => {
+				finish.value = true
+				loading.value = false
+			})
 	}
 	const getSummary = () => {
 		Https.axiosGet(Https.httpUrls.getSellerOrderSummary).then((res) => {
@@ -360,8 +367,14 @@
 			}
 			> .null {
 				margin-top: 10rem;
-				text-align: center;
+				display: flex;
-				color: #999;
+				align-items: center;
+				justify-content: center;
+				flex-direction: column;
+				> img {
+					width: 30rem;
+					height: auto;
+				}
 			}
 			> .footer {
 				min-height: 10rem;

src/views/SellerDashboard/index.vue

@@ -25,7 +25,7 @@
 	import myEvent from "@/tool/myEvents.js"
 	import { useStore } from "vuex"
 	const store = useStore()
-	store.dispatch("seller/get_designerInfo")
+	// store.dispatch("seller/get_designerInfo")
 	const route = useRoute()
 	const router = useRouter()
 	const visible = ref(false)