Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/components/enterprise/enterpisedg.vue

@@ -2,14 +2,14 @@
   <div id="adviserList">
     <el-row>
       <el-col :span="24" class="main">
+        <el-col :span="24" class="top">
+          <heads></heads>
+        </el-col>
         <div class="w_1200">
           <el-col :span="5" class="left">
             <el-col :span="24" class="leftTop">
               <mainMenu :liebiaoList="liebiaoList" v-on="$listeners"></mainMenu>
             </el-col>
-            <el-col :span="24" class="leftDiao">
-              <examine></examine>
-            </el-col>
           </el-col>
           <el-col :span="19" class="right">
             <context
@@ -24,15 +24,19 @@
             ></context>
           </el-col>
         </div>
+        <el-col :span="24" class="foots">
+          <foot></foot>
+        </el-col>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import examine from '@/layout/personCenter/question.vue';
 import mainMenu from '@/layout/enterprise/mainMenu.vue';
 import context from '@/layout/enterprise/context.vue';
+import heads from '@/layout/enterprise/heads.vue';
+import foot from '@/layout/live/foot.vue';
 export default {
   name: 'adviserList',
   props: {
@@ -46,9 +50,10 @@ export default {
     total3: null,
   },
   components: {
-    examine, //网上调查
+    heads, //头部
     mainMenu, //分类导航
     context, //列表
+    foot,
   },
   data: () => ({}),
   created() {},
@@ -68,7 +73,7 @@ export default {
   overflow: hidden;
 }
 .main {
-  height: 900px;
+  min-height: 1080px;
   overflow: hidden;
   padding: 10px 0;
   background: #e9edf6;
@@ -77,25 +82,24 @@ export default {
   background-position: center center;
 }
 .left {
-  height: 900px;
+  height: 880px;
   margin: 0 10px 0 0;
   width: 20%;
 }
-.leftDiao {
-  background: #fff;
-  height: 510px;
-  overflow: hidden;
-}
+
 .leftTop {
   background: #fff;
-  height: 360px;
+  height: 480px;
   overflow: hidden;
   margin: 0 0 10px 0;
 }
 .right {
   width: 79%;
-  height: 880px;
+  min-height: 880px;
   overflow: hidden;
   background-color: #fff;
 }
+.foots {
+  margin: 10px 0 0 0;
+}
 </style>

src/components/enterprise/enterprisefabu.vue

@@ -2,14 +2,14 @@
   <div id="adviserList">
     <el-row>
       <el-col :span="24" class="main">
+        <el-col :span="24" class="top">
+          <heads></heads>
+        </el-col>
         <div class="w_1200">
           <el-col :span="5" class="left">
             <el-col :span="24" class="leftTop">
               <mainMenu :liebiaoList="liebiaoList" v-on="$listeners"></mainMenu>
             </el-col>
-            <el-col :span="24" class="leftDiao">
-              <examine></examine>
-            </el-col>
           </el-col>
 
           <el-col :span="19" class="right">
@@ -32,15 +32,19 @@
             ></contextfabuxx>
           </el-col>
         </div>
+        <el-col :span="24" class="foots">
+          <foot></foot>
+        </el-col>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import examine from '@/layout/personCenter/question.vue';
+import heads from '@/layout/enterprise/heads.vue';
 import mainMenu from '@/layout/enterprise/mainMenu.vue';
 import contextfabuxx from '@/layout/enterprise/contextfabuxx.vue';
+import foot from '@/layout/live/foot.vue';
 export default {
   name: 'adviserList',
   props: {
@@ -61,9 +65,10 @@ export default {
     totalfaqi: null,
   },
   components: {
-    examine, //网上调查
+    heads,
     mainMenu, //分类导航
     contextfabuxx, //列表
+    foot,
   },
   data: () => ({}),
   created() {},
@@ -83,9 +88,9 @@ export default {
   overflow: hidden;
 }
 .main {
-  height: 900px;
+  min-height: 1300px;
   overflow: hidden;
-  padding: 10px 0;
+  padding: 10px 0 0 0;
   background: #e9edf6;
   background-attachment: fixed;
   background-size: cover;
@@ -96,21 +101,20 @@ export default {
   margin: 0 10px 0 0;
   width: 20%;
 }
-.leftDiao {
-  background: #fff;
-  height: 510px;
-  overflow: hidden;
-}
+
 .leftTop {
   background: #fff;
-  height: 360px;
+  height: 480px;
   overflow: hidden;
   margin: 0 0 10px 0;
 }
 .right {
   width: 79%;
-  height: 880px;
+  height: 1100px;
   overflow: hidden;
   background-color: #fff;
 }
+.foots {
+  margin: 10px 0 0 0;
+}
 </style>

src/components/enterprise/enterprisejb.vue

@@ -2,29 +2,32 @@
   <div id="adviserList">
     <el-row>
       <el-col :span="24" class="main">
+        <el-col :span="24" class="top">
+          <heads></heads>
+        </el-col>
         <div class="w_1200">
           <el-col :span="5" class="left">
             <el-col :span="24" class="leftTop">
               <mainMenu :liebiaoList="liebiaoList" v-on="$listeners"></mainMenu>
             </el-col>
-            <el-col :span="24" class="leftDiao">
-              <examine></examine>
-            </el-col>
           </el-col>
           <el-col :span="19" class="right">
             <jibencontext v-on="$listeners" :liebiaoList="liebiaoList" :userinfo="userinfo"></jibencontext>
           </el-col>
         </div>
+        <el-col :span="24" class="foots">
+          <foot></foot>
+        </el-col>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import examine from '@/layout/personCenter/question.vue';
+import heads from '@/layout/enterprise/heads.vue';
 import mainMenu from '@/layout/enterprise/mainMenu.vue';
 import jibencontext from '@/layout/enterprise/jibencontext.vue';
-
+import foot from '@/layout/live/foot.vue';
 export default {
   name: 'adviserList',
   props: {
@@ -33,9 +36,10 @@ export default {
     userinfo: null, //基本信息
   },
   components: {
-    examine, //网上调查
+    heads,
     mainMenu, //分类导航
     jibencontext, //基本信息
+    foot,
   },
   data: () => ({}),
   created() {},
@@ -57,7 +61,7 @@ export default {
 .main {
   min-height: 740px;
   overflow: hidden;
-  padding: 10px 0;
+  padding: 10px 0 0 0;
   background: #e9edf6;
   background-attachment: fixed;
   background-size: cover;
@@ -68,14 +72,10 @@ export default {
   margin: 0 10px 0 0;
   width: 20%;
 }
-.leftDiao {
-  background: #fff;
-  height: 770px;
-  overflow: hidden;
-}
+
 .leftTop {
   background: #fff;
-  height: 360px;
+  height: 480px;
   overflow: hidden;
   margin: 0 0 10px 0;
 }
@@ -85,4 +85,7 @@ export default {
   overflow: hidden;
   background-color: #fff;
 }
+.foots {
+  margin: 10px 0 0 0;
+}
 </style>

src/components/enterprise/enterprisexuqiu.vue

@@ -2,29 +2,32 @@
   <div id="adviserList">
     <el-row>
       <el-col :span="24" class="main">
+        <el-col :span="24" class="top">
+          <heads></heads>
+        </el-col>
         <div class="w_1200">
           <el-col :span="5" class="left">
             <el-col :span="24" class="leftTop">
               <mainMenu :liebiaoList="liebiaoList" v-on="$listeners"></mainMenu>
             </el-col>
-            <el-col :span="24" class="leftDiao">
-              <examine></examine>
-            </el-col>
           </el-col>
           <el-col :span="19" class="right">
             <contextfabu v-on="$listeners" :demandForm="demandForm" :totaltype="totaltype" :columnList="columnList"></contextfabu>
           </el-col>
         </div>
+        <el-col :span="24" class="foots">
+          <foot></foot>
+        </el-col>
       </el-col>
-      <el-col :span="24" class="foot"> </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import examine from '@/layout/personCenter/question.vue';
+import heads from '@/layout/enterprise/heads.vue';
 import mainMenu from '@/layout/enterprise/mainMenu.vue';
 import contextfabu from '@/layout/enterprise/contextfabu.vue';
+import foot from '@/layout/live/foot.vue';
 export default {
   name: 'adviserList',
   props: {
@@ -34,9 +37,10 @@ export default {
     totaltype: null, //判断
   },
   components: {
-    examine, //网上调查
+    heads,
     mainMenu, //分类导航
     contextfabu, //列表
+    foot,
   },
   data: () => ({}),
   created() {},
@@ -56,9 +60,9 @@ export default {
   overflow: hidden;
 }
 .main {
-  min-height: 1720px;
+  min-height: 1920px;
   overflow: hidden;
-  padding: 10px 0;
+  padding: 10px 0 0 0;
   background: #e9edf6;
   background-attachment: fixed;
   background-size: cover;
@@ -69,14 +73,10 @@ export default {
   margin: 0 10px 0 0;
   width: 20%;
 }
-.leftDiao {
-  background: #fff;
-  height: 1350px;
-  overflow: hidden;
-}
+
 .leftTop {
   background: #fff;
-  height: 360px;
+  height: 480px;
   overflow: hidden;
   margin: 0 0 10px 0;
 }
@@ -86,4 +86,7 @@ export default {
   overflow: hidden;
   background-color: #fff;
 }
+.foots {
+  margin: 10px 0 0 0;
+}
 </style>

src/components/enterprise/enterprisexx.vue

@@ -2,28 +2,32 @@
   <div id="adviserList">
     <el-row>
       <el-col :span="24" class="main">
+        <el-col :span="24" class="top">
+          <heads></heads>
+        </el-col>
         <div class="w_1200">
           <el-col :span="5" class="left">
             <el-col :span="24" class="leftTop">
               <mainMenu :liebiaoList="liebiaoList" v-on="$listeners"></mainMenu>
             </el-col>
-            <el-col :span="24" class="leftDiao">
-              <examine></examine>
-            </el-col>
           </el-col>
           <el-col :span="19" class="right">
             <contextxx></contextxx>
           </el-col>
         </div>
+        <el-col :span="24" class="foots">
+          <foot></foot>
+        </el-col>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import examine from '@/layout/personCenter/question.vue';
+import heads from '@/layout/enterprise/heads.vue';
 import mainMenu from '@/layout/enterprise/mainMenu.vue';
 import contextxx from '@/layout/enterprise/contextxx.vue';
+import foot from '@/layout/live/foot.vue';
 export default {
   name: 'adviserList',
   props: {
@@ -31,9 +35,10 @@ export default {
     liebiaoList: null, //分类导航
   },
   components: {
-    examine, //网上调查
+    heads,
     mainMenu, //分类导航
     contextxx, //消息管理
+    foot,
   },
   data: () => ({}),
   created() {},
@@ -55,7 +60,7 @@ export default {
 .main {
   min-height: 740px;
   overflow: hidden;
-  padding: 10px 0;
+  padding: 10px 0 0 0;
   background: #e9edf6;
   background-attachment: fixed;
   background-size: cover;
@@ -66,14 +71,10 @@ export default {
   margin: 0 10px 0 0;
   width: 20%;
 }
-.leftDiao {
-  background: #fff;
-  height: 770px;
-  overflow: hidden;
-}
+
 .leftTop {
   background: #fff;
-  height: 360px;
+  height: 480px;
   overflow: hidden;
   margin: 0 0 10px 0;
 }
@@ -83,4 +84,7 @@ export default {
   overflow: hidden;
   background-color: #fff;
 }
+.foots {
+  margin: 10px 0 0 0;
+}
 </style>

src/components/enterprise/xiugai.vue

@@ -0,0 +1,92 @@
+<template>
+  <div id="adviserList">
+    <el-row>
+      <el-col :span="24" class="main">
+        <el-col :span="24" class="top">
+          <heads></heads>
+        </el-col>
+        <div class="w_1200">
+          <el-col :span="5" class="left">
+            <el-col :span="24" class="leftTop">
+              <mainMenu :liebiaoList="liebiaoList" v-on="$listeners"></mainMenu>
+            </el-col>
+          </el-col>
+          <el-col :span="19" class="right">
+            <xiugai v-on="$listeners" :form="form"></xiugai>
+          </el-col>
+        </div>
+        <el-col :span="24" class="foots">
+          <foot></foot>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import heads from '@/layout/enterprise/heads.vue';
+import mainMenu from '@/layout/enterprise/mainMenu.vue';
+import xiugai from '@/layout/enterprise/xiugai.vue';
+import foot from '@/layout/live/foot.vue';
+
+export default {
+  name: 'adviserList',
+  props: {
+    info: null, //站点信息
+    liebiaoList: null, //分类导航
+    form: null,
+  },
+  components: {
+    heads,
+    mainMenu, //分类导航
+    xiugai, //消息管理
+    foot,
+  },
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+.w_1200 {
+  width: 80%;
+  margin: 0 auto;
+}
+
+.menu {
+  height: 70px;
+  overflow: hidden;
+}
+.main {
+  min-height: 500px;
+  overflow: hidden;
+  padding: 10px 0;
+  background: #e9edf6;
+  background-attachment: fixed;
+  background-size: cover;
+  background-position: center center;
+}
+.left {
+  min-height: 480px;
+  margin: 0 10px 0 0;
+  width: 20%;
+}
+
+.leftTop {
+  background: #fff;
+  height: 480px;
+  overflow: hidden;
+  margin: 0 0 10px 0;
+}
+.right {
+  width: 79%;
+  min-height: 480px;
+  overflow: hidden;
+  background-color: #fff;
+}
+.foots {
+  margin: 10px 0 0 0;
+}
+</style>

src/layout/enterprise/contextfabu.vue

@@ -11,6 +11,29 @@
                     <el-option v-for="(item, index) in totaltype_list" :key="index" :value="item.value" :label="item.name"></el-option>
                   </el-select>
                 </el-form-item>
+                <span v-if="totaltype == 0">
+                  <el-form-item label="选择不显示的信息">
+                    <el-select v-model="is_display" multiple placeholder="请选择" style="width:100%">
+                      <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                    </el-select>
+                  </el-form-item>
+                </span>
+                <span v-if="totaltype == 1">
+                  <el-form-item label="选择不显示的信息">
+                    <el-select v-model="demandForm.is_display" multiple placeholder="请选择" style="width:100%">
+                      <el-option v-for="item in option2" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                    </el-select>
+                  </el-form-item>
+                </span>
+
+                <span v-if="totaltype == 2">
+                  <el-form-item label="选择不显示的信息">
+                    <el-select v-model="demandForm.is_display" multiple placeholder="请选择" style="width:100%">
+                      <el-option v-for="item in option3" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                    </el-select>
+                  </el-form-item>
+                </span>
+
                 <el-form-item label="产品名称">
                   <el-input v-model="demandForm.name" placeholder="请输入产品名称"></el-input>
                 </el-form-item>
@@ -154,6 +177,250 @@ export default {
     upload,
   },
   data: () => ({
+    options: [
+      {
+        value: 'totaltype',
+        label: '产品类型',
+      },
+      {
+        value: 'name',
+        label: '产品名称',
+      },
+      {
+        value: 'contact_user',
+        label: '联系人',
+      },
+
+      {
+        value: 'contact_tel',
+        label: '联系人电话',
+      },
+
+      {
+        value: 'description',
+        label: '产品描述',
+      },
+      {
+        value: 'product_type_id',
+        label: '类型',
+      },
+      {
+        value: 'phase',
+        label: '研发阶段',
+      },
+      {
+        value: 'introduction',
+        label: '产品简介',
+      },
+
+      {
+        value: 'price',
+        label: '产品单价',
+      },
+      {
+        value: 'priceunit',
+        label: '产品单位',
+      },
+
+      {
+        value: 'image',
+        label: '产品图片',
+      },
+      {
+        value: 'product_args',
+        label: '产品参数',
+      },
+      {
+        value: 'field',
+        label: '应用领域',
+      },
+
+      {
+        value: 'prospect',
+        label: '市场前景',
+      },
+      {
+        value: 'contract',
+        label: '电子合同',
+      },
+      {
+        value: 'gxtype',
+        label: '供给类型',
+      },
+      {
+        value: 'scope',
+        label: '服务范围',
+      },
+
+      {
+        value: 'property',
+        label: '知识产权',
+      },
+
+      {
+        value: 'business',
+        label: '交易方式',
+      },
+    ],
+
+    option2: [
+      {
+        value: 'totaltype',
+        label: '产品类型',
+      },
+      {
+        value: 'name',
+        label: '产品名称',
+      },
+      {
+        value: 'contact_user',
+        label: '联系人',
+      },
+
+      {
+        value: 'contact_tel',
+        label: '联系人电话',
+      },
+
+      {
+        value: 'description',
+        label: '产品描述',
+      },
+      {
+        value: 'product_type_id',
+        label: '类型',
+      },
+
+      {
+        value: 'introduction',
+        label: '产品简介',
+      },
+
+      {
+        value: 'price',
+        label: '产品单价',
+      },
+      {
+        value: 'priceunit',
+        label: '产品单位',
+      },
+
+      {
+        value: 'image',
+        label: '产品图片',
+      },
+      {
+        value: 'product_args',
+        label: '产品参数',
+      },
+
+      {
+        value: 'contract',
+        label: '电子合同',
+      },
+      {
+        value: 'gxtype',
+        label: '供给类型',
+      },
+      {
+        value: 'scope',
+        label: '服务范围',
+      },
+
+      {
+        value: 'property',
+        label: '知识产权',
+      },
+
+      {
+        value: 'business',
+        label: '交易方式',
+      },
+    ],
+
+    option3: [
+      {
+        value: 'totaltype',
+        label: '产品类型',
+      },
+      {
+        value: 'name',
+        label: '产品名称',
+      },
+      {
+        value: 'contact_user',
+        label: '联系人',
+      },
+
+      {
+        value: 'contact_tel',
+        label: '联系人电话',
+      },
+
+      {
+        value: 'description',
+        label: '产品描述',
+      },
+      {
+        value: 'product_type_id',
+        label: '类型',
+      },
+
+      {
+        value: 'introduction',
+        label: '产品简介',
+      },
+
+      {
+        value: 'price',
+        label: '产品单价',
+      },
+      {
+        value: 'priceunit',
+        label: '产品单位',
+      },
+
+      {
+        value: 'image',
+        label: '产品图片',
+      },
+
+      {
+        value: 'field',
+        label: '应用领域',
+      },
+
+      {
+        value: 'prospect',
+        label: '市场前景',
+      },
+      {
+        value: 'contract',
+        label: '电子合同',
+      },
+      {
+        value: 'gxtype',
+        label: '供给类型',
+      },
+      {
+        value: 'scope',
+        label: '服务范围',
+      },
+
+      {
+        value: 'property',
+        label: '知识产权',
+      },
+
+      {
+        value: 'business',
+        label: '交易方式',
+      },
+    ],
+    is_display: [],
+    value1: [],
+    value2: [],
+
     activeName: 'first',
     priceunit_list: [
       {
@@ -176,12 +443,15 @@ export default {
     ],
   }),
   created() {},
+
   computed: {},
   methods: {
     handleClick(tab, event) {
       console.log(tab, event);
     },
     demandBtn() {
+      console.log(this.demandForm);
+
       this.$emit('demandSubmit', { data: this.demandForm, id: this.demandForm.id });
     },
     selectChild(product_type_id) {

src/layout/enterprise/heads.vue

@@ -0,0 +1,66 @@
+<template>
+  <div id="heads">
+    <div class="w_0100">
+      <div class="superbanner">
+        <img :src="top_bg" />
+      </div>
+      <div class="supertop">
+        <div class="w_1200">
+          <p>
+            欢迎来到吉林省计算中心科技平台
+          </p>
+          <p>
+            <span v-if="user && user.name">{{ user.name }}</span>
+          </p>
+        </div>
+      </div>
+      <div class="superlogo">
+        <div class="w_1200">
+          <a href="/">
+            <img :src="logo" />
+            <span>
+              吉林省计算中心科技平台
+            </span>
+          </a>
+        </div>
+      </div>
+      <div class="supermenu">
+        <div class="w_1200"></div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  name: 'heads',
+  props: {},
+  components: {},
+  data: () => {
+    return {
+      top_bg: require('@/assets/live/top_bg.png'),
+      logo: require('@/assets/live/logo.png'),
+    };
+  },
+  created() {},
+  methods: {},
+  computed: {
+    ...mapState(['user']),
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/style/style.css';
+.logininfo {
+  font-size: 20px;
+  margin: 0 0 0 5px;
+}
+/deep/.superbanner {
+  position: relative;
+  height: 250px;
+  overflow: hidden;
+  margin: 0 0 15px 0;
+}
+</style>

src/layout/enterprise/xiugai.vue

@@ -0,0 +1,57 @@
+<template>
+  <div id="loginMain">
+    <el-row class="loginMains">
+      <el-col :span="24" class="top">
+        <el-col :span="12" class="context">
+          <el-col :span="24" class="topTitle">
+            修改密码
+          </el-col>
+          <el-col :span="24">
+            <el-form ref="form" :model="form" label-width="60px">
+              <el-form-item label="新密码">
+                <el-input v-model="form.password" placeholder="请输入新密码" show-password></el-input>
+              </el-form-item>
+              <el-col :span="24" class="loginSubmit"><el-button type="primary" @click="registerSubmit">修改</el-button></el-col>
+            </el-form>
+          </el-col>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'loginMain',
+  props: {
+    form: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {
+    registerSubmit() {
+      console.log(this.form);
+
+      this.$emit('submitDates', { data: this.form });
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.topTitle {
+  font-size: 22px;
+  color: #22529a;
+  margin: 0 0 20px 20px;
+}
+.loginMains {
+  padding: 20px 0;
+  background-color: #fff;
+}
+
+.loginSubmit {
+  text-align: center;
+}
+</style>

src/layout/supermarket/detali.vue

@@ -22,10 +22,10 @@
               <span>总分类：</span
               ><span>{{ policyInfo.totaltype === '0' ? '技术' : policyInfo.totaltype === '1' ? '产品' : policyInfo.totaltype === '2' ? '服务' : '暂无' }}</span>
               <span>类型名称：</span>
-              <span>{{ policyInfo.product_type_name }}</span>
+              <span>{{ policyInfo.product_type_name || '暂无' }}</span>
             </p>
             <p class="infoPrice">
-              <span>收费标准：</span><span>{{ policyInfo.price }}元/</span><span>{{ policyInfo.priceunit }}</span>
+              <span>收费标准：</span><span>{{ policyInfo.price || '暂无' }}元/</span><span>{{ policyInfo.priceunit || '暂无' }}</span>
             </p>
             <p class="infoStatus">
               <span>交易方式：</span
@@ -41,34 +41,35 @@
               ><span>{{ policyInfo.business === '0' ? '公用' : policyInfo.business === '1' ? '供' : policyInfo.business === '2' ? '需' : '暂无' }}</span>
             </p>
             <p class="infoType">
-              <span>联系人：</span><span>{{ policyInfo.contact_user }}</span
-              ><span>联系电话：</span><span>{{ policyInfo.contact_tel }}</span>
+              <span>联系人：</span><span>{{ policyInfo.contact_user || '暂无' }}</span
+              ><span>联系电话：</span><span>{{ policyInfo.contact_tel || '暂无' }}</span>
             </p>
           </el-col>
         </el-col>
         <el-col :span="24" class="infoDown">
           <el-form label-width="150px">
             <el-form-item label="应用领域：">
-              <span>{{ policyInfo.field }}</span>
+              <span>{{ policyInfo.field || '暂无' }}</span>
             </el-form-item>
             <el-form-item label="市场前景：">
-              <span>{{ policyInfo.prospect }}</span>
+              <span>{{ policyInfo.prospect || '暂无' }}</span>
             </el-form-item>
             <el-form-item label="电子合同：">
-              <span>{{ policyInfo.contract }}</span>
+              <span>{{ policyInfo.contract || '暂无' }}</span>
             </el-form-item>
             <el-form-item label="服务范围：">
-              <span>{{ policyInfo.scope }}</span>
+              <span>{{ policyInfo.scope || '暂无' }}</span>
             </el-form-item>
             <el-form-item label="描述：">
-              <span>{{ policyInfo.description }}</span>
+              <span>{{ policyInfo.description || '暂无' }}</span>
             </el-form-item>
             <el-form-item label="知识产权：">
-              <span>{{ policyInfo.property }}</span>
+              <span>{{ policyInfo.property || '暂无' }}</span>
             </el-form-item>
             <el-form-item label="简介：">
-              <span>{{ policyInfo.introduction }}</span>
+              <span>{{ policyInfo.introduction || '暂无' }}</span>
             </el-form-item>
+
             <el-form-item label="产品参数：">
               <el-table :data="policyInfo.product_args" border style="width: 100%">
                 <el-table-column prop="arg_name" label="参数名称"> </el-table-column>

src/router/index.js

@@ -114,23 +114,17 @@ const live = [
         component: () => import('../views/hall/liveApply.vue'),
       },
 
-      //企业-发布信息列表
-      {
-        path: '/enterprise/enterprisefabu',
-        name: 'enterprisefabu',
-        component: () => import('../views/enterprise/enterprisefabu.vue'),
-      },
       //企业-基本信息
       {
         path: '/enterprise/enterprisejb',
         name: 'enterprisefabu',
         component: () => import('../views/enterprise/enterprisejb.vue'),
       },
-      //企业-信息管理
+      //企业-发布信息列表
       {
-        path: '/enterprise/enterprisexx',
-        name: 'enterprisexuqiu',
-        component: () => import('../views/enterprise/enterprisexx.vue'),
+        path: '/enterprise/enterprisefabu',
+        name: 'enterprisefabu',
+        component: () => import('../views/enterprise/enterprisefabu.vue'),
       },
 
       // 企业-需求发布
@@ -153,6 +147,31 @@ const live = [
       },
     ],
   },
+  //企业-信息管理
+  {
+    path: '/enterprise/enterprisexx',
+    name: 'enterprisexuqiu',
+    component: () => import('../views/enterprise/enterprisexx.vue'),
+  },
+
+  // 企业-需求发布
+  {
+    path: '/enterprise/enterprisexuqiu',
+    name: 'enterprisexuqiu',
+    component: () => import('../views/enterprise/enterprisexuqiu.vue'),
+  },
+  //企业-订购
+  {
+    path: '/enterprise/enterprisedg',
+    name: 'enterprisedg',
+    component: () => import('../views/enterprise/enterprisedg.vue'),
+  },
+  //修改密码
+  {
+    path: '/enterprise/xiugai',
+    name: 'enterprisedg',
+    component: () => import('../views/enterprise/xiugai.vue'),
+  },
   {
     path: '/direct',
     name: 'live_direct',

src/store/index.js

@@ -16,6 +16,8 @@ import personalchat from '@common/store/live/personalchat';
 import personalroom from '@common/store/live/personalroom';
 import markettype from '@common/store/market/markettype';
 import enterpriseproject from '@common/store/market/enterpriseproject';
+import newmarketproduct from '@common/store/market/newmarketproduct';
+
 Vue.use(Vuex);
 
 export default new Vuex.Store({
@@ -37,5 +39,6 @@ export default new Vuex.Store({
     transaction,
     markettype,
     enterpriseproject,
+    newmarketproduct,
   },
 });

src/views/direct.vue

@@ -115,18 +115,19 @@
                         </p>
 
                         <p class="newp">
-                          <span class="name"><i class="el-icon-user-solid"></i>{{ item.contact_user }}</span
-                          ><span> <i class="el-icon-phone"></i>{{ item.contact_tel }}</span>
+                          <span class="name"><i class="el-icon-user-solid"></i>{{ item.contact_user || '暂无' }}</span
+                          ><span> <i class="el-icon-phone"></i>{{ item.contact_tel || '暂无' }}</span>
                         </p>
                         <p>
-                          <span class="pspan">类型:{{ item.product_type_name }}</span
-                          ><span class="pspan">研发阶段:{{ item.phase == '0' ? '阶段成果' : '最终成果' }}</span
-                          ><span class="pspan">交易方式:{{ item.business == '0' ? '公用' : item.business == '1' ? '转让' : '竞价' }} </span
-                          ><span class="pspan">交易价格:{{ item.price }}{{ item.priceunit }}</span>
+                          <span class="pspan">类型:{{ item.product_type_name || '暂无' }}</span
+                          ><span class="pspan">研发阶段:{{ item.phase == '0' ? '阶段成果' : item.phase == '1' ? '阶段成果' : '暂无' }}</span
+                          ><span class="pspan"
+                            >交易方式:{{ item.business == '0' ? '公用' : item.business == '1' ? '转让' : item.business == '2' ? '竞价' : '暂无' }} </span
+                          ><span class="pspan">交易价格:{{ item.price || '暂无' }}{{ item.priceunit || '暂无' }}</span>
                         </p>
                       </el-col>
                       <el-col :span="10" class="liright">
-                        <p>摘要:{{ item.introduction }}</p>
+                        <p>摘要:{{ item.introduction || '暂无' }}</p>
                       </el-col>
                     </li>
                   </ul>
@@ -141,20 +142,23 @@
                           <el-col :span="24" class="detail" v-if="policyInfo.totaltype">
                             <el-col :span="24" class="infoMess">
                               <el-col :span="24" class="info"> 名称:{{ policyInfo.name }} </el-col>
-                              <el-col :span="24" class="info"> 类型：{{ policyInfo.product_type_name }} </el-col>
-                              <el-col :span="24" class="info"> 单价:{{ policyInfo.price }} </el-col>
-                              <el-col :span="24" class="info"> 单位:{{ policyInfo.priceunit }} </el-col>
+                              <el-col :span="24" class="info"> 类型：{{ policyInfo.product_type_name || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 单价:{{ policyInfo.price || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 单位:{{ policyInfo.priceunit || '暂无' }} </el-col>
                               <el-col :span="24">
                                 <span class="tupian"> 图片:</span>
                                 <el-col :span="6" class="info" v-for="(acm, index) in policyInfo.image" :key="index">
-                                  <span><el-image class="newclassimage" style="width:100px;height:100px" :src="acm.url"></el-image></span>
+                                  <span v-if="policyInfo.image.length > 0"
+                                    ><el-image class="newclassimage" style="width:100px;height:100px" :src="acm.url"></el-image
+                                  ></span>
+                                  <span v-else>暂无</span>
                                 </el-col>
                               </el-col>
-                              <el-col :span="24" class="info"> 服务范围:{{ policyInfo.scope }} </el-col>
-                              <el-col :span="24" class="infos"> 描述:{{ policyInfo.description }} </el-col>
-                              <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property }} </el-col>
+                              <el-col :span="24" class="info"> 服务范围:{{ policyInfo.scope || '暂无' }} </el-col>
+                              <el-col :span="24" class="infos"> 描述:{{ policyInfo.description || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property || '暂无' }} </el-col>
 
-                              <el-col :span="24" class="infos"> 简介:{{ policyInfo.introduction }} </el-col>
+                              <el-col :span="24" class="infos"> 简介:{{ policyInfo.introduction || '暂无' }} </el-col>
 
                               <el-col :span="24" class="info">
                                 <el-button type="primary" class="duijie" @click="technology(policyInfo.id)">对接</el-button>
@@ -167,12 +171,12 @@
                         <el-button type="primary" size="mini" @click="technologyBtn(item.id)" class="duijie">对接</el-button>
                       </p>
                       <p>
-                        <span>研发阶段：{{ item.phase == '0' ? '阶段成果' : '最终成果' }}</span>
+                        <span>研发阶段：{{ item.phase == '0' ? '阶段成果' : item.phase == '1' ? '最终成果' : '暂无' }}</span>
                         <span>发布时间：{{ item.meta | getDate }}</span>
                       </p>
                       <p>
-                        <span>需求类型：{{ item.product_type_name }}</span>
-                        <span>{{ item.address }}</span>
+                        <span>需求类型：{{ item.product_type_name || '暂无' }}</span>
+                        <span>{{ item.address || '暂无地址' }}</span>
                       </p>
                     </li>
                   </ul>
@@ -187,18 +191,21 @@
                           <el-col :span="24" class="detail" v-if="policyInfo.totaltype">
                             <el-col :span="24" class="infoMess">
                               <el-col :span="24" class="info"> 名称:{{ policyInfo.name }} </el-col>
-                              <el-col :span="24" class="info"> 类型：{{ policyInfo.product_type_name }} </el-col>
-                              <el-col :span="24" class="info"> 单价:{{ policyInfo.price }} </el-col>
-                              <el-col :span="24" class="info"> 单位:{{ policyInfo.priceunit }} </el-col>
+                              <el-col :span="24" class="info"> 类型：{{ policyInfo.product_type_name || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 单价:{{ policyInfo.price || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 单位:{{ policyInfo.priceunit || '暂无' }} </el-col>
                               <el-col :span="24">
                                 <span class="tupian"> 图片:</span>
                                 <el-col :span="6" class="infos" v-for="(acm, index) in policyInfo.image" :key="index">
-                                  <span><el-image class="newclassimage" style="width:100px;height:100px" :src="acm.url"></el-image></span>
+                                  <span v-if="policyInfo.image.length > 0"
+                                    ><el-image class="newclassimage" style="width:100px;height:100px" :src="acm.url"></el-image
+                                  ></span>
+                                  <span v-else>暂无</span>
                                 </el-col>
                               </el-col>
-                              <el-col :span="24" class="info"> 服务范围:{{ policyInfo.scope }} </el-col>
-                              <el-col :span="24" class="info"> 描述{{ policyInfo.description }} </el-col>
-                              <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property }} </el-col>
+                              <el-col :span="24" class="info"> 服务范围:{{ policyInfo.scope || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 描述{{ policyInfo.description || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property || '暂无' }} </el-col>
 
                               <el-col :span="24" class="infos"> 简介:{{ policyInfo.introduction }} </el-col>
 
@@ -211,15 +218,16 @@
                         </el-popover>
                       </p>
                       <div class="serviceDown">
-                        <el-image :src="item.image[0].url"></el-image>
-                        <p>联系人:{{ item.contact_user }}</p>
+                        <span v-if="item.image.length > 0"> <el-image :src="item.image[0].url"></el-image></span>
+                        <span v-else>暂无</span>
+                        <p>联系人:{{ item.contact_user || '暂无' }}</p>
                         <p>
                           <span>服务类型：</span>
-                          <span class="type2">{{ item.product_type_name }}</span>
+                          <span class="type2">{{ item.product_type_name || '暂无' }}</span>
                         </p>
-                        <p>电话:{{ item.contact_tel }}</p>
-                        <p>单价:{{ item.price }} 单位:{{ item.priceunit }}</p>
-                        <p>知识产权:{{ item.property }}</p>
+                        <p>电话:{{ item.contact_tel || '暂无' }}</p>
+                        <p>单价:{{ item.price || '暂无' }} 单位:{{ item.priceunit || '暂无' }}</p>
+                        <p>知识产权:{{ item.property || '暂无' }}</p>
                       </div>
                     </li>
                   </ul>
@@ -478,7 +486,7 @@ export default {
     this.searchInfo();
   },
   methods: {
-    ...mapProduct({ mapProductQuery: 'query' }),
+    ...mapProduct({ mapProductQuery: 'newquery' }),
     ...market({ marketFetch: 'fetch' }),
     ...dock({ dockQuery: 'query' }),
     ...talentExperts({ expertQuery: 'query' }),

src/views/enterprise/enterprisedg.vue

@@ -29,7 +29,15 @@ export default {
     enterprisedgDetail,
   },
   data: () => ({
-    liebiaoList: [{ name: '基本信息' }, { name: '消息管理' }, { name: '我的发布' }, { name: '我的订购' }, { name: '注销账号' }],
+    liebiaoList: [
+      { name: '基本信息' },
+      { name: '消息管理' },
+      { name: '我的发布' },
+      { name: '事项管理' },
+      { name: '返回首页' },
+      { name: '修改密码' },
+      { name: '注销账号' },
+    ],
     total1: 1,
     total2: 1,
     total3: 1,
@@ -106,8 +114,12 @@ export default {
         this.$router.push({ path: '/enterprise/enterprisexx' });
       } else if (id === '我的发布') {
         this.$router.push({ path: '/enterprise/enterprisefabu' });
-      } else if (id === '我的订购') {
+      } else if (id === '事项管理') {
         this.$router.push({ path: '/enterprise/enterprisedg' });
+      } else if (id === '修改密码') {
+        this.$router.push({ path: '/enterprise/xiugai' });
+      } else if (id === '返回首页') {
+        this.$router.push({ path: '/home.html' });
       }
     },
   },

src/views/enterprise/enterprisefabu.vue

@@ -52,7 +52,15 @@ export default {
     shenheList: [],
     successlist: [],
     info: {},
-    liebiaoList: [{ name: '基本信息' }, { name: '消息管理' }, { name: '我的发布' }, { name: '我的订购' }, { name: '注销账号' }],
+    liebiaoList: [
+      { name: '基本信息' },
+      { name: '消息管理' },
+      { name: '我的发布' },
+      { name: '事项管理' },
+      { name: '返回首页' },
+      { name: '修改密码' },
+      { name: '注销账号' },
+    ],
     recruitData: [],
     gonggeiData: [],
     Transactionlist: [],
@@ -225,14 +233,22 @@ export default {
       this.jiaoyi2();
     },
     async onsaveClick({ id }) {
+      console.log(id);
+
       if (id === '基本信息') {
         this.$router.push({ path: '/enterprise/enterprisejb' });
       } else if (id === '消息管理') {
         this.$router.push({ path: '/enterprise/enterprisexx' });
       } else if (id === '我的发布') {
         this.$router.push({ path: '/enterprise/enterprisefabu' });
-      } else if (id === '我的订购') {
+      } else if (id === '事项管理') {
+        console.log('bbb');
+
         this.$router.push({ path: '/enterprise/enterprisedg' });
+      } else if (id === '修改密码') {
+        this.$router.push({ path: '/enterprise/xiugai' });
+      } else if (id === '返回首页') {
+        this.$router.push({ path: '/home.html' });
       }
     },
   },

src/views/enterprise/enterprisejb.vue

@@ -17,7 +17,15 @@ export default {
   },
   data: () => ({
     info: {},
-    liebiaoList: [{ name: '基本信息' }, { name: '消息管理' }, { name: '我的发布' }, { name: '我的订购' }, { name: '注销账号' }],
+    liebiaoList: [
+      { name: '基本信息' },
+      { name: '消息管理' },
+      { name: '我的发布' },
+      { name: '事项管理' },
+      { name: '返回首页' },
+      { name: '修改密码' },
+      { name: '注销账号' },
+    ],
     userinfo: {},
   }),
   created() {
@@ -43,8 +51,12 @@ export default {
         this.$router.push({ path: '/enterprise/enterprisexx' });
       } else if (id === '我的发布') {
         this.$router.push({ path: '/enterprise/enterprisefabu' });
-      } else if (id === '我的订购') {
+      } else if (id === '事项管理') {
         this.$router.push({ path: '/enterprise/enterprisedg' });
+      } else if (id === '修改密码') {
+        this.$router.push({ path: '/enterprise/xiugai' });
+      } else if (id === '返回首页') {
+        this.$router.push({ path: '/home.html' });
       }
     },
   },

src/views/enterprise/enterprisexuqiu.vue

@@ -27,7 +27,15 @@ export default {
   },
   data: () => ({
     info: {},
-    liebiaoList: [{ name: '基本信息' }, { name: '消息管理' }, { name: '我的发布' }, { name: '我的订购' }, { name: '注销账号' }],
+    liebiaoList: [
+      { name: '基本信息' },
+      { name: '消息管理' },
+      { name: '我的发布' },
+      { name: '事项管理' },
+      { name: '返回首页' },
+      { name: '修改密码' },
+      { name: '注销账号' },
+    ],
     demandForm: {
       image: {},
       product_args: [],
@@ -93,8 +101,12 @@ export default {
         this.$router.push({ path: '/enterprise/enterprisexx' });
       } else if (id === '我的发布') {
         this.$router.push({ path: '/enterprise/enterprisefabu' });
-      } else if (id === '我的订购') {
+      } else if (id === '事项管理') {
         this.$router.push({ path: '/enterprise/enterprisedg' });
+      } else if (id === '修改密码') {
+        this.$router.push({ path: '/enterprise/xiugai' });
+      } else if (id === '返回首页') {
+        this.$router.push({ path: '/home.html' });
       }
     },
     changeType(item) {

src/views/enterprise/enterprisexx.vue

@@ -16,7 +16,15 @@ export default {
   },
   data: () => ({
     info: {},
-    liebiaoList: [{ name: '基本信息' }, { name: '消息管理' }, { name: '我的发布' }, { name: '我的订购' }, { name: '注销账号' }],
+    liebiaoList: [
+      { name: '基本信息' },
+      { name: '消息管理' },
+      { name: '我的发布' },
+      { name: '事项管理' },
+      { name: '返回首页' },
+      { name: '修改密码' },
+      { name: '注销账号' },
+    ],
   }),
   created() {},
   computed: {},
@@ -29,8 +37,12 @@ export default {
         this.$router.push({ path: '/enterprise/enterprisexx' });
       } else if (id === '我的发布') {
         this.$router.push({ path: '/enterprise/enterprisefabu' });
-      } else if (id === '我的订购') {
+      } else if (id === '事项管理') {
         this.$router.push({ path: '/enterprise/enterprisedg' });
+      } else if (id === '修改密码') {
+        this.$router.push({ path: '/enterprise/xiugai' });
+      } else if (id === '返回首页') {
+        this.$router.push({ path: '/s' });
       }
     },
   },

src/views/enterprise/xiugai.vue

@@ -0,0 +1,64 @@
+<template>
+  <div id="adviserList">
+    <xiugai-detail :liebiaoList="liebiaoList" :form="form" @onsave="onsaveClick" @submitDates="submit"></xiugai-detail>
+  </div>
+</template>
+
+<script>
+import xiugaiDetail from '@/components/enterprise/xiugai.vue';
+import { createNamespacedHelpers, mapGetters, mapState } from 'vuex';
+const { mapActions: mapSite } = createNamespacedHelpers('site');
+const { mapActions: mapMarket } = createNamespacedHelpers('market');
+export default {
+  name: 'adviserList',
+  props: {},
+  components: {
+    xiugaiDetail,
+  },
+  data: () => ({
+    info: {},
+    liebiaoList: [
+      { name: '基本信息' },
+      { name: '消息管理' },
+      { name: '我的发布' },
+      { name: '事项管理' },
+      { name: '返回首页' },
+      { name: '修改密码' },
+      { name: '注销账号' },
+    ],
+    form: {},
+  }),
+  created() {},
+  computed: {
+    ...mapState(['user']),
+  },
+  methods: {
+    ...mapMarket({ userFetch: 'fetch', userCreate: 'create', userUpdate: 'update' }),
+    async onsaveClick({ id }) {
+      console.log(id);
+      if (id === '基本信息') {
+        this.$router.push({ path: '/enterprise/enterprisejb' });
+      } else if (id === '消息管理') {
+        this.$router.push({ path: '/enterprise/enterprisexx' });
+      } else if (id === '我的发布') {
+        this.$router.push({ path: '/enterprise/enterprisefabu' });
+      } else if (id === '事项管理') {
+        this.$router.push({ path: '/enterprise/enterprisedg' });
+      } else if (id === '修改密码') {
+        this.$router.push({ path: '/enterprise/xiugai' });
+      } else if (id === '返回首页') {
+        this.$router.push({ path: '/home.html' });
+      }
+    },
+
+    async submit({ data }) {
+      data.id = this.user.uid;
+      let res = await this.userUpdate(data);
+      let msg = `修改成功`;
+      this.$checkRes(res, msg);
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped></style>

src/views/hall/dock/dockDetail.vue

@@ -26,21 +26,23 @@
                   <p class="name textOver">{{ productInfo.name }}</p>
                   <div class="brief">
                     <p>
-                      <span>应用领域：{{ productInfo.field }}</span>
-                      <span>服务范围：{{ productInfo.scope }}</span>
+                      <span>应用领域：{{ productInfo.field || '暂无' }}</span>
+                      <span>服务范围：{{ productInfo.scope || '暂无' }}</span>
                     </p>
                     <p>
-                      <span>产品类型：{{ productInfo.product_type_name }}</span>
-                      <span>研发阶段：{{ productInfo.phase == 1 ? '阶段成果' : '最终成果' }}</span>
+                      <span>产品类型：{{ productInfo.product_type_name || '暂无' }}</span>
+                      <span>研发阶段：{{ productInfo.phase == 1 ? '阶段成果' : productInfo.phase == 2 ? '最终成果' : '暂无' }}</span>
                     </p>
                     <p>
-                      <span>{{ productInfo.business == '0' ? '公用' : productInfo.business == '1' ? '转让' : '竞价' }}</span>
-                      <span>交易价格：{{ productInfo.price }}/{{ productInfo.priceunit }}</span>
+                      <span>{{
+                        productInfo.business == '0' ? '公用' : productInfo.business == '1' ? '转让' : productInfo.business == '2' ? '竞价' : '暂无'
+                      }}</span>
+                      <span>交易价格：{{ productInfo.price || '暂无' }}/{{ productInfo.priceunit || '暂无' }}</span>
                     </p>
                   </div>
                   <p class="intro">
                     <span><i class="el-icon-date"></i>项目简介</span>
-                    <span>{{ productInfo.introduction }}</span>
+                    <span>{{ productInfo.introduction || '暂无' }}</span>
                   </p>
                 </el-col>
                 <el-col :span="24" v-if="display === '2'" class="contact">

src/views/market/index.vue

@@ -43,8 +43,12 @@
             </span>
           </el-col>
           <el-col :span="12" class="productList" v-for="(item, index) in productList" :key="index" @click.native="productDetail(item.id)">
-            <el-image :src="item.image[0].url"></el-image>
-            <p class="textOver">{{ item.name }}</p>
+            <!-- <el-image :src="item.image[0].url"></el-image> -->
+            <template v-if="item.image.length > 0">
+              <el-image :src="item.image[0].url"></el-image>
+            </template>
+            <template v-else>暂无图片</template>
+            <p class="textOver">{{ item.name || '暂无' }}</p>
           </el-col>
         </el-col>
         <el-col :span="12" class="right">
@@ -61,7 +65,7 @@
           </el-col>
           <el-col :span="24" class="tecList" v-for="(item, index) in tecList" :key="index">
             <span></span>
-            <span class="textOver" @click="tecDetail(item.id)">{{ item.name }}</span>
+            <span class="textOver" @click="tecDetail(item.id)">{{ item.name || '暂无' }}</span>
             <span @click="toChat(item)">对接</span>
             <span>{{ item.meta | getDate }}</span>
           </el-col>
@@ -87,11 +91,14 @@
             <el-col :span="24" class="downLeftInfo">
               <el-col :span="24" class="bankingList" v-for="(item, index) in serviceList" :key="index" @click.native="serviceDetail(item.id)">
                 <el-col :span="10">
-                  <el-image :src="item.image[0].url"></el-image>
+                  <template v-if="item.image.length > 0">
+                    <el-image :src="item.image[0].url"></el-image>
+                  </template>
+                  <template v-else>暂无图片</template>
                 </el-col>
                 <el-col :span="14">
-                  <span class="textOver">{{ item.name }}</span>
-                  <span>{{ item.introduction }}</span>
+                  <span class="textOver">{{ item.name || '暂无' }}</span>
+                  <span>{{ item.introduction || '暂无' }}</span>
                 </el-col>
               </el-col>
             </el-col>
@@ -112,12 +119,12 @@
               <el-col :span="24" class="downRightList" v-for="(item, index) in expertsList" :key="index" @click.native="zhuanjiaDetail(item.id)">
                 <el-col :span="10"><el-image :src="item.imgpath"></el-image></el-col>
                 <el-col :span="14"
-                  ><p>{{ item.name }}</p>
+                  ><p>{{ item.name || '暂无' }}</p>
                   <p>从事领域：</p>
-                  <p>{{ item.field }}</p></el-col
+                  <p>{{ item.field || '暂无' }}</p></el-col
                 >
                 <el-col :span="24"
-                  ><p>{{ item.job_profile }}</p></el-col
+                  ><p>{{ item.job_profile || '暂无' }}</p></el-col
                 >
               </el-col>
             </el-col>
@@ -138,11 +145,14 @@
           <el-col :span="24" class="downLeftInfos">
             <el-col :span="12" class="bankingLists" v-for="(item, index) in newList" :key="index" @click.native="productDetail(item.id)">
               <el-col :span="10">
-                <el-image :src="item.image[0].url"></el-image>
+                <template v-if="item.image.length > 0">
+                  <el-image :src="item.image[0].url"></el-image>
+                </template>
+                <template v-else>暂无图片</template>
               </el-col>
               <el-col :span="12">
-                <span class="textOvers">{{ item.name }}</span>
-                <span>{{ item.introduction }}</span>
+                <span class="textOvers">{{ item.name || '暂无' }}</span>
+                <span>{{ item.introduction || '暂无' }}</span>
               </el-col>
             </el-col>
           </el-col>
@@ -196,15 +206,15 @@ export default {
   },
 
   methods: {
-    ...product(['query']),
+    ...product(['newquery']),
     ...talentExperts({ expertQuery: 'query' }),
     async search() {
-      let res = await this.query({ skip: 0, limit: 4, totaltype: '0' });
+      let res = await this.newquery({ skip: 0, limit: 4, totaltype: '0' });
       if (this.$checkRes(res)) this.$set(this, `tecList`, res.data);
-      res = await this.query({ skip: 0, limit: 4, totaltype: '1' });
+      res = await this.newquery({ skip: 0, limit: 4, totaltype: '1' });
       if (this.$checkRes(res)) this.$set(this, `productList`, res.data);
       if (this.$checkRes(res)) this.$set(this, `newList`, res.data);
-      res = await this.query({ skip: 0, limit: 4, totaltype: '2' });
+      res = await this.newquery({ skip: 0, limit: 4, totaltype: '2' });
       if (this.$checkRes(res)) this.$set(this, `serviceList`, res.data);
       res = await this.expertQuery({ skip: 0, limit: 4 });
       if (this.$checkRes(res)) this.$set(this, `expertsList`, res.data);

src/views/supermaket/supermarketdetail.vue

@@ -49,7 +49,7 @@ export default {
     },
   },
   methods: {
-    ...mapEnterpriseproject({ list: 'query', fetch: 'fetch' }),
+    ...mapEnterpriseproject({ list: 'query', fetch: 'newfetch' }),
     ...transaction({ transactioncreate: 'create', transactionfetch: 'fetch' }),
     ...tranaudit({ tranauditcreate: 'create' }),
     fetchInfo() {},