From 972b9b01550aec96a5dd20c082a972b962ecaf03 Mon Sep 17 00:00:00 2001
From: Wayne <wwayne.hsu@gmail.com>
Date: Mon, 18 Mar 2024 15:34:02 +0800
Subject: [PATCH] bugfix20240318

---
 app/app/adminapi/controller/ProductController.php | 2 ++
 web/layouts/default.vue                           | 6 ++++++
 web/pages/contact.vue                             | 4 ++--
 web/pages/contact/form.vue                        | 2 +-
 web/pages/index.vue                               | 5 ++++-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/app/adminapi/controller/ProductController.php b/app/app/adminapi/controller/ProductController.php
index ef6a245..e1a0ab7 100644
--- a/app/app/adminapi/controller/ProductController.php
+++ b/app/app/adminapi/controller/ProductController.php
@@ -37,6 +37,7 @@ class ProductController extends BaseController
 
         $total = Db::name('product')
             ->where($where)
+            ->where('lang', $param['lang'])
             ->count();
 
         foreach($list as $key => $val){
@@ -57,6 +58,7 @@ class ProductController extends BaseController
         $params = $request->post();
         
         $data = [
+            'lang' => $params['lang'],
             'name' => isset($params['name'])?$params['name']:'',
             'imageurl' => isset($params['imageurl'])?$params['imageurl']:'',
             'cat_id'    => isset($params['cat_id'])?$params['cat_id']:0,
diff --git a/web/layouts/default.vue b/web/layouts/default.vue
index cfed01d..24fca46 100644
--- a/web/layouts/default.vue
+++ b/web/layouts/default.vue
@@ -36,6 +36,12 @@ const handleSearchSubmit = () => {
   router.push(localePath('/products/search/' + searchKeyword.value));
   searchKeyword.value = '';
 }
+
+watch(locale, (nVal,oVal) => {
+  if(nVal !== oVal) {
+    router.push(localePath('/'));
+  }
+})
 </script>
 
 <template>
diff --git a/web/pages/contact.vue b/web/pages/contact.vue
index 24f538b..7cccb12 100644
--- a/web/pages/contact.vue
+++ b/web/pages/contact.vue
@@ -30,11 +30,11 @@ const bannerObj = computed(() => {
 
 const menuList = [
   {
-    "name": t('contact'), 
+    "name": t('Contact.form'), 
     "path": "/contact/form"
   },
   {
-    "name": t('branch'),
+    "name": t('Contact.branch'),
     "path":"/contact/company"
   },
 ]
diff --git a/web/pages/contact/form.vue b/web/pages/contact/form.vue
index d469c15..29c25e2 100644
--- a/web/pages/contact/form.vue
+++ b/web/pages/contact/form.vue
@@ -59,7 +59,7 @@ const submitForm = async (formEl) => {
 <template>
     <div class="toolbar">
         <div class="text">
-            <div class="tTitle">{{ $t('contact') }}</div>
+            <div class="tTitle">{{ $t('Contact.form') }}</div>
         </div>
     </div>
     <div class="content">
diff --git a/web/pages/index.vue b/web/pages/index.vue
index 1db9847..2393e18 100644
--- a/web/pages/index.vue
+++ b/web/pages/index.vue
@@ -5,6 +5,9 @@ import prodImg from '@/assets/img/noImage.jpg';
 import featureImg from '@/assets/img/iStock.jpg';
 
 const { locale } = useI18n()
+const localePath = useLocalePath()
+
+
 const store = useStore();
 const router = useRouter();
 
@@ -63,7 +66,7 @@ onMounted(async () => {
 // 至產品頁
 const goProd = (cid) => {
   if(cid && cid !== null){
-    router.push({ path: '/products/list/' + cid });
+    router.push(localePath('/products/list/' + cid));
   }
 }
 </script>