Merge branch 'dev' into 'master'

uniapp【修复】：修复首页商品组组件查询更多跳转带上分类id和品牌id

See merge request jianweie/coreshoppro!93

CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods/home-goods.vue

@@ -124,7 +124,7 @@
 	}
 
 	const hanldeClickViewMore = () => {
-		handleRouteNavigateTo('/pages/category/category')
+		handleRouteNavigateTo(`/pages/category/category?catId=${props.data.classifyId}&brandId=${props.data.brandId}`)
 	}
 
 	const hanldeClickGoods = (data : any) => {

CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-video/home-video.vue

@@ -4,7 +4,7 @@
 	</view>
 </template>
 <script setup lang="ts">
-	import { ref,ks watch } from 'vue';
+	import { ref, watch } from 'vue';
 
 	const props = withDefaults(defineProps<{
 		data : any,