+ {{ scope.row.sort_order }}
+
+
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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) => {
+
-
-
-
-
- 取消
- 剪裁
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜尋
+
+
+
+
@@ -135,12 +219,22 @@ const handleCloseFormDraw = (val) => {
-
+
+
@@ -166,11 +260,15 @@ const handleCloseFormDraw = (val) => {
+ {{ scope.row.sort_order }}
+
+
+
-
\ No newline at end of file
+
\ 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 @@
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 @@
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 @@
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 () => {
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 }}
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.
- ![]()
+ ![]()