From a901838aa284d7c26ab38d13795376886dbc032f Mon Sep 17 00:00:00 2001
From: Wayne <wwayne.hsu@gmail.com>
Date: Wed, 17 Jan 2024 09:43:01 +0800
Subject: [PATCH] release v1

---
 admin/package.json                            |   3 +-
 admin/src/api/product.js                      |   5 +-
 admin/src/main.js                             |  12 +-
 admin/src/pages/Contact/email/Index.vue       |   2 +-
 admin/src/pages/Contact/map/Index.vue         |  43 ++-
 admin/src/pages/Index/banner/Index.vue        |  48 +++-
 admin/src/pages/Index/supplier/Index.vue      |  50 +++-
 .../pages/Index/supplier/components/Form.vue  |  10 +-
 admin/src/pages/News/activity/Index.vue       |  12 +-
 .../pages/News/activity/components/Form.vue   |  14 +-
 admin/src/pages/News/list/form.vue            |   8 +-
 admin/src/pages/Product/group/Index.vue       |  49 +++-
 .../pages/Product/list/components/Form.vue    | 251 ------------------
 admin/src/pages/Product/list/index.vue        | 118 +++++++-
 admin/vite.config.js                          |   5 +-
 .../controller/ActivityController.php         |   8 +-
 .../adminapi/controller/BranchController.php  |   8 +-
 .../adminapi/controller/CateController.php    |   5 +-
 .../adminapi/controller/IndexController.php   |  16 +-
 .../adminapi/controller/NewsController.php    |   2 +-
 .../adminapi/controller/ProductController.php |  36 ++-
 .../controller/SupplierController.php         | 109 ++++----
 .../appapi/controller/ContactController.php   |   1 +
 app/app/appapi/controller/IndexController.php |  48 ++--
 .../appapi/controller/ProductController.php   |   3 +-
 .../appapi/controller/SocialController.php    |  36 ++-
 web/package.json                              |   3 +-
 web/pages/index.vue                           |  19 +-
 web/pages/social.vue                          |   2 +-
 web/pages/social/news/detail/[id].vue         |  11 +-
 web/pages/social/news/index.vue               |   2 +-
 31 files changed, 513 insertions(+), 426 deletions(-)
 delete mode 100644 admin/src/pages/Product/list/components/Form.vue

