diff --git a/cas_web_03.zip b/cas_web_03.zip
deleted file mode 100644
index 46c88ca..0000000
Binary files a/cas_web_03.zip and /dev/null differ
diff --git a/package.json b/package.json
index c7fff4e..5fa7e88 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
   "dependencies": {
     "@element-plus/icons-vue": "1.1.4",
     "@vueuse/core": "8.5.0",
-    "@wangeditor/editor": "^5.1.14",
+    "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "0.26.1",
     "echarts": "^5.4.0",
diff --git a/src/api/website/solution/index.js b/src/api/website/solution/index.js
index 231f352..3dfe2d0 100644
--- a/src/api/website/solution/index.js
+++ b/src/api/website/solution/index.js
@@ -16,3 +16,11 @@ export function getInfo(params) {
     params,
   });
 }
+
+// 获取分类
+export function getCategory() {
+  return request({
+    url: "/app/solution/getCategory",
+    method: "get",
+  });
+}
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index 584a79a..4e54855 100644
Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ
diff --git a/src/assets/logo/logo_small.png b/src/assets/logo/logo_small.png
new file mode 100644
index 0000000..584a79a
Binary files /dev/null and b/src/assets/logo/logo_small.png differ
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index b65746d..8ac1f4d 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -1,5 +1,10 @@
 <template>
-  <div :style="`border: 1px solid #ccc; width: ${width}px`">
+  <div
+    :style="`border: 1px solid #ccc; width: ${width}px`"
+    :class="{
+      disabled: readOnly,
+    }"
+  >
     <Toolbar
       style="border-bottom: 1px solid #ccc"
       :editor="editorRef"
@@ -7,12 +12,14 @@
       :mode="mode"
     />
     <Editor
