bugfix

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) {

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;">
 

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;">￥{{
+                    <span v-if=" form.price && !isNaN(Number(form.price))" style="color: red;font-size: 14px;font-weight: bold;">￥
-                        ((form.price *
+                        <span v-if="form.discount == 0 || !form.discount">{{ Number(form.price)* 0.03.toFixed(2) }}</span>
-                        form.discount/10)*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>

f/web-kboss/src/views/homePage/ncmatch/proDetail/index.vue

@@ -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,7 +48,8 @@
                 <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">
 
@@ -182,6 +188,7 @@ export default {
         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;
 

f/web-kboss/src/views/login/indexNew.vue

@@ -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('运营')) {