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

src/store/index.js

@@ -19,6 +19,7 @@ import market from './market/market';
 import transaction from './market/transaction';
 import expertsaudit from './market/expertsaudit';
 import marketproduct from './market/marketproduct';
+import collectproduct from './market/collectproduct';
 import notice from './market/notice';
 import talentExperts from './market/talentExperts';
 import markettype from './market/markettype';
@@ -51,6 +52,7 @@ export default new Vuex.Store({
   modules: {
     roomchat,
     marketproduct,
+    collectproduct,
     notice,
     talentExperts,
     market,

src/store/market/collectproduct.js

@@ -0,0 +1,59 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import _ from 'lodash';
+Vue.use(Vuex);
+const api = {
+  collectproductInfo: `/api/market/collectproduct`,
+};
+const state = () => ({});
+const mutations = {};
+
+const actions = {
+  async query({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.collectproductInfo}`, {
+      skip,
+      limit,
+      ...info,
+    });
+    return res;
+  },
+  async newquery({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.collectproductInfo}/newquery`, {
+      skip,
+      limit,
+      ...info,
+    });
+    return res;
+  },
+  async newfetch({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.collectproductInfo}/newfetch`, {
+      skip,
+      limit,
+      ...info,
+    });
+    return res;
+  },
+  async create({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.collectproductInfo}`, payload);
+    return res;
+  },
+  async fetch({ commit }, payload) {
+    const res = await this.$axios.$get(`${api.collectproductInfo}/${payload}`);
+    return res;
+  },
+  async update({ commit }, { id, ...data }) {
+    const res = await this.$axios.$post(`${api.collectproductInfo}/update/${id}`, data);
+    return res;
+  },
+
+  async delete({ commit }, payload) {
+    const res = await this.$axios.$delete(`${api.collectproductInfo}/${payload}`);
+    return res;
+  },
+};
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

src/views/adminCenter/dockInfo/parts/dockInfo.vue

@@ -37,6 +37,12 @@
           <el-form-item label="负责人手机号">
             <el-input v-model="form.phone" maxlength="11" placeholder="请输入手机号" disabled> </el-input>
           </el-form-item>
+          <el-form-item label="主办方">
+            <el-input v-model="form.sponsor" placeholder="请输入主办方"></el-input>
+          </el-form-item>
+          <el-form-item label="承办方">
+            <el-input v-model="form.organizer" placeholder="请输入承办方"></el-input>
+          </el-form-item>
           <el-form-item label="对接会视频">
             <upload :limit="1" :data="form.file_path" type="file_path" listType="" :url="'/files/imgpath/upload'" @upload="uploadSuccess"></upload>
           </el-form-item>

src/views/adminLogin.vue

@@ -57,12 +57,13 @@ export default {
         data.role = '0';
         const res = await this.toLogin({ user: data });
         if (res.uid) {
-          history.back();
+          this.$router.push({ path: '/superAdminCenter/index', query: { num: '1' } });
         }
       } else {
         const res = await this.toLogin({ user: this.form });
         if (res.uid) {
-          history.back();
+          // history.back();
+          this.$router.push({ path: '/superAdminCenter/index', query: { num: '1' } });
         }
       }
     },

src/views/dockLogin.vue

