canrd-main / canrud-nuxt-front · Commits

Commit 1ceae382ec367b71df602e2cfd97a273dfaacecb

Authored by boyang
1 parent 9df9de63
build: skipped

fix: prod2.sh-20/21

Inline Side-by-side
Showing 2 changed files with 13 additions and 10 deletions
components/ProductDetail.vue
  View file @1ceae38
@@ -362,7 +362,7 @@ const items = ref<BreadcrumbItem[]>([ @@ -362,7 +362,7 @@ const items = ref<BreadcrumbItem[]>([
362 { 362 {
363 title: "Products", 363 title: "Products",
364 disabled: false, 364 disabled: false,
365 - href: "/products", 365 + href: "https://www.canrud.com/products",
366 }, 366 },
367 { 367 {
368 title: "CATEGORY", 368 title: "CATEGORY",
@@ -406,12 +406,11 @@ let { data: resData } = await useAsyncData( @@ -406,12 +406,11 @@ let { data: resData } = await useAsyncData(
406 } 406 }
407 ); 407 );
408 watchEffect(() => { 408 watchEffect(() => {
409 - console.log(info,'5656info');  
410 if (info?.productCrumbsVO?.category1 && productStore.keyword) { 409 if (info?.productCrumbsVO?.category1 && productStore.keyword) {
411 items.value[1].title = info.productCrumbsVO.category1; 410 items.value[1].title = info.productCrumbsVO.category1;
412 items.value[1].href = 411 items.value[1].href =
413 - href1.value + "?categories=" + info.productCrumbsVO.category1;  
414 - href1.value = href1.value + "?categories=" + info.productCrumbsVO.category1; 412 + "https://www.canrud.com/products?categories=" + info.productCrumbsVO.category1;
  413 + href1.value = "https://www.canrud.com/products?categories=" + info.productCrumbsVO.category1;
415 if (info?.productCrumbsVO?.category2) { 414 if (info?.productCrumbsVO?.category2) {
416 items.value[2].title = info.productCrumbsVO.category2; 415 items.value[2].title = info.productCrumbsVO.category2;
417 href2.value = href1.value + "," + info.productCrumbsVO.category2; 416 href2.value = href1.value + "," + info.productCrumbsVO.category2;
@@ -427,6 +426,8 @@ watchEffect(() => { @@ -427,6 +426,8 @@ watchEffect(() => {
427 items.value[3].href = 426 items.value[3].href =
428 href2.value + "&function=" + info.productCrumbsVO.function; 427 href2.value + "&function=" + info.productCrumbsVO.function;
429 } 428 }
  429 + items.value[4].title = info.name;
  430 + items.value[4].href = "https://www.canrud.com/products/detail/" + info.id;
430 } else if (routeQuery.categories) { 431 } else if (routeQuery.categories) {
431 if (!routeQuery.categories.includes("Energy materials")) { 432 if (!routeQuery.categories.includes("Energy materials")) {
432 routeQuery.updateFunction("Not specified"); 433 routeQuery.updateFunction("Not specified");
@@ -443,8 +444,8 @@ watchEffect(() => { @@ -443,8 +444,8 @@ watchEffect(() => {
443 items.value[2].title = subCategoryName.value; 444 items.value[2].title = subCategoryName.value;
444 } 445 }
445 items.value[1].title = mainCategory; 446 items.value[1].title = mainCategory;
446 - items.value[1].href = href1.value + "?categories=" + mainCategory;  
447 - href1.value = href1.value + "?categories=" + mainCategory; 447 + items.value[1].href = "https://www.canrud.com/products?categories=" + mainCategory;
  448 + href1.value = "https://www.canrud.com/products?categories=" + mainCategory;
448 // items.value[1].title = subCategoryName.value; 449 // items.value[1].title = subCategoryName.value;
449 href2.value = href1.value + "," + subCategoryName.value; 450 href2.value = href1.value + "," + subCategoryName.value;
450 items.value[2].href = href1.value + "," + subCategoryName.value; 451 items.value[2].href = href1.value + "," + subCategoryName.value;
@@ -459,11 +460,13 @@ watchEffect(() => { @@ -459,11 +460,13 @@ watchEffect(() => {
459 href2.value + "&function=" + routeQuery.selectedFunction; 460 href2.value + "&function=" + routeQuery.selectedFunction;
460 // routeQuery.updateFunction(null); 461 // routeQuery.updateFunction(null);
461 } 462 }
  463 + items.value[4].title = info.name;
  464 + items.value[4].href = "https://www.canrud.com/products/detail/" + info.id;
462 } else if (info?.productCrumbsVO?.category1) { 465 } else if (info?.productCrumbsVO?.category1) {
463 items.value[1].title = info.productCrumbsVO.category1; 466 items.value[1].title = info.productCrumbsVO.category1;
464 items.value[1].href = 467 items.value[1].href =
465 - href1.value + "?categories=" + info.productCrumbsVO.category1;  
466 - href1.value = href1.value + "?categories=" + info.productCrumbsVO.category1; 468 + "https://www.canrud.com/products?categories=" + info.productCrumbsVO.category1;
  469 + href1.value = "https://www.canrud.com/products?categories=" + info.productCrumbsVO.category1;
467 if (info?.productCrumbsVO?.category2) { 470 if (info?.productCrumbsVO?.category2) {
468 items.value[2].title = info.productCrumbsVO.category2; 471 items.value[2].title = info.productCrumbsVO.category2;
469 href2.value = href1.value + "," + info.productCrumbsVO.category2; 472 href2.value = href1.value + "," + info.productCrumbsVO.category2;
deploy/prod2.sh
  View file @1ceae38
1 #!/bin/bash 1 #!/bin/bash
2 # 变量定义 2 # 变量定义
3 -LAST_TAG="1.0.19"  
4 -TAG="1.0.20" 3 +LAST_TAG="1.0.20"
  4 +TAG="1.0.21"
5 TARGET_PATH="/root/web/canrud-outside-nuxt-front" 5 TARGET_PATH="/root/web/canrud-outside-nuxt-front"
6 DOCKERFILE_PATH="/root/web/canrud-outside-nuxt-front/canrud-nuxt-front" 6 DOCKERFILE_PATH="/root/web/canrud-outside-nuxt-front/canrud-nuxt-front"
7 IMAGE_NAME="canrud-outside-front" 7 IMAGE_NAME="canrud-outside-front"