diff --git a/admin/package.json b/admin/package.json
index 67accf3..bba7a43 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "postbuild": "scp -r ./dist/* root@207.148.89.145:/www/wwwroot/prodio.zltest.com.tw/public/admin"    
   },
   "dependencies": {
     "@ckeditor/ckeditor5-vue": "^5.1.0",
diff --git a/admin/src/api/product.js b/admin/src/api/product.js
index 18f0a88..04090f2 100644
--- a/admin/src/api/product.js
+++ b/admin/src/api/product.js
@@ -1,7 +1,8 @@
 import ajax from "@/utils/request";
 
-export const getProductList = async () =>
-  ajax(`/product/getProductList`, "GET");
+export const getProductList = async (params) => {
+  return ajax(`/product/getProductList`, "POST", params);
+}
 
 export const getProduct = async (id) =>
   ajax(`/product/getProduct`, "GET" , { id });
diff --git a/admin/src/main.js b/admin/src/main.js
index 3374841..4ae0ecb 100644
--- a/admin/src/main.js
+++ b/admin/src/main.js
@@ -6,9 +6,19 @@ import CKEditor from '@ckeditor/ckeditor5-vue';
 
 import "./assets/css/normalize.css";
 import "./assets/css/common.less";
-    
+
 const app = createApp(App);
 
+app.directive('focus', {
+    // 將el-input的下的input元素聚焦
+
+    mounted(el) {
+        const inputElement = el.querySelector('input');
+        // Focus the element
+        inputElement.focus()
+    }
+})
+
 app.use(router);
 app.use(store);
 app.use(CKEditor);
diff --git a/admin/src/pages/Contact/email/Index.vue b/admin/src/pages/Contact/email/Index.vue
index af94ec0..4e2f228 100644
--- a/admin/src/pages/Contact/email/Index.vue
+++ b/admin/src/pages/Contact/email/Index.vue
@@ -104,7 +104,7 @@ const handleShowContent = (row) => {
         <el-table-column prop="name" label="聯絡人" width="180" />
         <el-table-column prop="email" label="E-mail" />
         <el-table-column prop="tel" label="聯絡電話" />
-        <el-table-column prop="address" label="地址" />
+        <el-table-column prop="create_time" label="留言時間" />
         <el-table-column label="操作" width="105" fixed="right">
           <template #default="scope">            
             <el-dropdown>
diff --git a/admin/src/pages/Contact/map/Index.vue b/admin/src/pages/Contact/map/Index.vue
index 46dec46..4301559 100644
--- a/admin/src/pages/Contact/map/Index.vue
+++ b/admin/src/pages/Contact/map/Index.vue
@@ -4,7 +4,7 @@ import { Plus, Edit, Delete, ArrowDown } from "@element-plus/icons-vue";
 
 import AscForm from "./components/Form.vue";
 
-import { getBranchList, deleteBranch } from "@/api/branch.js";
+import { getBranchList, updateBranch, deleteBranch } from "@/api/branch.js";
 
 const state = reactive({
   page: 1,
@@ -85,6 +85,37 @@ const handleNextClick = (val) => {
   getTableData();
 };
 
+
+// 編輯排序
+const editOrderId = ref(0);
+
+const handleEditItem = (id) => {
+  editOrderId.value = id;
+}
+
+const handleUpdateItem = async (row) => {
+
+  let res = await updateBranch(row);
+  if (res.code === 200) {
+    ElMessage({
+      message: '修改成功.',
+      type: 'success',
+    });
+    getTableData();
+  } else {
+    ElMessage({
+      message: '修改失敗.',
+      type: 'error',
+    });
+  }
+  editOrderId.value = 0;
+}
+
+const handleCloseEditItem = () => {
+  console.log('handleCloseEditItem')
+  editOrderId.value = 0;
+}
+
 // Drawer
 
 const editid = ref(0);
@@ -130,7 +161,15 @@ const handleCloseFormDraw = (val) => {
         <el-table-column prop="status" label="是否有效" />
         <el-table-column prop="sort" label="排序" width="80">
           <template #default="scope">
-            <el-input v-model="scope.row.sort_order" :style="{ width: '40px' }"/>
+            <div @dblclick="handleEditItem(scope.row.id)" v-if="scope.row.id !== editOrderId">
+              {{ scope.row.sort_order }}
+            </div>
+            <el-input v-model="scope.row.sort_order" :style="{ width: '50px' }" 
+            @keyup.enter="handleUpdateItem(scope.row)" 
+            @blur="handleCloseEditItem()"
+            :autoFocus="true"
+            v-focus="scope.row.id === editOrderId"
+            v-else />
           </template>
         </el-table-column>
         <el-table-column label="操作" width="105" fixed="right">
diff --git a/admin/src/pages/Index/banner/Index.vue b/admin/src/pages/Index/banner/Index.vue
index ffb754d..e6db9f1 100644
--- a/admin/src/pages/Index/banner/Index.vue
+++ b/admin/src/pages/Index/banner/Index.vue
@@ -4,7 +4,7 @@ import { Plus, Edit, Delete, ArrowDown } from "@element-plus/icons-vue";
 
 import AscForm from "./components/Form.vue";
 
-import { getBannerList, deleteBanner } from "@/api/home.js";
+import { getBannerList, deleteBanner, updateBanner } from "@/api/home.js";
 
 const state = reactive({
   page: 1,
@@ -85,6 +85,36 @@ const handleNextClick = (val) => {
   getTableData();
 };
 
+// 編輯排序
+const editOrderId = ref(0);
+
+const handleEditItem = (id) => {
+  editOrderId.value = id;
+}
+
+const handleUpdateItem = async (row) => {
+  console.log('row', row)
+
+  let res = await updateBanner(row);
+  if (res.code === 200) {
+    ElMessage({
+      message: '修改成功.',
+      type: 'success',
+    });
+    getTableData();
+  } else {
+    ElMessage({
+      message: '修改失敗.',
+      type: 'error',
+    });
+  }
+  editOrderId.value = 0;
+}
+
+const handleCloseEditItem = () => {
+  console.log('handleCloseEditItem')
+  editOrderId.value = 0;
+}
 // Drawer
 
 const editid = ref(0);
@@ -125,19 +155,27 @@ const handleCloseFormDraw = (val) => {
         <el-table-column prop="id" label="#" width="50" />
         <el-table-column label="電腦版背景">
           <template #default="scope">
-            <el-image style="width: 100px; height: 50px" :src="scope.row.imageurl1" fit="cover" />
+            <el-image style="width: 100px; height: 50px" :src="scope.row.imageurl1" fit="cover" :crossorigin="null" />
           </template>
         </el-table-column>
         <el-table-column label="手機版背景">
           <template #default="scope">
-            <el-image style="width: 50px; height: 100px" :src="scope.row.imageurl2" fit="cover" />
+            <el-image style="width: 50px; height: 100px" :src="scope.row.imageurl2" fit="cover" :crossorigin="null" />
           </template>
         </el-table-column>
         <el-table-column prop="slogon" label="標題" />
         <el-table-column prop="describe" label="描述" />
-        <el-table-column prop="sort" label="排序" width="80">
+        <el-table-column prop="sort_order" label="排序" width="80">
           <template #default="scope">
-            <el-input v-model="scope.row.sort_order" :style="{ width: '40px' }"/>
+            <div @dblclick="handleEditItem(scope.row.id)" v-if="scope.row.id !== editOrderId">
+              {{ scope.row.sort_order }}
+            </div>
+            <el-input v-model="scope.row.sort_order" :style="{ width: '50px' }" 
+            @keyup.enter="handleUpdateItem(scope.row)" 
+            @blur="handleCloseEditItem()"
+            :autoFocus="true"
+            v-focus="scope.row.id === editOrderId"
+            v-else />
           </template>
         </el-table-column>
         <el-table-column label="其他項目" width="105" fixed="right">
diff --git a/admin/src/pages/Index/supplier/Index.vue b/admin/src/pages/Index/supplier/Index.vue
index 60b70cf..2d1ce95 100644
--- a/admin/src/pages/Index/supplier/Index.vue
+++ b/admin/src/pages/Index/supplier/Index.vue
@@ -4,7 +4,7 @@ import { Plus, Edit, Delete, ArrowDown } from "@element-plus/icons-vue";
 
 import AscForm from "./components/Form.vue";
 
-import { getSupplierList, deleteSupplier } from "@/api/supplier.js";
+import { getSupplierList, updateSupplier ,deleteSupplier } from "@/api/supplier.js";
 
 const state = reactive({
   page: 1,
@@ -85,6 +85,38 @@ const handleNextClick = (val) => {
   getTableData();
 };
 
+
+// 編輯排序
+const editOrderId = ref(0);
+
+const handleEditItem = (id) => {
+  editOrderId.value = id;
+}
+
+const handleUpdateItem = async (row) => {
+
+  let res = await updateSupplier(row);
+  if (res.code === 200) {
+    ElMessage({
+      message: '修改成功.',
+      type: 'success',
+    });
+    getTableData();
+  } else {
+    ElMessage({
+      message: '修改失敗.',
+      type: 'error',
+    });
+  }
+  editOrderId.value = 0;
+}
+
+const handleCloseEditItem = () => {
+  console.log('handleCloseEditItem')
+  editOrderId.value = 0;
+}
+
+
 // Drawer
 
 const editid = ref(0);
@@ -125,13 +157,23 @@ const handleCloseFormDraw = (val) => {
         <el-table-column prop="id" label="#" width="50" />
         <el-table-column label="供應商LOGO">
           <template #default="scope">
-            <el-image style="width: 150px; height: 80px" :src="scope.row.imageurl" fit="cover"/>
+            <el-image style="width: 150px; height: 80px" :src="scope.row.imageurl" fit="cover" :crossorigin="null"/>
           </template>
         </el-table-column>
-        <el-table-column prop="name" label="供應商名稱" />
+        <el-table-column prop="name1" label="供應商名稱(繁)" />
+        <el-table-column prop="name2" label="供應商名稱(簡)" />
+        <el-table-column prop="name3" label="供應商名稱(英)" />
         <el-table-column prop="sort" label="排序" width="80">
           <template #default="scope">
-            <el-input v-model="scope.row.sort_order" :style="{ width: '40px' }"/>
+            <div @dblclick="handleEditItem(scope.row.id)" v-if="scope.row.id !== editOrderId">
+              {{ scope.row.sort_order }}
+            </div>
+            <el-input v-model="scope.row.sort_order" :style="{ width: '50px' }" 
+            @keyup.enter="handleUpdateItem(scope.row)" 
+            @blur="handleCloseEditItem()"
+            :autoFocus="true"
+            v-focus="scope.row.id === editOrderId"
+            v-else />
           </template>
         </el-table-column>
         <el-table-column label="操作" width="105" fixed="right">
diff --git a/admin/src/pages/Index/supplier/components/Form.vue b/admin/src/pages/Index/supplier/components/Form.vue
index 5f7064d..5779355 100644
--- a/admin/src/pages/Index/supplier/components/Form.vue
+++ b/admin/src/pages/Index/supplier/components/Form.vue
@@ -157,8 +157,14 @@ const submitForm = (formEl) => {
             </template> -->
           </el-upload>
         </el-form-item>
-        <el-form-item label="供應商名稱" prop="name">
-          <el-input v-model="form.name" />
+        <el-form-item label="供應商名稱(繁)" prop="name1">
+          <el-input v-model="form.name1" />
+        </el-form-item>
+        <el-form-item label="供應商名稱(簡)" prop="name2">
+          <el-input v-model="form.name2" />
+        </el-form-item>
+        <el-form-item label="供應商名稱(英)" prop="name3">
+          <el-input v-model="form.name3" />
         </el-form-item>
       </el-form>
     </el-card>
diff --git a/admin/src/pages/News/activity/Index.vue b/admin/src/pages/News/activity/Index.vue
index ea31523..a020e88 100644
--- a/admin/src/pages/News/activity/Index.vue
+++ b/admin/src/pages/News/activity/Index.vue
@@ -108,8 +108,8 @@ const handleCloseFormDraw = (val) => {
     <div class="breadcrumb-section">
       <div>
         <el-breadcrumb separator="/">
-          <el-breadcrumb-item> 經銷系統 </el-breadcrumb-item>
-          <el-breadcrumb-item><a href="/">產業動態</a></el-breadcrumb-item>
+          <el-breadcrumb-item> 最新消息 </el-breadcrumb-item>
+          <el-breadcrumb-item><a href="/">公司活動</a></el-breadcrumb-item>
         </el-breadcrumb>
       </div>
       <div>
@@ -118,7 +118,7 @@ const handleCloseFormDraw = (val) => {
           :icon="Plus"
           @click="handleAdd"
         >
-          新增動態
+          新增活動 
         </el-button>
       </div>
     </div>
@@ -140,8 +140,10 @@ const handleCloseFormDraw = (val) => {
           </template>
         </el-table-column>
         <el-table-column prop="id" label="#" width="50" />
-        <el-table-column prop="title" label="標題" />
-        <el-table-column prop="date" label="建立時間" />
+        <el-table-column prop="title1" label="標題(繁)" />
+        <el-table-column prop="title2" label="標題(簡)" />
+        <el-table-column prop="title3" label="標題(英)" />
+        <el-table-column prop="create_time" label="建立時間" />
         <el-table-column prop="sort" label="排序" width="80">
           <template #default="scope">
             <el-input v-model="tableData[scope.$index].sort" :style="{ width: '40px' }"/>
diff --git a/admin/src/pages/News/activity/components/Form.vue b/admin/src/pages/News/activity/components/Form.vue
index 11a1fb0..82ea1f1 100644
--- a/admin/src/pages/News/activity/components/Form.vue
+++ b/admin/src/pages/News/activity/components/Form.vue
@@ -20,7 +20,9 @@ const loading = ref(false);
 const formRef = ref(null);
 const form = ref({
   id: 0,
-  title: "",
+  title1: "",
+  title2: "",
+  title3: "",
   imageList: [],
 });
 
@@ -128,8 +130,14 @@ const handlePictureCardPreview = (uploadFile) => {
       status-icon 
       :rules="rules" 
       label-width="120px">
-      <el-form-item label="標題" prop="title">
-          <el-input v-model="form.title" />
+      <el-form-item label="標題(繁)" prop="title">
+          <el-input v-model="form.title1" />
+      </el-form-item>
+      <el-form-item label="標題(簡)" prop="title">
+          <el-input v-model="form.title2" />
+      </el-form-item>
+      <el-form-item label="標題(英)" prop="title">
+          <el-input v-model="form.title3" />
       </el-form-item>
       <el-form-item label="活動照片" prop="content">
         <el-upload
diff --git a/admin/src/pages/News/list/form.vue b/admin/src/pages/News/list/form.vue
index 1554bf0..de0e65d 100644
--- a/admin/src/pages/News/list/form.vue
+++ b/admin/src/pages/News/list/form.vue
@@ -64,7 +64,7 @@ onMounted(async () => {
 });
 
 const rules = reactive({
-  username: [{ required: true, message: "管理員帳號必填", trigger: 'blur' }],
+  title: [{ required: true, message: "產業動態標題必填", trigger: 'blur' }],
 })
 
 const cancelForm = () => {
@@ -95,7 +95,7 @@ const submitForm = (formEl) => {
       }
     } else {
       ElMessage({
-        message: "操作失敗.",
+        message: "請檢查輸入資料是否正確.",
         type: 'error',
       });
       return false
@@ -148,4 +148,8 @@ const submitForm = (formEl) => {
 :deep(.ck-editor__editable_inline) {
     height: 400px;
 }
+
+.demo-drawer__footer{
+  margin-top: 20px;
+}
 </style>
\ No newline at end of file
diff --git a/admin/src/pages/Product/group/Index.vue b/admin/src/pages/Product/group/Index.vue
index 812df53..515ea55 100644
--- a/admin/src/pages/Product/group/Index.vue
+++ b/admin/src/pages/Product/group/Index.vue
@@ -4,7 +4,7 @@ import { ArrowDown, Plus, Edit, Delete } from "@element-plus/icons-vue";
 
 import AscForm from "./components/Form.vue";
 
-import { getCateList, deleteCategory } from "@/api/category.js";
+import { getCateList, updateCategory, deleteCategory } from "@/api/category.js";
 
 const tableData = ref([]);
 
@@ -26,6 +26,37 @@ const getTableData = async () => {
 }
 
 
+// 編輯排序
+const editOrderId = ref(0);
+
+const handleEditItem = (id) => {
+  editOrderId.value = id;
+}
+
+const handleUpdateItem = async (row) => {
+
+  let res = await updateCategory(row);
+  if (res.code === 200) {
+    ElMessage({
+      message: '修改成功.',
+      type: 'success',
+    });
+    getTableData();
+  } else {
+    ElMessage({
+      message: '修改失敗.',
+      type: 'error',
+    });
+  }
+  editOrderId.value = 0;
+}
+
+const handleCloseEditItem = () => {
+  console.log('handleCloseEditItem')
+  editOrderId.value = 0;
+}
+
+// 表單
 const editid = ref(0);
 
 const handleAdd = () => {
@@ -88,8 +119,20 @@ const handleCloseFormDraw = (val) => {
     <el-card :body-style="{ padding: '0px' }">
       <el-table :data="tableData" style="width: 100%" row-key="id" default-expand-all>
         <el-table-column prop="name" label="類別名稱" />
-        <el-table-column prop="num" label="產品數" />
-        <el-table-column prop="sort_order" label="排序" width="80" />
+        <!-- <el-table-column prop="num" label="產品數" /> -->
+        <el-table-column label="排序" width="80">
+        <template #default="scope">
+            <div @dblclick="handleEditItem(scope.row.id)" v-if="scope.row.id !== editOrderId">
+              {{ scope.row.sort_order }}
+            </div>
+            <el-input v-model="scope.row.sort_order" :style="{ width: '50px' }" 
+            @keyup.enter="handleUpdateItem(scope.row)" 
+            @blur="handleCloseEditItem()"
+            :autoFocus="true"
+            v-focus="scope.row.id === editOrderId"
+            v-else />
+          </template>
+        </el-table-column>
         <el-table-column label="其他項目" width="105" fixed="right">
           <template #default="scope">
             <el-dropdown>
diff --git a/admin/src/pages/Product/list/components/Form.vue b/admin/src/pages/Product/list/components/Form.vue
deleted file mode 100644
index e36ea8d..0000000
--- a/admin/src/pages/Product/list/components/Form.vue
+++ /dev/null
@@ -1,251 +0,0 @@
-<script setup>
-import { ref, reactive, onMounted, watch } from "vue";
-import { Plus } from "@element-plus/icons-vue";
-
-import { getParentCateList, getCategory, addCategory, updateCategory } from "@/api/category";
-
-// import { getAminUser, addAdminUser, updateAdminUser } from "@/api/adminuser";
-
-const props = defineProps({
-  editid: {
-    type: Number,
-    default: 0,
-  },
-});
-
-const emit = defineEmits(["close"]);
-
-const formType = ref("insert");
-
-const loading = ref(false);
-const formRef = ref(null);
-const form = ref({
-  id: 0,
-  parent_id: 0,
-});
-
-const options = ref([]);
-
-onMounted(async () => {
-  if (props.editid) {
-    let res = await getCategory(props.editid);
-    if (res.code === 200) {
-      form.value = res.data;
-      formType.value = "update";
-    }
-  }
-
-  let pcateRes = await getParentCateList();
-  if (pcateRes.code === 200) {
-    options.value = pcateRes.data.map((item) => {
-      return {
-        label: item.name,
-        value: item.id,
-      };
-    });
-  }
-});
-
-
-const rules = reactive({
-  username: [{ required: true, message: "管理員帳號必填", trigger: 'blur' }],
-})
-
-// START: 圖片上傳
-import { uploadFile } from "@/utils/request";
-
-import { Cropper } from 'vue-advanced-cropper';
-import "vue-advanced-cropper/dist/style.css";
-
-const crop = ref({
-  show: false,
-  img: null,
-  ratio: 2.6,
-})
-
-const myCrop = ref(null)
-
-const beforeAvatarUpload = (rawFile) => {
-  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
-    ElMessage.error('圖片格式只能是jpeg/png/jpg!');
-    return false;
-  }
-  // if (rawFile.size / 1024 / 1024 > 2) {
-  //     ElMessage.error('檔案大小請勿超過2MB!')
-  //     return false
-  // }
-  crop.value.show = true
-
-  crop.value.img = URL.createObjectURL(rawFile);
-
-  return false;
-}
-
-const onCrop = () => {
-  const { canvas } = myCrop.value.getResult();
-  if (canvas) {
-    const imgFile = new FormData();
-    canvas.toBlob(async (blob) => {
-      let ufile = new File([blob], "image.jpg");
-      imgFile.append("fileType", "IMAGE");
-      imgFile.append("file", ufile);
-
-      crop.value.show = false;
-
-      loading.value = true;
-
-      let res = await uploadFile('/cate/uploadImage', imgFile);
-
-      if (res.code === 200) {
-        form.value.imageurl = res.data;
-        ElMessage.success('上傳成功');
-      } else {
-        ElMessage.error('上傳失敗');
-      }
-      loading.value = false;
-      
-    }, "image/jpeg");
-  }
-
-  return;
-};
-
-const handleClose = () => {
-  crop.value.show = false
-}
-
-// END: 圖片剪裁
-
-
-const cancelForm = () => {
-  console.log("cancel!");
-  emit("close", false);
-};
-
-const submitForm = (formEl) => {
-  if (!formEl) return
-  formEl.validate(async (valid) => {
-    if (valid) {
-      let res;
-      let message;
-      if (formType.value === "update") {
-        form.value.id = props.editid;
-        res = await updateCategory(form.value);
-        message = "修改成功.";
-      } else {
-        res = await addCategory(form.value);
-        message = "新增成功.";
-      }
-
-      if (res.code === 200) {
-        ElMessage({
-          message: message,
-          type: 'success',
-        });
-        emit("close", true);
-      }
-    } else {
-      ElMessage({
-        message: "操作失敗.",
-        type: 'error',
-      });
-      return false
-    }
-  })
-};
-</script>
-
-<template>
-  <div>
-    <el-form ref="formRef" :model="form" status-icon :rules="rules" label-width="120px">
-      <el-form-item label="分類名稱" prop="name">
-        <el-input v-model="form.name" type="text" v-if="form.parent_id === 0"/>
-        <el-input v-model="form.name" :rows="4" type="textarea" v-else/>
-      </el-form-item>
-      <el-form-item label="上級分類">
-        <el-select v-model="form.parent_id" class="m-2" placeholder="Select">
-          <el-option label="最上層" :value="0" />
-          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="類別圖片" prop="imageurl" v-if="form.parent_id === 0">
-          <el-upload class="avatar-uploader" 
-          action="#" 
-          accept="image/*" 
-          :show-file-list="false" 
-          :auto-upload="true"
-          :before-upload="(file) => beforeAvatarUpload(file)">
-            <img v-if="form.imageurl" :src="form.imageurl" class="avatar" id="imageurl" />
-            <el-icon v-else class="avatar-uploader-icon">
-              <Plus />
-            </el-icon>
-          </el-upload>
-        </el-form-item>
-    </el-form>
-    <div class="demo-drawer__footer" style="text-align: right;">
-      <el-button @click="cancelForm">取消</el-button>
-      <el-button type="primary" :loading="loading" @click="submitForm(formRef)">{{
-        loading ? '提交中 ...' : '確認'
-      }}</el-button>
-    </div>
-  </div>
-
-  <div>
-    <el-dialog
-      v-model="crop.show"
-      title="Tips"
-      :before-close="handleClose"
-    >
-      <div class="cropper-section" v-if="crop.show">
-      <div class="crop-area">
-        <cropper class="cropper" ref="myCrop" :src="crop.img" :stencil-props="{
-          aspectRatio: crop.ratio,
-        }" :auto-zoom="true" />
-      </div>
-      <div class="crop-btn">
-          <el-button type="primary" size="small" text @click="handleClose">取消</el-button>
-          <el-button type="primary" size="small" @click="onCrop">剪裁</el-button>
-      </div>
-    </div>
-    </el-dialog>    
-  </div>
-
-</template>
-
-<style lang="less" scoped>
-.avatar-uploader .avatar {
-  width: 312px;
-  height: 120px;
-  display: block;
-}
-
-:deep(.avatar-uploader .el-upload) {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 312px;
-  height: 120px;
-  text-align: center;
-}
-
-:deep(.el-dialog) {
-  width: 40% !important;
-}
-
-.crop-btn {
-  text-align: right;
-  margin-top: 10px;
-}
-</style>
\ No newline at end of file
diff --git a/admin/src/pages/Product/list/index.vue b/admin/src/pages/Product/list/index.vue
index 2f2b2e5..9568b24 100644
--- a/admin/src/pages/Product/list/index.vue
+++ b/admin/src/pages/Product/list/index.vue
@@ -2,17 +2,26 @@
 import { ref, reactive, onMounted, toRefs } from "vue";
 import { Plus, Edit, Delete, ArrowDown } from "@element-plus/icons-vue";
 
-import AscForm from "./components/Form.vue";
-
-import { getProductList, deleteProduct } from "@/api/product";
+import { getProductList, updateProduct, deleteProduct } from "@/api/product";
+import { getCateList } from "@/api/category";
 
 import { useRouter, useRoute } from "vue-router";
 const route = useRoute();
 const router = useRouter();
 
+const CateOptions = ref([])
+
+const props = {
+  emitPath: false,
+}
+
 const state = reactive({
   page: 1,
   pageSize: 10,
+  search: {
+    cat_id: null,
+    keyword: '',
+  }
 });
 
 const { page, pageSize } = toRefs(state);
@@ -23,10 +32,30 @@ const showFormDraw = ref(false);
 
 const tableData = ref([]);
 
-onMounted(() => {
+onMounted(async () => {
+  let res = await getCateList();
+  if (res.code === 200) {
+    CateOptions.value = res.data.map((item) => {
+      return {
+        value: item.id,
+        label: item.name,
+        children: item.children.map((item2) => {
+          return {
+            value: item2.id,
+            label: item2.name,
+          };
+        }),
+      };
+    });
+  }
+
   getTableData();
 });
 
+const handleSearch = () => {
+  getTableData();
+};
+
 const getTableData = async () => {
   loading.value = true;
   let res = await getProductList(state);
@@ -50,7 +79,7 @@ const handleEdit = (id) => {
   editid.value = id;
   // showFormDraw.value = true;
   router.push({
-    path: '/news/list/form',
+    path: '/product/list/form',
     query: {
       id: id
     }
@@ -60,7 +89,7 @@ const handleEdit = (id) => {
 const handleDelete = (id) => {
   ElMessageBox.confirm('確認刪除此紀錄?')
     .then(async () => {
-      let res = await deleteNews(id);
+      let res = await deleteProduct(id);
       if (res.code === 200) {
         ElMessage({
           message: '刪除成功.',
@@ -100,6 +129,37 @@ const handleNextClick = (val) => {
   getTableData();
 };
 
+
+// 編輯排序
+const editOrderId = ref(0);
+
+const handleEditItem = (id) => {
+  editOrderId.value = id;
+}
+
+const handleUpdateItem = async (row) => {
+
+  let res = await updateProduct(row);
+  if (res.code === 200) {
+    ElMessage({
+      message: '修改成功.',
+      type: 'success',
+    });
+    getTableData();
+  } else {
+    ElMessage({
+      message: '修改失敗.',
+      type: 'error',
+    });
+  }
+  editOrderId.value = 0;
+}
+
+const handleCloseEditItem = () => {
+  console.log('handleCloseEditItem')
+  editOrderId.value = 0;
+}
+
 // Drawer
 
 const editid = ref(0);
@@ -128,6 +188,30 @@ const handleCloseFormDraw = (val) => {
       </div>
     </div>
     <!-- Breadcrumb: End -->
+    <el-card>
+      <div class="search-section">
+        <el-row :gutter="15">
+          <el-col :sm="20" :lg="21">
+            <el-row :gutter="15">
+              <el-col :sm="8">
+              </el-col>
+              <el-col :sm="8">
+                <el-cascader v-model="state.search.cat_id" 
+                :options="CateOptions" 
+                :props="props"
+                clearable/>
+              </el-col>
+              <el-col :sm="8">
+                <el-input v-model="state.search.keyword" placeholder="請輸入產品名稱" style="width: 100%;" />
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :sm="4" :lg="3">
+            <el-button type="primary" style="width: 100%;height: 100%;" @click="handleSearch">搜尋</el-button>
+          </el-col>
+        </el-row>
+      </div>
+    </el-card>
 
     <el-card :body-style="{ padding: '0px' }">
       <div v-loading="loading">
@@ -135,12 +219,22 @@ const handleCloseFormDraw = (val) => {
           <el-table-column label="#" prop="id" width="50" />
           <el-table-column label="產品圖片">
             <template #default="scope">
-              <el-image style="width: 150px; height: 80px" :src="scope.row.imageurl" fit="cover" />
+              <el-image style="width: 150px; height: 80px" :src="scope.row.imageurl" fit="cover" :crossorigin="null" />
             </template>
           </el-table-column>
           <el-table-column label="產品類別" prop="cat_name" />
           <el-table-column label="產品名稱" prop="name" />
           <el-table-column label="建立時間" prop="create_time" />
+          <el-table-column prop="sort" label="排序" width="80">
+            <template #default="scope">
+              <div @dblclick="handleEditItem(scope.row.id)" v-if="scope.row.id !== editOrderId">
+                {{ scope.row.sort_order }}
+              </div>
+              <el-input v-model="scope.row.sort_order" :style="{ width: '50px' }"
+                @keyup.enter="handleUpdateItem(scope.row)" @blur="handleCloseEditItem()" :autoFocus="true"
+                v-focus="scope.row.id === editOrderId" v-else />
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="105" fixed="right">
             <template #default="scope">
               <el-dropdown>
@@ -166,11 +260,15 @@ const handleCloseFormDraw = (val) => {
       </div>
     </el-card>
   </div>
-  <div>
+  <!-- <div>
     <el-drawer ref="drawerRef" v-model="showFormDraw" :destroy-on-close="true" title="新增管理員" direction="rtl" size="70%">
       <asc-form :editid="editid" @close="handleCloseFormDraw" />
     </el-drawer>
-  </div>
+  </div> -->
 </template>
 
-<style scoped></style>
\ No newline at end of file
+<style scoped>
+.el-cascader{
+  width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/admin/vite.config.js b/admin/vite.config.js
index 178f464..d7650a5 100644
--- a/admin/vite.config.js
+++ b/admin/vite.config.js
@@ -28,5 +28,8 @@ export default defineConfig({
         additionalData: '@import "./src/assets/css/color.less";',
       },
     }
-  }
+  },
+  esbuild: {
+    drop: ["console", "debugger"],
+  },
 });
diff --git a/app/app/adminapi/controller/ActivityController.php b/app/app/adminapi/controller/ActivityController.php
index 3e3ea07..6a22171 100644
--- a/app/app/adminapi/controller/ActivityController.php
+++ b/app/app/adminapi/controller/ActivityController.php
@@ -47,7 +47,9 @@ class ActivityController extends BaseController
         
         $data = [
             'lang' => 'tw',
-            'title' => isset($params['title'])?$params['title']:'',
+            'title1' => isset($params['title1'])?$params['title1']:'',
+            'title2' => isset($params['title2'])?$params['title2']:'',
+            'title3' => isset($params['title3'])?$params['title3']:'',
             'image_list' => isset($params['imageList'])?json_encode($params['imageList']):'',
             'create_time' => date('Y-m-d H:i:s',time())
         ];
@@ -104,7 +106,9 @@ class ActivityController extends BaseController
         $params = $request->post();
         
         $data = [
-            'title' => isset($params['title'])?$params['title']:'',
+            'title1' => isset($params['title1'])?$params['title1']:'',
+            'title2' => isset($params['title2'])?$params['title2']:'',
+            'title3' => isset($params['title3'])?$params['title3']:'',
             'image_list' => isset($params['imageList'])?json_encode($params['imageList']):'',
             'update_time' => date('Y-m-d H:i:s',time())
         ];
diff --git a/app/app/adminapi/controller/BranchController.php b/app/app/adminapi/controller/BranchController.php
index 2b92d99..ca00aa0 100644
--- a/app/app/adminapi/controller/BranchController.php
+++ b/app/app/adminapi/controller/BranchController.php
@@ -15,6 +15,7 @@ class BranchController extends BaseController
 
         $list = Db::name('branch')
             ->where('lang',$param['lang'])
+            ->order('sort_order', 'asc')
             ->order('id', 'asc')
             ->select()
             ->toArray();
@@ -47,9 +48,9 @@ class BranchController extends BaseController
         try{
             $id = Db::name('branch')->insertGetId($data);
 
-            Db::name('branch')
-            ->where('id',$id)
-            ->update(['sort_order'=>($id * 10)]);
+            // Db::name('branch')
+            // ->where('id',$id)
+            // ->update(['sort_order'=>($id * 10)]);
 
             AdminLog( $this->uid , '新增據點 [' . $id .']');
 
@@ -103,6 +104,7 @@ class BranchController extends BaseController
             'email' => isset($params['email'])?$params['email']:'',
             'url' => isset($params['url'])?$params['url']:'',
             'imageurl' => isset($params['imageurl'])?$params['imageurl']:'',
+            'sort_order' => isset($params['sort_order'])?$params['sort_order']:100,
         ];
 
         try{
diff --git a/app/app/adminapi/controller/CateController.php b/app/app/adminapi/controller/CateController.php
index 1ed755a..da8ca46 100644
--- a/app/app/adminapi/controller/CateController.php
+++ b/app/app/adminapi/controller/CateController.php
@@ -16,6 +16,7 @@ class CateController extends BaseController
         $list = Db::name('category')
             ->where('lang',$param['lang'])
             ->order('sort_order', 'asc')
+            ->order('id', 'asc')
             ->select()
             ->toArray();
 
@@ -49,6 +50,7 @@ class CateController extends BaseController
             ->where('lang',$param['lang'])
             ->where('parent_id',0)
             ->order('sort_order', 'asc')
+            ->order('id', 'asc')
             ->select()
             ->toArray();
 
@@ -82,7 +84,7 @@ class CateController extends BaseController
             "lang" => isset($params['lang'])?$params['lang']:'tw',
             "parent_id" => isset($params['parent_id'])?$params['parent_id']:0,
             "name" => isset($params['name'])?$params['name']:'',
-            "imageurl" => getUrl().isset($params['imageurl'])?$params['imageurl']:'',
+            "imageurl" => isset($params['imageurl'])?getUrl().$params['imageurl']:'',
         ];
         
         try{
@@ -122,6 +124,7 @@ class CateController extends BaseController
             "parent_id" => isset($params['parent_id'])?$params['parent_id']:0,
             "name" => isset($params['name'])?$params['name']:'',
             "imageurl" => getUrl().isset($params['imageurl'])?$params['imageurl']:'',
+            "sort_order" => isset($params['sort_order'])?$params['sort_order']:100,
         ];
 
         try{
diff --git a/app/app/adminapi/controller/IndexController.php b/app/app/adminapi/controller/IndexController.php
index 113d1df..e307eca 100644
--- a/app/app/adminapi/controller/IndexController.php
+++ b/app/app/adminapi/controller/IndexController.php
@@ -15,16 +15,11 @@ class IndexController extends BaseController
 
         $list = Db::name('banner')
             ->where('lang',$param['lang'])
-            ->order('id', 'desc')
+            ->order('sort_order', 'asc')         
+            ->order('id', 'desc')            
             ->select()
             ->toArray();
 
-
-        foreach($list as $key => $val){
-            $list[$key]['imageurl1'] = getUrl().$val['imageurl1'];
-            $list[$key]['imageurl2'] = getUrl().$val['imageurl2'];
-        }
-
         $result = $list;
 
         return $this->Success($result);
@@ -45,9 +40,9 @@ class IndexController extends BaseController
         try{
             $id = Db::name('banner')->insertGetId($data);
 
-            Db::name('banner')
-            ->where('id',$id)
-            ->update(['sort_order'=>($id * 10)]);
+            // Db::name('banner')
+            // ->where('id',$id)
+            // ->update(['sort_order'=>($id * 10)]);
 
             AdminLog( $this->uid , '新增輪撥 [' . $id .']');
 
@@ -97,6 +92,7 @@ class IndexController extends BaseController
             'describe' => isset($params['describe'])?$params['describe']:'',
             'imageurl1' => isset($params['imageurl1'])?$params['imageurl1']:'',
             'imageurl2' => isset($params['imageurl2'])?$params['imageurl2']:'',
+            'sort_order' => isset($params['sort_order'])?$params['sort_order']:100,
             'update_time' => date('Y-m-d H:i:s',time())
         ];
 
diff --git a/app/app/adminapi/controller/NewsController.php b/app/app/adminapi/controller/NewsController.php
index bb9c8b5..c9de0ea 100644
--- a/app/app/adminapi/controller/NewsController.php
+++ b/app/app/adminapi/controller/NewsController.php
@@ -20,7 +20,7 @@ class NewsController extends BaseController
 
         $list = Db::name('news')
             ->where($where)
-            ->order('id', 'asc')
+            ->order('create_time', 'desc')
             ->page($page, $pageSize)
             ->select()
             ->toArray();
diff --git a/app/app/adminapi/controller/ProductController.php b/app/app/adminapi/controller/ProductController.php
index 3c297b3..70ae150 100644
--- a/app/app/adminapi/controller/ProductController.php
+++ b/app/app/adminapi/controller/ProductController.php
@@ -15,21 +15,33 @@ class ProductController extends BaseController
         $pageSize   = isset($param['pageSize']) ? $param['pageSize'] : 10;
         $search     = isset($param['search']) ? $param['search'] : [];
 
-        $where = [
-        ];
+        $where = [];
+
+        if(isset($search['cat_id']) && $search['cat_id'] > 0){
+            $where[] = ['cat_id','=' ,$search['cat_id']];
+        }
+
+        if(isset($search['keyword']) && strlen($search['keyword']) >0){
+            $where[] = ['name', 'like', '%'.$search['keyword'].'%'];
+        }
 
         $list = Db::name('product')
             ->where($where)
+            ->order('sort_order', 'asc')
             ->order('id', 'asc')
             ->page($page, $pageSize)
             ->select()
             ->toArray();
 
+
         $total = Db::name('product')
             ->where($where)
             ->count();
 
         foreach($list as $key => $val){
+            $list[$key]['cat_name'] = Db::name('category')
+                ->where('id',$val['cat_id'])
+                ->value('name');
         }
 
         $result = [
@@ -69,16 +81,14 @@ class ProductController extends BaseController
         $id = $request->get('id');
 
         try{
-            $admin_name = getNameById('admin','username',$id);
-
-            $result = Db::name('product')
+            Db::name('product')
             ->where('id',$id)
             ->delete();
     
-            AdminLog($this->uid, '刪除管理員 '. $admin_name);
+            AdminLog($this->uid, '刪除產品 ['. $id. '] 成功');
             return $this->Success('操作成功');    
         }catch(\Exception $e){
-            AdminLog($this->uid, '刪除管理員'.$admin_name.'失敗');
+            AdminLog($this->uid, '刪除產品 ['.$id.'] 失敗');
             return $this->Error('操作失敗');                
         }
     }
@@ -105,9 +115,13 @@ class ProductController extends BaseController
         $params = $request->post();
         
         $data = [
-            'title' => isset($params['title'])?$params['title']:'',
+            'name' => isset($params['name'])?$params['name']:'',
+            'imageurl' => isset($params['imageurl'])?$params['imageurl']:'',
+            'cat_id'    => isset($params['cat_id'])?$params['cat_id']:0,
+            'description' => isset($params['description'])?$params['description']:'',
             'content' => isset($params['content'])?$params['content']:'',
-            'update_time' => date('Y-m-d H:i:s',time())
+            'sort_order' => isset($params['sort_order'])?$params['sort_order']:100,
+            'create_time' => date('Y-m-d H:i:s',time())
         ];
 
         try{
@@ -115,12 +129,12 @@ class ProductController extends BaseController
             ->where('id',$params['id'])
             ->update($data);
 
-            AdminLog($this->uid, '修改產業動態 [' . $params['id'] .']');
+            AdminLog($this->uid, '修改產品 [' . $params['id'] .'] 成功');
     
             return $this->Success('操作成功');
         }catch(\Exception $e){
 
-            AdminLog($this->uid, '修改產業動態 [' . $params['id'] . '] 失敗');
+            AdminLog($this->uid, '修改產品 [' . $params['id'] . '] 失敗');
             
             return $this->Error('操作失敗:'. $e->getMessage());                
         }
diff --git a/app/app/adminapi/controller/SupplierController.php b/app/app/adminapi/controller/SupplierController.php
index dc3f747..d1f3c76 100644
--- a/app/app/adminapi/controller/SupplierController.php
+++ b/app/app/adminapi/controller/SupplierController.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace app\adminapi\controller;
 
 use app\adminapi\BaseController;
@@ -14,13 +15,13 @@ class SupplierController extends BaseController
         $where[] = ['lang', $param['lang']];
 
         $list = Db::name('supplier')
-            ->where('lang',$param['lang'])
-            ->order('id', 'desc')
+            ->order('sort_order', 'asc')
+            ->order('id', 'asc')
             ->select()
             ->toArray();
 
 
-        foreach($list as $key => $val){
+        foreach ($list as $key => $val) {
             $list[$key]['imageurl'] = $val['imageurl'];
         }
 
@@ -29,97 +30,107 @@ class SupplierController extends BaseController
         return $this->Success($result);
     }
 
-    public function addSupplier(Request $request){
+    public function addSupplier(Request $request)
+    {
         $params = $request->post();
-        
+
         $data = [
-            'lang' => isset($params['lang'])?$params['lang']:'tw',
-            'name' => isset($params['name'])?$params['name']:'',
-            'imageurl' => isset($params['imageurl'])?$params['imageurl']:'',
-            'create_time' => date('Y-m-d H:i:s',time())
+            'lang' => isset($params['lang']) ? $params['lang'] : 'tw',
+            'name1' => isset($params['name1']) ? $params['name1'] : '',
+            'name2' => isset($params['name2']) ? $params['name2'] : '',
+            'name3' => isset($params['name3']) ? $params['name3'] : '',
+            'imageurl' => isset($params['imageurl']) ? $params['imageurl'] : '',
+            'create_time' => date('Y-m-d H:i:s', time())
         ];
-        
-        try{
+
+        try {
             $id = Db::name('supplier')->insertGetId($data);
 
-            Db::name('supplier')
-            ->where('id',$id)
-            ->update(['sort_order'=>($id * 10)]);
+            // Db::name('supplier')
+            // ->where('id',$id)
+            // ->update(['sort_order'=>($id * 10)]);
 
-            AdminLog( $this->uid , '新增供應商 [' . $id .']');
+            AdminLog($this->uid, '新增供應商 [' . $id . ']');
 
             return $this->Success('操作成功');
-        }catch(\Exception $e){
-            AdminLog( $this->uid , '新增供應商 [' . $id . '] 失敗');
-            
-            return $this->Error('操作失敗:'. $e->getMessage());                
+        } catch (\Exception $e) {
+            AdminLog($this->uid, '新增供應商 [' . $id . '] 失敗');
+
+            return $this->Error('操作失敗:' . $e->getMessage());
         }
     }
 
-    public function deleteSupplier(Request $request){
+    public function deleteSupplier(Request $request)
+    {
         $id = $request->get('id');
 
-        try{
+        try {
             $result = Db::name('supplier')
-            ->where('id',$id)
-            ->delete();
-    
-            AdminLog($this->uid, '刪除供應商 ['. $id .']');
-            return $this->Success('操作成功');    
-        }catch(\Exception $e){
-            AdminLog($this->uid, '刪除供應商 ['.$id.'] 失敗');
-            return $this->Error('操作失敗');                
+                ->where('id', $id)
+                ->delete();
+
+            AdminLog($this->uid, '刪除供應商 [' . $id . ']');
+            return $this->Success('操作成功');
+        } catch (\Exception $e) {
+            AdminLog($this->uid, '刪除供應商 [' . $id . '] 失敗');
+            return $this->Error('操作失敗');
         }
     }
 
-    public function getSupplier(Request $request){
+    public function getSupplier(Request $request)
+    {
         $id = $request->get('id');
 
         $result = Db::name('supplier')
-        ->where('id',$id)
-        ->find();
+            ->where('id', $id)
+            ->find();
 
-        if(!$result){
+        if (!$result) {
             return $this->Error('資料不存在');
         }
 
         return $this->Success($result);
     }
 
-    public function updateSupplier(Request $request){
+    public function updateSupplier(Request $request)
+    {
         $params = $request->post();
-       
+
         $data = [
-            'name' => isset($params['name'])?$params['name']:'',
-            'imageurl' => isset($params['imageurl'])?$params['imageurl']:'',
-            'update_time' => date('Y-m-d H:i:s',time())
+            'name1' => isset($params['name1']) ? $params['name1'] : '',
+            'name2' => isset($params['name2']) ? $params['name2'] : '',
+            'name3' => isset($params['name3']) ? $params['name3'] : '',
+            'imageurl' => isset($params['imageurl']) ? $params['imageurl'] : '',
+            'sort_order' => isset($params['sort_order']) ? $params['sort_order'] : 100,
+            'update_time' => date('Y-m-d H:i:s', time())
         ];
 
-        try{
+        try {
             Db::name('supplier')
-            ->where('id',$params['id'])
-            ->update($data);
+                ->where('id', $params['id'])
+                ->update($data);
+
+            AdminLog($this->uid, '修改供應商 [' . $params['id'] . ']');
 
-            AdminLog($this->uid, '修改供應商 [' . $params['id'] .']');
-    
             return $this->Success('操作成功');
-        }catch(\Exception $e){
+        } catch (\Exception $e) {
 
             AdminLog($this->uid, '修改供應商 [' . $params['id'] . '] 失敗');
-            
-            return $this->Error('操作失敗:'. $e->getMessage());                
+
+            return $this->Error('操作失敗:' . $e->getMessage());
         }
     }
 
-    public function uploadSupplierImage(Request $request){
+    public function uploadSupplierImage(Request $request)
+    {
         $file = $request->file('file');
 
         if ($file && $file->isValid()) {
             // 產生唯一的檔名
             $filename = uniqid() . '.' . $file->getUploadExtension();
 
-            $file->move(public_path().'/storage/supplier/'. $filename);
-            $savePath = getUrl().'/storage/supplier/'. $filename;
+            $file->move(public_path() . '/storage/supplier/' . $filename);
+            $savePath = getUrl() . '/storage/supplier/' . $filename;
             return $this->Success($savePath);
         }
         return $this->Error('操作失敗');
diff --git a/app/app/appapi/controller/ContactController.php b/app/app/appapi/controller/ContactController.php
index c9c0fb0..430a8d1 100644
--- a/app/app/appapi/controller/ContactController.php
+++ b/app/app/appapi/controller/ContactController.php
@@ -15,6 +15,7 @@ class ContactController extends BaseController
         $list = Db::name('branch')
             ->where('lang',$param['lang'])
             ->order('sort_order', 'asc')
+            ->order('id', 'asc')
             ->select()
             ->toArray();
 
diff --git a/app/app/appapi/controller/IndexController.php b/app/app/appapi/controller/IndexController.php
index ec79656..dba7de4 100644
--- a/app/app/appapi/controller/IndexController.php
+++ b/app/app/appapi/controller/IndexController.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace app\appapi\controller;
 
 use app\appapi\BaseController;
@@ -31,17 +32,13 @@ class IndexController extends BaseController
         // $where[] = ['lang', $param['lang']];
 
         $list = Db::name('banner')
-            ->where('lang',$param['lang'])
+            ->where('lang', $param['lang'])
             ->order('id', 'desc')
+            ->order('sort_order', 'asc')
             ->select()
             ->toArray();
 
 
-        foreach($list as $key => $val){
-            $list[$key]['imageurl1'] = getUrl().$val['imageurl1'];
-            $list[$key]['imageurl2'] = getUrl().$val['imageurl2'];
-        }
-
         $result = $list;
 
         return $this->Success($result);
@@ -54,13 +51,13 @@ class IndexController extends BaseController
         $where = [];
 
         $list = Db::name('category')
-            ->where('lang',$param['lang'])
-            ->where('parent_id',0)
+            ->where('lang', $param['lang'])
+            ->where('parent_id', 0)
             ->order('sort_order', 'asc')
             ->select()
             ->toArray();
 
-        
+
         // foreach($list as $key => $val){
 
         // }
@@ -74,13 +71,25 @@ class IndexController extends BaseController
         // $where[] = ['lang', $param['lang']];
 
         $list = Db::name('supplier')
-            ->where('lang',$param['lang'])
-            ->order('id', 'desc')
+            ->order('sort_order', 'asc')
+            ->order('id', 'asc')
             ->select()
             ->toArray();
 
 
-        foreach($list as $key => $val){
+        foreach ($list as $key => $val) {
+            switch($param['lang']){
+                case 'tw':
+                    $list[$key]['name'] = $val['name1'];
+                    break;
+                case 'en':
+                    $list[$key]['name'] = $val['name2'];
+                    break;
+                case 'cn':
+                    $list[$key]['name'] = $val['name3'];
+                    break;
+            }
+            
             $list[$key]['imageurl'] = $val['imageurl'];
         }
 
@@ -96,13 +105,14 @@ class IndexController extends BaseController
         $where = [];
 
         $list = Db::name('category')
-            ->where('lang',$param['lang'])
+            ->where('lang', $param['lang'])
             ->order('sort_order', 'asc')
+            ->order('id', 'asc')
             ->select()
             ->toArray();
 
         $list = $this->genCategoryTree($list);
-        
+
         // foreach($list as $key => $val){
 
         // }
@@ -110,15 +120,15 @@ class IndexController extends BaseController
         return $this->Success($list);
     }
 
-    public function genCategoryTree($list,$parent_id = 0){
+    public function genCategoryTree($list, $parent_id = 0)
+    {
         $tree = [];
-        foreach($list as $key => $val){
-            if($val['parent_id'] == $parent_id){
-                $val['children'] = $this->genCategoryTree($list,$val['id']);
+        foreach ($list as $key => $val) {
+            if ($val['parent_id'] == $parent_id) {
+                $val['children'] = $this->genCategoryTree($list, $val['id']);
                 $tree[] = $val;
             }
         }
         return $tree;
     }
-
 }
diff --git a/app/app/appapi/controller/ProductController.php b/app/app/appapi/controller/ProductController.php
index 5d27ef3..c66de64 100644
--- a/app/app/appapi/controller/ProductController.php
+++ b/app/app/appapi/controller/ProductController.php
@@ -41,7 +41,8 @@ class ProductController extends BaseController
         $list = Db::name('product')
             ->where('lang',$param['lang'])
             ->where('cat_id',$param['cat_id'])
-            ->order('id', 'desc')
+            ->order('sort_order', 'asc')
+            ->order('id', 'asc')
             ->select()
             ->toArray();
 
diff --git a/app/app/appapi/controller/SocialController.php b/app/app/appapi/controller/SocialController.php
index 30c1f7e..1dba4a1 100644
--- a/app/app/appapi/controller/SocialController.php
+++ b/app/app/appapi/controller/SocialController.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace app\appapi\controller;
 
 use app\appapi\BaseController;
@@ -15,12 +16,11 @@ class SocialController extends BaseController
         $pageSize   = isset($param['pageSize']) ? $param['pageSize'] : 10;
         $search     = isset($param['search']) ? $param['search'] : [];
 
-        $where = [
-        ];
+        $where = [];
 
         $list = Db::name('news')
             ->where($where)
-            ->order('id', 'asc')
+            ->order('create_time', 'desc')
             ->page($page, $pageSize)
             ->select()
             ->toArray();
@@ -44,14 +44,14 @@ class SocialController extends BaseController
     {
         $param = $request->get();
 
-        if(empty($param['id'])){
+        if (empty($param['id'])) {
             return $this->Error('參數錯誤');
         }
 
         $where = [];
 
         $news = Db::name('news')
-            ->where('id',$param['id'])
+            ->where('id', $param['id'])
             ->find();
 
         $result = $news;
@@ -63,9 +63,24 @@ class SocialController extends BaseController
     {
         $param = $request->post();
 
-        $result = \app\common\GetData::getPageList('activity',$param);
+        $result = \app\common\GetData::getPageList('activity', $param);
+
+        foreach ($result['list'] as $key => $val) {
+            switch ($param['lang']) {
+                case 'tw':
+                    $result['list'][$key]['title'] = $val['title1'];
+                    break;
+                case 'cn':
+                    $result['list'][$key]['title'] = $val['title2'];
+                    break;
+                case 'en':
+                    $result['list'][$key]['title'] = $val['title3'];
+                    break;
+                default:
+                    $result['list'][$key]['title'] = $val['title1'];
+                    break;
+            }
 
-        foreach($result['list'] as $key => $val){
             $result['list'][$key]['imageList'] = json_decode($val['image_list']);
             unset($result['list'][$key]['image_list']);
         }
@@ -77,22 +92,21 @@ class SocialController extends BaseController
     {
         $param = $request->get();
 
-        if(empty($param['id'])){
+        if (empty($param['id'])) {
             return $this->Error('參數錯誤');
         }
 
         $where = [];
 
         $activity = Db::name('activity')
-            ->where('id',$param['id'])
+            ->where('id', $param['id'])
             ->find();
 
         $activity['imageList'] = json_decode($activity['image_list']);
         unset($activity['image_list']);
-        
+
         $result = $activity;
 
         return $this->Success($result);
     }
-    
 }
diff --git a/web/package.json b/web/package.json
index 24936b9..2dfa4f0 100644
--- a/web/package.json
+++ b/web/package.json
@@ -7,7 +7,8 @@
     "dev": "nuxt dev --dotenv .env.development",
     "generate": "nuxt generate --dotenv .env.staging",
     "preview": "nuxt preview",
-    "postinstall": "nuxt prepare"
+    "postinstall": "nuxt prepare",
+    "postbuild": "cp -r .output/* ../nuxt/app && scp -r ../nuxt/app/* root@test:/www/wwwroot/prodio.zltest.com.tw/nuxt/app"
   },
   "devDependencies": {
     "@element-plus/nuxt": "^1.0.7",
diff --git a/web/pages/index.vue b/web/pages/index.vue
index 409fd6f..06c3734 100644
--- a/web/pages/index.vue
+++ b/web/pages/index.vue
@@ -10,26 +10,13 @@ const store = useStore();
 const { config } = storeToRefs(store);
 
 const bannerData = computed(() => bannerRes.value.data);
-const cateData = ref([]);
-const supplierData = ref([]);
+const cateData = computed(() => cateRes.value.data);
+const supplierData = computed(() => supplierRes.value.data);
 
 const { data: bannerRes } = await useMyFetch('/index/getBannerList', "GET")
-
-// if (bannerRes.value.code === 200) {
-//   bannerData.value = bannerRes.value.data
-// }
-
 const { data: cateRes } = await useMyFetch('/index/getParentCateList', "GET")
-
-if (cateRes.value.code === 200) {
-  cateData.value = cateRes.value.data
-}
-
 const { data: supplierRes } = await useMyFetch('/index/getSupplierList', "GET")
 
-if (supplierRes.value.code === 200) {
-  supplierData.value = supplierRes.value.data
-}
 
 onMounted(async () => {
   let swiper1 = new Swiper(".banner .swiper", {
@@ -139,7 +126,7 @@ onMounted(async () => {
           <div class="swiper">
             <div class="swiper-wrapper">
               <div class="swiper-slide" v-for="(supplier, index) in supplierData" :key="index">
-                <div class="imgCnt"><img :src="supplier.imageurl" alt=""></div>
+                <div class="imgCnt"><img :src="supplier.imageurl" :alt="supplier.name"></div>
               </div>
             </div>
           </div>
diff --git a/web/pages/social.vue b/web/pages/social.vue
index d38afcd..d8ca09b 100644
--- a/web/pages/social.vue
+++ b/web/pages/social.vue
@@ -57,7 +57,7 @@ watch(() => route.params,
                   :class="{ 'active': currentRoute.includes(item.path) }"
                   href="javascript:;" 
                   v-for="(item,index) in menuList" :key="index"
-                  @click="router.push(item.path);"
+                  @click="router.push(localeLocation(item.path));"
                 >
                   {{ item.name }}
                 </a>
diff --git a/web/pages/social/news/detail/[id].vue b/web/pages/social/news/detail/[id].vue
index 24790da..bd641ce 100644
--- a/web/pages/social/news/detail/[id].vue
+++ b/web/pages/social/news/detail/[id].vue
@@ -9,20 +9,19 @@ const { data: newsRes } = await useMyFetch('/social/getNews', "GET", {id: route.
 
 <template>
   <div class="toolbar">
-    <div class="tTitle">最新消息</div>
+    <div class="tTitle">{{ $t('Social.news') }}</div>
   </div>
   <div class="content">
 
     <div class="block">
       <div class="bName mb-4">{{ newsData.title }}</div>
-      <div class="imgCnt me-4 mb-4" style="float: left;width:350px;">
+      <!-- <div class="imgCnt me-4 mb-4" style="float: left;width:350px;">
         <img :src="newsData.imageurl" alt="">
-      </div>
-      <div class="desc">
-        {{ newsData.content }}
+      </div> -->
+      <div class="desc" v-html="newsData.content">
       </div>
       <div class="d-flex justify-content-end">
-        <a class="backBtn" href="javascript:;" @click="$router.back()">back</a>
+        <a class="backBtn" href="javascript:;" @click="$router.push(localeLocation('/social/news'))">back</a>
       </div>
     </div>
   </div>
diff --git a/web/pages/social/news/index.vue b/web/pages/social/news/index.vue
index cbd91e6..32696e3 100644
--- a/web/pages/social/news/index.vue
+++ b/web/pages/social/news/index.vue
@@ -25,7 +25,7 @@ const handlePageChange = async (npage,npageSize) => {
 
 <template>
   <div class="toolbar">
-    <div class="tTitle">最新消息</div>
+    <div class="tTitle">{{ $t('Social.news') }}</div>
   </div>
   <div class="content">
     <div>