From 968639f063289c46c2b3a279cd9cfd1cf3be19da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=A8=E7=93=9C=E4=B8=80=E5=9D=97=E5=85=AB?=
 <2523890936@qq.com>
Date: Fri, 15 Aug 2025 14:51:52 +0800
Subject: [PATCH] bugfix

---
 .../src/views/homePage/dialog/talk/index.vue  |  1 +
 .../ncmatch/mainPage/productCard/index.vue    |  4 ++
 .../ncmatch/mainPage/sendProduct/index.vue    | 11 +++-
 .../homePage/ncmatch/proDetail/index.vue      | 60 +++++++++++--------
 f/web-kboss/src/views/login/indexNew.vue      |  7 ++-
 5 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/f/web-kboss/src/views/homePage/dialog/talk/index.vue b/f/web-kboss/src/views/homePage/dialog/talk/index.vue
index 81f6672..3d41373 100644
--- a/f/web-kboss/src/views/homePage/dialog/talk/index.vue
+++ b/f/web-kboss/src/views/homePage/dialog/talk/index.vue
@@ -100,6 +100,7 @@ export default Vue.extend({
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
           this.addBtnLoading = true
+          this.addData.url_link = window.location.href
           reqNewHomeConsult(this.addData).then(response => {
             this.addBtnLoading = false
             if (response.status) {
diff --git a/f/web-kboss/src/views/homePage/ncmatch/mainPage/productCard/index.vue b/f/web-kboss/src/views/homePage/ncmatch/mainPage/productCard/index.vue
index 0411a2e..3be6828 100644
--- a/f/web-kboss/src/views/homePage/ncmatch/mainPage/productCard/index.vue
+++ b/f/web-kboss/src/views/homePage/ncmatch/mainPage/productCard/index.vue
@@ -89,6 +89,10 @@
 
 
 
+          </div>
+          <div class="product-price">
+            <span class="price">¥{{ item.discount_price }}</span>
+            <span class="price-unit">{{ item.unit }} {{ item.short_term === '1' ? '（可短租）' : '' }} </span>
           </div>
           <div style="display: flex;justify-content: space-between;align-items: center;">
 
diff --git a/f/web-kboss/src/views/homePage/ncmatch/mainPage/sendProduct/index.vue b/f/web-kboss/src/views/homePage/ncmatch/mainPage/sendProduct/index.vue
index 107dde0..0da8fed 100644
--- a/f/web-kboss/src/views/homePage/ncmatch/mainPage/sendProduct/index.vue
+++ b/f/web-kboss/src/views/homePage/ncmatch/mainPage/sendProduct/index.vue
@@ -114,6 +114,10 @@
 
             <div class="form-row">
                 <el-form-item label="价格" prop="price" required class="form-item-half">
+                    <template slot="label">
+                        <span v-if="publish_type === '1'"   >商品价格</span>
+                        <span v-if="publish_type === '2'">预期价格</span>
+                    </template>
                     <div class="price-unit-container">
                         <el-input v-model="form.price" placeholder="请输入价格" class="price-input"></el-input>
                         <el-input v-model="form.unit" placeholder="单位" class="unit-input"></el-input>
@@ -149,9 +153,10 @@
                                 style="margin-left: 5px; color: #333; cursor: pointer;"></i>
                         </el-tooltip>
                     </template>
-                    <span v-if="form.discount !== 0 && form.price" style="color: red;font-size: 14px;font-weight: bold;">￥{{
-                        ((form.price *
-                        form.discount/10)*0.03).toFixed(2) }}</span>
+                    <span v-if=" form.price && !isNaN(Number(form.price))" style="color: red;font-size: 14px;font-weight: bold;">￥
+                        <span v-if="form.discount == 0 || !form.discount">{{ Number(form.price)* 0.03.toFixed(2) }}</span>
+                        <span v-else>{{ (Number(form.price) * Number(form.discount) / 10 * 0.03).toFixed(2) }}</span>
+                    </span>
 
                     <span v-else>-</span>
                 </el-form-item>
diff --git a/f/web-kboss/src/views/homePage/ncmatch/proDetail/index.vue b/f/web-kboss/src/views/homePage/ncmatch/proDetail/index.vue
index e6661b2..0f70228 100644
--- a/f/web-kboss/src/views/homePage/ncmatch/proDetail/index.vue
+++ b/f/web-kboss/src/views/homePage/ncmatch/proDetail/index.vue
@@ -1,12 +1,12 @@
 <template>
     <div class="enterprise-demand-detail">
-<div style="display: flex;justify-content: space-between;align-items: center;">
-    <h1 class="demand-title" style="margin: 0 0;">
-            {{ productDetailInfo.product_name }}
-        
-        </h1>
-        <button v-if="!isApprove" class="consult-btn" @click="openTalk">立即咨询</button>
-</div>
+        <div style="display: flex;justify-content: space-between;align-items: center;">
+            <h1 class="demand-title" style="margin: 0 0;">
+                {{ productDetailInfo.product_name }}
+
+            </h1>
+            <button v-if="!isApprove" class="consult-btn" @click="openTalk">立即咨询</button>
+        </div>
         <!-- 标题区域 -->
         <ul class="title-section">
 
@@ -14,6 +14,11 @@
                 <span class="mylabel">企业名称：</span>
                 <span class="value">{{ productDetailInfo.company_name }}</span>
             </li>
+            <li class="info-item" style="margin:5px  0;">
+                <span class="mylabel"> <span v-if="productDetailInfo.publish_type === '1'   ">商品价格：</span> <span
+                        v-else>预期价格：</span></span>
+                <span class="value">￥{{ productDetailInfo.discount_price }}</span>
+            </li>
             <li class="info-item" style="margin:5px  0;">
                 <span class="mylabel">所属类别：</span>
                 <span class="value">{{ productDetailInfo.product_category }}</span>
@@ -43,13 +48,14 @@
                 <span class="value">{{ productDetailInfo.create_at ? productDetailInfo.create_at : '暂未发布' }}</span>
             </li>
         </ul>
-        <div v-if="productDetailInfo.cart_flag==='1'" style="position: relative;width: 100%;padding-left: 16px;" class="mysection">
+        <div v-if="productDetailInfo.cart_flag === '1'" style="position: relative;width: 100%;padding-left: 16px;"
+            class="mysection">
             <div class="section-title">配置数据</div>
             <div class="section-content">
 
             </div>
         </div>
-        <ul v-if="productDetailInfo.cart_flag==='1'" class="adUl">
+        <ul v-if="productDetailInfo.cart_flag === '1'" class="adUl">
             <li>
                 <div class="leftBox">
                     <img src="https://www.kaiyuancloud.cn/idfile?path=firstpagehot/ssc2x.png" alt="">
@@ -165,23 +171,24 @@ export default {
 </script>
 
 <style scoped lang="scss">
-      .consult-btn {
-        width: fit-content;
-        background: linear-gradient(90deg, #275AFF 0%, #2EBDFA 100%);
-        color: white;
-        border: none;
-        padding: 12px 24px;
-        border-radius: 8px;
-        font-size: 16px;
-        font-weight: 500;
-        cursor: pointer;
-        transition: all 0.3s ease;
+.consult-btn {
+    width: fit-content;
+    background: linear-gradient(90deg, #275AFF 0%, #2EBDFA 100%);
+    color: white;
+    border: none;
+    padding: 12px 24px;
+    border-radius: 8px;
+    font-size: 16px;
+    font-weight: 500;
+    cursor: pointer;
+    transition: all 0.3s ease;
+
+    &:hover {
+        transform: translateY(-1px);
+        box-shadow: 0 4px 12px rgba(39, 90, 255, 0.3);
+    }
+}
 
-        &:hover {
-          transform: translateY(-1px);
-          box-shadow: 0 4px 12px rgba(39, 90, 255, 0.3);
-        }
-      }
 .mylabel {
     font-weight: 500;
     color: #252424;
@@ -344,6 +351,7 @@ export default {
     border-radius: 8px;
 
     .info-item {
+        width: 120px;
         display: flex;
         margin-bottom: 10px;
 
@@ -433,7 +441,7 @@ export default {
     margin-bottom: 30px;
 
     .section-title {
-margin-bottom: 10px;
+        margin-bottom: 10px;
         font-size: 14px;
         color: #333;
         font-weight: bold !important;
diff --git a/f/web-kboss/src/views/login/indexNew.vue b/f/web-kboss/src/views/login/indexNew.vue
index bf4c43e..8b4becc 100644
--- a/f/web-kboss/src/views/login/indexNew.vue
+++ b/f/web-kboss/src/views/login/indexNew.vue
@@ -846,7 +846,7 @@ export default {
                       if (this.$route.query.fromPath === 'homePage') {
                         // this.$router.push({path: "/homePage/index"});
                         if (this.$route.query.type === 'bd') {
-                          // this.$router.push('/product/baiduProduct')
+                          // this.$router.push('/product/baiduProduct') 
                           this.goBaidu(this.$route.query.listUrl, this.$route.query.url)
 
                         } else if (this.$route.query.type === 'ali') {
@@ -855,11 +855,12 @@ export default {
                         } else if (this.$route.query.type === 'rqy') {
                           this.$router.push("/product/productHome/k8s/createK8s");
                         } else {
-                          this.$router.push("/homePage/index");
+                          this.$router.push(getHomePath());
                         }
 
                       } else {
-                        this.$router.push({name: "productHome"});
+
+                        this.$router.push(getHomePath());
                       }
 
                     } else if (res.roles.includes('运营')) {