feat: update 商品详情显示价格

zhongnanhuang
1 parent c3fd09af
Showing 4 changed files with 34 additions and 18 deletions
components/ProductDetail.vue
deploy/prod.sh
nuxt.config.ts
pages/products/index.vue
@@ -39,17 +39,19 @@
             <tr class="bg-grey-lighten-3">
               <th class="text-left headerBorder text-grey-darken-1">Product Name / Code</th>
               <th class="text-left headerBorder text-grey-darken-1">Specification and model</th>
-              <th class="text-left headerBorder text-grey-darken-1">Price</th>
+              <th v-if="info.priceShow!==undefined && info.priceShow" class="text-left headerBorder text-grey-darken-1">Price</th>
+              <th class="text-left headerBorder text-grey-darken-1">Actions</th>
             </tr>
           </thead>
           <tbody>
             <tr class="tr" v-for="item in info.ticketTypes || []" :key="item.rank">
               <td class="td text-grey-darken-4 font-weight-medium">{{ item.rank }}</td>
               <td class="td text-grey-darken-4 font-weight-medium">{{ item.typeName }}</td>
-              <!-- <td class="td">{{ item.price }}</td> -->
+              <td v-if="item.priceShow" class="td">{{ item.price+" "+item.priceUnit }}</td>
               <td class="td">
-                <v-btn size="small" color="blue-darken-1" @click="router.push('/contact')">
-                  Quotation Inquiry
+                <v-btn  size="small" color="blue-darken-1" @click="router.push('/contact')">
+                  <!-- Quotation Inquiry -->
+                  Quote
                 </v-btn>
               </td>
             </tr>
-#!/bin/bash
-
 # 变量定义
-IMAGE_NAME="canrud-outside-front"
-TAG="1.0.6"
-TAR_FILE="${IMAGE_NAME}_${TAG}.tar"
-REMOTE_HOST="root@112.74.45.244"
-REMOTE_DIR="/root/web/canrud-outside-nuxt-front"
+$IMAGE_NAME = "canrud-outside-front"
+$TAG = "1.0.7"
+$TAR_FILE = "${IMAGE_NAME}_${TAG}.tar"
+$REMOTE_HOST = "root@112.74.45.244"
+$REMOTE_DIR = "/root/web/canrud-outside-nuxt-front"
 # 步骤1: 构建 Docker 镜像
-echo "Building Docker image..."
+Write-Output "Building Docker image..."
 docker build -t ${IMAGE_NAME}:${TAG} .
 # 步骤2: 将 Docker 镜像导出为 tar 文件
-echo "Saving Docker image to tar file..."
+Write-Output "Saving Docker image to tar file..."
 docker save -o ${TAR_FILE} ${IMAGE_NAME}:${TAG}
 # 步骤3: 上传 tar 文件到服务器
-echo "Uploading tar file to server..."
-scp ${TAR_FILE} ${REMOTE_HOST}:${REMOTE_DIR}
+Write-Output "Uploading tar file to server..."
+# 使用 PowerShell 的内置命令来实现 SCP 功能
+$sourcePath = (Resolve-Path $TAR_FILE).Path
+$destinationPath = "${REMOTE_HOST}:${REMOTE_DIR}"
+Invoke-Expression "scp -o StrictHostKeyChecking=no $sourcePath $destinationPath"
-echo "All tasks completed!"
+Write-Output "All tasks completed!"
 \ No newline at end of file
@@ -39,6 +39,7 @@ export default defineNuxtConfig({
     devProxy: {
       '/shop': {
         target: 'http://47.89.254.121:8002/shop', // 线上代理地址
+        // target: 'http://127.0.0.1:8002/shop/**',
         // target: process.env.BASE_URL || 'http://39.108.227.113:8002/shop', // 目标接口域名
         changeOrigin: true, // 表示是否跨域
       }
@@ -47,6 +48,7 @@ export default defineNuxtConfig({
      routeRules: {
       '/shop/**': {
         proxy: 'http://47.89.254.121:8002/shop/**'
+        // proxy: 'http://127.0.0.1:8002/shop/**'
         // proxy: process.env.BASE_URL || 'http://39.108.227.113:8002/shop/**'
       }
     }
@@ -56,7 +56,7 @@ import { watchEffect, computed, ref } from &#39;vue&#39;
 const productStore = useProductListStore()
 const categoryStore = useCategoryStore()
 const loading = ref(false)
-
+const route = useRoute()  // 获取路由信息
 useHead({
   title: 'canrud',
   meta: [{
@@ -74,7 +74,9 @@ useHead({
   }
   ]
 })
-watchEffect(async () => {
+
+
+const loadProducts = async () => {
   let params: any = {
     pageNo: productStore.pageNo,
     pageSize: 20
@@ -102,6 +104,15 @@ watchEffect(async () =&gt; {
     await productStore.getList(params)
   }
   loading.value = false
+}
+
+
+
+watchEffect(async () => {
+  if(route.query.keyword !== undefined){
+    productStore.keyword = route.query.keyword
+  }
+  loadProducts();
 })
 const length = computed(() =>