@@ -52,7 +52,8 @@ export default {
       if (this.form.role == '3') {
         let res = await this.todockLogin({ user: this.form });
         if (res.uid) {
-          history.back();
+          this.$router.push({ path: '/adminCenter/index', query: { num: '1' } });
+          // history.back();
         }
       } else if (this.form.role == '8') {
         let data = {};
@@ -61,7 +62,8 @@ export default {
         data.role = this.form.role;
         let res = await this.toLogin({ user: data });
         if (res.uid) {
-          history.back();
+          this.$router.push({ path: '/vipCenter/index', query: { num: '1' } });
+          // history.back();
         }
       }
     },

src/views/hall/directBefore.vue

@@ -2,7 +2,27 @@
   <div id="directBefore">
     <el-row>
       <el-col :span="24" class="style">
-        你信
+        <el-col :span="24" class="top">
+          <el-col :span="24" class="left">
+            中科在线
+          </el-col>
+          <el-col :span="24" class="right">
+            直播大厅
+          </el-col>
+        </el-col>
+        <el-col :span="24" class="main">
+          <div class="w_1200">
+            <el-col :span="24" class="title">{{ dockInfo.title }}</el-col>
+            <el-col :span="24" class="txt">主办方：{{ dockInfo.sponsor }}</el-col>
+            <el-col :span="24" class="txt">承办方：{{ dockInfo.organizer }}</el-col>
+            <el-col :span="24" class="txt">技术支持：长春市福瑞科技有限公司</el-col>
+            <el-col :span="24" class="btn">
+              <el-button @click="$router.push({ path: '/hall/direct', query: { id: dockInfo.id, title: dockInfo.title } })"
+                >进入活动现场<i class="iconfont icon-bofang"></i
+              ></el-button>
+            </el-col>
+          </div>
+        </el-col>
       </el-col>
     </el-row>
   </div>
@@ -10,17 +30,33 @@
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: dock } = createNamespacedHelpers('dock');
 export default {
   name: 'directBefore',
   props: {},
   components: {},
   data: function() {
-    return {};
+    return {
+      dockInfo: {},
+    };
+  },
+  created() {
+    this.search();
+  },
+  methods: {
+    ...dock({ dockQuery: 'query', dockFetch: 'fetch', goodsquery: 'goodsquery' }),
+    async search() {
+      let res = await this.dockFetch(this.id);
+      if (this.$checkRes(res)) {
+        this.$set(this, `dockInfo`, res.data);
+      }
+    },
   },
-  created() {},
-  methods: {},
   computed: {
     ...mapState(['user']),
+    id() {
+      return this.$route.query.id;
+    },
     pageTitle() {
       return `${this.$route.meta.title}`;
     },
@@ -32,10 +68,57 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.w_1200 {
+  width: 1200px;
+  margin: 0 auto;
+}
 .style {
   background-image: url('~@/assets/directBack.png');
   height: 100vh;
   background-size: 100% 100%;
   background-repeat: no-repeat;
+  .top {
+    .left {
+      height: 40px;
+      line-height: 40px;
+      padding: 0 15px;
+      font-size: 20px;
+      color: #fffa93;
+    }
+    .right {
+      text-align: center;
+      color: #fffa93;
+      font-size: 50px;
+      text-shadow: 2px 2px 5px #000;
+    }
+  }
+  .main {
+    text-align: center;
+    margin: 100px 0 0 0;
+    .title {
+      font-size: 40px;
+      color: #fffa93;
+      font-weight: bold;
+      font-family: monospace;
+      padding: 0 0 20px 0;
+      height: 100px;
+    }
+    .txt {
+      font-size: 25px;
+      color: #fffa93;
+      padding: 0 0 10px 0;
+    }
+    /deep/.btn {
+      margin: 50px 0 0 0;
+      .el-button {
+        background: linear-gradient(to bottom, #ffbd00 0%, #fd5a00 100%);
+        color: #fff;
+        border: none;
+        border-radius: 25px;
+        padding: 15px 40px;
+        font-size: 20px;
+      }
+    }
+  }
 }
 </style>

src/views/userCenter/productInfo/part/infoRelease.vue

@@ -6,68 +6,65 @@
           <el-button type="primary" size="mini" @click="back()">返回</el-button>
         </el-col>
         <el-col :span="24" class="form">
-          <el-form ref="form" :model="form" label-width="130px" :rules="rules">
+          <el-form ref="form" :model="form" label-width="140px" :rules="rules">
             <el-form-item label="产品类型" prop="totaltype">
-              <el-select v-model="form.totaltype" placeholder="请选择产品类型">
+              <el-select v-model="form.type" placeholder="请选择产品类型">
                 <el-option label="技术" value="0"></el-option>
                 <el-option label="产品" value="1"></el-option>
                 <el-option label="服务" value="2"></el-option>
               </el-select>
             </el-form-item>
-            <!-- <span v-if="form.totaltype == 0">
-              <el-form-item label="选择不显示的信息">
-                <el-select v-model="form.is_display" multiple placeholder="请选择" style="width:100%">
-                  <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
-                </el-select>
-              </el-form-item>
-            </span>
-            <span v-if="form.totaltype == 1">
-              <el-form-item label="选择不显示的信息">
-                <el-select v-model="form.is_display" multiple placeholder="请选择" style="width:100%">
-                  <el-option v-for="item in option2" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
-                </el-select>
-              </el-form-item>
-            </span>
-            <span v-if="form.totaltype == 2">
-              <el-form-item label="选择不显示的信息">
-                <el-select v-model="form.is_display" multiple placeholder="请选择" style="width:100%">
-                  <el-option v-for="item in option3" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
-                </el-select>
-              </el-form-item>
-            </span> -->
-            <el-form-item label="名称" prop="name">
+            <el-form-item label="名称">
               <el-input v-model="form.name" placeholder="请输入名称"></el-input>
             </el-form-item>
-            <el-form-item label="类型">
-              <el-select v-model="form.product_type_id" filterable @change="selectChild">
-                <el-option v-for="(item, index) in columnList" :key="index" :value="item.id" :label="item.name"></el-option>
+            <el-form-item label="所属领域">
+              <el-select v-model="form.field" filterable>
+                <el-option v-for="(item, index) in fieldList" :key="index" :value="item.name" :label="item.name"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="产品简介">
-              <el-input type="textarea" v-model="form.introduction" placeholder="请输入产品简介"></el-input>
-            </el-form-item>
-            <el-form-item label="研发阶段" v-if="form.totaltype == null || form.totaltype == '0'">
-              <el-select v-model="form.phase" placeholder="请选择研发阶段">
-                <el-option label="阶段成果" value="0"></el-option>
-                <el-option label="最终成果" value="1"></el-option>
+            <el-form-item label="合作方式">
+              <el-select v-model="form.cooperation" filterable>
+                <el-option v-for="(item, index) in cooperationList" :key="index" :value="item.name" :label="item.name"></el-option>
               </el-select>
             </el-form-item>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="产品单价" v-if="form.totaltype == null || form.totaltype == '0' || form.totaltype == '1'">
-                  <el-input v-model="form.price" placeholder="请输入产品单价"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="产品单位" v-if="form.totaltype == null || form.totaltype == '0' || form.totaltype == '1'">
-                  <el-select v-model="form.priceunit" placeholder="请选择产品单位">
-                    <el-option label="公斤" value="0"></el-option>
-                    <el-option label="套" value="1"></el-option>
-                    <el-option label="件" value="2"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
+            <el-form-item label="企业名称">
+              <el-input v-model="form.company" placeholder="请输入企业名称"></el-input>
+            </el-form-item>
+            <el-form-item label="企业简介">
+              <el-input
+                v-model="form.companybrief"
+                type="textarea"
+                maxlength="300"
+                show-word-limit
+                :autosize="{ minRows: 2, maxRows: 5 }"
+                placeholder="请输入企业简介"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="企业网站">
+              <el-input v-model="form.companyweb" placeholder="请输入企业网站"></el-input>
+            </el-form-item>
+            <el-form-item label="联系人">
+              <el-input v-model="form.contacts" placeholder="请输入联系人"></el-input>
+            </el-form-item>
+            <el-form-item label="联系电话">
+              <el-input v-model="form.phone" placeholder="请输入联系电话"></el-input>
+            </el-form-item>
+            <el-form-item label="QQ&微信">
+              <el-input v-model="form.qqwx" placeholder="请输入QQ&微信"></el-input>
+            </el-form-item>
+            <el-form-item label="电子邮箱">
+              <el-input v-model="form.email" placeholder="请输入电子邮箱"></el-input>
+            </el-form-item>
+            <el-form-item label="合作条件及要求">
+              <el-input
+                v-model="form.condition"
+                type="textarea"
+                maxlength="300"
+                show-word-limit
+                :autosize="{ minRows: 2, maxRows: 5 }"
+                placeholder="请输入合作条件及要求"
+              ></el-input>
+            </el-form-item>
             <el-form-item label="产品图片" prop="image">
               <upload
                 :limit="6"
@@ -79,124 +76,174 @@
                 @delete="uploadDelete"
               ></upload>
             </el-form-item>
-            <!-- <span>
-              <el-form-item label="产品参数">
-                <template>
-                  <el-col :span="12">
-                    <el-table :data="form.product_args" ref="table" tooltip-effect="dark" border stripe @selection-change="selectRow">
-                      <el-table-column label="参数名称">
-                        <template slot-scope="scope">
-                          <el-input v-model="scope.row.arg_name"></el-input>
-                        </template>
-                      </el-table-column>
-                      <el-table-column label="参数内容">
-                        <template slot-scope="scope">
-                          <el-input v-model="scope.row.memo"></el-input>
-                        </template>
-                      </el-table-column>
-                    </el-table>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-button type="primary" @click.prevent="addRow()">添加参数</el-button>
-                  </el-col>
-                </template>
+            <!-- 技术 -->
+            <span v-if="form.type == '0'">
+              <el-form-item label="投资预算">
+                <el-input v-model="form.budget" placeholder="请输入投资预算"></el-input>
+              </el-form-item>
+              <el-form-item label="注册类型">
+                <el-input v-model="form.companytype" placeholder="请输入注册类型"></el-input>
+              </el-form-item>
+              <el-form-item label="组织机构代码">
+                <el-input v-model="form.zzjgdm" placeholder="请输入组织机构代码"></el-input>
+              </el-form-item>
+              <el-form-item label="注册时间">
+                <el-date-picker v-model="form.companydate" type="date" placeholder="请选择时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
               </el-form-item>
-            </span> -->
-            <span>
-              <el-form-item label="所属领域">
-                <el-select v-model="form.field" placeholder="请选择所属领域">
-                  <el-option label="先进制造" value="0"></el-option>
-                  <el-option label="新材料" value="1"></el-option>
-                  <el-option label="光电子" value="2"></el-option>
-                  <el-option label="信息技术" value="3"></el-option>
-                  <el-option label="文化和科技融合" value="4"></el-option>
+              <el-form-item label="注册资金">
+                <el-input v-model="form.companycapital" placeholder="请输入注册资金"></el-input>
+              </el-form-item>
+              <el-form-item label="企业法人">
+                <el-input v-model="form.companyperson" placeholder="请输入企业法人"></el-input>
+              </el-form-item>
+              <el-form-item label="上年度企业总收入">
+                <el-input v-model="form.sndqyzsr" placeholder="请输入上年度企业总收入"></el-input>
+              </el-form-item>
+              <el-form-item label="上年度研发费用">
+                <el-input v-model="form.sndyffy" placeholder="请输入上年度研发费用"></el-input>
+              </el-form-item>
+              <el-form-item label="企业总人数">
+                <el-input v-model="form.companytotal" placeholder="请输入企业总人数"></el-input>
+              </el-form-item>
+              <el-form-item label="专&兼职研发人数">
+                <el-input v-model="form.zjzyfrs" placeholder="请输入专&兼职研发人数"></el-input>
+              </el-form-item>
+              <el-form-item label="需求紧急程度">
+                <el-radio-group v-model="form.degreeurgency">
+                  <el-radio label="特急"></el-radio>
+                  <el-radio label="一般"></el-radio>
+                  <el-radio label="储备"></el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="技术难题&需求说明">
+                <el-input
+                  v-model="form.requirementdesc"
+                  type="textarea"
+                  maxlength="500"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入技术难题&需求说明"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="预期技术目标描述">
+                <el-input
+                  v-model="form.expect"
+                  type="textarea"
+                  maxlength="300"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入预期技术目标描述"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="需求现状及应对措施">
+                <el-input
+                  v-model="form.present"
+                  type="textarea"
+                  maxlength="300"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入需求现状及应对措施"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="主要产品">
+                <el-input
+                  v-model="form.mainproduct"
+                  type="textarea"
+                  maxlength="300"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入主要产品"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="企业资质&荣誉">
+                <el-input
+                  v-model="form.qualifications"
+                  type="textarea"
+                  maxlength="300"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入企业资质&荣誉"
+                ></el-input>
+              </el-form-item>
+            </span>
+            <!-- 产品 -->
+            <span v-else-if="form.type == '1'">
+              <el-form-item label="成果状态">
+                <el-select v-model="form.achievestatus" filterable>
+                  <el-option v-for="(item, index) in achievestatusList" :key="index" :value="item.name" :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="成果权属">
+                <el-input v-model="form.achieveown" placeholder="请输入成果权属"></el-input>
+              </el-form-item>
+              <el-form-item label="成果来源">
+                <el-radio-group v-model="form.degreeurgency">
+                  <el-radio label="国家项目"></el-radio>
+                  <el-radio label="省级项目"></el-radio>
+                  <el-radio label="市级项目"></el-radio>
+                  <el-radio label="自选项目"></el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="专利信息">
+                <el-input v-model="form.patentinfo" placeholder="请输入专利信息"></el-input>
+              </el-form-item>
+              <el-form-item label="专利状态">
+                <el-radio-group v-model="form.patentstatus">
+                  <el-radio label="已申请"></el-radio>
+                  <el-radio label="已授权"></el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="项目路演">
+                <el-input v-model="form.roadshow" placeholder="请输入项目路演"></el-input>
+              </el-form-item>
+              <el-form-item label="意向价格">
+                <el-input v-model="form.intentionprice" placeholder="请输入意向价格"></el-input>
+              </el-form-item>
+              <el-form-item label="成果简介">
+                <el-input
+                  v-model="form.achievebrief"
+                  type="textarea"
+                  maxlength="200"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入成果简介"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="技术特点">
+                <el-input
+                  v-model="form.features"
+                  type="textarea"
+                  maxlength="200"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入技术特点"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="技术团队">
+                <el-input
+                  v-model="form.team"
+                  type="textarea"
+                  maxlength="300"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入技术团队"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="商业预期">
+                <el-input
+                  v-model="form.expectations"
+                  type="textarea"
+                  maxlength="300"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入商业预期"
+                ></el-input>
+              </el-form-item>
+            </span>
+            <!-- 服务 -->
+            <span v-else-if="form.type == '2'">
+              服务
             </span>
-            <el-form-item label="服务范围">
-              <el-input type="textarea" v-model="form.scope" placeholder="请输入服务范围"></el-input>
-            </el-form-item>
-            <el-form-item label="合作方式" v-if="form.totaltype == null || form.totaltype == '0' || form.totaltype == '1'">
-              <el-select v-model="form.coopermode" placeholder="请选择合作方式">
-                <el-option label="技术转让" value="0"></el-option>
-                <el-option label="技术服务" value="1"></el-option>
-                <el-option label="技术许可" value="2"></el-option>
-                <el-option label="技术融资" value="3"></el-option>
-                <el-option label="其他" value="4"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="交易方式" v-if="form.totaltype == null || form.totaltype == '0' || form.totaltype == '1'">
-              <el-select v-model="form.business" placeholder="请选择交易方式">
-                <el-option label="公用" value="0"></el-option>
-                <el-option label="竞价" value="1"></el-option>
-                <el-option label="转让" value="2"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="投入预算" v-if="form.totaltype == null || form.totaltype == '0'">
-              <el-input v-model="form.budget" placeholder="请输入投入预算"></el-input>
-            </el-form-item>
-            <el-form-item label="需求截止日期" v-if="form.totaltype == null || form.totaltype == '0'">
-              <el-date-picker v-model="form.end_date" type="date" placeholder="请选择需求截止日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item v-if="form.totaltype == null || form.totaltype == '0'">
-              <span slot="label">
-                <el-popover
-                  placement="top-start"
-                  width="200"
-                  trigger="hover"
-                  content="（阐述在生产经营、项目建设、科研活动、产业化方向中遇到的技术难题或瓶颈问题及需达到的技术指标）"
-                >
-                  <span slot="reference" style="color:#409eff">难题或瓶颈问题</span>
-                </el-popover>
-              </span>
-              <el-input type="textarea" v-model="form.difficult_problem" placeholder="请输入难题或瓶颈问题"></el-input>
-            </el-form-item>
-            <el-form-item v-if="form.totaltype == null || form.totaltype == '0'">
-              <span slot="label">
-                <el-popover
-                  placement="top-start"
-                  width="200"
-                  trigger="hover"
-                  content="（企业承接成果、技术所具备的技术人员、设备、资金等基础条件及其他配套条件）"
-                >
-                  <span slot="reference" style="color:#409eff">企业解决技术需求已具备的条件</span>
-                </el-popover>
-              </span>
-              <el-input type="textarea" v-model="form.demand" placeholder="请输入企业解决需求"></el-input>
-            </el-form-item>
-            <el-form-item label="企业名称" v-if="form.totaltype == null || form.totaltype == '1'">
-              <el-input v-model="form.company" placeholder="请输入企业名称"></el-input>
-            </el-form-item>
-            <el-form-item label="企业地址" v-if="form.totaltype == null || form.totaltype == '1'">
-              <el-input v-model="form.address" placeholder="请输入企业地址"></el-input>
-            </el-form-item>
-            <el-form-item label="技术团队情况" v-if="form.totaltype == null || form.totaltype == '1'">
-              <el-input type="textarea" v-model="form.team" placeholder="请输入技术团队情况"></el-input>
-            </el-form-item>
-            <el-form-item label="知识产权情况" v-if="form.totaltype == null || form.totaltype == '1'">
-              <el-input v-model="form.property" placeholder="请输入知识产权情况"></el-input>
-            </el-form-item>
-            <el-form-item label="技术成熟度" v-if="form.totaltype == null || form.totaltype == '1'">
-              <el-select v-model="form.mature" placeholder="请选择技术成熟度">
-                <el-option label="实验室" value="0"></el-option>
-                <el-option label="小试" value="1"></el-option>
-                <el-option label="中试" value="2"></el-option>
-                <el-option label="成熟" value="3"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="是否有拟合作企业，如有请填企业名称" v-if="form.totaltype == null || form.totaltype == '1'">
-              <el-input v-model="form.coopercompany" placeholder="请输入是否有拟合作企业，如有请填企业名称"></el-input>
-            </el-form-item>
-            <el-form-item label="其他需求" v-if="form.totaltype == null || form.totaltype == '1'">
-              <el-input v-model="form.other" placeholder="请输入其他需求"></el-input>
-            </el-form-item>
-            <el-form-item label="联系人" prop="contact_user">
-              <el-input v-model="form.contact_user" placeholder="请输入联系人"></el-input>
-            </el-form-item>
-            <el-form-item label="联系电话" prop="contact_tel">
-              <el-input v-model.number="form.contact_tel" placeholder="请输入联系电话" maxlength="11"></el-input>
-            </el-form-item>
             <el-form-item>
               <el-button @click="draftBtn('form')">保存草稿</el-button>
               <el-button type="primary" @click="submitBtn('form')">信息发布</el-button>
@@ -212,7 +259,7 @@
 import _ from 'lodash';
 import upload from '@/components/upload.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: mapMarkettype } = createNamespacedHelpers('markettype');
+const { mapActions: markettype } = createNamespacedHelpers('markettype');
 export default {
   name: 'infoRelease',
   props: {
@@ -224,205 +271,41 @@ export default {
   },
   data: function() {
     return {
-      // 类型
-      columnList: [],
-      // 不显示的信息
-      // 技术
-      options: [
-        {
-          value: 'totaltype',
-          label: '产品类型',
-          disabled: true,
-        },
-        {
-          value: 'name',
-          label: '产品名称',
-          disabled: true,
-        },
-        {
-          value: 'contact_user',
-          label: '联系人',
-          disabled: true,
-        },
-        {
-          value: 'contact_tel',
-          label: '联系人电话',
-          disabled: true,
-        },
-        {
-          value: 'product_type_id',
-          label: '类型',
-        },
-        {
-          value: 'phase',
-          label: '研发阶段',
-        },
-        {
-          value: 'introduction',
-          label: '产品简介',
-          disabled: true,
-        },
-        {
-          value: 'price',
-          label: '产品单价',
-        },
-        {
-          value: 'priceunit',
-          label: '产品单位',
-        },
-        {
-          value: 'image',
-          label: '产品图片',
-        },
-        {
-          value: 'product_args',
-          label: '产品参数',
-        },
-        {
-          value: 'field',
-          label: '所属领域',
-        },
-        {
-          value: 'scope',
-          label: '服务范围',
-        },
-        {
-          value: 'business',
-          label: '交易方式',
-        },
-      ],
-      // 产品
-      option2: [
-        {
-          value: 'totaltype',
-          label: '产品类型',
-          disabled: true,
-        },
-        {
-          value: 'name',
-          label: '产品名称',
-          disabled: true,
-        },
-        {
-          value: 'contact_user',
-          label: '联系人',
-          disabled: true,
-        },
-        {
-          value: 'contact_tel',
-          label: '联系人电话',
-          disabled: true,
-        },
-        {
-          value: 'product_type_id',
-          label: '类型',
-        },
-        {
-          value: 'introduction',
-          label: '产品简介',
-          disabled: true,
-        },
-        {
-          value: 'price',
-          label: '产品单价',
-        },
-        {
-          value: 'priceunit',
-          label: '产品单位',
-        },
-        {
-          value: 'image',
-          label: '产品图片',
-        },
-        {
-          value: 'product_args',
-          label: '产品参数',
-        },
-        {
-          value: 'scope',
-          label: '服务范围',
-        },
-        {
-          value: 'business',
-          label: '交易方式',
-        },
-      ],
-      // 服务
-      option3: [
-        {
-          value: 'totaltype',
-          label: '产品类型',
-          disabled: true,
-        },
-        {
-          value: 'name',
-          label: '产品名称',
-          disabled: true,
-        },
-        {
-          value: 'contact_user',
-          label: '联系人',
-          disabled: true,
-        },
-
-        {
-          value: 'contact_tel',
-          label: '联系人电话',
-          disabled: true,
-        },
-        {
-          value: 'product_type_id',
-          label: '类型',
-        },
-        {
-          value: 'introduction',
-          label: '产品简介',
-          disabled: true,
-        },
-        {
-          value: 'price',
-          label: '产品单价',
-        },
-        {
-          value: 'priceunit',
-          label: '产品单位',
-        },
-
-        {
-          value: 'image',
-          label: '产品图片',
-        },
-        {
-          value: 'field',
-          label: '应用领域',
-        },
-        {
-          value: 'scope',
-          label: '服务范围',
-        },
-        {
-          value: 'business',
-          label: '交易方式',
-        },
-      ],
       // 验证
       rules: {
         name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-        totaltype: [{ required: true, message: '请输入名称', trigger: 'change' }],
-        contact_user: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-        contact_tel: [
-          { required: true, message: '请输入联系电话', trigger: 'blur' },
-          // { type: 'number', message: '电话必须为数字值' },
-        ],
       },
+      // 所属领域
+      fieldList: [],
+      // 成果状态
+      achievestatusList: [],
+      // 合作方式
+      cooperationList: [],
     };
   },
   created() {
-    // 查询类型
-    this.maarkettype();
+    this.searchtype();
   },
   methods: {
-    ...mapMarkettype({ markettypeList: 'query' }),
+    ...markettype({ markettypeList: 'query' }),
+    // 查询字典表
+    async searchtype() {
+      // 所属领域;
+      let res = await this.markettypeList({ category: '01' });
+      if (this.$checkRes(res)) {
+        this.$set(this, `fieldList`, res.data);
+      }
+      // 成果状态;
+      res = await this.markettypeList({ category: '02' });
+      if (this.$checkRes(res)) {
+        this.$set(this, `achievestatusList`, res.data);
+      }
+      // 合作方式;
+      res = await this.markettypeList({ category: '03' });
+      if (this.$checkRes(res)) {
+        this.$set(this, `cooperationList`, res.data);
+      }
+    },
     // 草稿
     draftBtn() {
       this.$emit('draftBtn', { data: this.form });
@@ -431,28 +314,14 @@ export default {
     submitBtn(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.$emit('submitBtn', { data: this.form });
+          console.log(this.form);
+          // this.$emit('submitBtn', { data: this.form });
         } else {
           console.log('error submit!!');
           return false;
         }
       });
     },
-    // 查询类型
-    async maarkettype({ category = 54, ...info } = {}) {
-      const res = await this.markettypeList({ category, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `columnList`, res.data);
-      }
-    },
-    // 类型选择
-    selectChild(product_type_id) {
-      let res = this.columnList.filter(fil => fil.id === product_type_id);
-      if (res.length > 0) {
-        this.$set(this.form, `product_type_name`, res[0].name);
-      }
-      this.$forceUpdate();
-    },
     // 图片
     uploadSuccess({ type, data }) {
       let arr = _.get(this.form, type);
@@ -468,18 +337,6 @@ export default {
     uploadDelete(index) {
       this.form.image.splice(index, 1);
     },
-    // 获取表格选中时的数据
-    selectRow(val) {
-      this.selectlistRow = val;
-    },
-    addRow() {
-      var list = {
-        rowNum: this.rowNum,
-      };
-      // let tableData = this.emandForm.product_args;
-      this.form.product_args.unshift(list);
-      this.rowNum += 1;
-    },
     back() {
       this.$emit('back');
     },

src/views/webLogin.vue

@@ -37,7 +37,7 @@ export default {
     async submitnewLogin(form) {
       let res = await this.toLogin({ user: form });
       if (res.uid) {
-        history.back();
+        this.$router.push({ path: '/userCenter/index', query: { num: '1' } });
       }
     },
     // 注册