-      :style="`min-height: ${minHeight}px; height: ${height}px; overflow-y: hidden`"
+      :style="`min-height: ${minHeight}px; height: ${height}px;
+    overflow-y: hidden`"
       v-model="valueHtml"
       :defaultConfig="editorConfig"
       :mode="mode"
       @onCreated="handleCreated"
       @onChange="handleChange"
+      @onBlur="emitBlur"
     />
   </div>
 </template>
@@ -20,16 +27,37 @@
 <script>
 import "@wangeditor/editor/dist/css/style.css"; // 引入 css
 import { getToken } from "@/utils/auth";
-import { onBeforeUnmount, ref, shallowRef, onMounted, toRefs } from "vue";
+import {
+  onBeforeUnmount,
+  ref,
+  shallowRef,
+  onMounted,
+  toRefs,
+  nextTick,
+  watch,
+  computed,
+  // readonly,
+} from "vue";
 import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 export default {
   components: { Editor, Toolbar },
+  // expose: {
+  //   isEmpty,
+  // },
   props: {
+    readOnly: {
+      type: Boolean,
+      default: false,
+    },
     modelValue: {
       type: String,
       default: "",
     },
+    placeholder: {
+      type: String,
+      default: "请输入内容",
+    },
     minHeight: {
       type: [String, Number],
       default: 300,
@@ -50,6 +78,9 @@ export default {
   setup(props, context) {
     // 编辑器实例，必须用 shallowRef
     const editorRef = shallowRef();
+    // editorRef.value.on("blur", () => {
+    //   console.log("blur");
+    // });
 
     // 内容 HTML
     const valueHtml = ref("");
@@ -61,11 +92,16 @@ export default {
       { immediate: true }
     );
     const { height } = toRefs(props);
+
     const toolbarConfig = {
       excludeKeys: [],
     };
+    // onBlur: (editor) => {
+    //   console.log("onBlur");
+    // },
     const editorConfig = {
-      placeholder: "请输入内容...",
+      placeholder: props.placeholder,
+      readOnly: props.readOnly,
       MENU_CONF: {
         uploadImage: {
           server: `${baseUrl}/common/upload`,
@@ -84,7 +120,10 @@ export default {
       },
     };
 
-    // console.log(editor.getMenuConfig('uploadImage'));
+    const isEmpty = () => {
+      return editorRef.value.isEmpty();
+    };
+
     // 组件销毁时，也及时销毁编辑器
     onBeforeUnmount(() => {
       const editor = editorRef.value;
@@ -96,8 +135,19 @@ export default {
       editorRef.value = editor; // 记录 editor 实例，重要！
     };
     const handleChange = (editor) => {
-      context.emit("update:modelValue", editor.getHtml());
+      if (editor.isEmpty()) {
+        context.emit("update:modelValue", "");
+      } else {
+        context.emit("update:modelValue", editor.getHtml());
+      }
     };
+    context.expose({ isEmpty });
+
+    const emitBlur = () => {
+      context.emit("blur", editorRef.value);
+      // editorRef.value.emit("blur");
+    };
+
     return {
       editorRef,
       valueHtml,
@@ -107,7 +157,25 @@ export default {
       height,
       handleCreated,
       handleChange,
+      // isEmpty,
+      emitBlur,
     };
   },
 };
 </script>
+<style lang="scss" scoped>
+.disabled {
+  background-color: #f5f7fa;
+  cursor: not-allowed;
+  :deep(.w-e-text-container) {
+    background-color: inherit;
+    // color: green;
+    opacity: 0.5;
+  }
+  :deep(.w-e-toolbar) {
+    user-select: none;
+    pointer-events: none;
+    background-color: inherit;
+  }
+}
+</style>
diff --git a/src/components/WebsiteHeader/index.vue b/src/components/WebsiteHeader/index.vue
index 52bded0..98c1907 100644
--- a/src/components/WebsiteHeader/index.vue
+++ b/src/components/WebsiteHeader/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="webHead">
     <el-row>
-      <el-col :span="8">
+      <el-col :span="5">
         <img src="@/assets/logo/logo.png" class="logo" />
       </el-col>
       <el-col :span="16">
@@ -23,6 +23,19 @@
               解决方案
             </div>
             <div class="show_box">
+              <div
+                v-for="item in categoryList"
+                class="pointer"
+                :class="
+                  pagePath == `/solution/${item.id}` ? 'x_blue _active' : ''
+                "
+                @click="handlePath(`/solution/${item.id}?name=${item.name}`)"
+              >
+                {{ item.name }}
+              </div>
+              <!--
+
+             
               <div
                 class="pointer"
                 :class="pagePath == '/solution/small' ? 'x_blue _active' : ''"
@@ -55,6 +68,7 @@
               >
                 科研区域服务
               </div>
+               -->
             </div>
           </li>
           <li class="menu-item1">
@@ -84,7 +98,7 @@
               关于我们
             </div>
           </li>
-          <li class="menu-item1" style="display: flex; justify-content: center">
+          <li class="menu-item1 profile-menu-group" style="display: flex">
             <div
               v-if="!userStore.avatar"
               class="menu-item-tit"
@@ -93,9 +107,39 @@
             >
               登录注册
             </div>
-
-            <el-dropdown
-              v-else
+            <!-- <el-popover
+              
+              placement="bottom"
+              :title="`32`"
+              :width="200"
+              trigger="hover"
+              :content="userStore.nickName"
+            > -->
+            <!-- content="this is content, this is content, this is content" -->
+            <!-- <template #reference> -->
+            <div v-else class="avatar-wrapper">
+              <img :src="userStore.avatar" class="user-avatar" />
+              <i class="el-icon-caret-bottom" />
+            </div>
+            <!-- </template> -->
+            <!-- </el-popover> -->
+            <div
+              v-if="userStore.avatar"
+              class="menu-item-tit"
+              :class="pagePath == '/login' ? 'active' : ''"
+              @click="handlePage"
+            >
+              个人中心
+            </div>
+            <div
+              v-if="userStore.avatar"
+              class="menu-item-tit"
+              :class="pagePath == '/login' ? 'active' : ''"
+              @click="logout"
+            >
+              退出登录
+            </div>
+            <!-- <el-dropdown
               style="margin-top: 20px"
               class="avatar-container right-menu-item hover-effect"
               trigger="click"
@@ -106,17 +150,17 @@
               </div>
               <template #dropdown>
                 <el-dropdown-menu>
-                  <!-- <router-link to="/identity/index"> -->
+                 // <router-link to="/identity/index">
                   <el-dropdown-item @click="handlePage"
                     >个人中心</el-dropdown-item
                   >
-                  <!-- </router-link> -->
+                 // </router-link>
                   <el-dropdown-item divided @click="logout">
                     <span>退出登录</span>
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </template>
-            </el-dropdown>
+            </el-dropdown> -->
           </li>
         </ul>
       </el-col>
@@ -130,12 +174,20 @@ import { defineComponent, onMounted, reactive, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 
 import useUserStore from "@/store/modules/user";
+import { getCategory } from "@/api/website/solution";
 
 const userStore = useUserStore();
 let state = reactive({});
 let pagePath = ref("");
 const route = useRoute();
 const router = useRouter();
+
+const categoryList = ref([]);
+const loadCategoryList = async () => {
+  const { data } = await getCategory();
+  categoryList.value = data;
+};
+loadCategoryList();
 watch(
   () => route.path,
   (newVal, oldVal) => {
@@ -161,7 +213,8 @@ function handlePage() {
 
 function handlePath(path) {
   pagePath.value = path;
-  router.push(path);
+  // router.push(path);
+  window.open(path, "_blank");
 }
 function logout() {
   ElMessageBox.confirm("确定注销并退出系统吗？", "提示", {
@@ -211,6 +264,7 @@ dt {
   }
   .menu {
     display: flex;
+    // justify-content: space-between;
     .solution {
       position: relative;
       .show_box {
@@ -221,8 +275,9 @@ dt {
         text-align: center;
         background-color: red;
         div {
-          height: 42px;
-          line-height: 42px;
+          // height: 42px;
+          // line-height: 42px;
+          padding: 8px 0;
           font-size: 14px;
           color: #666666;
           background-color: #f2f6ff;
@@ -259,13 +314,22 @@ dt {
         border-bottom: 2.5px solid #000;
       }
     }
+    .profile-menu-group {
+      height: 71px;
+      flex: 2;
+      justify-content: space-between;
+      align-items: center;
+      // .avatar-wrapper {
+      //   padding-top: 25px;
+      // }
+    }
   }
 }
 </style>
 
 <style lang="scss" scoped>
 .user-avatar {
-  cursor: pointer;
+  // cursor: pointer;
   width: 40px;
   height: 40px;
   border-radius: 50%;
diff --git a/src/components/webFooter/index.vue b/src/components/webFooter/index.vue
index 604b614..13ac1b1 100644
--- a/src/components/webFooter/index.vue
+++ b/src/components/webFooter/index.vue
@@ -1,11 +1,17 @@
 <template>
   <div class="webFooter">
     <div class="wrap">
-      <el-row>
-        <el-col :span="4" v-for="(item, index) in state.list" :key="index">
+      <el-row type="flex" justify="center" :gutter="100">
+        <el-col :span="6" v-for="item in state.list" :key="item.id">
           <div class="tit">{{ item.title }}</div>
-          <p v-for="(item2, index2) in item.children" :key="index2">
-            <a :href="item2.link" target="_black">{{ item2.title }}</a>
+          <p v-for="subItem in item.children" :key="subItem.id">
+            <a :href="`${subItem.link}`" target="_black">{{ subItem.title }}</a>
+          </p>
+        </el-col>
+        <!-- <el-col :span="4">
+          <div class="tit">创新服务</div>
+          <p v-for="(item, index2) in state.list[1].children" :key="index2">
+            <a :href="item.link" target="_black">{{ item.title }}</a>
           </p>
         </el-col>
         <el-col :span="8">
@@ -19,7 +25,7 @@
           <p>
             <a href="">地址：{{ state.address }}</a>
           </p>
-        </el-col>
+        </el-col> -->
         <!-- <el-col :span="4" style="text-align: center;">
                     <div class="tit">二维码</div>
                     <p><img class="qrcode" src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fbpic.588ku.com%2Felement_origin_min_pic%2F01%2F39%2F53%2F71573cc4a35de96.jpg&refer=http%3A%2F%2Fbpic.588ku.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1643849770&t=80c12feeca42dad377bbdde1d6e78f33" alt=""></p>
@@ -41,6 +47,7 @@
 <script setup>
 import request from "@/utils/request";
 import { onMounted, reactive, watch } from "vue";
+import { getCategory } from "@/api/website/solution";
 
 function navigation() {
   return request({
@@ -66,57 +73,164 @@ function getNavigation() {
   //   }
   // });
   const res = {
+    msg: "操作成功",
     code: 200,
-    message: "ok",
     data: [
       {
-        title: "解决方案",
+        id: 21,
+        tenantId: 3,
+        parentId: 0,
+        title: "创新服务",
         link: "/",
-        is_target: false,
+        targetFlag: "0",
+        sort: 0,
+        status: "1",
+        createTime: "2022-02-21 14:03:28",
+        updateTime: "2022-02-21 14:03:28",
         children: [
           {
-            title: "大型企业方服务",
-            link: "/",
-            is_target: false,
+            id: 22,
+            tenantId: 1,
+            parentId: 21,
+            title: "中科院设备共享平台",
+            link: "http://samp.cas.cn",
+            targetFlag: "0",
+            sort: 0,
+            status: "1",
+            createTime: "2022-02-21 14:03:47",
+            updateTime: "2022-02-21 14:03:47",
+            children: [],
+          },
+          {
+            id: 23,
+            tenantId: 1,
+            parentId: 21,
+            title: "中科院文献情报中心",
+            link: "https://www.las.ac.cn",
+            targetFlag: "0",
+            sort: 0,
+            status: "1",
+            createTime: "2022-02-21 14:04:52",
+            updateTime: "2022-02-21 14:04:52",
+            children: [],
+          },
+          {
+            id: 25,
+            tenantId: 1,
+            parentId: 21,
+            title: "中国科学院",
+            link: "https://www.cas.cn",
+            targetFlag: "0",
+            sort: 0,
+            status: "1",
+            createTime: "2022-02-21 14:05:59",
+            updateTime: "2022-02-21 14:05:59",
+            children: [],
+          },
+          {
+            id: 26,
+            tenantId: 1,
+            parentId: 21,
+            title: "中科院重庆院合肥分院",
+            link: "http://www.caszl.cn",
+            targetFlag: "0",
+            sort: 0,
+            status: "1",
+            createTime: "2022-02-21 14:06:29",
+            updateTime: "2022-02-21 14:06:29",
             children: [],
           },
-          { title: "科研院所服务", link: "/", is_target: false, children: [] },
-          { title: "政府区域服务", link: "/", is_target: false, children: [] },
         ],
       },
       {
-        title: "创新服务",
+        id: 29,
+        tenantId: 3,
+        parentId: 0,
+        title: "联系我们",
         link: "/",
-        is_target: false,
+        targetFlag: "0",
+        sort: 0,
+        status: "1",
+        createTime: "2022-11-15 16:20:19",
+        updateTime: null,
         children: [
           {
-            title: "中科院设备共享平台",
-            link: "http://samp.cas.cn",
-            is_target: false,
+            id: 30,
+            tenantId: 3,
+            parentId: 29,
+            title: "客服电话：18156053255",
+            link: "/",
+            targetFlag: "0",
+            sort: 0,
+            status: "1",
+            createTime: "2022-11-15 16:20:39",
+            updateTime: null,
             children: [],
           },
           {
-            title: "中科院文献情报中心",
-            link: "https://www.las.ac.cn",
-            is_target: false,
+            id: 31,
+            tenantId: 3,
+            parentId: 29,
+            title: "邮箱：zky@gmail.com",
+            link: "/",
+            targetFlag: "0",
+            sort: 0,
+            status: "1",
+            createTime: "2022-11-15 16:20:56",
+            updateTime: null,
             children: [],
           },
           {
-            title: "中科院重庆院",
-            link: "http://www.cigit.cas.cn/loading",
-            is_target: false,
+            id: 32,
+            tenantId: 3,
+            parentId: 29,
+            title: "地址：安徽省合肥市高新区创新产业园D1南楼",
+            link: "/",
+            targetFlag: "0",
+            sort: 0,
+            status: "1",
+            createTime: "2022-11-15 16:21:43",
+            updateTime: null,
+            children: [],
+          },
+        ],
+      },
+      {
+        id: 33,
+        tenantId: 3,
+        parentId: 0,
+        title: "解决方案",
+        link: "/",
+        targetFlag: "0",
+        sort: 0,
+        status: "1",
+        createTime: "2022-11-15 16:22:41",
+        updateTime: null,
+        children: [
+          {
+            id: 34,
+            tenantId: 3,
+            parentId: 33,
+            title: "企业创新升级",
+            link: "/",
+            targetFlag: "0",
+            sort: 0,
+            status: "1",
+            createTime: "2022-11-15 16:22:58",
+            updateTime: null,
             children: [],
           },
           {
-            title: "中国科学院",
-            link: "https://www.cas.cn",
-            is_target: false,
-            children: [],
-          },
-          {
-            title: "中科院重庆院合肥分院",
-            link: "http://www.caszl.cn",
-            is_target: false,
+            id: 35,
+            tenantId: 3,
+            parentId: 33,
+            title: "成果转化",
+            link: "/",
+            targetFlag: "0",
+            sort: 0,
+            status: "1",
+            createTime: "2022-11-15 16:23:21",
+            updateTime: null,
             children: [],
           },
         ],
@@ -162,6 +276,13 @@ async function getConfig() {
 }
 getNavigation();
 getConfig();
+
+const solutionCategoryList = ref([]);
+const loadsolutionCategoryList = async () => {
+  const { data } = await getCategory();
+  solutionCategoryList.value = data;
+};
+loadsolutionCategoryList();
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index bd79c96..dc5cc9d 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -16,7 +16,7 @@
         class="sidebar-logo-link"
         to="/"
       >
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <img v-if="logoSmall" :src="logoSmall" class="sidebar-logo-small" />
         <h1
           v-else
           class="sidebar-title"
@@ -51,6 +51,7 @@
 <script setup>
 import variables from "@/assets/styles/variables.module.scss";
 import logo from "@/assets/logo/logo.png";
+import logoSmall from "@/assets/logo/logo_small.png";
 import useSettingsStore from "@/store/modules/settings";
 
 defineProps({
@@ -60,7 +61,7 @@ defineProps({
   },
 });
 
-const title = ref("中科云");
+const title = ref("数字科创大脑");
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
 </script>
@@ -89,11 +90,20 @@ const sideTheme = computed(() => settingsStore.sideTheme);
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
+      // width: 32px;
+      width: 75px;
       height: 32px;
       vertical-align: middle;
       margin-right: 12px;
     }
+    & .sidebar-logo-small {
+      // width: 32px;
+      width: unset;
+      height: 22px;
+      vertical-align: middle;
+      // margin-right: 12px;
+      margin-right: 0;
+    }
 
     & .sidebar-title {
       display: inline-block;
diff --git a/src/permission.js b/src/permission.js
index 9e42ae6..d710fc9 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -27,6 +27,7 @@ const whiteList = [
 ];
 const whiteListReg = [
   /\/solution\/detail\/[0-9]+/,
+  /\/solution\/[0-9]+/,
   /\/innovate\/detail\/[0-9]+/,
   /\/searchList\/[\S]+/,
   /\/searchList\/[\S]+\/detail\/[0-9]+/,
diff --git a/src/router/index.js b/src/router/index.js
index 16290c8..f0f6d58 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -47,89 +47,94 @@ export const constantRoutes = [
         path: "searchList/enterprise",
         component: () => import("../views/website/searchList/enterprise.vue"),
         meta: {
-          searchType: 1
-        }
+          searchType: 1,
+        },
       },
       {
         path: "searchList/enterprise/detail/:id",
         component: () =>
           import("../views/website/searchList/enterpriseDetail.vue"),
         meta: {
-          searchType: 1
-        }
+          searchType: 1,
+        },
       },
       {
         path: "searchList/achievement",
         component: () => import("../views/website/searchList/achievement.vue"),
         meta: {
-          searchType: 2
-        }
+          searchType: 2,
+        },
       },
       {
         path: "searchList/achievement/detail/:id",
-        component: () => import("../views/website/searchList/achievementDetail.vue"),
+        component: () =>
+          import("../views/website/searchList/achievementDetail.vue"),
         meta: {
-          searchType: 2
-        }
+          searchType: 2,
+        },
       },
       {
         path: "searchList/patent",
         component: () => import("../views/website/searchList/patent.vue"),
         meta: {
-          searchType: 4
-        }
+          searchType: 4,
+        },
       },
       {
         path: "searchList/patent/detail/:id",
         component: () => import("../views/website/searchList/patentDetail.vue"),
         meta: {
-          searchType: 4
-        }
+          searchType: 4,
+        },
       },
       {
         path: "searchList/expert",
         component: () => import("../views/website/searchList/expert.vue"),
         meta: {
-          searchType: 5
-        }
+          searchType: 5,
+        },
       },
       {
         path: "searchList/expert/detail/:id",
         component: () => import("../views/website/searchList/expertDetail.vue"),
         meta: {
-          searchType: 5
-        }
+          searchType: 5,
+        },
       },
       {
         path: "searchList/serviceDemand",
-        component: () => import("../views/website/searchList/serviceDemand.vue"),
+        component: () =>
+          import("../views/website/searchList/serviceDemand.vue"),
         meta: {
-          searchType: 7
-        }
+          searchType: 7,
+        },
       },
       {
         path: "searchList/serviceDemand/detail/:id",
-        component: () => import("../views/website/searchList/serviceDemandDetail.vue"),
+        component: () =>
+          import("../views/website/searchList/serviceDemandDetail.vue"),
         meta: {
-          searchType: 7
-        }
+          searchType: 7,
+        },
       },
       {
         path: "searchList/technologyDemand",
-        component: () => import("../views/website/searchList/technologyDemand.vue"),
+        component: () =>
+          import("../views/website/searchList/technologyDemand.vue"),
         meta: {
-          searchType: 6
-        }
+          searchType: 6,
+        },
       },
       {
         path: "searchList/technologyDemand/detail/:id",
-        component: () => import("../views/website/searchList/technologyDemandDetail.vue"),
+        component: () =>
+          import("../views/website/searchList/technologyDemandDetail.vue"),
         meta: {
-          searchType: 6
-        }
+          searchType: 6,
+        },
       },
       {
-        path: "solution/:name",
+        path: "solution/:mode",
         name: "solution",
         component: () => import("../views/website/solution/solution.vue"),
       },
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 81dfb5d..b5eb433 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -11,6 +11,8 @@ const useUserStore = defineStore("user", {
     permissions: [],
     roleId: localStorage.getItem("role-id") ?? 1,
     userId: "",
+    nickName: "",
+    enterprise: {},
   }),
   actions: {
     // 登录
@@ -37,6 +39,7 @@ const useUserStore = defineStore("user", {
         getInfo()
           .then((res) => {
             const user = res.data.user;
+            const enterprise = res.data.enterprise;
             const userId = user.userId;
             const avatar =
               user.avatar == "" || user.avatar == null
@@ -53,6 +56,8 @@ const useUserStore = defineStore("user", {
             this.name = user.userName;
             this.avatar = avatar;
             this.userId = userId;
+            this.nickName = user.nickName;
+            this.enterprise = enterprise;
             resolve(res);
           })
           .catch((error) => {
diff --git a/src/utils/parameter.js b/src/utils/parameter.js
index 9e5638e..4ae1f47 100644
--- a/src/utils/parameter.js
+++ b/src/utils/parameter.js
@@ -1,69 +1,76 @@
 // 归属导航
 export const modeOptions = [
-	{
-		value: 101,
-		label: '中小企业服务',
-	},
-	{
-		value: 102,
-		label: '大型企业服务',
-	},
-	{
-		value: 103,
-		label: '政府企业服务',
-	},
-	{
-		value: 104,
-		label: '科研院所服务',
-	},
-]
+  {
+    value: 101,
+    label: "中小企业服务",
+  },
+  {
+    value: 102,
+    label: "大型企业服务",
+  },
+  {
+    value: 103,
+    label: "政府企业服务",
+  },
+  {
+    value: 104,
+    label: "科研院所服务",
+  },
+];
 // 学历
 export const educationOptions = [
-	{ key: 1, text: '小学' },
-	{ key: 2, text: '初中' },
-	{ key: 3, text: '高中' },
-	{ key: 4, text: '大专' },
-	{ key: 5, text: '本科' },
-	{ key: 6, text: '研究生' },
-	{ key: 7, text: '博士' },
-]
+  { key: 1, text: "小学" },
+  { key: 2, text: "初中" },
+  { key: 3, text: "高中" },
+  { key: 4, text: "大专" },
+  { key: 5, text: "本科" },
+  { key: 6, text: "研究生" },
+  { key: 7, text: "博士" },
+];
 // 企业类型
 export const enterpriseOptions = [
-	{ key: "101", value: '上市企业' },
-	{ key: "102", value: '优质企业' },
-	{ key: "103", value: '普通企业' },
-]
+  { key: "101", value: "上市企业" },
+  { key: "102", value: "独角兽企业" },
+  { key: "103", value: "国家级专精特新企业" },
+  { key: "104", value: "高新技术企业" },
+  { key: "105", value: "科技企业" },
+];
+// export const enterpriseOptions = [
+// 	{ key: "101", value: '上市企业' },
+// 	{ key: "102", value: '优质企业' },
+// 	{ key: "103", value: '普通企业' },
+// ]
 // 成果成熟度  技术
 export const maturityOptions = [
-	{ key: "1", value: '正在研发' },
-	{ key: "2", value: '小试阶段' },
-	{ key: "3", value: '通过小试' },
-	{ key: "4", value: '中试阶段' },
-	{ key: "5", value: '通过中试' },
-	{ key: "6", value: '可规模生产' },
-]
+  { key: "1", value: "正在研发" },
+  { key: "2", value: "小试阶段" },
+  { key: "3", value: "通过小试" },
+  { key: "4", value: "中试阶段" },
+  { key: "5", value: "通过中试" },
+  { key: "6", value: "可规模生产" },
+];
 // 成果领先型  领先标准
 export const leadOptions = [
-	{ key: "1", value: '国内先进' },
-	{ key: "2", value: '国内领先' },
-	{ key: "3", value: '国际先进' },
-	{ key: "4", value: '国际领先' },
-]
+  { key: "1", value: "国内先进" },
+  { key: "2", value: "国内领先" },
+  { key: "3", value: "国际先进" },
+  { key: "4", value: "国际领先" },
+];
 // 专利类型
 export const patentOptions = [
-	{ key: "1", value: '发明专利' },
-	{ key: "2", value: '外观设计' },
-	{ key: "3", value: '实用新型' },
-]
+  { key: "1", value: "发明专利" },
+  { key: "2", value: "外观设计" },
+  { key: "3", value: "实用新型" },
+];
 // 合作模式
 export const cooperationOptions = [
-	{ key: "101", value: '技术转让' },
-	{ key: "102", value: '技术许可' },
-	{ key: "103", value: '技术入股' },
-	{ key: "104", value: '合作开发' },
-	{ key: "105", value: '融资' },
-	{ key: "106", value: '公司' },
-	{ key: "107", value: '代理加盟' },
-	{ key: "108", value: '市场推广' },
-	{ key: "109", value: '其他' },
-]
+  { key: "101", value: "技术转让" },
+  { key: "102", value: "技术许可" },
+  { key: "103", value: "技术入股" },
+  { key: "104", value: "合作开发" },
+  { key: "105", value: "融资" },
+  { key: "106", value: "公司" },
+  { key: "107", value: "代理加盟" },
+  { key: "108", value: "市场推广" },
+  { key: "109", value: "其他" },
+];
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 71d0d06..3bbad01 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -1,10 +1,10 @@
 /**
- * 判断url是否是http或https 
+ * 判断url是否是http或https
  * @param {string} path
  * @returns {Boolean}
  */
- export function isHttp(url) {
-  return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
+export function isHttp(url) {
+  return url.indexOf("http://") !== -1 || url.indexOf("https://") !== -1;
 }
 
 /**
@@ -12,8 +12,8 @@
  * @param {string} path
  * @returns {Boolean}
  */
- export function isExternal(path) {
-  return /^(https?:|mailto:|tel:)/.test(path)
+export function isExternal(path) {
+  return /^(https?:|mailto:|tel:)/.test(path);
 }
 
 /**
@@ -21,8 +21,8 @@
  * @returns {Boolean}
  */
 export function validUsername(str) {
-  const valid_map = ['admin', 'editor']
-  return valid_map.indexOf(str.trim()) >= 0
+  const valid_map = ["admin", "editor"];
+  return valid_map.indexOf(str.trim()) >= 0;
 }
 
 /**
@@ -30,8 +30,9 @@ export function validUsername(str) {
  * @returns {Boolean}
  */
 export function validURL(url) {
-  const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
-  return reg.test(url)
+  const reg =
+    /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/;
+  return reg.test(url);
 }
 
 /**
@@ -39,8 +40,8 @@ export function validURL(url) {
  * @returns {Boolean}
  */
 export function validLowerCase(str) {
-  const reg = /^[a-z]+$/
-  return reg.test(str)
+  const reg = /^[a-z]+$/;
+  return reg.test(str);
 }
 
 /**
@@ -48,8 +49,8 @@ export function validLowerCase(str) {
  * @returns {Boolean}
  */
 export function validUpperCase(str) {
-  const reg = /^[A-Z]+$/
-  return reg.test(str)
+  const reg = /^[A-Z]+$/;
+  return reg.test(str);
 }
 
 /**
@@ -57,8 +58,8 @@ export function validUpperCase(str) {
  * @returns {Boolean}
  */
 export function validAlphabets(str) {
-  const reg = /^[A-Za-z]+$/
-  return reg.test(str)
+  const reg = /^[A-Za-z]+$/;
+  return reg.test(str);
 }
 
 /**
@@ -66,8 +67,9 @@ export function validAlphabets(str) {
  * @returns {Boolean}
  */
 export function validEmail(email) {
-  const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
-  return reg.test(email)
+  const reg =
+    /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+  return reg.test(email);
 }
 
 /**
@@ -75,10 +77,10 @@ export function validEmail(email) {
  * @returns {Boolean}
  */
 export function isString(str) {
-  if (typeof str === 'string' || str instanceof String) {
-    return true
+  if (typeof str === "string" || str instanceof String) {
+    return true;
   }
-  return false
+  return false;
 }
 
 /**
@@ -86,8 +88,12 @@ export function isString(str) {
  * @returns {Boolean}
  */
 export function isArray(arg) {
-  if (typeof Array.isArray === 'undefined') {
-    return Object.prototype.toString.call(arg) === '[object Array]'
+  if (typeof Array.isArray === "undefined") {
+    return Object.prototype.toString.call(arg) === "[object Array]";
   }
-  return Array.isArray(arg)
+  return Array.isArray(arg);
 }
+
+// export function isWangEditorEmpty(wangEditorInstance) {
+//   wangEditorInstance.isEmpty();
+// }
diff --git a/src/views/admin/enterprise/account/basicInfo.vue b/src/views/admin/enterprise/account/basicInfo.vue
index 94902ee..f0ea2e0 100644
--- a/src/views/admin/enterprise/account/basicInfo.vue
+++ b/src/views/admin/enterprise/account/basicInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card shadow="always" style="width: 55%; margin: 0 auto">
-      <p><b>基本资料</b></p>
+      <!-- <p><b>基本资料</b></p>
       <el-form
         ref="PersonalInfoFormRef"
         :model="PersonalInfoForm"
@@ -35,7 +35,7 @@
         <el-form-item>
           <el-button type="primary" @click="submitPersonalInfo">提交</el-button>
         </el-form-item>
-      </el-form>
+      </el-form> -->
       <p><b>企业资料</b></p>
       <EnterpriseForm
         v-model="enterpriseInfoForm"
diff --git a/src/views/admin/enterprise/account/joinMembership.vue b/src/views/admin/enterprise/account/joinMembership.vue
index 789dc46..45d6c96 100644
--- a/src/views/admin/enterprise/account/joinMembership.vue
+++ b/src/views/admin/enterprise/account/joinMembership.vue
@@ -54,6 +54,9 @@
           </el-icon>
         </div>
       </div>
+      <div class="contact">
+        联系电话：<a href="tel:18156053255">18156053255</a> (微信同号)
+      </div>
     </div>
   </div>
 </template>
@@ -66,14 +69,8 @@ const serviceContent = ref([
   "一般企业的需求匹配推送",
 ]);
 const ordinaryMember = ref(["普通会员", true, false, false, false]);
-const vipMember = ref(["VIP会员服务(2999/年)", true, true, false, true]);
-const advanceVipMember = ref([
-  "高级VIP会员服务(3999/年)",
-  true,
-  true,
-  true,
-  true,
-]);
+const vipMember = ref(["VIP会员服务", true, true, false, true]);
+const advanceVipMember = ref(["高级VIP会员服务", true, true, true, true]);
 </script>
 <style lang="scss" scoped>
 .container {
@@ -98,5 +95,9 @@ const advanceVipMember = ref([
       // background-color: salmon;
     }
   }
+  .contact {
+    margin-top: 10px;
+    text-align: end;
+  }
 }
 </style>
diff --git a/src/views/admin/enterprise/demand/releaseService.vue b/src/views/admin/enterprise/demand/releaseService.vue
index 0e68400..1b21166 100644
--- a/src/views/admin/enterprise/demand/releaseService.vue
+++ b/src/views/admin/enterprise/demand/releaseService.vue
@@ -9,13 +9,13 @@
       >
         <p><b>基本信息</b></p>
 
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="需求名称:" prop="title">
               <el-input v-model="form.title"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
 
         <el-row>
           <el-col :span="24">
@@ -52,16 +52,17 @@
                 v-model="form.description"
                 width="100%"
                 min-height="150px"
+                @blur="formRef.validateField(`description`)"
               ></wangEditor>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <CityOptions
+        <!-- <CityOptions
           v-model="form"
           :labelWidth="labelWidth"
           ref="cityFormRef"
-        />
+        /> -->
 
         <el-row>
           <el-col :span="12">
@@ -81,7 +82,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- 
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="需求提交人:" prop="commitUserName">
@@ -99,10 +100,10 @@
               ></el-input>
             </el-form-item>
           </el-col>
-        </el-row> -->
+        </el-row>
       </el-form>
       <div :style="{ marginLeft: labelWidth + 'px' }">
-        <el-button @click="$router.go(-1)">取消</el-button>
+        <el-button @click="backToList">取消</el-button>
         <el-button type="primary" @click="submitForm">提交</el-button>
       </div>
     </el-card>
@@ -110,14 +111,16 @@
 </template>
 <script setup>
 // import { insertDemand } from "@/api/admin/enterprise";
+import tab from "../../../../plugins/tab";
 import {
   insertDemand,
   getDemand,
   updateDemand,
 } from "@/api/admin/enterprise/demand";
-import CityOptions from "@/views/components/CityOptions";
+// import CityOptions from "@/views/components/CityOptions";
 import { ElMessage } from "element-plus";
 import { onActivated } from "vue";
+// import { onActivated } from "vue";
 import { useRoute, useRouter } from "vue-router";
 
 const router = useRouter();
@@ -125,7 +128,7 @@ const route = useRoute();
 const data = reactive({
   form: {
     check: [],
-    status: 0,
+    status: 1,
   },
   queryParams: {
     pageNum: 1,
@@ -188,6 +191,11 @@ const submitForm = () => {
     }
   });
 };
+
+// 返回服务需求列表
+const backToList = () => {
+  tab.closeOpenPage({ path: "/demand/serviceDemand" });
+};
 // 添加需求类别时验证
 function addCheck() {
   if (!checkInput.value.trim().length) return ElMessage.error("请输入");
@@ -219,6 +227,14 @@ onMounted(() => {
       }
       form.value = resp.data;
     });
+  } else {
+    form.value = {
+      check: [],
+      status: 1,
+    };
+    if (formRef.value) {
+      formRef.value.resetFields();
+    }
   }
 });
 </script>
diff --git a/src/views/admin/enterprise/demand/releaseTechnology.vue b/src/views/admin/enterprise/demand/releaseTechnology.vue
index 799f77c..c27a456 100644
--- a/src/views/admin/enterprise/demand/releaseTechnology.vue
+++ b/src/views/admin/enterprise/demand/releaseTechnology.vue
@@ -11,15 +11,15 @@
 
         <el-row>
           <el-col :span="24">
-            <el-form-item label="成果需求名称:" prop="title">
+            <el-form-item label="技术需求名称:" prop="title">
               <el-input v-model="form.title"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
-            <!-- <el-checkbox label="0" @change="handleCheck">其他</el-checkbox> -->
+           //  <el-checkbox label="0" @change="handleCheck">其他</el-checkbox>
             <el-form-item label="需求类别:" prop="kinds">
               <el-checkbox-group v-model="form.kinds">
                 <el-checkbox
@@ -42,15 +42,17 @@
               </el-row>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
 
         <el-row>
           <el-col :span="24">
             <el-form-item label="需求描述:" prop="introduce">
               <wangEditor
                 v-model="form.introduce"
+                placeholder="请输入技术需求内容和详细的技术指标"
                 width="100%"
                 min-height="150px"
+                @blur="formRef.validateField(`introduce`)"
               ></wangEditor>
             </el-form-item>
           </el-col>
@@ -61,6 +63,11 @@
           :labelWidth="labelWidth"
           ref="fieldFormRef"
         />
+        <CityOptions
+          v-model="form"
+          :labelWidth="labelWidth"
+          ref="cityFormRef"
+        ></CityOptions>
 
         <el-row>
           <el-col :span="12">
@@ -145,10 +152,11 @@
         <el-row>
           <el-col :span="24">
             <InputBoxAdd
+              class="cooperation-mode"
               :labelWidth="labelWidth"
               v-model="form"
-              title="想合作的单位及模式"
-              placeholder=""
+              title="合作模式"
+              placeholder="合作开发、委托研发、技术转让、技术入股、技术许可"
               fieldKey="wants"
               ref="directionsFormRef"
             />
@@ -194,7 +202,7 @@ const data = reactive({
   rules: {
     title: [{ required: true, message: "需求名称不能为空", trigger: "blur" }],
     introduce: [
-      { required: true, message: "需求描述不能为空", trigger: "blur" },
+      { required: true, message: "需求描述不能为空", trigger: "change" },
     ],
     name: [{ required: true, message: "需求联系人不能为空", trigger: "blur" }],
     mobile: [
@@ -247,6 +255,7 @@ const checkList = reactive([
 const formRef = ref(null);
 const fieldFormRef = ref(null);
 const directionsFormRef = ref(null);
+const cityFormRef = ref(null);
 const checkInput = ref("");
 const submitForm = async (status) => {
   let formValid;
@@ -258,7 +267,8 @@ const submitForm = async (status) => {
   form.value.status = status;
   const fieldFormValid = await fieldFormRef.value.validateForm();
   const directionsFormValid = await directionsFormRef.value.validateForm();
-  if (formValid && fieldFormValid && directionsFormValid) {
+  const cityFormValid = await cityFormRef.value.validateForm();
+  if (formValid && fieldFormValid && directionsFormValid && cityFormValid) {
     if (route.query.id) {
       await updateTechnologyDemand(form.value);
       ElMessage.success("修改企业需求成功");
@@ -328,6 +338,20 @@ onMounted(() => {
         form.value.wants = resp.data.want?.split(",") ?? [];
       }
     });
+  } else {
+    form.value = {
+      check: [],
+    };
+    if (formRef.value) {
+      formRef.value.resetFields();
+    }
   }
 });
 </script>
+<style lang="scss" scoped>
+:deep(.cooperation-mode) {
+  .input-add-bar {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/admin/enterprise/demand/results.vue b/src/views/admin/enterprise/demand/results.vue
index c0d8932..d59d1f0 100644
--- a/src/views/admin/enterprise/demand/results.vue
+++ b/src/views/admin/enterprise/demand/results.vue
@@ -11,8 +11,8 @@
       <el-radio-button label="2">成果</el-radio-button>
       <el-radio-button label="4">专利</el-radio-button>
       <el-radio-button label="5">专家</el-radio-button>
-      <el-radio-button label="6">服务需求</el-radio-button>
-      <el-radio-button label="7">技术需求</el-radio-button>
+      <!-- <el-radio-button label="6">服务需求</el-radio-button> -->
+      <!-- <el-radio-button label="7">技术需求</el-radio-button> -->
       <!-- <el-radio-button label="4">实验室</el-radio-button> -->
     </el-radio-group>
 
@@ -35,14 +35,14 @@
             :data="item"
             v-else-if="queryParams.searchType == 5"
           ></expertItem>
-          <serviceDemandItem
+          <!-- <serviceDemandItem
             :data="item"
             v-else-if="queryParams.searchType == 6"
           ></serviceDemandItem>
           <TechnologyDemandItem
             :data="item"
             v-else-if="queryParams.searchType == 7"
-          ></TechnologyDemandItem>
+          ></TechnologyDemandItem> -->
         </div>
       </section>
     </div>
@@ -62,16 +62,18 @@
 import { search } from "@/api/website/home/index";
 import gainItem from "@/views/website/searchList/components/gainItem.vue";
 import expertItem from "@/views/website/searchList/components/expertItem.vue";
-import serviceDemandItem from "@/views/website/searchList/components/serviceDemandItem.vue";
+// import serviceDemandItem from "@/views/website/searchList/components/serviceDemandItem.vue";
 import enterpriseItem from "../../components/enterpriseItem.vue";
-import TechnologyDemandItem from "@/views/website/searchList/components/technologyDemandItem.vue";
+// import TechnologyDemandItem from "@/views/website/searchList/components/technologyDemandItem.vue";
 import AchievementItem from "@/views/website/searchList/components/achievementItem.vue";
 import { useRoute, useRouter } from "vue-router";
-import { watch } from "vue";
+
+// import { watch } from "vue";
 
 const route = useRoute();
 const router = useRouter();
 
+// console.log(userStore.userId);
 const dataList = ref([]);
 const loading = ref(true);
 const total = ref(0);
@@ -85,11 +87,12 @@ const queryType = computed(() => {
     return 2;
   } else if (queryParams.value.searchType == 5) {
     return 2;
-  } else if (queryParams.value.searchType == 6) {
-    return 1;
-  } else if (queryParams.value.searchType == 7) {
-    return 1;
   }
+  //  else if (queryParams.value.searchType == 6) {
+  //   return 1;
+  // } else if (queryParams.value.searchType == 7) {
+  //   return 1;
+  // }
 });
 
 // router.replace({
@@ -121,6 +124,7 @@ const { queryParams } = toRefs(data);
 /** 查询列表 */
 async function getList() {
   const resp = await search(queryParams.value);
+  // if()
   dataList.value = resp.list;
   total.value = resp.total;
   loading.value = false;
diff --git a/src/views/admin/enterprise/demand/serviceDemand.vue b/src/views/admin/enterprise/demand/serviceDemand.vue
index b087f35..5557d71 100644
--- a/src/views/admin/enterprise/demand/serviceDemand.vue
+++ b/src/views/admin/enterprise/demand/serviceDemand.vue
@@ -23,7 +23,7 @@
     </el-radio-group>
 
     <el-table v-loading="loading" :data="dataList" style="margin-top: 20px">
-      <el-table-column label="需求名称" align="center" prop="title" />
+      <!-- <el-table-column label="需求名称" align="center" prop="title" /> -->
       <el-table-column label="需求类别" align="center" prop="kind" />
       <!-- <el-table-column label="状态" align="center" prop="status" /> -->
       <el-table-column label="联系人" align="center" prop="name" />
diff --git a/src/views/admin/enterprise/extension/results.vue b/src/views/admin/enterprise/extension/results.vue
index bbd67c9..86c9ef3 100644
--- a/src/views/admin/enterprise/extension/results.vue
+++ b/src/views/admin/enterprise/extension/results.vue
@@ -11,7 +11,7 @@
       <el-radio-button label="2">成果</el-radio-button>
       <el-radio-button label="4">专利</el-radio-button>
       <el-radio-button label="5">专家</el-radio-button>
-      <el-radio-button label="6">服务需求</el-radio-button>
+      <!-- <el-radio-button label="6">服务需求</el-radio-button> -->
       <el-radio-button label="7">技术需求</el-radio-button>
       <!-- <el-radio-button label="4">实验室</el-radio-button> -->
     </el-radio-group>
@@ -104,13 +104,13 @@ import enterpriseItem from "../../components/enterpriseItem.vue";
 import TechnologyDemandItem from "@/views/website/searchList/components/technologyDemandItem.vue";
 import AchievementItem from "@/views/website/searchList/components/achievementItem.vue";
 import { useRoute, useRouter } from "vue-router";
-
+import useUserStore from "@/store/modules/user";
 const route = useRoute();
 const router = useRouter();
 const dataList = ref([]);
 const loading = ref(true);
 const total = ref(0);
-
+const userStore = useUserStore();
 const queryType = computed(() => {
   if (queryParams.value.searchType == 1) {
     return 2;
@@ -155,7 +155,20 @@ watch(
 /** 查询列表 */
 async function getList() {
   const resp = await search(queryParams.value);
+  // console.log(userStore.enterprise.id);
   dataList.value = resp.list;
+  // 排除自己企业
+  if (queryParams.value.searchType === "1") {
+    dataList.value = dataList.value.filter(
+      (el) => el.id != userStore.enterprise?.id
+    );
+  }
+  // 成果排除专家自己
+  else if (queryParams.value.searchType === "2") {
+    dataList.value = dataList.value.filter(
+      (el) => el.expertId != userStore.userId
+    );
+  }
   total.value = resp.total;
   loading.value = false;
 }
diff --git a/src/views/admin/enterprise/index.vue b/src/views/admin/enterprise/index.vue
index a8c901e..0c6e37d 100644
--- a/src/views/admin/enterprise/index.vue
+++ b/src/views/admin/enterprise/index.vue
@@ -3,26 +3,33 @@
     <div class="card-panel surplus-currency" :class="flag ? 'vip-box' : ''">
       <div class="_tit">
         <span style="visibility: hidden"> 会员banner图 </span>
-        <div class="fr" v-if="flag">
-          <div class="text-right">
+        <div class="fr">
+          <!-- <div class="text-right">
             {{ vipData.vipType == 1 ? "VIP" : "SVIP" }}
-          </div>
-          <div class="text-right">续期</div>
-          <div>升级VIP</div>
+          </div> -->
+          <!-- <div class="text-right">续期</div> -->
+          <div v-if="vipData.vipType == 1">升级SVIP</div>
+          <div v-else-if="vipData.vipType == 0">普通会员</div>
         </div>
-        <div class="text-right" style="margin-top: 50px" v-if="flag">
-          会员到期时间：{{ vipData.expireTime }}
+        <div
+          class="text-right"
+          style="margin-top: 50px"
+          v-if="vipData.vipType == 1 || vipData.vipType == 2"
+        >
+          {{ vipData.vipType == 1 ? "VIP" : "SVIP" }}到期时间：{{
+            vipData.expireTime
+          }}
         </div>
       </div>
-      <span
-        class="pointer"
-        style="font-size: 14px"
-        v-if="flag"
-        @click="vipBenefits"
-      >
+      <span class="pointer" style="font-size: 14px" @click="vipBenefits">
         查看会员权益
       </span>
-      <p class="text-center pointer" v-else>开通VIP</p>
+      <p
+        class="text-center pointer"
+        v-if="!vipData.vipType || vipData.vipType == 0"
+      >
+        开通VIP
+      </p>
     </div>
     <!-- 
     <div class="card-panel surplus-currency">
diff --git a/src/views/admin/expert/components/ReleaseForm/index.vue b/src/views/admin/expert/components/ReleaseForm/index.vue
index ab936ef..76f7bd7 100644
--- a/src/views/admin/expert/components/ReleaseForm/index.vue
+++ b/src/views/admin/expert/components/ReleaseForm/index.vue
@@ -85,6 +85,7 @@
       ref="customersFormRef"
     />
 
+    <CityOptions v-model="modelValue" :labelWidth="labelWidth"></CityOptions>
     <el-row>
       <el-col :span="24">
         <el-form-item label="成果成熟度:" prop="maturity">
@@ -161,22 +162,34 @@
       fieldKey="keywords"
       ref="keywordsFormRef"
     />
-
+    <!-- //TODO: -->
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="所属单位:" prop="unit">
+          <el-input
+            v-model="modelValue.unit"
+          ></el-input> </el-form-item></el-col
+    ></el-row>
     <el-row>
       <el-col :span="24">
         <el-form-item label="成果简介:" prop="description">
-          <el-input
+          <!-- <el-input
             v-model="modelValue.description"
             type="textarea"
             :autosize="{ minRows: 2, maxRows: 8 }"
-          />
+          /> -->
+          <wangEditor
+            v-model="modelValue.description"
+            width="100%"
+            min-height="150px"
+            @blur="formRef.validateField(`description`)"
+          ></wangEditor>
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <!-- <el-row>
       <el-col :span="24">
         <el-form-item label="成果来源:">
-          <!-- <Editor v-model="modelValue.comeFrom" :minHeight="150" /> -->
           <wangEditor
             v-model="modelValue.comeFrom"
             width="100%"
@@ -184,7 +197,7 @@
           ></wangEditor>
         </el-form-item>
       </el-col>
-    </el-row>
+    </el-row> -->
     <el-row v-if="modelValue.mode == 1">
       <el-col :span="24">
         <el-form-item label="成果图片:" prop="image">
diff --git a/src/views/admin/expert/demand/release.vue b/src/views/admin/expert/demand/release.vue
index 82fe38e..0366b93 100644
--- a/src/views/admin/expert/demand/release.vue
+++ b/src/views/admin/expert/demand/release.vue
@@ -9,17 +9,17 @@
       >
         <p><b>基本信息</b></p>
 
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="需求名称:" prop="title">
               <el-input v-model="formData.title"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
 
         <el-row>
           <el-col :span="24">
-            <el-form-item label="需求类别:">
+            <el-form-item label="需求类别:" prop="kinds">
               <el-checkbox-group v-model="formData.kinds">
                 <el-checkbox
                   v-for="item in checkList"
@@ -49,19 +49,21 @@
             <el-form-item label="需求描述:" prop="description">
               <!-- <Editor v-model="formData.description" :minHeight="150" /> -->
               <wangEditor
+                ref="wangEditorRef"
                 v-model="formData.description"
                 width="100%"
                 min-height="150px"
+                @blur="formRef.validateField(`description`)"
               ></wangEditor>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <CityOptions
+        <!-- <CityOptions
           v-model="formData"
           :labelWidth="labelWidth"
           ref="cityFormRef"
-        />
+        /> -->
 
         <el-row>
           <el-col :span="12">
@@ -87,15 +89,15 @@
             <el-form-item label="需求提交人:" prop="commitUserName">
               <el-input
                 v-model="formData.commitUserName"
-                placeholder="自动获取"
+                placeholder="请输入需求提交人"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="手机号:" prop="commitPhone">
+            <el-form-item label="提交人手机号:" prop="commitPhone">
               <el-input
                 v-model="formData.commitPhone"
-                placeholder="自动获取"
+                placeholder="请输入需求提交人手机号"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -111,9 +113,21 @@
 <script setup>
 // import { expert } from "@/api/identity/index";
 import { insertDemand } from "@/api/admin/expert/demand";
-import CityOptions from "@/views/components/CityOptions";
+// import CityOptions from "@/views/components/CityOptions";
 import { ElMessage } from "element-plus";
 import { useRoute, useRouter } from "vue-router";
+
+const validateWangEditor = (rule, value, callback) => {
+  console.log(rule);
+  if (wangEditorRef.value.isEmpty()) {
+    callback(new Error(rule.message));
+  } else {
+    callback();
+  }
+};
+const testBlur = () => {
+  console.log("fsd");
+};
 const data = reactive({
   formData: {
     check: [],
@@ -125,9 +139,14 @@ const data = reactive({
     // postCode: undefined,
   },
   rules: {
+    kinds: [{ required: true, message: "请选择需求类别" }],
     title: [{ required: true, message: "需求名称不能为空", trigger: "blur" }],
     description: [
-      { required: true, message: "需求描述不能为空", trigger: "blur" },
+      {
+        required: true,
+        trigger: "blur",
+        message: "需求描述不能为空",
+      },
     ],
     bankAccount: [
       { required: true, message: "需求联系人不能为空", trigger: "blur" },
@@ -138,7 +157,16 @@ const data = reactive({
     username: [
       { required: true, message: "需求提交人不能为空", trigger: "blur" },
     ],
-    userPhone: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
+    name: [{ required: true, message: "需求联系人不能为空", trigger: "blur" }],
+    mobile: [
+      { required: true, message: "需求联系人手机号不能为空", trigger: "blur" },
+    ],
+    // commitUserName: [
+    //   { required: true, message: "需求提交人不能为空", trigger: "blur" },
+    // ],
+    // commitPhone: [
+    //   { required: true, message: "需求提交人手机号不能为空", trigger: "blur" },
+    // ],
   },
 });
 
@@ -147,7 +175,7 @@ const { queryParams, formData, rules } = toRefs(data);
 const { proxy } = getCurrentInstance();
 const route = useRoute();
 const router = useRouter();
-const cityFormRef = ref();
+// const cityFormRef = ref();
 const formRef = ref();
 
 if (route.query.id) {
@@ -172,24 +200,21 @@ const checkList = reactive([
     name: "上市辅导",
   },
 ]);
+const wangEditorRef = ref();
 const checkInput = ref("");
-function submitForm() {
-  formRef.value.validate(async (valid) => {
-    const cityFormValid = cityFormRef.value.validateForm(); // 城市
-    if (valid && cityFormValid) {
-      // console.log(formData.value);
-      if (formData.value.id) {
-        // updatePost(form.value).then((response) => {
-        //   proxy.$modal.msgSuccess("修改成功");
-        // proxy.$router.go(-1);
-        // });
-      } else {
-        await insertDemand(formData.value);
-        ElMessage.success("新增成功");
-        router.back();
-      }
-    }
-  });
+async function submitForm() {
+  console.log(wangEditorRef.value.isEmpty());
+  await formRef.value.validate();
+  if (formData.value.id) {
+    // updatePost(form.value).then((response) => {
+    //   proxy.$modal.msgSuccess("修改成功");
+    // proxy.$router.go(-1);
+    // });
+  } else {
+    await insertDemand(formData.value);
+    ElMessage.success("新增成功");
+    router.back();
+  }
 }
 function addCheck() {
   if (!checkInput.value.trim().length) return proxy.$modal.msgError("请输入");
diff --git a/src/views/admin/expert/index.vue b/src/views/admin/expert/index.vue
index 195720b..9fe78b7 100644
--- a/src/views/admin/expert/index.vue
+++ b/src/views/admin/expert/index.vue
@@ -30,10 +30,10 @@
       </template>
       <el-row :gutter="20">
         <el-col :span="4">
-          <router-link to="/extension/release">
+          <router-link to="/technology/release">
             <div class="menu-item">
               <el-avatar :icon="Box" />
-              <div class="title">发布产品</div>
+              <div class="title">发布成果</div>
             </div>
           </router-link>
         </el-col>
diff --git a/src/views/admin/expert/technology/achievement.vue b/src/views/admin/expert/technology/achievement.vue
index 8978bc7..e5081bd 100644
--- a/src/views/admin/expert/technology/achievement.vue
+++ b/src/views/admin/expert/technology/achievement.vue
@@ -93,7 +93,7 @@ import {
 } from "@/api/admin/expert/achievement";
 import dayjs from "dayjs";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { update } from "lodash-unified";
+// import { update } from "lodash-unified";
 import { useRouter } from "vue-router";
 import { updateExpertAchievement } from "@/api/admin/expert/achievement";
 import { onActivated } from "vue";
diff --git a/src/views/admin/expert/technology/paper.vue b/src/views/admin/expert/technology/paper.vue
index fcbede4..cd5d5b9 100644
--- a/src/views/admin/expert/technology/paper.vue
+++ b/src/views/admin/expert/technology/paper.vue
@@ -106,8 +106,8 @@
         <el-form-item label="论文题目:" prop="title">
           <el-input v-model="form.title" placeholder="请输入论文题目" />
         </el-form-item>
-        <el-form-item label="引用格式:" prop="ext">
-          <el-input v-model="form.ext" placeholder="请输入引用格式" />
+        <el-form-item label="期刊名称:" prop="ext">
+          <el-input v-model="form.ext" placeholder="请输入期刊名称" />
         </el-form-item>
         <el-form-item label="作者:" prop="author">
           <el-input v-model="form.author" placeholder="多人员请用 , 隔开" />
@@ -128,13 +128,21 @@
           fieldKey="keywords"
           ref="keywordsFormRef"
         />
-        <el-form-item label="摘要:">
+        <el-form-item label="摘要:" prop="remark">
           <el-input
             v-model="form.remark"
             type="textarea"
             placeholder="请输入内容"
           ></el-input>
         </el-form-item>
+        <!-- //TODO:上传论文添加字段 -->
+        <el-form-item label="上传论文:" prop="paper">
+          <FileUpload
+            v-model="form.paper"
+            :limit="1"
+            :fileType="['docx', 'doc', 'pdf']"
+          ></FileUpload>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -187,6 +195,13 @@ const data = reactive({
         trigger: ["blur", "change"],
       },
     ],
+    remark: [
+      {
+        required: true,
+        message: "请输入摘要",
+        trigger: "blur",
+      },
+    ],
   },
 });
 
diff --git a/src/views/admin/expert/technology/release.vue b/src/views/admin/expert/technology/release.vue
index 3dcb1b0..f4a0f79 100644
--- a/src/views/admin/expert/technology/release.vue
+++ b/src/views/admin/expert/technology/release.vue
@@ -21,7 +21,7 @@ import {
   updateExpertAchievement,
 } from "@/api/admin/expert/achievement";
 import { ElMessage } from "element-plus";
-import { reactive, toRefs } from "vue";
+import { reactive, ref, toRefs } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import ReleaseForm from "../components/ReleaseForm";
 const labelWidth = 140;
@@ -29,6 +29,8 @@ const labelWidth = 140;
 const data = reactive({
   form: { mode: 1 },
 });
+const formData = reactive({});
+
 const { form } = toRefs(data);
 const route = useRoute();
 const router = useRouter();
diff --git a/src/views/admin/expert/technology/research.vue b/src/views/admin/expert/technology/research.vue
index ddb7614..04a01a0 100644
--- a/src/views/admin/expert/technology/research.vue
+++ b/src/views/admin/expert/technology/research.vue
@@ -136,7 +136,9 @@
                 v-model="form.amount"
                 oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
                 placeholder="请输入资助经费"
-              />
+              >
+                <template #append>万元</template></el-input
+              >
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -182,6 +184,19 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <!-- //TODO:添加项目简介字段 -->
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="项目简介:" prop="kind">
+              <el-input
+                type="textarea"
+                v-model="form.kind"
+                placeholder="请输入项目简介"
+                :autosize="{ minRows: 8, maxRows: 16 }"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
diff --git a/src/views/components/EnterpriseForm/index.vue b/src/views/components/EnterpriseForm/index.vue
index 6b6f7cf..d675fc0 100644
--- a/src/views/components/EnterpriseForm/index.vue
+++ b/src/views/components/EnterpriseForm/index.vue
@@ -22,8 +22,42 @@
         </el-form-item>
       </el-col>
     </el-row>
-
     <el-row>
+      <el-col :span="24">
+        <el-form-item label="联系人" prop="name">
+          <el-input v-model="modelValue.name"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="联系方式" prop="mobilephone">
+          <el-input
+            v-model="modelValue.mobilephone"
+            :maxlength="11"
+            oninput="
+                value = value
+                  .replace(/[^\d.]/g, '')
+                  .replace(/\.{2,}/g, '.')
+                  .replace('.', '$#$')
+                  .replace(/\./g, '')
+                  .replace('$#$', '.')
+                  .replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3')
+                  .replace(/^\./g, '')
+              "
+          ></el-input>
+          <!-- v-number -->
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="邮箱" prop="name">
+          <el-input v-model="modelValue.name"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <!-- <el-row>
       <el-col :span="24">
         <el-form-item label="信用代码:" prop="code">
           <el-row type="flex" justify="space-between">
@@ -36,7 +70,7 @@
           </el-row>
         </el-form-item>
       </el-col>
-    </el-row>
+    </el-row> -->
     <el-row>
       <el-col :span="24">
         <el-form-item label="企业类型:" prop="kind">
@@ -134,7 +168,11 @@
     <el-row>
       <el-col :span="24">
         <el-form-item label="单位简介" prop="introduce">
-          <WangEditor v-model="modelValue.introduce" :minHeight="300" />
+          <WangEditor
+            v-model="modelValue.introduce"
+            :minHeight="300"
+            @blur="formRef.validateField(`introduce`)"
+          />
         </el-form-item>
       </el-col>
     </el-row>
@@ -148,7 +186,7 @@ import InputBoxAdd from "../InputBoxAdd";
 // import { researchSelect, laboratorySelect } from "@/api/identity/index";
 import WangEditor from "@/components/WangEditor";
 import { enterpriseOptions } from "@/utils/parameter";
-import { toRefs } from "vue";
+import { nextTick, toRefs } from "vue";
 
 const props = defineProps({
   modelValue: Object,
@@ -166,6 +204,23 @@ const props = defineProps({
   },
 });
 const { modelValue, isAdd, showTitle, labelWidth } = toRefs(props);
+
+const vNumber = {
+  mounted: (el, _binding, vnode, _prevVnode) => {
+    console.log(vnode);
+    el.children[0].addEventListener("keypress", (e) => {
+      // console.log(e);
+      if (/[\D]/.test(e.key)) {
+        e.preventDefault();
+      }
+    });
+    // el.addEventListener("input", (e) => {
+    //   console.log(e);
+    //   e.srcElement.value = e.srcElement.value.replace("3", "");
+    //   // value = value.replace("3", "");
+    // });
+  },
+};
 const data = reactive({
   rules: {
     product: [{ required: true, message: "请输入", trigger: "blur" }],
diff --git a/src/views/components/ExpertForm/index.vue b/src/views/components/ExpertForm/index.vue
index 6c2b015..4274310 100644
--- a/src/views/components/ExpertForm/index.vue
+++ b/src/views/components/ExpertForm/index.vue
@@ -170,9 +170,9 @@
         <el-form-item label="个人简介:" prop="introduce">
           <el-input
             v-model="modelValue.introduce"
+            placeholder="请输入研究方向、核心技术及产品、代表专利和论文、承担科研项目名称及项目摘要"
             type="textarea"
-            :autosize="{ minRows: 2, maxRows: 8 }"
-            maxlength="400"
+            :autosize="{ minRows: 16, maxRows: 20 }"
             show-word-limit
           />
         </el-form-item>
diff --git a/src/views/components/InputBoxAdd/index.vue b/src/views/components/InputBoxAdd/index.vue
index 4cdf14f..ababad4 100644
--- a/src/views/components/InputBoxAdd/index.vue
+++ b/src/views/components/InputBoxAdd/index.vue
@@ -19,7 +19,7 @@
             },
           ]"
         >
-          <el-row type="flex" justify="space-between">
+          <el-row type="flex" class="input-add-bar" justify="space-between">
             <el-col :span="20">
               <el-input v-model="dataVal" :placeholder="placeholder"></el-input>
             </el-col>
diff --git a/src/views/components/ReleaseForm/index.vue b/src/views/components/ReleaseForm/index.vue
index f944419..1a47fa3 100644
--- a/src/views/components/ReleaseForm/index.vue
+++ b/src/views/components/ReleaseForm/index.vue
@@ -19,13 +19,37 @@
         </el-form-item>
       </el-col>
     </el-row>
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="联系人:" prop="title">
+          <el-input
+            v-model="modelValue.title"
+            placeholder="请输入联系人"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="联系方式:" prop="title">
+          <el-input
+            v-model="modelValue.title"
+            placeholder="请输入联系方式"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
 
     <FieldOptions
       v-model="modelValue"
       :labelWidth="labelWidth"
       ref="fieldFormRef"
     />
-
+    <CityOptions
+      v-model="modelValue"
+      :labelWidth="labelWidth"
+      ref="cityFormRef"
+    ></CityOptions>
     <InputBoxAdd
       :labelWidth="labelWidth"
       v-model="modelValue"
@@ -79,6 +103,7 @@
           <el-select
             v-model="modelValue.cooperationMode"
             clearable
+            multiple
             placeholder="请选择"
           >
             <el-option
@@ -110,6 +135,7 @@
             min-height="150px"
             width="100%"
             ref="introduceRef"
+            @blur="formRef.validateField(`introduce`)"
           />
         </el-form-item>
       </el-col>
@@ -236,6 +262,7 @@ const { rules } = toRefs(data);
 const formRef = ref(null);
 const fieldFormRef = ref(null);
 const customerFormRef = ref(null);
+const cityFormRef = ref(null);
 const validateForm = async () => {
   // await formRef.value.validate();
   let formValid;
@@ -246,8 +273,10 @@ const validateForm = async () => {
   }
   const fieldFormValid = await fieldFormRef.value.validateForm(); // 城市选择表单验证
   const customerValid = await customerFormRef.value.validateForm(); // 领域选择表单验证
+  const cityFormValid = await cityFormRef.value.validateForm(); // 领域选择表单验证
+
   console.log(formValid, fieldFormValid, customerValid);
-  return formValid && fieldFormValid && customerValid;
+  return formValid && fieldFormValid && customerValid && cityFormValid;
   // const keywordsFormValid = await keywordsFormRef.value.validateForm(); // 关键词表单验证
   // console.log(cityFormValid);
   // if (isAdd.value) {
diff --git a/src/views/identity/index.vue b/src/views/identity/index.vue
index 44d221d..fed5b4c 100644
--- a/src/views/identity/index.vue
+++ b/src/views/identity/index.vue
@@ -1,5 +1,21 @@
 <template>
   <div class="app-container" v-if="identityList.length">
+    <el-row>
+      <el-col :span="2">
+        <el-button size="small" :icon="ArrowLeftBold" round @click="backToHome"
+          >返回</el-button
+        ></el-col
+      >
+      <el-col :span="22">
+        <el-alert
+          title="温馨提示：如是企业请入驻企业后台，专家请入驻专家后台，并完善资料"
+          type="warning"
+          :style="{
+            marginBottom: `10px`,
+          }"
+        ></el-alert>
+      </el-col>
+    </el-row>
     <el-card shadow="always">
       <el-row :gutter="20" justify="center">
         <el-col
@@ -67,6 +83,7 @@ import { useRouter } from "vue-router";
 import usePermissionStore from "@/store/modules/permission";
 import useUserStore from "@/store/modules/user";
 import { ElMessageBox } from "element-plus";
+import { ArrowLeftBold } from "@element-plus/icons-vue";
 const router = useRouter();
 
 const permissionStore = usePermissionStore();
@@ -115,6 +132,11 @@ function reason(item) {
 function noClicking() {
   return identityList.value.some((item) => item.status == 0);
 }
+const backToHome = () => {
+  router.push({
+    path: "/",
+  });
+};
 // item.status -1>未入驻 0>审核中 1>通过 2拒绝
 function handleStatus(item) {
   // console.log(item);
diff --git a/src/views/website/activity/activity.vue b/src/views/website/activity/activity.vue
index ff5f9f4..dca1892 100644
--- a/src/views/website/activity/activity.vue
+++ b/src/views/website/activity/activity.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="activity" v-loading="loading">
-    <!-- <webReleaseActive v-model:dialogVisible="dialogVisible"></webReleaseActive> -->
     <el-dialog title="发布活动" v-model="dialogVisible" width="380px">
       <div class="contact-admin">
         <qrcode-vue :value="`tel:${mobile}`" :size="300" level="H" />
@@ -70,7 +69,7 @@
             <p class="text_hidden">{{ item.title }}</p>
             <div class="_time">活动时间：{{ item.beginTime }}</div>
             <div class="_time">收费金额：{{ item.amount }}</div>
-            <div class="_info">
+            <div class="_info" style="visibility: hidden">
               <!-- <span class="fl"
                 ><span class="x_blue">{{ item.user }}</span> 人报名</span
               > -->
diff --git a/src/views/website/home/comp/index1.vue b/src/views/website/home/comp/index1.vue
index 391ec8e..de1a867 100644
--- a/src/views/website/home/comp/index1.vue
+++ b/src/views/website/home/comp/index1.vue
@@ -119,7 +119,8 @@
 </template>
 
 <script setup>
-import { onMounted, reactive } from "vue";
+// TODO:成果搜索添加按成果介绍搜索，需求搜索添加按需求描述搜索,添加实验室搜索
+import { onMounted, reactive, watch } from "vue";
 import { banner } from "@/api/website/home/index";
 import { useRouter } from "vue-router";
 import { getAllCount } from "../../../../api/website/home";
@@ -135,7 +136,7 @@ const router = useRouter();
 const queryParams = reactive({
   queryType: undefined,
   keyword: "",
-  queryType: "1",
+  queryType: "2",
 });
 const queryRules = reactive({
   queryType: [{ required: true, trigger: "change", message: "请选择搜索类型" }],
@@ -148,7 +149,7 @@ const searchTypeList = ref([
   "lab",
   "patent",
   "expert",
-  "serviceDemand",
+  // "serviceDemand",
   "technologyDemand",
 ]);
 // const patentQueryTypeList = ;
@@ -179,13 +180,9 @@ const queryTypeList = [
     { value: "3", label: "通过关键词搜索" },
   ],
   [{ value: "1", label: "通过标题搜索" }],
-  [{ value: "1", label: "通过标题搜索" }],
+  // [{ value: "1", label: "通过标题搜索" }],
 ];
-const switchTab = (index) => {
-  state.tabIndex = index;
-  // queryParams.queryType = undefined
-  queryRef.value.resetFields("queryType");
-};
+
 const handleDetail = async (mode, keyword, queryType) => {
   await queryRef.value.validate();
   const routeData = router.resolve({
@@ -213,8 +210,8 @@ const state = reactive({
     "找实验室",
     "找专利",
     "找专家",
-    "接服务需求",
-    "接技术需求",
+    // "接服务需求",
+    "接需求",
   ],
   tabIndex: 0,
   banner: "",
@@ -228,6 +225,22 @@ const state = reactive({
   },
 });
 
+const switchTab = (index) => {
+  state.tabIndex = index;
+  // queryParams.queryType = undefined
+  // if(index)
+  queryRef.value.resetFields("queryType");
+};
+
+watch(
+  () => state.tabIndex,
+  (val) => {
+    console.log(val);
+    // return [2, 0][val];
+    queryParams.queryType = ["2", "1", "0", "2", "2", "1"][val];
+  },
+  { immediate: true }
+);
 onMounted(() => {
   banner({ locals: "首页背景" }).then((resp) => {
     // console.log(resp);
diff --git a/src/views/website/login/index.vue b/src/views/website/login/index.vue
index 23109f3..bc35be8 100644
--- a/src/views/website/login/index.vue
+++ b/src/views/website/login/index.vue
@@ -213,7 +213,7 @@ const handleLogin = async () => {
         userStore
           .login(formData)
           .then(() => {
-            router.push({ path: redirect.value || "/" });
+            router.push({ path: redirect.value || "/identity/index" });
           })
           .catch(() => {
             loading.value = false;
diff --git a/src/views/website/searchList/achievementDetail.vue b/src/views/website/searchList/achievementDetail.vue
index a7363ce..2fa5fc9 100644
--- a/src/views/website/searchList/achievementDetail.vue
+++ b/src/views/website/searchList/achievementDetail.vue
@@ -23,10 +23,10 @@
                 <div>{{ state.expertDetail.introduce }}</div>
               </template>
             </achievementItem>
-            <!-- <div class="btns">
-              <div class="order">预约对接</div>
+            <div class="btns">
+              <div class="order" @click="showDocking = true">预约对接</div>
               <div class="share">一键分享</div>
-            </div> -->
+            </div>
 
             <div class="detail">
               <!-- <div style="padding: 20px 0">
@@ -44,6 +44,7 @@
         </el-row>
       </template>
     </searchContainer>
+    <docking v-model:visible="showDocking"></docking>
   </div>
 </template>
 
@@ -59,7 +60,8 @@ import productItem from "./components/productItem.vue";
 import { searchAchievementDetail } from "../../../api/website/home";
 import { useRoute, useRouter } from "vue-router";
 import { reactive, ref } from "vue";
-
+import docking from "./components/docking.vue";
+const showDocking = ref(false);
 const loading = ref(true);
 const state = reactive({
   pageNum: 1,
diff --git a/src/views/website/searchList/components/achievementItem.vue b/src/views/website/searchList/components/achievementItem.vue
index b9891e7..9f77064 100644
--- a/src/views/website/searchList/components/achievementItem.vue
+++ b/src/views/website/searchList/components/achievementItem.vue
@@ -24,6 +24,14 @@
             "未知"
           }}</span>
         </div>
+        <div class="line">
+          联系人
+          <span>中科云平台</span>
+        </div>
+        <div class="line">
+          联系方式(微信同号)：
+          <span>18156053255</span>
+        </div>
       </div>
       <div>
         <div class="keywords">
@@ -86,7 +94,7 @@ function createdData(arr) {
 <style lang="scss" scoped>
 .box {
   width: 100%;
-  height: 190px;
+  // height: 190px;
   background: #ffffff;
   padding: 20px;
   box-sizing: border-box;
diff --git a/src/views/website/searchList/components/docking.vue b/src/views/website/searchList/components/docking.vue
new file mode 100644
index 0000000..421b50b
--- /dev/null
+++ b/src/views/website/searchList/components/docking.vue
@@ -0,0 +1,30 @@
+<template>
+  <el-dialog
+    width="400px"
+    :modelValue="visible"
+    title="预约对接"
+    align-center
+    @close="closeDialog"
+  >
+    <p>如需对接，请联系我们</p>
+    <p>联系人：中科云平台</p>
+    <p>联系电话：18156053255（微信同号）</p>
+    <template #footer>
+      <el-button type="primary" @click="closeDialog">关闭</el-button>
+    </template>
+  </el-dialog>
+</template>
+<script setup>
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    required: true,
+  },
+});
+
+const emit = defineEmits(["update:visible"]);
+
+const closeDialog = () => {
+  emit("update:visible", false);
+};
+</script>
diff --git a/src/views/website/searchList/components/gainItem.vue b/src/views/website/searchList/components/gainItem.vue
index 0550fa6..a671923 100644
--- a/src/views/website/searchList/components/gainItem.vue
+++ b/src/views/website/searchList/components/gainItem.vue
@@ -84,7 +84,7 @@ function createdData(arr) {
 <style lang="scss" scoped>
 .box {
   width: 100%;
-  height: 190px;
+  // height: 190px;
   background: #ffffff;
   padding: 20px;
   box-sizing: border-box;
diff --git a/src/views/website/searchList/components/laboratoryItem.vue b/src/views/website/searchList/components/laboratoryItem.vue
index 2151c36..9f927b1 100644
--- a/src/views/website/searchList/components/laboratoryItem.vue
+++ b/src/views/website/searchList/components/laboratoryItem.vue
@@ -68,7 +68,7 @@ function createdData (arr) {
 <style lang="scss" scoped>
 .box {
     width: 100%;
-    height: 190px;
+    // height: 190px;
     background: #ffffff;
     padding: 20px;
     box-sizing: border-box;
diff --git a/src/views/website/searchList/components/productItem.vue b/src/views/website/searchList/components/productItem.vue
index b70ae20..261f251 100644
--- a/src/views/website/searchList/components/productItem.vue
+++ b/src/views/website/searchList/components/productItem.vue
@@ -54,7 +54,7 @@ function createdData (arr) {
 <style lang="scss" scoped>
 .box {
     width: 100%;
-    height: 190px;
+    // height: 190px;
     background: #ffffff;
     padding: 20px;
     box-sizing: border-box;
diff --git a/src/views/website/searchList/components/serviceDemandItem.vue b/src/views/website/searchList/components/serviceDemandItem.vue
index 59ffe6d..202aad1 100644
--- a/src/views/website/searchList/components/serviceDemandItem.vue
+++ b/src/views/website/searchList/components/serviceDemandItem.vue
@@ -84,7 +84,7 @@ function createdData(arr) {
 <style lang="scss" scoped>
 .box {
   width: 100%;
-  height: 190px;
+  // height: 190px;
   background: #ffffff;
   padding: 20px;
   box-sizing: border-box;
diff --git a/src/views/website/searchList/components/technologyDemandItem.vue b/src/views/website/searchList/components/technologyDemandItem.vue
index 26fd324..2022795 100644
--- a/src/views/website/searchList/components/technologyDemandItem.vue
+++ b/src/views/website/searchList/components/technologyDemandItem.vue
@@ -21,8 +21,12 @@
           <span>{{ data.kind }}</span>
         </div>
         <div class="line">
-          联系方式：
-          <span>{{ data.mobile }}</span>
+          联系人
+          <span>中科云平台</span>
+        </div>
+        <div class="line">
+          联系方式(微信同号)：
+          <span>18156053255</span>
         </div>
       </div>
       <div>
@@ -83,7 +87,7 @@ function createdData(arr) {
 <style lang="scss" scoped>
 .box {
   width: 100%;
-  height: 190px;
+  // height: 190px;
   background: #ffffff;
   padding: 20px;
   box-sizing: border-box;
diff --git a/src/views/website/searchList/enterpriseDetail.vue b/src/views/website/searchList/enterpriseDetail.vue
index a0d2e69..4a46c29 100644
--- a/src/views/website/searchList/enterpriseDetail.vue
+++ b/src/views/website/searchList/enterpriseDetail.vue
@@ -63,10 +63,10 @@
                     :data="createdData(state.companyDetail.keywords)"
                   ></wordcloud>
                 </div>
-                <!-- <div class="btns">
-                  <div class="order">预约对接</div>
+                <div class="btns">
+                  <div class="order" @click="showDocking = true">预约对接</div>
                   <div class="share">一键分享</div>
-                </div> -->
+                </div>
               </el-row>
             </div>
 
@@ -154,10 +154,12 @@
         </el-row>
       </template>
     </searchContainer>
+    <docking v-model:visible="showDocking"></docking>
   </div>
 </template>
 
 <script setup>
+import docking from "./components/docking.vue";
 import webContact from "@/components/webContact/index.vue";
 import request from "@/utils/request";
 import { searchEnterpriseDetail } from "@/api/website/home";
@@ -171,6 +173,7 @@ import { search } from "../../../api/website/home";
 const router = useRouter();
 const route = useRoute();
 const loading = ref(true);
+const showDocking = ref(false);
 const state = reactive({
   pageNum: 1,
   pageSize: 4,
@@ -233,9 +236,8 @@ function createdData(arr) {
 function handleDetail(id) {
   let routeData = router.resolve({
     path: `/searchList/enterprise/detail/${id}`,
-    query: { keyword: state.keyword, queryType: route.query.queryType },
+    query: { keyword: route.query.keyword, queryType: route.query.queryType },
   });
-  // window.open(routeData.href, "_blank");
   router.push(routeData);
 }
 
@@ -286,7 +288,8 @@ function getDataList() {
     queryType: route.query.queryType,
   }).then((resp) => {
     const recommendList = resp.list.filter(
-      (el) => el.id != state.companyDetail.id
+      // (el) => el.id != state.companyDetail.id
+      (el) => el.id != id
     );
     state.list = recommendList;
     state.total = resp.total;
diff --git a/src/views/website/searchList/expertDetail.vue b/src/views/website/searchList/expertDetail.vue
index 954c983..c68599f 100644
--- a/src/views/website/searchList/expertDetail.vue
+++ b/src/views/website/searchList/expertDetail.vue
@@ -19,10 +19,10 @@
         <el-row type="flex" style="padding-bottom: 20px">
           <div style="flex: 1">
             <expertItem :data="state.expertDetail"></expertItem>
-            <!-- <div class="btns">
-              <div class="order">预约对接</div>
+            <div class="btns">
+              <div class="order" @click="showDocking = true">预约对接</div>
               <div class="share">一键分享</div>
-            </div> -->
+            </div>
 
             <div class="detail">
               <div style="padding: 20px 0">
@@ -325,20 +325,23 @@
         </el-row>
       </template>
     </searchContainer>
+    <docking v-model:visible="showDocking"></docking>
   </div>
 </template>
 
 <script setup>
 import webContact from "@/components/webContact/index.vue";
 import expertItem from "./components/expertItem.vue";
-import loadMore from "./components/loadMore.vue";
-import request from "@/utils/request";
+// import loadMore from "./components/loadMore.vue";
+// import request from "@/utils/request";
 import { searchExpertDetail } from "@/api/website/home";
 import { onMounted, reactive, ref } from "vue";
 import searchContainer from "./components/searchContainer.vue";
-import wordcloud from "./components/wordcloud.vue";
-import productItem from "./components/productItem.vue";
+// import wordcloud from "./components/wordcloud.vue";
+// import productItem from "./components/productItem.vue";
 import { useRoute, useRouter } from "vue-router";
+import docking from "./components/docking.vue";
+const showDocking = ref(false);
 const router = useRouter();
 const route = useRoute();
 const loading = ref(true);
@@ -361,103 +364,6 @@ const state = reactive({
   activeName: "first",
 });
 
-// 建议 列表前4条
-function recommend() {
-  return request({
-    url: "/v1/search",
-    method: "post",
-    data: {
-      mode: 5,
-      page_num: state.pageNum,
-      page_size: state.pageSize,
-      keyword: state.keyword,
-    },
-  });
-}
-
-// 专家详情
-function expert(id) {
-  return request({
-    url: "/v1/manage/expert",
-    method: "post",
-    data: { expert_id: id },
-  });
-}
-
-// 合作成果
-function achievement(data) {
-  return request({
-    url: "/v1/manage/expert/achievement",
-    method: "post",
-    data,
-  });
-}
-
-// 科研项目
-function project(data) {
-  return request({
-    url: "/v1/manage/expert/project",
-    method: "post",
-    data,
-  });
-}
-
-// 代表专利
-function patent(data) {
-  return request({
-    url: "/v1/manage/expert/patent",
-    method: "post",
-    data,
-  });
-}
-// 代表论文
-function paper(data) {
-  return request({
-    url: "/v1/manage/expert/paper",
-    method: "post",
-    data,
-  });
-}
-
-// 合作企业
-function cooperate(data) {
-  return request({
-    url: "/v1/manage/expert/cooperate",
-    method: "post",
-    data,
-  });
-}
-async function cooperateDetail(item, type) {
-  item["loading"] = true;
-  let { code, msg, data } = await request({
-    url: "/v1/manage/expert/cooperate/detail",
-    method: "post",
-    data: { id: item.id },
-  });
-  if (200 == code) {
-    item[type] = data[type];
-  }
-  item["loading"] = false;
-}
-
-function createdData(arr) {
-  let l = [];
-  let snap = JSON.parse(JSON.stringify(arr));
-  snap.map((e) => {
-    l.push({ name: e, value: 30 });
-    return { name: e, value: 30 };
-  });
-  return l;
-}
-
-function handleDetail(id) {
-  let routeData = router.resolve({
-    path: `/searchList/0/detail/${id}`,
-    query: { keyword: state.keyword },
-  });
-  window.open(routeData.href, "_blank");
-}
-
 function handleList(mode, query) {
   router.push({
     path: `/searchList/${mode}`,
@@ -507,7 +413,16 @@ function getDataList() {
   //   })
   searchExpertDetail(id)
     .then((resp) => {
-      state.expertDetail = resp.data;
+      const data = resp.data;
+      // data.expertDetail.introduce = data.expertDetail.introduce?.replace(
+      //   "\n",
+      //   "</br>"
+      // );
+      data.introduce = data.introduce
+        ?.replaceAll("\n", "</br>")
+        ?.replaceAll(" ", "&ensp;");
+      // console.log(data.introduce.replaceAll("\n", "</br>"));
+      state.expertDetail = data;
       loading.value = false;
     })
     .catch(() => {
diff --git a/src/views/website/searchList/patentDetail.vue b/src/views/website/searchList/patentDetail.vue
index 3f20e8f..94b11af 100644
--- a/src/views/website/searchList/patentDetail.vue
+++ b/src/views/website/searchList/patentDetail.vue
@@ -58,10 +58,10 @@
                     :data="createdData(state.patentDetail.keywords)"
                   ></wordcloud>
                 </div>
-                <!-- <div class="btns">
-                  <div class="order">预约对接</div>
+                <div class="btns">
+                  <div class="order" @click="showDocking = true">预约对接</div>
                   <div class="share">一键分享</div>
-                </div> -->
+                </div>
               </el-row>
             </div>
 
@@ -145,6 +145,7 @@
         </el-row>
       </template>
     </searchContainer>
+    <docking v-model:visible="showDocking"></docking>
   </div>
 </template>
 
@@ -157,6 +158,8 @@ import searchContainer from "./components/searchContainer.vue";
 import wordcloud from "./components/wordcloud.vue";
 import productItem from "./components/productItem.vue";
 import { useRoute, useRouter } from "vue-router";
+import docking from "./components/docking.vue";
+const showDocking = ref(false);
 const router = useRouter();
 const route = useRoute();
 const loading = ref(true);
diff --git a/src/views/website/searchList/serviceDemandDetail.vue b/src/views/website/searchList/serviceDemandDetail.vue
index 539fbf2..9cddeae 100644
--- a/src/views/website/searchList/serviceDemandDetail.vue
+++ b/src/views/website/searchList/serviceDemandDetail.vue
@@ -62,10 +62,10 @@
                     :data="createdData(state.demandDetail.keywords)"
                   ></wordcloud>
                 </div>
-                <!-- <div class="btns">
-                  <div class="order">预约对接</div>
+                <div class="btns">
+                  <div class="order" @click="showDocking = true">预约对接</div>
                   <div class="share">一键分享</div>
-                </div> -->
+                </div>
               </el-row>
             </div>
 
@@ -149,6 +149,7 @@
         </el-row>
       </template>
     </searchContainer>
+    <docking v-model:visible="showDocking"></docking>
   </div>
 </template>
 
@@ -161,6 +162,8 @@ import searchContainer from "./components/searchContainer.vue";
 import wordcloud from "./components/wordcloud.vue";
 import productItem from "./components/productItem.vue";
 import { useRoute, useRouter } from "vue-router";
+import docking from "./components/docking.vue";
+const showDocking = ref(false);
 const router = useRouter();
 const route = useRoute();
 const loading = ref(true);
diff --git a/src/views/website/searchList/technologyDemandDetail.vue b/src/views/website/searchList/technologyDemandDetail.vue
index e430a91..784ec09 100644
--- a/src/views/website/searchList/technologyDemandDetail.vue
+++ b/src/views/website/searchList/technologyDemandDetail.vue
@@ -62,10 +62,10 @@
                     :data="createdData(state.demandDetail.keywords)"
                   ></wordcloud>
                 </div>
-                <!-- <div class="btns">
-                  <div class="order">预约对接</div>
+                <div class="btns">
+                  <div class="order" @click="showDocking = true">预约对接</div>
                   <div class="share">一键分享</div>
-                </div> -->
+                </div>
               </el-row>
             </div>
 
@@ -84,6 +84,7 @@
         </el-row>
       </template>
     </searchContainer>
+    <docking v-model:visible="showDocking"></docking>
   </div>
 </template>
 
@@ -96,6 +97,8 @@ import searchContainer from "./components/searchContainer.vue";
 import wordcloud from "./components/wordcloud.vue";
 import productItem from "./components/productItem.vue";
 import { useRoute, useRouter } from "vue-router";
+import docking from "./components/docking.vue";
+const showDocking = ref(false);
 const router = useRouter();
 const route = useRoute();
 const loading = ref(true);
diff --git a/src/views/website/solution/solution.vue b/src/views/website/solution/solution.vue
index 6b38fa0..d768c37 100644
--- a/src/views/website/solution/solution.vue
+++ b/src/views/website/solution/solution.vue
@@ -99,6 +99,7 @@ import webFooter from "@/components/webFooter/index.vue";
 import { banner } from "@/api/website/home/index";
 import { useRoute, useRouter } from "vue-router";
 import { getCase } from "@/api/website/solution";
+// import { getCategory } from "../../../api/website/solution";
 
 const router = useRouter();
 
@@ -110,13 +111,13 @@ function handlePath(id) {
 let moreData = ref([]);
 const loading = ref(true);
 const oneLevelTitle = ref({});
-const modeDict = { small: 101, large: 102, government: 103, scientific: 104 };
-const keyDict = {
-  small: "解决方案>中小型企业服务",
-  large: "解决方案>大型企业服务",
-  government: "解决方案>政府区域服务",
-  scientific: "解决方案>政府区域服务",
-};
+// const modeDict = { small: 101, large: 102, government: 103, scientific: 104 };
+// const keyDict = {
+//   small: "解决方案>中小型企业服务",
+//   large: "解决方案>大型企业服务",
+//   government: "解决方案>政府区域服务",
+//   scientific: "解决方案>政府区域服务",
+// };
 const isShowMore = ref(false);
 const activeId = ref("");
 const itemRefs = [];
@@ -141,18 +142,19 @@ onMounted(() => {
 });
 
 //
-function initData() {
-  let name = route.params.name;
-  if (!name) return;
-  let mode = modeDict[name];
-  let key = keyDict[name];
+async function initData() {
+  let name = route.query.name;
+  // if (!name) return;
+  let mode = route.params.mode;
+  // let key = keyDict[name];
 
   getCase({ mode }).then((res) => {
     state.caseList = res.data;
     initScroll();
+    // loading.value = false;
   });
   loading.value = true;
-  banner({ locals: key })
+  banner({ locals: `解决方案>${name}` })
     .then((resp) => {
       state.banner = resp.data[0].images;
       loading.value = false;
diff --git a/src/views/website/website-layout.vue b/src/views/website/website-layout.vue
index 514c256..286d5df 100644
--- a/src/views/website/website-layout.vue
+++ b/src/views/website/website-layout.vue
@@ -2,7 +2,7 @@
   <div class="index">
     <WebsiteHeader></WebsiteHeader>
     <div class="content">
-      <router-view />
+      <router-view :key="route.fullPath" />
     </div>
     <el-backtop />
   </div>
@@ -10,6 +10,8 @@
 
 <script setup name="WebsiteLayout">
 import WebsiteHeader from "@/components/WebsiteHeader";
+import { useRoute } from "vue-router";
+const route = useRoute();
 </script>
 
 <style lang="scss" scoped>
diff --git a/vite.config.js b/vite.config.js
index b73b5a5..b8bfa28 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -31,9 +31,9 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         "/dev-api": {
-          // target: 'http://120.26.107.74:1618',
+          target: 'http://101.34.131.16:1618',
           // target: "http://101.34.131.16:1618",
-          target: "http://192.168.110.10:1618",
+          // target: "http://192.168.110.10:1618",
           // target: 'http://172.18.3.127:1618',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, ""),
diff --git a/web.zip b/web.zip
deleted file mode 100644
index 7dcba2c..0000000
Binary files a/web.zip and /dev/null differ