bugfix

f/web-kboss/src/router/index.js

@@ -66,10 +66,9 @@ export const constantRoutes = [
     hidden: true
   },
   {
-    hidden: true,
     alwaysShow: true,
     path: "/productMangement",
-    component: Layout,
+    component:Layout,
     name: "productMangement",
     redirect: "/productMangement/index",
     meta: { fullPath: "/productMangement", title: "商品管理", noCache: true, icon: 'el-icon-s-home' },
@@ -183,7 +182,6 @@ export const constantRoutes = [
     meta: { title: "注册" },
   },
   {
-    hidden: true,
     path: "/ncmatchHome",
     component: () => import("@/views/homePage/ncmatch/index.vue"),
     name: "ncmatchHome",
@@ -747,7 +745,6 @@ export const asyncRoutes = [
       meta: { title: "工单管理", fullPath: "/customer/workOrderManagement" },
     },
     {
-      hidden: true,
       path: 'approve',
       component: () => import('@/views/customer/ncApprove/index.vue'),
       name: "Approve",
@@ -839,7 +836,7 @@ export const asyncRoutes = [
       ), name: "userResource", meta: { title: "资源实例", fullPath: "/customer/userResource", noCache: true },
     },
     {
-      hidden: true,
+
       path: "sshTerminal",
       component: () => import(
         // "@/views/customer/userResource/iframeJiNan.vue"//iframe报错

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

@@ -125,17 +125,31 @@
             </div>
             <div class="form-row">
                 <el-form-item label="折扣"   class="full-width">
-                    <el-input-number :controls="false" v-model="form.discount" :precision="2" :step="0.01" :max="10">
+                    <el-input-number style="width: 120px;" :controls="false" v-model="form.discount" :precision="2" :step="0.01" :max="10">
                     </el-input-number>
                 <span style="margin-left: 10px; font-weight: bold;">    折</span>
+                <span style="margin-left: 10px; font-weight: bold;font-size: 14px;">折后价:
+<span v-if="form.discount!==0&&form.price" style="color: red;">￥{{ (form.price * form.discount/10).toFixed(2 ) }}</span>
+<span v-else>-</span>
+                </span>
                     <!-- <el-input v-model="form.discount" placeholder="请输入折扣" type="number">
                         <template slot="append">折</template>
                     </el-input> -->
                 </el-form-item>
-                <!-- <el-form-item label="折扣后价格"   class="full-width">
+                <el-form-item class="full-width">
+                    <template slot="label">
+                        <span>平台服务费用</span>
+                        <el-tooltip 
+                            content="平台服务费用为商品价格的3%，如有疑问请联系客服进行处理。" 
+                            placement="top" 
+                            effect="light">
+                            <i class="el-icon-warning-outline" 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>{{ form.price * form.discount }}</span>
+                    <span v-else>-</span>
-                </el-form-item> -->
+                </el-form-item>
             </div>
 
             <el-form-item :label="publish_type === '2' ? '需求概述' : '商品概述'" prop="requirement_summary" required
@@ -157,7 +171,7 @@
             <div class="form-actions">
                 <el-button type="primary" @click="submitForm" size="large">{{ publish_type === '2' ? '发布需求' : '发布商品'
                     }}</el-button>
-                <el-button @click="resetForm" size="large">重置</el-button>
+                <!-- <el-button @click="resetForm" size="large">重置</el-button> -->
                 <!-- <el-button type="info" @click="getBinaryData" size="large">获取二进制数据</el-button> -->
             </div>
         </el-form>

f/web-kboss/src/views/setting/tools.js

@@ -1,6 +1,6 @@
 export function getHomePath() {
-  let homePath= "/homePage/index"
+  // let homePath= "/homePage/index"
-  // let homePath= "/ncmatchHome/index"
+  let homePath= "/ncmatchHome/index"
 
   // 业主机构信息
   let url_link = window.location.href || '';
@@ -24,5 +24,5 @@ export function getHomePath() {
     }
   }
   console.log("res是",homePath)
-  return "/homePage/index"
+  return homePath
 }