去除prodio不必要的部份

admin/package.json

@@ -6,9 +6,11 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
+    "build:hot": "vite build",
     "build:sta": "vite build --mode staging",
     "preview": "vite preview",
     "postbuild:sta": "scp -r ./dist/* root@207.148.89.145:/www/wwwroot/prodio.zltest.com.tw/public/admin",
+    "postbuild:hot": "scp -r ./dist/* root@207.246.102.73:/opt/wwwroot/weisen/nginx/html/admin",
     "postbuild": "cp -rf ./dist/* ../../prodio.prod/nginx/html/admin"
   },
   "dependencies": {

admin/src/config/config.js

@@ -1,5 +1,5 @@
 let config = {
-  systemName: "普達後台管理系統",
+  systemName: "後台管理系統",
   theme: {
     color: "#13c2c2",
     mode: "dark",

admin/src/config/default/setting.config.js

@@ -1,5 +1,5 @@
 export default {
-  // lang: 'tw',                           //語言，可選 CN(簡體)、TW(繁體)、US(英語)，也可擴充套件其它語言
+  // lang: 'tw',                        //語言，可選 CN(簡體)、TW(繁體)、US(英語)，也可擴充套件其它語言
   theme: {                              //主題
     color: '#1890ff',                   //主題色
     mode: 'dark',                       //主題模式 可選 dark、 light 和 night
@@ -16,8 +16,8 @@ export default {
   multiPage: false,                     //多頁籤模式，true:開啟，false:不開啟
   cachePage: true,                      //是否快取頁面資料，僅多頁籤模式下生效，true 快取, false 不快取
   hideSetting: true,                    //隱藏設定抽屜，true:隱藏，false:不隱藏
-  systemName: '管理系統',                //系統名稱
+  systemName: '管理系統',               //系統名稱
-  copyright: '2023 ZL corp.',           //copyright
+  copyright: '2023 corp.',              //copyright
   asyncRoutes: false,                   //非同步載入路由，true:開啟，false:不開啟
   showPageTitle: true,                  //是否顯示頁面標題（PageLayout 佈局中的頁面標題），true:顯示，false:不顯示
   filterMenu: true,                     //根據許可權過濾選單，true:過濾，false:不過濾

admin/src/layouts/header/index.vue

@@ -66,7 +66,7 @@ const handleClick = () => {
     </ul>
     <ul class="header-nav">
       <li class="header-nav-item header-flexible" style="cursor: pointer">
-        <el-dropdown @click="handleClick">
+        <!-- <el-dropdown @click="handleClick">
           <div class="header-avatar" :style="{marginRight:'5px'}">
             <el-icon :size="13" :style="{marginRight:'5px'}">
               <Help />
@@ -80,7 +80,7 @@ const handleClick = () => {
               <el-dropdown-item @click="setLocale('en')">EN</el-dropdown-item>
             </el-dropdown-menu>
           </template>
-        </el-dropdown>
+        </el-dropdown> -->
         <el-dropdown :hide-on-click="false">
           <div class="header-avatar" >
             <el-icon :size="13" :style="{marginRight:'5px'}">

admin/src/layouts/menu/index.vue

@@ -36,14 +36,14 @@ const menuData = ([
         title: "首頁輪播",
         path: "/index/banner",
       },
-      {
+      // {
-        title: "供應商",
+      //   title: "供應商",
-        path: "/index/supplier",
+      //   path: "/index/supplier",
-      }
+      // }
     ],
   },
   {
-    title: "關於普達",
+    title: "關於我們",
     icon: Tickets,
     path: "/about",
     children: [
@@ -51,10 +51,10 @@ const menuData = ([
         title: "公司簡介",
         path: "/about/company",
       },
-      {
+      // {
-        title: "經營理念",
+      //   title: "經營理念",
-        path: "/about/concept",
+      //   path: "/about/concept",
-      }
+      // }
     ],
   },
   {
@@ -81,14 +81,14 @@ const menuData = ([
         title: "產業動態",
         path: "/news/list",
       },
-      {
+      // {
-        title: "公司活動",
+      //   title: "公司活動",
-        path: "/news/activity",
+      //   path: "/news/activity",
-      },
+      // },
-      {
+      // {
-        title: "ESG",
+      //   title: "ESG",
-        path: "/news/esg",
+      //   path: "/news/esg",
-      }
+      // }
     ],
   },  
   {
@@ -145,7 +145,7 @@ const handleSelect = (key, keyPath) => {
     :default-active="$route.path"
     @select="handleSelect"  
   >
-    <div class="logo"><el-image style="width: 100px;" :src="logoImg" /></div>
+    <div class="logo">WEISEN</div>
 
     <template v-for="(menu, index) in menuData" :key="index">
       <el-sub-menu

docker-compose-prod.yaml

@@ -6,6 +6,10 @@ services:
     container_name: "prodio-nginx"
     ports:
       - "6060:80"
+    depends_on:
+      - web
+      - api
+    restart: always      
     volumes:
       - ./nginx/html:/usr/share/nginx/html
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf
@@ -13,25 +17,28 @@ services:
       - ./data/nginx/logs:/var/log/nginx
     networks:
       - internal
-  # web:
+  web:
-  #   build:
-  #     context: .
-  #     dockerfile: ./nuxt/Dockerfile
-  #   container_name: "prodio-web"
-  #   ports:
-  #     - "6061:3000"
-  #   volumes:
-  #     - ./nuxt/app:/app
-  #   networks:
-  #     - internal
-  api:
-    # image: krisss/docker-webman:8.2-cli-alpine
     build:
       context: .
-      dockerfile: ./webman/Dockerfile
+      dockerfile: ./web/Dockerfile
+    container_name: "prodio-web"
+    ports:
+      - "6061:3000"
+    depends_on:
+      - api
+    restart: always      
+    volumes:
+      - ./web/app:/app
+    networks:
+      - internal
+  api:
+    image: krisss/docker-webman:8.2-cli-alpine
     container_name: "prodio-api"
     ports:
       - "6065:8787"
+    depends_on:
+      - mysql
+    restart: always      
     volumes:
       - ./app:/app
     networks:
@@ -41,25 +48,14 @@ services:
       context: .
       dockerfile: ./mysql/Dockerfile
     container_name: "prodio-mysql"
-    networks:
+    restart: always      
-      - internal
     volumes:
       - ./data/mysql/data:/var/lib/mysql
       - ./data/mysql/init:/docker-entrypoint-initdb.d
     environment:
       MYSQL_ROOT_PASSWORD: 1qazvfr4  
-  # redis:
+    networks:
-  #   image: redis
+      - internal
-  #   container_name: "prodio-redis"
-  #   networks:
-  #     - internal
-  mail:
-    image: boky/postfix
-    container_name: "prodio-mail"
-    environment:
-      - ALLOWED_SENDER_DOMAINS=prodio.com.tw
-      - POSTFIX_always_add_missing_headers=yes
-      - HOSTNAME=mail.prodio.com.tw # set to the hostname of the server
   phpmyadmin:
     image: phpmyadmin/phpmyadmin
     container_name: "prodio-myadmin"

web/app.vue

@@ -2,11 +2,11 @@
 import Cookies from 'js-cookie';
 
 useHead({
-  title: '普達國際',
+  title: 'WEISEN',
   viewport: 'width=device-width, initial-scale=1, maximum-scale=1',
   charset: 'utf-8',
   meta: [
-    { name: 'description', content: '普達國際,化工材料買賣' }
+    { name: 'description', content: 'WEISEN' }
   ],
   bodyAttrs: {
     

web/assets/css/main.css

@@ -12610,7 +12610,7 @@ footer.footer .dotCircle img {
   height: 250px !important;
 }
 .imgCnt.md {
-  height: 180px !important;
+  /* height: 180px !important; */
 }
 .imgCnt.sm {
   height: 120px !important;
@@ -13095,10 +13095,10 @@ footer.footer .dotCircle img {
   margin: 20px 0;
 }
 .main.products .section .content .block .cardGroup .card {
-  -webkit-box-orient: horizontal;
+  -webkit-box-orient: vertical;
   -webkit-box-direction: normal;
-      -ms-flex-direction: row;
+      -ms-flex-direction: column;
-          flex-direction: row;
+          flex-direction: column;
   margin-bottom: 10px;
   border: none;
   overflow: hidden;
@@ -13107,7 +13107,7 @@ footer.footer .dotCircle img {
   padding: 0;
 }
 .main.products .section .content .block .cardGroup .card .card-body .imgCnt {
-  width: 220px;
+  /* width: 220px; */
 }
 .main.products .section .content .block .cardGroup .card .card-footer {
   border: none;
@@ -13117,10 +13117,22 @@ footer.footer .dotCircle img {
   font-size: 18px;
   font-weight: bold;
   color: #2c2d3b;
+  display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;  
+  overflow: hidden;
+  text-overflow: ellipsis;  
 }
 .main.products .section .content .block .cardGroup .card .card-footer .card-desc {
   font-size: 14px;
   color: #355785;
+  height: 3em;
+  line-height: 1.5em;
+  display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;  
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 .main.products .section .content .block .cardGroup .card .card-footer .moreBtn {
   width: 120px;

web/assets/sass/page/_social.scss

@@ -8,7 +8,7 @@
                 .card-body{
                     padding: 0;                    
                     .imgCnt{
-                        width:100%;                        
+                        // width:100%;                        
                     }
                 }
                 .card-footer{

web/layouts/default.vue

@@ -50,9 +50,9 @@ watch(locale, (nVal,oVal) => {
       <div class="container">
         <a class="navbar-brand" href="javascript:;">
           <div class="logo" @click="router.push(localeLocation('/'))">
-            <img :src="logoImg" alt="prodio">
+            <!-- <img :src="logoImg" alt="prodio"> -->
+            WEISEN
           </div>
-          <p>since 2002</p>
         </a>
         <button ref="navbarToggler" class="navbar-toggler" type="button" data-bs-toggle="collapse"
           data-bs-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
@@ -61,13 +61,7 @@ watch(locale, (nVal,oVal) => {
         <div class="collapse navbar-collapse" id="navbarText">
           <ul class="navbar-nav ms-auto">
             <li class="nav-item">
-              <div class="nav-link">{{ $t('aboutus') }}</div>
+              <div class="nav-link" @click="goRoute(localeLocation('/about/company'))">{{ $t('aboutus') }}</div>
-              <ul class="dropdown-menu">
-                <li><a class="dropdown-item" href="javascript:;" @click="goRoute(localeLocation('/about/company'))">{{
-                  $t('About.company') }}</a></li>
-                <li><a class="dropdown-item" href="javascript:;" @click="goRoute(localeLocation('/about/concept'))">{{
-                  $t('About.concept') }}</a></li>
-              </ul>
             </li>
             <li class="nav-item">
               <div class="nav-link" data-toggle="dropdown" data-submenu>{{ $t('products') }}</div>
@@ -86,15 +80,7 @@ watch(locale, (nVal,oVal) => {
               </div>
             </li>
             <li class="nav-item">
-              <div class="nav-link">{{ $t('news') }}</div>
+              <div class="nav-link" @click="goRoute(localeLocation('/social/news'))">{{ $t('news') }}</div>
-              <ul class="dropdown-menu">
-                <li><a class="dropdown-item" @click="goRoute(localeLocation('/social/news'))">{{ $t('Social.news')
-                }}</a></li>
-                <li><a class="dropdown-item" @click="goRoute(localeLocation('/social/activity'))">{{
-                  $t('Social.activity') }}</a></li>
-                <li><a class="dropdown-item" @click="goRoute(localeLocation('/social/esg'))">{{
-                  $t('Social.esg') }}</a></li>
-              </ul>
             </li>
             <li class="nav-item">
               <div class="nav-link">{{ $t('contact') }}</div>
@@ -106,11 +92,11 @@ watch(locale, (nVal,oVal) => {
               </ul>
             </li>
           </ul>
-          <div class="landBtnGroup btn-group">
+          <!-- <div class="landBtnGroup btn-group">
             <NuxtLink class="btn chBtn" :class="{ active: locale === 'tw' }" :to="switchLocalePath('tw')">繁</NuxtLink>
             <NuxtLink class="btn chBtn" :class="{ active: locale === 'cn' }" :to="switchLocalePath('cn')">简</NuxtLink>
             <NuxtLink class="btn chBtn" :class="{ active: locale === 'en' }" :to="switchLocalePath('en')">EN</NuxtLink>
-          </div>
+          </div> -->
           <form class="searchBar" @submit="handleSearchSubmit">
 						<input class="form-control form-control-sm bg-silver border-0" type="search" 
             placeholder="產品搜尋" 
@@ -131,8 +117,10 @@ watch(locale, (nVal,oVal) => {
       <div class="row gx-lg-5 justify-content-between mb-5">
         <div class="col-12 col-lg-auto">
           <a class="logoGroup" href="javascript:;" @click="router.push(localeLocation('/'))">
-            <div class="logo"><img :src="logoImg" alt=""></div>
+            <div class="logo">
-            <p>since 2002</p>
+              <!-- <img :src="logoImg" alt=""> -->
+              WEISEN
+            </div>
           </a>
           <!-- <div class="share_link">
               <a href="#"><div class="item fb"><i class="fa-brands fa-facebook-f"></i></div></a>
@@ -184,6 +172,6 @@ watch(locale, (nVal,oVal) => {
         </div>
       </div>
     </div>
-    <div class="copyright">{{ $t('copyright') }}</div>
+    <div class="copyright">{{ config[locale].copyright }}</div>
   </footer>
 </template>

web/locales/cn.js

@@ -10,7 +10,6 @@ export default {
     searchResult: '搜寻结果',
     total: '共',
     num: '笔',
-    copyright: '普达国际 版权所有 © All Rights Reserved Copyright © 2013. All rights reserved.',
     Form: {
         submit: '确认送出',
     },

web/locales/en.js

@@ -10,7 +10,6 @@ export default {
     searchResult: 'Search Results',
     total: 'Total',
     num: 'Results',
-    copyright: 'Puda International. All Rights Reserved © Copyright 2013. All rights reserved.',
     Form: {
         submit: 'Submit',
     },

web/locales/tw.js

@@ -1,6 +1,6 @@
 export default {
     aboutus: '關於我們',
-    products: '產品應用資訊',
+    products: '產品介紹',
     news: '最新消息',
     contact: '聯絡我們',
     branch: '公司據點',
@@ -10,7 +10,6 @@ export default {
     searchResult: '搜尋結果',
     total: '共',
     num: '筆',
-    copyright: '普達國際 版權所有 © All Rights Reserved Copyright © 2013. All rights reserved.',
     Form: {
         submit: '確認送出',
     },

web/package.json

@@ -4,12 +4,14 @@
   "type": "module",
   "scripts": {
     "build": "nuxt build --dotenv .env",
+    "build:hot": "nuxt build --dotenv .env",
     "build:sta": "nuxt build --dotenv .env.staging",
     "dev": "nuxt dev --dotenv .env.development",
     "generate": "nuxt generate --dotenv .env.staging",
     "preview": "nuxt preview",
     "postinstall": "nuxt prepare",
     "postbuild:sta": "cp -rf .output/* ../nuxt/app && scp -r ../nuxt/app/* root@test:/www/wwwroot/prodio.zltest.com.tw/nuxt/app",
+    "postbuild:hot": "scp -r .output/* root@h888.fun:/opt/wwwroot/weisen/web/app",
     "postbuild": "rm -rf ../../prodio.prod/web/app/* && cp -rf .output/* ../../prodio.prod/web/app"
   },
   "devDependencies": {

web/pages/about.vue

@@ -30,10 +30,6 @@ const menuList = [
     "name": t('About.company'),
     "path": "/about/company"
   },
-  {
-    "name": t('About.concept'),
-    "path": "/about/concept"
-  },
 ]
 
 const currentRoute = ref('');

web/pages/index.vue

@@ -15,11 +15,11 @@ const { config } = storeToRefs(store);
 
 const bannerData = computed(() => bannerRes.value.data);
 const cateData = computed(() => cateRes.value.data);
-const supplierData = computed(() => supplierRes.value.data);
+// const supplierData = computed(() => supplierRes.value.data);
 
 const { data: bannerRes } = await useMyFetch('/index/getBannerList', "GET")
 const { data: cateRes } = await useMyFetch('/index/getParentCateList', "GET")
-const { data: supplierRes } = await useMyFetch('/index/getSupplierList', "GET")
+// const { data: supplierRes } = await useMyFetch('/index/getSupplierList', "GET")
 
 
 onMounted(async () => {
@@ -130,7 +130,7 @@ const goProd = (cid) => {
         </div>
       </section>
 
-      <section class="section supplier">
+      <!-- <section class="section supplier">
         <div class="container-fluid">
           <div class="swiper">
             <div class="swiper-wrapper">
@@ -140,7 +140,7 @@ const goProd = (cid) => {
             </div>
           </div>
         </div>
-      </section>
+      </section> -->
     </div>
   </div>
 </template>

web/pages/products/list/[cat_id].vue

@@ -32,20 +32,21 @@ watch(()=>route.params.cat_id,(nVal)=>{
             <!-- <span>{{ props.pData.nameEn }}</span> -->
         </div>
         <div class="bDesc">{{ cateData.description }}</div>
-        <div class="cardGroup">
+        <div class="cardGroup row g-3">
-          <NuxtLinkLocale class="card" v-for="(prod, i) in productList" :key="i"
+          <NuxtLinkLocale class="card col-6 col-md-6 col-lg-3" v-for="(prod, i) in productList" :key="i"
           :to="{path: '/products/detail/'+prod.id}">
             <div class="card-body">
               <div class="imgCnt md">
                 <img :src="prod.imageurl" :alt="prod.name">
               </div>
             </div>
-            <div class="card-footer">
+            <!-- <div class="card-footer">
               <div class="card-title">{{ prod.name }}</div>
               <div class="card-desc">{{ prod.description }}</div>
               <div class="moreBtn">more</div>
-            </div>
+            </div> -->
           </NuxtLinkLocale>
+
         </div>
       </div>
     </div>

web/pages/social.vue

@@ -39,14 +39,6 @@ const menuList = [
     "name":t('Social.news'), 
     "path":"/social/news"
   },
-  {
-    "name":t('Social.activity'),
-    "path":"/social/activity"
-  },
-  {
-    "name":t('Social.esg'),
-    "path":"/social/esg"
-  },
 ]
 
 const currentRoute = ref('');