Merge branch 'feature/20250529home' into 'dev'

Feature/20250529home See merge request sparkprojects/20250528_FHQ1!33

Merge branch 'feature/20250529home' into 'dev'
Feature/20250529home See merge request sparkprojects/20250528_FHQ1!33
27190ac4 · 张九刚 · 12a140b8 · 924a5637 · 27190ac4 · 27190ac4
Commit 27190ac4 authored Jun 12, 2025 by 张九刚
Expand all Show whitespace changes
Inline Side-by-side

Showing with 476 additions and 3 deletions

brandtest.js mock/brandtest.js +465 -0

product.vue pages/product/product.vue +4 -0

Home.vue views/Home.vue +7 -3

No files found.
--- a/mock/brandtest.js
+++ b/mock/brandtest.js
--- a/pages/product/product.vue
+++ b/pages/product/product.vue
@@ -81,6 +81,10 @@ export default {
 	.productimg {
 		width: 750rpx;
 		vertical-align: top;
+		margin: 0;
+		padding: 0;
+		border: none;
+		margin-top: -1rpx;
 	}

 	.btnbox {

--- a/views/Home.vue
+++ b/views/Home.vue
@@ -204,8 +204,12 @@ export default {
 	},
 	methods: {
 		async initHomeInfo() {
+			try{
 				
 				await this.homeStore.loadHomeInfo();
+			}catch(e){
+				console.log('loadHomeInfo error',e);
+			}
 			
 			const { data } = await fetchHomeJSON();
 			if (data) {