bug fix 20240307

app/app/appapi/controller/SocialController.php

@@ -107,6 +107,21 @@ class SocialController extends BaseController
         $activity['imageList'] = json_decode($activity['image_list']);
         unset($activity['image_list']);
 
+        switch ($param['lang']) {
+            case 'tw':
+                $activity['title'] = $activity['title1'];
+                break;
+            case 'cn':
+                $activity['title'] = $activity['title2'];
+                break;
+            case 'en':
+                $activity['title'] = $activity['title3'];
+                break;
+            default:
+                $activity['title'] = $activity['title1'];
+            break;
+        }
+
         $result = $activity;
 
         return $this->Success($result);

web/components/PageBanner.vue

@@ -24,7 +24,7 @@ const props = defineProps({
                         <ol class="breadcrumb">
                             <li class="breadcrumb-item"><a href="javascript:;" @click="router.push('/')">HOME</a></li>
                             <template v-if="props.item.path!=''">
-                                <li class="breadcrumb-item"><a href="javascript:;" @click="router.push(props.item.pageName)">{{props.item.pageName.toUpperCase()}}</a></li>
+                                <li class="breadcrumb-item">{{props.item.pageName.toUpperCase()}}</li>
                                 <li class="breadcrumb-item active" aria-current="page">{{props.item.path}}</li>
                             </template>
                             <template v-else>

web/pages/contact/form.vue

@@ -1,5 +1,4 @@
 <script setup>
-import { addContact } from '@/api/contact'
 
 const formRef = ref(null)
 
@@ -35,7 +34,9 @@ const submitForm = async (formEl) => {
 
     await formEl.validate(async (valid, fields) => {
         if (valid) {
-            let res = await addContact(form.value)
+
+            let res = await useRequest('/contact/addContact',"POST",form.value);
+
             if (res.code === 200) {
                 form.value = {
                     company: '',
@@ -63,10 +64,8 @@ const submitForm = async (formEl) => {
     </div>
     <div class="content">
         <div>
-            <el-form ref="formRef" :model="form" :rules="rules" 
+            <el-form ref="formRef" :model="form" :rules="rules" label-width="150px" class="demo-ruleForm"
-            label-width="150px" class="demo-ruleForm" 
+                label-position="top" status-icon>
-            label-position="top"
-            status-icon>
                 <el-form-item :label="$t('Contact.company')" prop="company">
                     <el-input v-model="form.company" />
                 </el-form-item>

web/pages/products.vue

@@ -3,15 +3,17 @@ import { getCateList } from '@/api/index.js';
 
 import PageBanner from "@/components/PageBanner.vue";
 
-import bannerImg from '@/assets/img/pageBanner/p3.jpg';
+import bannerImg from '@/assets/img/product_bg.jpg';
+
+const { t } = useI18n();
 
 const route = useRoute();
 
 const bannerObj = {
   "bImg":bannerImg,
-  "pageName":"products",
+  "pageName":t('products'),
   "path":"",
-  "title":"產品應用"
+  "title":t('products')
 }
 
 const activeParams = ref({

web/pages/social.vue

@@ -29,7 +29,7 @@ const bannerObj = computed(() => {
   return {
     "bImg": bannerImg,
     "pageName": t('news'),
-    "path": path,
+    "path": '',
     "title": title
   }
 });