liuyu 4 years ago
parent
commit
26270f69db
47 changed files with 2294 additions and 6909 deletions
  1. 1 1
      .env
  2. 2151 2152
      package-lock.json
  3. 0 165
      src/router/index.js
  4. 7 0
      src/store/onlive/room.js
  5. 0 92
      src/views/adminCenter/duijiehui/apply.vue
  6. 0 132
      src/views/adminCenter/duijiehui/detail.vue
  7. 0 129
      src/views/adminCenter/duijiehui/examine.vue
  8. 0 92
      src/views/adminCenter/duijiehui/index.vue
  9. 0 162
      src/views/adminCenter/duijiehui/parts/applyList.vue
  10. 0 151
      src/views/adminCenter/duijiehui/parts/list.vue
  11. 0 92
      src/views/adminCenter/enterpriseProduct/index.vue
  12. 0 136
      src/views/adminCenter/enterpriseProduct/parts/list.vue
  13. 0 105
      src/views/adminCenter/transaction/detail.vue
  14. 0 92
      src/views/adminCenter/transaction/index.vue
  15. 0 133
      src/views/adminCenter/transaction/parts/list.vue
  16. 0 134
      src/views/adminCenter/user/detail.vue
  17. 0 90
      src/views/adminCenter/user/index.vue
  18. 0 147
      src/views/adminCenter/user/parts/userlist.vue
  19. 3 19
      src/views/live/parts/liveList.vue
  20. 132 41
      src/views/live/roomDetail.vue
  21. 0 66
      src/views/market/detail.vue
  22. 0 93
      src/views/market/exportDetail.vue
  23. 0 131
      src/views/market/index.vue
  24. 0 93
      src/views/market/parts/expertList.vue
  25. 0 87
      src/views/market/parts/productList.vue
  26. 0 87
      src/views/market/parts/serviceList.vue
  27. 0 87
      src/views/market/parts/technologyList.vue
  28. 0 77
      src/views/market/prodDetail.vue
  29. 0 83
      src/views/service/detail.vue
  30. 0 150
      src/views/service/index.vue
  31. 0 104
      src/views/service/parts/twoInfo.vue
  32. 0 100
      src/views/userCenter/dock/apply.vue
  33. 0 114
      src/views/userCenter/dock/index.vue
  34. 0 84
      src/views/userCenter/dock/parts/alreadyList.vue
  35. 0 84
      src/views/userCenter/dock/parts/nextList.vue
  36. 0 81
      src/views/userCenter/matter/detailinfo.vue
  37. 0 176
      src/views/userCenter/matter/index.vue
  38. 0 100
      src/views/userCenter/matter/parts/intentionList.vue
  39. 0 111
      src/views/userCenter/matter/parts/negotiation.vue
  40. 0 98
      src/views/userCenter/matter/parts/transaction.vue
  41. 0 97
      src/views/userCenter/matter/parts/wholeList.vue
  42. 0 143
      src/views/userCenter/myProduct/detail.vue
  43. 0 81
      src/views/userCenter/myProduct/detailinfo.vue
  44. 0 118
      src/views/userCenter/myProduct/index.vue
  45. 0 126
      src/views/userCenter/myProduct/parts/auditList.vue
  46. 0 147
      src/views/userCenter/myProduct/parts/caogaoList.vue
  47. 0 126
      src/views/userCenter/myProduct/parts/noauditList.vue

+ 1 - 1
.env

@@ -1,2 +1,2 @@
 VUE_APP_AXIOS_BASE_URL = ''
-VUE_APP_ROUTER="/platmobile"
+VUE_APP_ROUTER="/livemobile"

File diff suppressed because it is too large
+ 2151 - 2152
package-lock.json


+ 0 - 165
src/router/index.js

@@ -48,101 +48,6 @@ const routes = [
     component: () => import('../views/onlive/roomInfo.vue'),
   },
 
-  // 科技超市
-  {
-    path: '/market/index',
-    name: 'market_index',
-    meta: { title: '科技超市', isleftarrow: true },
-    component: () => import('../views/market/index.vue'),
-  },
-  // 科技超市-技术-产品-服务详情
-  {
-    path: '/market/prodDetail',
-    name: 'market_prodDetail',
-    meta: { title: '产品详情', isleftarrow: true },
-    component: () => import('../views/market/prodDetail.vue'),
-  },
-  // 科技超市-专家详情
-  {
-    path: '/market/exportDetail',
-    name: 'market_exportDetail',
-    meta: { title: '专家详情', isleftarrow: true },
-    component: () => import('../views/market/exportDetail.vue'),
-  },
-
-  // 科技超市-发布产品
-  {
-    path: '/market/detail',
-    name: 'market_detail',
-    meta: { title: '发布产品', isleftarrow: true },
-    component: () => import('../views/market/detail.vue'),
-  },
-  // 创新服务
-  {
-    path: '/service/index',
-    name: 'service_index',
-    meta: { title: '创新服务', isleftarrow: true },
-    component: () => import('../views/service/index.vue'),
-  },
-  {
-    path: '/service/detail',
-    name: 'service_detail',
-    meta: { title: '创新服务', isleftarrow: true },
-    component: () => import('../views/service/detail.vue'),
-  },
-  // 用户-我的发布
-  {
-    path: '/userCenter/myProduct/index',
-    name: 'myProduct_index',
-    meta: { title: '我的发布', isleftarrow: true },
-    component: () => import('../views/userCenter/myProduct/index.vue'),
-  },
-
-  //用户-我的发布详情
-  {
-    path: '/userCenter/myProduct/detailinfo',
-    name: 'myProduct_detailinfo',
-    meta: { title: '产品详情', isleftarrow: true },
-    component: () => import('../views/userCenter/myProduct/detailinfo.vue'),
-  },
-
-  // 用户-发布产品
-  {
-    path: '/userCenter/myProduct/detail',
-    name: 'myProduct_detail',
-    meta: { title: '发布产品', isleftarrow: true },
-    component: () => import('../views/userCenter/myProduct/detail.vue'),
-  },
-  // 用户-事项管理
-  {
-    path: '/userCenter/matter/index',
-    name: 'matter_index',
-    meta: { title: '事项管理', isleftarrow: true },
-    component: () => import('../views/userCenter/matter/index.vue'),
-  },
-
-  // 用户-事项管理详情
-  {
-    path: '/userCenter/matter/detailinfo',
-    name: 'matter_idetailinfo',
-    meta: { title: '事项详情', isleftarrow: true },
-    component: () => import('../views/userCenter/matter/detailinfo.vue'),
-  },
-
-  // 用户-展会管理
-  {
-    path: '/userCenter/dock/index',
-    name: 'dock_index',
-    meta: { title: '展会管理', isleftarrow: true },
-    component: () => import('../views/userCenter/dock/index.vue'),
-  },
-  // 用户-申请对接会
-  {
-    path: '/userCenter/dock/apply',
-    name: 'dock_apply',
-    meta: { title: '申请对接会', isleftarrow: true },
-    component: () => import('../views/userCenter/dock/apply.vue'),
-  },
   // 用户-个人中心
   {
     path: '/userCenter/user/index',
@@ -157,76 +62,6 @@ const routes = [
     meta: { title: '个人中心', isleftarrow: true },
     component: () => import('../views/user/index.vue'),
   },
-
-  // 管理员个人中心-用户管理
-  {
-    path: '/adminCenter/user/index',
-    name: 'adminCenter_user_index',
-    meta: { title: '用户管理', isleftarrow: true },
-    component: () => import('../views/adminCenter/user/index.vue'),
-  },
-  // 管理员个人中心-编辑审核
-  {
-    path: '/adminCenter/user/detail',
-    name: 'adminCenter_user_detail',
-    meta: { title: '用户详情', isleftarrow: true },
-    component: () => import('../views/adminCenter/user/detail.vue'),
-  },
-  // 管理员个人中心-对接会管理
-  {
-    path: '/adminCenter/duijiehui/index',
-    name: 'adminCenter_user_detail',
-    meta: { title: '对接会管理', isleftarrow: true },
-    component: () => import('../views/adminCenter/duijiehui/index.vue'),
-  },
-  // 管理员个人中心-对接会详情
-  {
-    path: '/adminCenter/duijiehui/detail',
-    name: 'adminCenter_duijiehuir_detail',
-    meta: { title: '对接会详情', isleftarrow: true },
-    component: () => import('../views/adminCenter/duijiehui/detail.vue'),
-  },
-
-  // 管理员个人中心-对接会审核
-  {
-    path: '/adminCenter/duijiehui/examine',
-    name: 'adminCenter_duijiehuiexamine',
-    meta: { title: '对接会状态审核', isleftarrow: true },
-    component: () => import('../views/adminCenter/duijiehui/examine.vue'),
-  },
-
-  // 管理员个人中心-对接会申请状况列表
-  {
-    path: '/adminCenter/duijiehui/apply',
-    name: 'adminCenter_duijiapply',
-    meta: { title: '对接会申请状况列表', isleftarrow: true },
-    component: () => import('../views/adminCenter/duijiehui/apply.vue'),
-  },
-
-  // 管理员个人中心-对接会申请状况列表
-  {
-    path: '/adminCenter/enterpriseProduct/index',
-    name: 'adminCenter_enterpriseProduct',
-    meta: { title: '产品供求审核管理', isleftarrow: true },
-    component: () => import('../views/adminCenter/enterpriseProduct/index.vue'),
-  },
-  // 管理员个人中心-产品供求交易状态审核管理
-  {
-    path: '/adminCenter/transaction/index',
-    name: 'adminCenter_transaction',
-    meta: { title: '产品供求交易状态审核管理', isleftarrow: true },
-    component: () => import('../views/adminCenter/transaction/index.vue'),
-  },
-
-  // 管理员个人中心-产品供求交易状态审核管理
-  {
-    path: '/adminCenter/transaction/detail',
-    name: 'adminCenter_detail',
-    meta: { title: '产品供求交易状态审核管理详情', isleftarrow: true },
-    component: () => import('../views/adminCenter/transaction/detail.vue'),
-  },
-
-  ,
 ];
 
 const router = new VueRouter({

+ 7 - 0
src/store/onlive/room.js

@@ -5,6 +5,7 @@ import _ from 'lodash';
 Vue.use(Vuex);
 const api = {
   roomInfo: `/api/onlive/room`,
+  lookuserInfo: `/api/onlive/lookuser`,
 };
 const state = () => ({});
 const mutations = {};
@@ -22,6 +23,12 @@ const actions = {
     const res = await this.$axios.$post(`${api.roomInfo}`, payload);
     return res;
   },
+  // 记录观看
+  async lookuserFetch({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.lookuserInfo}`, payload);
+    return res;
+  },
+  // 名字查详情
   async roomfetch({ commit }, payload) {
     const res = await this.$axios.$get(`${api.roomInfo}/roomname`, payload);
     return res;

+ 0 - 92
src/views/adminCenter/duijiehui/apply.vue

@@ -1,92 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <el-col :span="24" class="main">
-            <el-col :span="24" class="one">
-              <applyList></applyList>
-            </el-col>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-import NavBar from '@/layout/common/topInfo.vue';
-import applyList from './parts/applyList.vue';
-export default {
-  name: 'index',
-  props: {},
-  components: { NavBar, applyList },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    img_path: require('@/assets/logo.png'),
-    active: 0,
-    show: false,
-    newform: {},
-  }),
-  created() {},
-  computed: {},
-  methods: {},
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-  .two {
-    position: fixed;
-    top: 80%;
-
-    left: 10px;
-    z-index: 999;
-  }
-}
-/deep/.van-tab {
-  text-align: center;
-}
-/deep/.van-tabs--line .van-tabs__wrap {
-  height: 70px;
-  margin: 0 0 10px 0;
-}
-/deep/.van-tab--active {
-  color: red;
-}
-.van-icon {
-  font-size: 20px;
-}
-/deep/.van-popup--bottom {
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 300px;
-}
-</style>

+ 0 - 132
src/views/adminCenter/duijiehui/detail.vue

@@ -1,132 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <detail :form="form" @onSubmit="onSubmit" @placesubmit="placesubmit" :option="option" :options="options"></detail>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import detail from '@/layout/duijiehui/detail.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: dock } = createNamespacedHelpers('dock');
-const { mapActions: place } = createNamespacedHelpers('place');
-
-export default {
-  name: 'index',
-  props: {},
-  components: {
-    NavBar,
-    detail, //个人信息维护
-  },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    // 个人信息
-    form: {},
-    option: [],
-    options: [],
-  }),
-  created() {
-    this.searchinfo();
-    this.search();
-    this.searchplace();
-  },
-  computed: {
-    ...mapState(['user']),
-    id() {
-      return this.$route.query.id;
-    },
-    role() {
-      return this.$route.query.role;
-    },
-  },
-  methods: {
-    ...place({ palcequery: 'query', transactiondtetle: 'delete' }),
-    ...dock({ livefetch: 'fetch', livelist: 'query', livecreate: 'create', liveupdate: 'update' }),
-
-    async placesubmit({ value }) {
-      let level = 2;
-      let parent = value;
-      let res = await this.palcequery({ level, parent });
-      this.$set(this, `options`, res.data);
-    },
-
-    async searchplace() {
-      if (this.id) {
-        let level = 2;
-        let ress = await this.livefetch(this.id);
-        let parent = ress.data.place;
-        let res = await this.palcequery({ level, parent });
-        this.$set(this, `options`, res.data);
-      }
-    },
-
-    async searchinfo() {
-      let level = 1;
-      let res = await this.palcequery({ level });
-      console.log(res.data);
-      console.log(res.data);
-      this.$set(this, `option`, res.data);
-    },
-
-    async search() {
-      if (this.id) {
-        let res = await this.livefetch(this.id);
-        this.$set(this, `form`, res.data);
-      }
-    },
-    async onSubmit({ data }) {
-      console.log(data);
-      if (this.id) {
-        let res = await this.liveupdate(data);
-        this.$checkRes(res, '修改成功', '修改失败');
-      } else {
-        this.form.user_id = this.user.uid;
-        this.form.is_allowed = '1';
-        let res = await this.livecreate(data);
-        this.$checkRes(res, '创建成功', '添加失败');
-      }
-      this.$router.push({ path: './index' });
-    },
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-}
-.foot {
-  position: absolute;
-  bottom: 0;
-}
-</style>

+ 0 - 129
src/views/adminCenter/duijiehui/examine.vue

@@ -1,129 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <examineinfo :form="form" @onSubmit="onSubmit" @placesubmit="placesubmit" :option="option" :options="options"></examineinfo>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import examineinfo from '@/layout/duijiehui/examineinfo.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: dock } = createNamespacedHelpers('dock');
-const { mapActions: place } = createNamespacedHelpers('place');
-
-export default {
-  name: 'index',
-  props: {},
-  components: {
-    NavBar,
-    examineinfo, //个人信息维护
-  },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    // 个人信息
-    form: {},
-    option: [],
-    options: [],
-  }),
-  created() {
-    this.searchinfo();
-    this.search();
-    this.searchplace();
-  },
-  computed: {
-    ...mapState(['user']),
-    id() {
-      return this.$route.query.id;
-    },
-    role() {
-      return this.$route.query.role;
-    },
-  },
-  methods: {
-    ...place({ palcequery: 'query', transactiondtetle: 'delete' }),
-    ...dock({ livefetch: 'fetch', livelist: 'query', livecreate: 'create', liveupdate: 'update' }),
-
-    async placesubmit({ value }) {
-      let level = 2;
-      let parent = value;
-      let res = await this.palcequery({ level, parent });
-      this.$set(this, `options`, res.data);
-    },
-
-    async searchplace() {
-      if (this.id) {
-        let level = 2;
-        let ress = await this.livefetch(this.id);
-        let parent = ress.data.place;
-        let res = await this.palcequery({ level, parent });
-        this.$set(this, `options`, res.data);
-      }
-    },
-
-    async searchinfo() {
-      let level = 1;
-      let res = await this.palcequery({ level });
-
-      this.$set(this, `option`, res.data);
-    },
-
-    async search() {
-      let res = await this.livefetch(this.id);
-      this.$set(this, `form`, res.data);
-    },
-    async onSubmit({ data }) {
-      console.log(data);
-      if (this.id) {
-        let res = await this.liveupdate(data);
-        this.$checkRes(res, '修改成功', '修改失败');
-      } else {
-        this.form.user_id = this.user.uid;
-        this.form.is_allowed = '1';
-        let res = await this.livecreate(data);
-        this.$checkRes(res, '创建成功', '添加失败');
-      }
-      this.$router.push({ path: './index' });
-    },
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-}
-.foot {
-  position: absolute;
-  bottom: 0;
-}
-</style>

+ 0 - 92
src/views/adminCenter/duijiehui/index.vue

@@ -1,92 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <el-col :span="24" class="main">
-            <el-col :span="24" class="one">
-              <list></list>
-            </el-col>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-import NavBar from '@/layout/common/topInfo.vue';
-import list from './parts/list.vue';
-export default {
-  name: 'index',
-  props: {},
-  components: { NavBar, list },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    img_path: require('@/assets/logo.png'),
-    active: 0,
-    show: false,
-    newform: {},
-  }),
-  created() {},
-  computed: {},
-  methods: {},
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-  .two {
-    position: fixed;
-    top: 80%;
-
-    left: 10px;
-    z-index: 999;
-  }
-}
-/deep/.van-tab {
-  text-align: center;
-}
-/deep/.van-tabs--line .van-tabs__wrap {
-  height: 70px;
-  margin: 0 0 10px 0;
-}
-/deep/.van-tab--active {
-  color: red;
-}
-.van-icon {
-  font-size: 20px;
-}
-/deep/.van-popup--bottom {
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 300px;
-}
-</style>

+ 0 - 162
src/views/adminCenter/duijiehui/parts/applyList.vue

@@ -1,162 +0,0 @@
-<template>
-  <div id="auditList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <!-- <el-col class="newuser"><van-button type="info" size="small" @click="usersubmit()">新建对接会</van-button> </el-col> -->
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <p class="textOver">
-            <span class="titel">{{ item.user_name }}</span>
-
-            <span style="margin:0 0 0  5px;"><van-button type="info" size="mini" @click="submit(item)">审核通过</van-button> </span>
-
-            <span style="margin:0 0 0  5px;"><van-button type="info" size="mini" @click="jujue(item)">审核拒绝</van-button> </span>
-          </p>
-          <p>
-            <span class="ptwo"
-              ><span>买家/卖家:{{ item.buyer == '0' ? '买家' : item.buyer == '1' ? '卖家' : '' }}</span></span
-            >
-          </p>
-          <p class="newptwo">
-            <span class="ptwo"><span>联系人:</span>{{ item.contact }}</span>
-            <span>联系人电话</span>{{ item.contact_tel }} <span>邮箱:{{ item.email }}</span>
-          </p>
-
-          <p class="newptwo">
-            <span>单位名称:{{ item.company }}</span>
-            <span>申请时间:{{ item.apply_time }}</span>
-          </p>
-
-          <p class="newptwo">
-            <span>申请状态:{{ item.status == '0' ? '待审核' : item.status == '1' ? '已通过' : item.status == '2' ? '已拒绝' : '' }} </span>
-          </p>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: apply } = createNamespacedHelpers('apply');
-const { mapActions: user } = createNamespacedHelpers('user');
-export default {
-  name: 'auditList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.search();
-  },
-  methods: {
-    ...user(['query', 'delete', 'update']),
-    ...apply({ dockQuery: 'query', dockDteate: 'delete', applyUpdate: 'update' }),
-    async search() {
-      this.$set(this, `list`, this.data.apply);
-    },
-    async submit(item) {
-      console.log(item);
-      item.status = '1';
-      item.dock_id = this.id;
-      item.id = item._id;
-      console.log(item);
-      let res = await this.applyUpdate(item);
-
-      if (this.$checkRes(res)) {
-        this.$message({
-          message: '审核通过',
-          type: 'success',
-        });
-      }
-    },
-    async jujue(item) {
-      console.log(item);
-      item.status = '2';
-      item.dock_id = this.id;
-      item.id = item._id;
-      console.log(item);
-      let res = await this.applyUpdate(item);
-      if (this.$checkRes(res)) {
-        this.$message({
-          message: '审核拒绝',
-          type: 'success',
-        });
-      }
-    },
-  },
-  computed: {
-    data() {
-      return this.$route.query.data;
-    },
-    id() {
-      return this.$route.query.id;
-    },
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.newuser {
-  float: right;
-  padding: 10px 0 10px 10px;
-}
-.info {
-  border-top: 1px solid #f5f5f5;
-  min-height: 400px;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    p {
-      font-size: 14px;
-      color: #000;
-      padding: 5px 0;
-    }
-    p:first-child {
-      font-size: 16px;
-    }
-    p:nth-child(2) .ptwo {
-      display: inline-block;
-      width: 50%;
-    }
-    p:nth-child(2) .ptwo span:first-child {
-      color: #ccc;
-    }
-    p:last-child span {
-      color: #ccc;
-    }
-  }
-}
-.content {
-  padding: 16px 16px 160px;
-  height: 160px;
-  background-color: aqua;
-}
-.newptwo {
-  color: #ccc !important;
-}
-/deep/.van-button--small {
-  min-width: 60px;
-  height: 30px;
-  padding: 0 8px;
-  font-size: 12px;
-  margin: 0 5px 0 0;
-}
-.titel {
-  display: inline-block;
-  width: 65%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  whitewhite-space: nowrap;
-}
-</style>

+ 0 - 151
src/views/adminCenter/duijiehui/parts/list.vue

@@ -1,151 +0,0 @@
-<template>
-  <div id="auditList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col class="newuser"><van-button type="info" size="small" @click="usersubmit()">新建对接会</van-button> </el-col>
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <el-col :span="20">
-            <p class="textOver">
-              <span class="titel">{{ item.title }}</span>
-            </p>
-            <p>
-              <span class="ptwo"
-                ><span>开始时间:{{ item.start_time || '暂无' }}</span></span
-              >
-            </p>
-            <p class="newptwo">
-              <span class="ptwo"><span>报名截止时间:</span>{{ item.join_end }}</span>
-            </p>
-
-            <p class="newptwo">
-              <span>审核状态:</span>{{ item.is_allowed == '0' ? '待审核' : item.is_allowed == '1' ? '审核成功' : item.is_allowed == '2' ? '审核拒绝' : '' }}
-              <span>对接会状态:</span>{{ item.status == '1' ? '开始' : item.status == '2' ? '结束' : '准备中' }}
-            </p>
-          </el-col>
-          <el-col :span="4">
-            <p><van-button type="danger" size="mini" @click="toDelete(item)">删除</van-button></p>
-            <p><van-button type="info" size="mini" @click="submit(item)">编辑</van-button></p>
-            <p><van-button type="info" size="mini" @click="shenqing(item)">申请情况</van-button></p>
-            <van-button type="primary" style="color:#fff!important;" size="mini" @click="shenhe(item)">审核</van-button>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: dock } = createNamespacedHelpers('dock');
-const { mapActions: user } = createNamespacedHelpers('user');
-export default {
-  name: 'auditList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.search();
-  },
-  methods: {
-    ...user(['query', 'delete', 'update']),
-    ...dock({ dockQuery: 'query', dockDteate: 'delete', dockUpdate: 'update' }),
-    async search() {
-      if (this.user.role == 4) {
-        let user_id = this.user.uid;
-        let res = await this.dockQuery({ user_id });
-        if (this.$checkRes(res)) {
-          this.$set(this, `list`, res.data);
-        }
-      } else {
-        let res = await this.dockQuery();
-        if (this.$checkRes(res)) {
-          this.$set(this, `list`, res.data);
-        }
-      }
-    },
-    async submit(item) {
-      this.$router.push({ path: './detail', query: { id: item.id, role: item.role } });
-    },
-    shenhe(item) {
-      this.$router.push({ path: './examine', query: { id: item.id, role: item.role } });
-    },
-    usersubmit() {
-      this.$router.push({ path: './detail' });
-    },
-    shenqing(item) {
-      this.$router.push({ path: './apply', query: { data: item, id: item.id } });
-    },
-    async toDelete(item) {
-      const res = await this.dockDteate(item.id);
-      if (this.$checkRes(res, '删除成功', res.errmsg || '删除失败')) this.search();
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.newuser {
-  float: right;
-  padding: 10px 0 10px 10px;
-}
-.info {
-  border-top: 1px solid #f5f5f5;
-
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    p {
-      font-size: 14px;
-      color: #000;
-      padding: 5px 0;
-    }
-    p:first-child {
-      font-size: 16px;
-    }
-    p:nth-child(2) .ptwo {
-      display: inline-block;
-      width: 50%;
-    }
-    p:nth-child(2) .ptwo span:first-child {
-      color: #ccc;
-    }
-    p:last-child span {
-    }
-  }
-}
-
-.content {
-  padding: 16px 16px 160px;
-  height: 160px;
-  background-color: aqua;
-}
-
-/deep/.van-button--small {
-  min-width: 60px;
-  height: 30px;
-  padding: 0 8px;
-  font-size: 12px;
-  margin: 0 5px 0 0;
-}
-.titel {
-  display: inline-block;
-  width: 90%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  whitewhite-space: nowrap;
-}
-</style>

+ 0 - 92
src/views/adminCenter/enterpriseProduct/index.vue

@@ -1,92 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <el-col :span="24" class="main">
-            <el-col :span="24" class="one">
-              <list></list>
-            </el-col>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-import NavBar from '@/layout/common/topInfo.vue';
-import list from './parts/list.vue';
-export default {
-  name: 'index',
-  props: {},
-  components: { NavBar, list },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    img_path: require('@/assets/logo.png'),
-    active: 0,
-    show: false,
-    newform: {},
-  }),
-  created() {},
-  computed: {},
-  methods: {},
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-  .two {
-    position: fixed;
-    top: 80%;
-
-    left: 10px;
-    z-index: 999;
-  }
-}
-/deep/.van-tab {
-  text-align: center;
-}
-/deep/.van-tabs--line .van-tabs__wrap {
-  height: 70px;
-  margin: 0 0 10px 0;
-}
-/deep/.van-tab--active {
-  color: red;
-}
-.van-icon {
-  font-size: 20px;
-}
-/deep/.van-popup--bottom {
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 300px;
-}
-</style>

+ 0 - 136
src/views/adminCenter/enterpriseProduct/parts/list.vue

@@ -1,136 +0,0 @@
-<template>
-  <div id="auditList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <p class="textOver">
-            <span class="titel">{{ item.name }}</span>
-            <span style="float:right;margin:0 0 0  5px;" v-if="item.status == '0'">
-              <van-button type="info" size="mini" @click="sussess(item)">审核通过</van-button>
-            </span>
-            <span style="float:right;margin:0 0 0  5px;" v-if="item.status == '0'">
-              <van-button type="info" size="mini" @click="fail(item)">审核拒绝</van-button>
-            </span>
-          </p>
-          <p class="listInfo">
-            <span>类型:</span><span>{{ item.status == '0' ? '技术' : item.status == '1' ? '产品' : '服务' }}</span>
-          </p>
-          <p class="listInfo">
-            <span>联系人:</span><span>{{ item.contact_user }}</span>
-          </p>
-          <p class="listInfo">
-            <span>审核状态:</span><span>{{ item.status == '0' ? '待审核' : item.status == '1' ? '审核成功' : item.status == '2' ? '审核拒绝' : '草稿' }}</span>
-          </p>
-          <p class="listInfo">
-            <span>简介:</span><span>{{ item.introduction }}</span>
-          </p>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: product } = createNamespacedHelpers('marketproduct');
-
-export default {
-  name: 'auditList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [{ name: '1' }],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...product(['query', 'update']),
-    async searchInfo() {
-      if (this.user.role == '4') {
-        // let userid = this.user.uid;
-        let res = await this.query();
-        this.$set(this, `list`, res.data);
-      } else {
-        let res = await this.query();
-        this.$set(this, `list`, res.data);
-      }
-    },
-    async sussess(item) {
-      item.status = '1';
-      let res = await this.update(item);
-      this.$message({
-        message: '信息审核成功',
-        type: 'success',
-      });
-      this.searchInfo();
-    },
-
-    async fail(item) {
-      item.status = '2';
-      let res = await this.update(item);
-      this.$message({
-        message: '信息审核成功',
-        type: 'success',
-      });
-      this.searchInfo();
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.newuser {
-  float: right;
-  padding: 10px 0 10px 10px;
-}
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    p {
-      font-size: 16px;
-      color: #000;
-      padding: 5px 0;
-    }
-    .listInfo {
-      font-size: 14px;
-      color: #000;
-      span:first-child {
-        color: #ccc;
-      }
-    }
-  }
-}
-.content {
-  padding: 16px 16px 160px;
-  height: 160px;
-  background-color: aqua;
-}
-/deep/.van-button--small {
-  min-width: 60px;
-  height: 30px;
-  padding: 0 8px;
-  font-size: 12px;
-  margin: 0 5px 0 0;
-}
-.titel {
-  display: inline-block;
-  width: 65%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-</style>

+ 0 - 105
src/views/adminCenter/transaction/detail.vue

@@ -1,105 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <detaliinfo :form="form" @onSubmit="onSubmit"></detaliinfo>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import detaliinfo from '@/layout/transaction/detaliinfo.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: transaction } = createNamespacedHelpers('transaction');
-const { mapActions: productpact } = createNamespacedHelpers('productpact');
-export default {
-  name: 'index',
-  props: {},
-  components: {
-    NavBar,
-    detaliinfo, //个人信息维护
-  },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    // 个人信息
-    form: {},
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    ...mapState(['user']),
-    id() {
-      return this.$route.query.id;
-    },
-    role() {
-      return this.$route.query.role;
-    },
-  },
-  methods: {
-    ...transaction({ transactionsfetch: 'fetch', transactionslist: 'query', transactionupdate: 'update' }),
-    ...productpact({ transactionQuery: 'query', productpactFetch: 'findpact', productpactUpdate: 'update' }),
-    async searchInfo() {
-      console.log(this.id);
-
-      const res = await this.productpactFetch(this.id);
-      if (this.$checkRes(res)) {
-        this.$set(this, `form`, res.data);
-      }
-    },
-    async onSubmit({ data }) {
-      const res = await this.productpactUpdate(data);
-      if (this.$checkRes(res)) {
-        data.status = '2';
-        data.id = data.transaction_id;
-        const arr = await this.transactionupdate(data);
-        if (this.$checkRes(arr)) {
-          this.$message({
-            message: '审核通过',
-            type: 'success',
-          });
-        }
-      }
-      this.$router.push({ path: './index' });
-    },
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-}
-.foot {
-  position: absolute;
-  bottom: 0;
-}
-</style>

+ 0 - 92
src/views/adminCenter/transaction/index.vue

@@ -1,92 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <el-col :span="24" class="main">
-            <el-col :span="24" class="one">
-              <list></list>
-            </el-col>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-import NavBar from '@/layout/common/topInfo.vue';
-import list from './parts/list.vue';
-export default {
-  name: 'index',
-  props: {},
-  components: { NavBar, list },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    img_path: require('@/assets/logo.png'),
-    active: 0,
-    show: false,
-    newform: {},
-  }),
-  created() {},
-  computed: {},
-  methods: {},
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-  .two {
-    position: fixed;
-    top: 80%;
-
-    left: 10px;
-    z-index: 999;
-  }
-}
-/deep/.van-tab {
-  text-align: center;
-}
-/deep/.van-tabs--line .van-tabs__wrap {
-  height: 70px;
-  margin: 0 0 10px 0;
-}
-/deep/.van-tab--active {
-  color: red;
-}
-.van-icon {
-  font-size: 20px;
-}
-/deep/.van-popup--bottom {
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 300px;
-}
-</style>

+ 0 - 133
src/views/adminCenter/transaction/parts/list.vue

@@ -1,133 +0,0 @@
-<template>
-  <div id="auditList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <p class="textOver">
-            <span @click="$router.push({ path: '/userCenter/matter/detailinfo', query: { id: item.id } })">{{ item.product_name }}</span>
-            <span style="float:right"><van-button v-if="item.status == '4'" type="primary" size="small" @click="submit(item)">审核</van-button> </span>
-          </p>
-          <p>
-            <span class="ptwo"><span>购买人名称:</span>{{ item.username || '暂无' }}</span>
-          </p>
-
-          <p>
-            <span class="ptwo"><span>营销人名称:</span>{{ item.market_username || '暂无' }}</span>
-            <span>状态:</span>
-            {{
-              `${item.status}` === `0`
-                ? '未交易'
-                : `${item.status}` === `1`
-                ? '交易中'
-                : `${item.status}` === `2`
-                ? '交易成功'
-                : `${item.status}` === `3`
-                ? '交易失败'
-                : `${item.status}` === `4`
-                ? '合同待审核'
-                : '未识别'
-            }}
-          </p>
-
-          <p class="textOver"><span>说明:</span>{{ item.description || '暂无' }}</p>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: transaction } = createNamespacedHelpers('transaction');
-
-export default {
-  name: 'auditList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
-    async searchInfo() {
-      if (this.user.role == '4') {
-        let create_userid = this.user.uid;
-        let res = await this.transactionList({ create_userid, status: '4' });
-        if (this.$checkRes(res)) {
-          this.$set(this, `list`, res.data);
-        }
-      } else {
-        let userid = this.user.uid;
-        let res = await this.transactionList({ status: '4' });
-        if (this.$checkRes(res)) {
-          this.$set(this, `list`, res.data);
-        }
-      }
-    },
-    async submit(item) {
-      this.$router.push({ path: './detail', query: { id: item.id } });
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    p {
-      font-size: 14px;
-      color: #000;
-      padding: 5px 0;
-    }
-    p:first-child {
-      font-size: 16px;
-    }
-    p:nth-child(2) .ptwo {
-      display: inline-block;
-      width: 75%;
-    }
-
-    p:nth-child(3) .ptwo {
-      display: inline-block;
-      width: 40%;
-    }
-
-    p:nth-child(3) .ptwo span:first-child {
-      color: #ccc;
-    }
-
-    p:nth-child(2) .ptwo span:first-child {
-      color: #ccc;
-    }
-    p:last-child span {
-      color: #ccc;
-    }
-  }
-}
-.content {
-  padding: 16px 16px 160px;
-  height: 160px;
-  background-color: aqua;
-}
-.newptwo {
-  color: #ccc !important;
-}
-</style>

+ 0 - 134
src/views/adminCenter/user/detail.vue

@@ -1,134 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <person :form="form" @onSubmit="onSubmit"></person>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import person from '@/layout/adminuser/release.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: market } = createNamespacedHelpers('market');
-const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
-export default {
-  name: 'index',
-  props: {},
-  components: {
-    NavBar,
-    person, //个人信息维护
-  },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    // 个人信息
-    form: {},
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    ...mapState(['user']),
-    id() {
-      return this.$route.query.id;
-    },
-    role() {
-      return this.$route.query.role;
-    },
-  },
-  methods: {
-    ...market(['fetch', 'update', 'create']),
-    ...expertsuser({ expertsuserFetch: 'fetch', expertsuserUpdate: 'update', expertsuserUpgrade: 'upgrade', expertsuserCreate: 'create' }),
-    async searchInfo() {
-      if (this.role == '2' || this.role == '3' || this.role == '7') {
-        let res = await this.fetch(this.id);
-        if (res.errcode === 0) {
-          this.$set(this, `form`, res.data);
-        }
-      } else if (this.role == '6') {
-        let res = await this.expertsuserFetch(this.id);
-        if (res.errcode === 0) {
-          this.$set(this, `form`, res.data);
-        }
-      }
-    },
-    async onSubmit({ data }) {
-      if (data.role == '2' || data.role == '3' || data.role == '7') {
-        let res;
-        let msg;
-        if (data.id) {
-          res = await this.update(data);
-          this.$message({
-            message: '个人信息修改成功',
-            type: 'success',
-          });
-        } else {
-          data.status = '0';
-          data.code = this.user.code;
-          res = await this.create(data);
-          this.$message({
-            message: '个人信息创建成功',
-            type: 'success',
-          });
-        }
-      } else if (data.role == '6') {
-        let res;
-        let msg;
-        if (data.id) {
-          res = await this.expertsuserUpdate(data);
-          this.$message({
-            message: '个人信息修改成功',
-            type: 'success',
-          });
-        } else {
-          data.code = this.user.code;
-          res = await this.expertsuserCreate(data);
-          this.$message({
-            message: '个人信息添加成功',
-            type: 'success',
-          });
-        }
-      }
-      this.$router.push({ path: './index' });
-    },
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-}
-.foot {
-  position: absolute;
-  bottom: 0;
-}
-</style>

+ 0 - 90
src/views/adminCenter/user/index.vue

@@ -1,90 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <el-col :span="24" class="one">
-            <userlist></userlist>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-import NavBar from '@/layout/common/topInfo.vue';
-import userlist from './parts/userlist.vue';
-export default {
-  name: 'index',
-  props: {},
-  components: { NavBar, userlist },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    img_path: require('@/assets/logo.png'),
-    active: 0,
-    show: false,
-    newform: {},
-  }),
-  created() {},
-  computed: {},
-  methods: {},
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-  .two {
-    position: fixed;
-    top: 80%;
-
-    left: 10px;
-    z-index: 999;
-  }
-}
-/deep/.van-tab {
-  text-align: center;
-}
-/deep/.van-tabs--line .van-tabs__wrap {
-  height: 70px;
-  margin: 0 0 10px 0;
-}
-/deep/.van-tab--active {
-  color: red;
-}
-.van-icon {
-  font-size: 20px;
-}
-/deep/.van-popup--bottom {
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 300px;
-}
-</style>

+ 0 - 147
src/views/adminCenter/user/parts/userlist.vue

@@ -1,147 +0,0 @@
-<template>
-  <div id="auditList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="newuser"><van-button type="info" size="small" @click="usersubmit()">新建用户</van-button> </el-col>
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <p class="textOver">
-            <span class="textOver">{{ item.name }}</span>
-            <span style="float:right"> <van-button type="danger" size="small" @click="toDelete(item)">删除</van-button></span>
-            <span style="float:right"
-              ><van-button type="info" size="small" @click="submit(item)">{{
-                item.status == '0' ? '审核' : item.status == '1' ? '查看' : '未识别'
-              }}</van-button>
-            </span>
-          </p>
-          <p>
-            <span class="ptwo"><span>电话:</span>{{ item.phone || '暂无' }}</span>
-            <span class="ptwo">
-              <span>用户类型:</span>{{ item.role == '2' ? '个人用户' : item.role == '3' ? '企业用户' : item.role == '6' ? '专家用户' : '临时用户' }}</span
-            >
-          </p>
-          <p class="newptwo">
-            <span>状态:</span>{{ item.status == '0' ? '待审核' : item.status == '1' ? '审核成功' : item.status == '2' ? '审核拒绝' : '待认证' }}
-          </p>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: exportuser } = createNamespacedHelpers('exportuser');
-const { mapActions: user } = createNamespacedHelpers('user');
-export default {
-  name: 'auditList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.search();
-  },
-  methods: {
-    ...user(['query', 'delete', 'update']),
-    ...exportuser({ exportuserQuery: 'query' }),
-    async search() {
-      if (this.user.code.length == 3) {
-        const res = await this.query();
-        const resTwo = await this.exportuserQuery();
-        var newData = res.data.concat(resTwo.data);
-        if (this.$checkRes(newData)) {
-          var arr = newData.filter(item => item.pid == undefined && item.status != '3');
-          this.$set(this, `list`, arr);
-        }
-      } else {
-        const res = await this.query({ code: this.user.code });
-
-        const resTwo = await this.exportuserQuery({ code: this.user.code });
-        console.log(resTwo);
-
-        var newData = res.data.concat(resTwo.data);
-        console.log(newData);
-
-        if (this.$checkRes(newData)) {
-          var arr = newData.filter(item => item.pid == undefined && item.status != '3');
-          this.$set(this, `list`, arr);
-        }
-      }
-    },
-    async submit(item) {
-      this.$router.push({ path: './detail', query: { id: item.id, role: item.role } });
-    },
-    usersubmit() {
-      this.$router.push({ path: './detail' });
-    },
-    async toDelete(item) {
-      const res = await this.delete(item.id);
-      if (this.$checkRes(res, '删除成功', res.errmsg || '删除失败')) this.search();
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.newuser {
-  text-align: center;
-  padding: 10px 0 10px 10px;
-}
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    p {
-      font-size: 14px;
-      color: #000;
-      padding: 5px 0;
-    }
-    p:first-child {
-      font-size: 16px;
-      span:first-child {
-        width: 60%;
-        display: inline-block;
-      }
-    }
-    p:nth-child(2) .ptwo {
-      display: inline-block;
-      width: 50%;
-    }
-    p:nth-child(2) .ptwo span:first-child {
-      color: #ccc;
-    }
-    p:last-child span {
-      color: #ccc;
-    }
-  }
-}
-.content {
-  padding: 16px 16px 160px;
-  height: 160px;
-  background-color: aqua;
-}
-.newptwo {
-  color: #ccc !important;
-}
-/deep/.van-button--small {
-  min-width: 60px;
-  height: 30px;
-  padding: 0 8px;
-  font-size: 12px;
-  margin: 0 5px 0 0;
-}
-</style>

+ 3 - 19
src/views/live/parts/liveList.vue

@@ -25,8 +25,7 @@
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: dock } = createNamespacedHelpers('dock');
-const { mapActions: place } = createNamespacedHelpers('place');
+const { mapActions: room } = createNamespacedHelpers('room');
 export default {
   name: 'liveList',
   props: {},
@@ -40,25 +39,10 @@ export default {
     this.searchInfo();
   },
   methods: {
-    ...dock({ dockQuery: 'query', palcefetch: 'fetch' }),
-    ...place({ palcequery: 'query', transactiondtetle: 'delete' }),
+    ...room({ roomQuery: 'query' }),
     async searchInfo() {
-      let res = await this.dockQuery();
+      let res = await this.roomQuery();
       if (this.$checkRes(res)) {
-        for (const val of res.data) {
-          let parent = val.province;
-          let places = val.place;
-          let provinceInfo = await this.palcequery({ level: 1, parent });
-          let placesInfo = await this.palcequery({ level: 2, places });
-          var arr = provinceInfo.data.filter(item => item.code === parent);
-          var arrTwo = placesInfo.data.filter(item => item.code === places);
-          for (const province of arr) {
-            val.province = province.name;
-          }
-          for (const places of arrTwo) {
-            val.places = places.name;
-          }
-        }
         this.$set(this, `list`, res.data);
       }
     },

+ 132 - 41
src/views/live/roomDetail.vue

@@ -1,12 +1,27 @@
 <template>
-  <div id="roomDetail">
+  <div id="roomsDetail">
     <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
+      <el-col :span="24" class="info">
+        <el-col :span="24" class="video">
+          <el-col :span="15" class="videoLeft">
+            <div id="look-video-left" class="video-box col-div" style="justify-content: flex-end"></div>
+          </el-col>
+          <el-col :span="9" class="videoRight">
+            <div id="look-video-right" class="video-box col-div" style="justify-content: flex-end"></div>
+          </el-col>
         </el-col>
-        <el-col :span="24" class="main">
-          <roomsDetail></roomsDetail>
+        <el-col :span="24" class="chat">
+          <el-col :span="24" class="chatList">
+            聊天列表
+          </el-col>
+          <el-col :span="24" class="chatInput">
+            <el-col :span="19" class="input">
+              <el-input v-model="input"></el-input>
+            </el-col>
+            <el-col :span="5" class="btn">
+              <el-button type="primary" size="mini" @click="onSubmit">发送</el-button>
+            </el-col>
+          </el-col>
         </el-col>
       </el-col>
     </el-row>
@@ -14,60 +29,136 @@
 </template>
 
 <script>
+import TRTC from 'trtc-js-sdk';
 import { mapState, createNamespacedHelpers } from 'vuex';
-import NavBar from '@/layout/common/topInfo.vue';
-import footInfo from '@/layout/common/footInfo.vue';
-import roomsDetail from './parts/roomsDetail.vue';
+const { mapActions: gensign } = createNamespacedHelpers('gensign');
+const { mapActions: room } = createNamespacedHelpers('room');
 export default {
-  name: 'roomDetail',
+  name: 'roomsDetail',
   props: {},
-  components: {
-    NavBar,
-    // footInfo,
-    roomsDetail, //直播详情
-  },
+  components: {},
   data: function() {
     return {
-      // 头部标题
-      title: '',
-      // meta为true
-      isleftarrow: '',
-      // 返回
-      navShow: true,
+      client_: null,
+      localStream_: null,
+      sdkAppId_: '1400380125',
+      userId_: '',
     };
   },
   created() {
-    console.log(this.user);
+    this.initclient();
+    this.lookuserSearch();
+  },
+  methods: {
+    ...gensign(['gensignFetch']),
+    ...room(['lookuserFetch']),
+    async lookuserSearch() {
+      let data = {};
+      data.roomid = this.id;
+      data.roomname = this.roomname;
+      data.userid = this.user.userid;
+      data.username = this.user.name;
+      const res = await this.lookuserFetch(data);
+      console.log(res);
+    },
+    onSubmit() {
+      console.log(this.input);
+    },
+    async initclient() {
+      this.userId_ = this.user.uid;
+      const res = await this.gensignFetch({ userid: this.userId_ });
+      if (this.$checkRes(res)) {
+        this.client_ = TRTC.createClient({
+          mode: 'live',
+          sdkAppId: this.sdkAppId_,
+          userId: this.userId_,
+          userSig: res.data,
+        });
+        await this.client_.join({ roomId: this.roomname, role: 'audience' });
+        let i = 0;
+        this.client_.on('stream-subscribed', event => {
+          const remoteStream = event.stream;
+          // 远端流订阅成功,播放远端音视频流
+          console.log('111' + remoteStream.getType());
+          i = i + 1;
+          if (i === 1) {
+            remoteStream.play('look-video-right');
+          } else {
+            remoteStream.play('look-video-left');
+          }
+        });
+        // 监听远端流增加事件
+        this.client_.on('stream-added', event => {
+          const remoteStream = event.stream;
+          console.log('222' + remoteStream.getType());
+          // 订阅远端音频和视频流
+          this.client_.subscribe(remoteStream, { audio: false, video: true }).catch(e => {
+            console.error('failed to subscribe remoteStream');
+          });
+        });
+      }
+    },
   },
-  methods: {},
   computed: {
     ...mapState(['user']),
+    id() {
+      return this.$route.query.id;
+    },
+    roomname() {
+      return this.$route.query.roomname;
+    },
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
   },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
+  metaInfo() {
+    return { title: this.$route.meta.title };
   },
 };
 </script>
 
 <style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
+.info {
+  .video {
+    background: #fff;
+    margin: 0 0 10px 0;
+    .videoLeft {
+      height: 200px;
+    }
+    .videoRight {
+      height: 200px;
+    }
+  }
+  .chat {
+    background: #fff;
+    padding: 10px;
+    .chatList {
+      border: 1px solid #ccc;
+      min-height: 300px;
+      margin: 0 0 10px 0;
+      border-radius: 10px;
+      padding: 5px 10px;
+    }
+    .chatInput {
+      .el-button {
+        width: 100%;
+        padding: 13px 0;
+      }
+    }
+  }
 }
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
+/deep/.video-js {
+  height: 190px !important;
+  border-radius: 10px;
 }
-.main {
-  min-height: 570px;
+#look-video-left {
+  width: 100%;
+  height: 200px;
+  grid-area: 1/1/3/4;
 }
-.foot {
-  position: absolute;
-  bottom: 0;
+#look-video-right {
+  width: 100%;
+  height: 200px;
+  grid-area: 1/1/3/4;
 }
 </style>

+ 0 - 66
src/views/market/detail.vue

@@ -1,66 +0,0 @@
-<template>
-  <div id="detail">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <release></release>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import footInfo from '@/layout/common/footInfo.vue';
-import release from '@/layout/market/release.vue';
-
-export default {
-  name: 'detail',
-  props: {},
-  components: {
-    NavBar,
-    release, //产品发布
-  },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-  }),
-  created() {},
-  computed: {},
-  methods: {},
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-}
-.foot {
-  position: absolute;
-  bottom: 0;
-}
-</style>

+ 0 - 93
src/views/market/exportDetail.vue

@@ -1,93 +0,0 @@
-<template>
-  <div id="exportDetail">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <exportDetails :exportInfo="exportInfo"></exportDetails>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import footInfo from '@/layout/common/footInfo.vue';
-import exportDetails from '@/layout/market/exportDetails.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
-export default {
-  name: 'exportDetail',
-  props: {},
-  components: {
-    NavBar,
-    exportDetails, //专家详情
-  },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    exportInfo: {},
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    id() {
-      return this.$route.query.id;
-    },
-  },
-  methods: {
-    ...expertsuser(['fetch']),
-    async searchInfo() {
-      if (this.id) {
-        const res = await this.fetch(this.id);
-        if (this.$checkRes(res)) {
-          res.data.phone = this.phoneNumFilter(res.data.phone);
-          res.data.cardnumber = this.cardnumberNumFilter(res.data.cardnumber);
-          this.$set(this, `exportInfo`, res.data);
-        }
-      }
-    },
-    phoneNumFilter(phone) {
-      let start = phone.slice(0, 3);
-      let end = phone.slice(-4);
-      return `${start}****${end}`;
-    },
-    cardnumberNumFilter(cardnumber) {
-      let start = cardnumber.slice(0, 4);
-      let end = cardnumber.slice(-3);
-      return `${start}****${end}`;
-    },
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 600px;
-  background: #fff;
-}
-</style>

+ 0 - 131
src/views/market/index.vue

@@ -1,131 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <el-col :span="24" class="one">
-            <van-tabs v-model="active" animated>
-              <van-tab>
-                <template #title>
-                  <van-icon name="todo-list" />
-                  <p>技术供求</p>
-                </template>
-                <technologyList></technologyList>
-              </van-tab>
-              <van-tab>
-                <template #title>
-                  <van-icon name="cluster" />
-                  <p>产品供求</p>
-                </template>
-                <productList></productList>
-              </van-tab>
-              <van-tab>
-                <template #title>
-                  <van-icon name="label" />
-                  <p>服务供求</p>
-                </template>
-                <serviceList></serviceList>
-              </van-tab>
-              <van-tab>
-                <template #title>
-                  <van-icon name="manager" />
-                  <p>专家供求</p>
-                </template>
-                <expertList></expertList>
-              </van-tab>
-            </van-tabs>
-          </el-col>
-          <el-col :span="24" class="two">
-            <van-button type="primary" @click="$router.push({ path: '/market/detail' })" v-if="user.role == 3 || user.role == 2">发布产品</van-button>
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="foot">
-          <footInfo></footInfo>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-import NavBar from '@/layout/common/topInfo.vue';
-import footInfo from '@/layout/common/footInfo.vue';
-import technologyList from './parts/technologyList.vue';
-import productList from './parts/productList.vue';
-import serviceList from './parts/serviceList.vue';
-import expertList from './parts/expertList.vue';
-export default {
-  name: 'index',
-  props: {},
-  components: {
-    NavBar,
-    footInfo,
-    technologyList, //技术供求
-    productList, //产品供求
-    serviceList, //服务供求
-    expertList, //专家供求
-  },
-  data: function() {
-    return {
-      // 头部标题
-      title: '',
-      // meta为true
-      isleftarrow: '',
-      // 返回
-      navShow: true,
-      // 标签
-      active: '1',
-    };
-  },
-  created() {},
-  methods: {},
-  computed: {
-    ...mapState(['user']),
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-  .two {
-    position: fixed;
-    top: 80%;
-    left: 10px;
-    z-index: 999;
-  }
-}
-/deep/.van-tab {
-  text-align: center;
-}
-/deep/.van-tabs--line .van-tabs__wrap {
-  height: 70px;
-  margin: 0 0 10px 0;
-}
-/deep/.van-tab--active {
-  color: red;
-}
-.van-icon {
-  font-size: 20px;
-}
-</style>

+ 0 - 93
src/views/market/parts/expertList.vue

@@ -1,93 +0,0 @@
-<template>
-  <div id="expertList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col
-          :span="24"
-          class="list"
-          @click.native="$router.push({ path: '/market/exportDetail', query: { id: item.id } })"
-          v-for="(item, index) in list"
-          :key="index"
-        >
-          <el-col :span="4" class="left">
-            <el-image :src="item.img_path"></el-image>
-          </el-col>
-          <el-col :span="20" class="right">
-            <p>
-              <span>{{ item.name }}</span>
-            </p>
-            <p><span>从事专业:</span>{{ item.professional || '暂无' }}</p>
-            <p><span>邮箱:</span>{{ item.email }}</p>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
-export default {
-  name: 'expertList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...expertsuser({ expertQuery: 'query' }),
-    async searchInfo() {
-      let res = await this.expertQuery({ skip: 0, limit: 6 });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-      }
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    .left {
-      padding: 12px 0;
-      .el-image {
-        width: 60px;
-        height: 60px;
-        border-radius: 90px;
-      }
-    }
-    .right {
-      padding: 0 10px;
-      p {
-        font-size: 14px;
-        color: #000;
-        padding: 5px 0;
-      }
-      p:first-child {
-        color: blue;
-        font-size: 16px;
-      }
-    }
-  }
-}
-</style>

+ 0 - 87
src/views/market/parts/productList.vue

@@ -1,87 +0,0 @@
-<template>
-  <div id="productList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col
-          :span="24"
-          class="list"
-          @click.native="$router.push({ path: '/market/prodDetail', query: { id: item.id } })"
-          v-for="(item, index) in list"
-          :key="index"
-        >
-          <p class="textOver">{{ item.name }}</p>
-          <p>
-            <span class="ptwo"><span>产品类型:</span>{{ item.product_type_name || '暂无' }}</span>
-            <span class="ptwo"><span>产品单价</span>{{ item.price }}/{{ item.priceunit || '暂无' }}</span>
-          </p>
-          <p class="textOver"><span>产品简介:</span>{{ item.introduction || '暂无' }}</p>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: product } = createNamespacedHelpers('marketproduct');
-export default {
-  name: 'productList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...product(['newquery']),
-    async searchInfo() {
-      let res = await this.newquery({ totaltype: '1', status: '1' });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-      }
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    p {
-      font-size: 14px;
-      color: #000;
-      padding: 5px 0;
-    }
-    p:first-child {
-      font-size: 16px;
-    }
-    p:nth-child(2) .ptwo {
-      display: inline-block;
-      width: 50%;
-    }
-    p:nth-child(2) .ptwo span:first-child {
-      color: #ccc;
-    }
-    p:last-child span {
-      color: #ccc;
-    }
-  }
-}
-</style>

+ 0 - 87
src/views/market/parts/serviceList.vue

@@ -1,87 +0,0 @@
-<template>
-  <div id="serviceList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col
-          :span="24"
-          class="list"
-          @click.native="$router.push({ path: '/market/prodDetail', query: { id: item.id } })"
-          v-for="(item, index) in list"
-          :key="index"
-        >
-          <p class="textOver">{{ item.name }}</p>
-          <p>
-            <span class="ptwo"><span>产品类型:</span>{{ item.product_type_name || '暂无' }}</span>
-            <span class="ptwo"><span>产品单价</span>{{ item.price }}/{{ item.priceunit || '暂无' }}</span>
-          </p>
-          <p class="textOver"><span>应用领域:</span>{{ item.field || '暂无' }}</p>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: product } = createNamespacedHelpers('marketproduct');
-export default {
-  name: 'technologyList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...product(['newquery']),
-    async searchInfo() {
-      let res = await this.newquery({ totaltype: '2', status: '1' });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-      }
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    p {
-      font-size: 14px;
-      color: #000;
-      padding: 5px 0;
-    }
-    p:first-child {
-      font-size: 16px;
-    }
-    p:nth-child(2) .ptwo {
-      display: inline-block;
-      width: 50%;
-    }
-    p:nth-child(2) .ptwo span:first-child {
-      color: #ccc;
-    }
-    p:last-child span {
-      color: #ccc;
-    }
-  }
-}
-</style>

+ 0 - 87
src/views/market/parts/technologyList.vue

@@ -1,87 +0,0 @@
-<template>
-  <div id="technologyList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col
-          :span="24"
-          class="list"
-          @click.native="$router.push({ path: '/market/prodDetail', query: { id: item.id } })"
-          v-for="(item, index) in list"
-          :key="index"
-        >
-          <p class="textOver">{{ item.name }}</p>
-          <p>
-            <span class="ptwo"><span>产品类型:</span>{{ item.product_type_name || '暂无' }}</span>
-            <span class="ptwo"><span>研发阶段:</span>{{ item.phase == 1 ? '阶段成果' : item.phase == 2 ? '最终成果' : '暂无' }}</span>
-          </p>
-          <p class="textOver"><span>应用领域:</span>{{ item.field || '暂无' }}</p>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: product } = createNamespacedHelpers('marketproduct');
-export default {
-  name: 'technologyList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...product(['newquery']),
-    async searchInfo() {
-      let res = await this.newquery({ totaltype: '0', status: '1' });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-      }
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    p {
-      font-size: 14px;
-      color: #000;
-      padding: 5px 0;
-    }
-    p:first-child {
-      font-size: 16px;
-    }
-    p:nth-child(2) .ptwo {
-      display: inline-block;
-      width: 50%;
-    }
-    p:nth-child(2) .ptwo span:first-child {
-      color: #ccc;
-    }
-    p:last-child span {
-      color: #ccc;
-    }
-  }
-}
-</style>

+ 0 - 77
src/views/market/prodDetail.vue

@@ -1,77 +0,0 @@
-<template>
-  <div id="">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <prodDetails :productInfo="productInfo"></prodDetails>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import prodDetails from '@/layout/market/prodDetail.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: marketproduct } = createNamespacedHelpers('marketproduct');
-
-export default {
-  name: 'prodDetail',
-  props: {},
-  components: {
-    NavBar,
-    prodDetails, //详情
-  },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    // 产品名称
-    productInfo: {},
-  }),
-  created() {
-    this.search();
-  },
-  computed: {
-    id() {
-      return this.$route.query.id;
-    },
-  },
-  methods: {
-    ...marketproduct(['fetch']),
-    async search() {
-      let res = await this.fetch(this.id);
-      this.$set(this, `productInfo`, res.data);
-    },
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-}
-</style>

+ 0 - 83
src/views/service/detail.vue

@@ -1,83 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <span v-if="column_name == '智慧推荐'">智慧推荐</span>
-          <span v-else-if="column_name == '展会管理'"><twoInfo :column_name="column_name"></twoInfo></span>
-          <span v-else-if="column_name == '科技评估'">科技评估</span>
-          <span v-else-if="column_name == '合同在线'">合同在线</span>
-          <span v-else-if="column_name == '信用认证'">信用认证</span>
-          <span v-else-if="column_name == '绩效评价'">绩效评价</span>
-        </el-col>
-        <el-col :span="24" class="foot">
-          <footInfo></footInfo>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-import NavBar from '@/layout/common/topInfo.vue';
-import footInfo from '@/layout/common/footInfo.vue';
-import twoInfo from './parts/twoInfo.vue';
-
-export default {
-  name: 'index',
-  props: {},
-  components: {
-    NavBar,
-    footInfo,
-    twoInfo, //展会管理
-  },
-  data: function() {
-    return {
-      // 头部标题
-      title: '',
-      // meta为true
-      isleftarrow: '',
-      // 返回
-      navShow: true,
-    };
-  },
-  created() {},
-  methods: {},
-  computed: {
-    ...mapState(['user']),
-    column_name() {
-      return this.$route.query.column_name;
-    },
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-}
-.foot {
-  position: absolute;
-  bottom: 0;
-}
-</style>

+ 0 - 150
src/views/service/index.vue

@@ -1,150 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <el-col :span="12" class="btn">
-            <el-link :underline="false" @click="$router.push({ path: '/service/detail', query: { column_name: '智慧推荐' } })" disabled>
-              <el-image :src="onePic"></el-image>
-              <p>智慧推荐</p>
-            </el-link>
-          </el-col>
-          <el-col :span="12" class="btn">
-            <el-link :underline="false" @click="$router.push({ path: '/service/detail', query: { column_name: '展会管理' } })">
-              <el-image :src="twoPic"></el-image>
-              <p>展会管理</p>
-            </el-link>
-          </el-col>
-          <el-col :span="12" class="btn">
-            <el-link :underline="false" @click="$router.push({ path: '/service/detail', query: { column_name: '科技评估' } })" disabled>
-              <el-image :src="threePic"></el-image>
-              <p>科技评估</p>
-            </el-link>
-          </el-col>
-          <el-col :span="12" class="btn">
-            <el-link :underline="false" @click="$router.push({ path: '/service/detail', query: { column_name: '合同在线' } })" disabled>
-              <el-image :src="fourPic"></el-image>
-              <p>合同在线</p>
-            </el-link>
-          </el-col>
-          <el-col :span="12" class="btn">
-            <el-link :underline="false" @click="$router.push({ path: '/service/detail', query: { column_name: '信用认证' } })" disabled>
-              <el-image :src="fivePic"></el-image>
-              <p>信用认证</p>
-            </el-link>
-          </el-col>
-          <el-col :span="12" class="btn">
-            <el-link :underline="false" @click="$router.push({ path: '/service/detail', query: { column_name: '绩效评价' } })" disabled>
-              <el-image :src="sixPic"></el-image>
-              <p>绩效评价</p>
-            </el-link>
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="foot">
-          <footInfo></footInfo>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-import NavBar from '@/layout/common/topInfo.vue';
-import footInfo from '@/layout/common/footInfo.vue';
-export default {
-  name: 'index',
-  props: {},
-  components: {
-    NavBar,
-    footInfo,
-  },
-  data: function() {
-    return {
-      // 头部标题
-      title: '',
-      // meta为true
-      isleftarrow: '',
-      // 返回
-      navShow: true,
-      onePic: require('@/assets/bendi1.png'),
-      twoPic: require('@/assets/bendi2.png'),
-      threePic: require('@/assets/bendi3.png'),
-      fourPic: require('@/assets/bendi4.png'),
-      fivePic: require('@/assets/bendi5.png'),
-      sixPic: require('@/assets/bendi6.png'),
-    };
-  },
-  created() {},
-  methods: {
-    // 智慧推荐
-    oneBtn() {},
-    // 展会管理
-    twoBtn() {
-      console.log('智慧推荐');
-    },
-    // 科技评估
-    threeBtn() {
-      console.log('智慧推荐');
-    },
-    // 合同在线
-    fourBtn() {
-      console.log('智慧推荐');
-    },
-    // 信用认证
-    fiveBtn() {
-      console.log('智慧推荐');
-    },
-    // 绩效评价
-    sixBtn() {
-      console.log('智慧推荐');
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-  .btn {
-    text-align: center;
-    background: #fff;
-    margin: 10px 10px 0 10px;
-    width: 44%;
-    border-radius: 5px;
-    padding: 15px 0;
-    p {
-      font-size: 17px;
-      font-family: 楷体;
-      padding: 5px 0 0 0;
-      font-weight: bold;
-    }
-  }
-}
-.foot {
-  position: absolute;
-  bottom: 0;
-}
-</style>

+ 0 - 104
src/views/service/parts/twoInfo.vue

@@ -1,104 +0,0 @@
-<template>
-  <div id="twoInfo">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="top">
-          {{ column_name }}
-        </el-col>
-        <el-col :span="24" class="describe">
-          <h3>服务描述</h3>
-          <p>
-            展会众多业内人士齐聚直播大厅现场进行业务洽谈、产品展示、以及行业经验的交流。展会邀请各种行业的企业进行参加,促进行业交流,内外交流,横向交流,促进商业发展
-          </p>
-        </el-col>
-        <el-col :span="24" class="process">
-          <h3>服务流程</h3>
-          <el-col :span="24" class="processDiv">
-            <div>
-              <el-button>注册登录</el-button>
-              <i data-v-f4ffaafc="" class="el-icon-right"></i>
-            </div>
-            <div>
-              <el-button>提交申请办展资料</el-button>
-              <i data-v-f4ffaafc="" class="el-icon-right"></i>
-            </div>
-            <div>
-              <el-button>确认需求</el-button>
-              <i data-v-f4ffaafc="" class="el-icon-right"></i>
-            </div>
-            <div>
-              <el-button>展会宣传</el-button>
-            </div>
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="btn">
-          <el-button type="primary">申请办理</el-button>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-export default {
-  name: 'twoInfo',
-  props: {
-    column_name: null,
-  },
-  components: {},
-  data: function() {
-    return {};
-  },
-  created() {},
-  methods: {},
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.info {
-  padding: 0 15px;
-  .top {
-    text-align: center;
-    font-size: 25px;
-    font-weight: bold;
-    color: #22529a;
-    padding: 20px 0;
-  }
-  .describe {
-    p {
-      background: #fff;
-      padding: 10px;
-      border: 1px dashed #ccc;
-    }
-  }
-  .process {
-    .processDiv {
-      background: #fff;
-      border: 1px dashed #ccc;
-      div {
-        float: left;
-        margin: 0 0 13px 0px;
-        background: #fff;
-        padding: 5px;
-        i {
-          margin: 0 5px;
-        }
-      }
-    }
-  }
-  .btn {
-    text-align: center;
-    margin: 20px 0;
-  }
-}
-</style>

+ 0 - 100
src/views/userCenter/dock/apply.vue

@@ -1,100 +0,0 @@
-<template>
-  <div id="detail">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <applyForm :form="form" @onSubmit="onSubmit" @restBtn="restBtn" :list="list"></applyForm>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: product } = createNamespacedHelpers('marketproduct');
-const { mapActions: apply } = createNamespacedHelpers('apply');
-import NavBar from '@/layout/common/topInfo.vue';
-import applyForm from '@/layout/dock/applyForm.vue';
-export default {
-  name: 'detail',
-  props: {},
-  components: {
-    NavBar,
-    applyForm, //申请
-  },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    // 申請
-    form: {},
-    list: [],
-  }),
-  created() {
-    this.search();
-  },
-  computed: {
-    ...mapState(['user']),
-    id() {
-      return this.$route.query.id;
-    },
-  },
-  methods: {
-    ...product(['newquery']),
-    ...apply({ appleCreate: 'create' }),
-    async search() {
-      let userid = this.user.uid;
-      let res = await this.newquery({ status: '1', userid });
-
-      this.$set(this, `list`, res.data);
-    },
-    async onSubmit({ data }) {
-      data.user_id = this.user.uid;
-      if (this.user.role == '3' || this.user.role == '2' || this.user.role == '6') {
-        console.log(data);
-        data.user_name = this.user.name;
-        let dock_id = this.$route.query.id;
-        console.log(data);
-
-        const res = await this.appleCreate({ id: dock_id, ...data });
-        this.$checkRes(res, '添加成功', '添加失败');
-      } else {
-        this.$message.error('您的身份不能申请展会,请重新登录');
-      }
-    },
-    restBtn() {
-      this.form = {};
-      this.$router.push({ path: '/userCenter/dock/index' });
-    },
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-}
-</style>

+ 0 - 114
src/views/userCenter/dock/index.vue

@@ -1,114 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <el-col :span="24" class="one">
-            <van-tabs v-model="active" animated>
-              <van-tab>
-                <template #title>
-                  <van-icon name="live" />
-                  <p>下期直播</p>
-                </template>
-                <nextList :nextLive="nextLive"></nextList>
-              </van-tab>
-              <van-tab>
-                <template #title>
-                  <van-icon name="live" />
-                  <p>已往直播</p>
-                </template>
-                <alreadyList :alreadyLive="alreadyLive"></alreadyList>
-              </van-tab>
-            </van-tabs>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import nextList from './parts/nextList.vue';
-import alreadyList from './parts/alreadyList.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: dock } = createNamespacedHelpers('dock');
-export default {
-  name: 'index',
-  props: {},
-  components: {
-    NavBar,
-    nextList, //下期直播
-    alreadyList, //已往直播
-  },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    // 标签
-    active: '1',
-    // 下期直播
-    nextLive: [],
-    // 已往直播
-    alreadyLive: [],
-  }),
-  created() {
-    this.searchList();
-  },
-  computed: {},
-  methods: {
-    ...dock({ dockQuery: 'query' }),
-    async searchList({ skip = 0, limit = 10, ...info } = {}) {
-      let res = await this.dockQuery({ skip, limit, status: 0, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `nextLive`, res.data);
-      }
-      res = await this.dockQuery({ skip, limit, status: 2, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `alreadyLive`, res.data);
-      }
-    },
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-}
-/deep/.van-tab {
-  text-align: center;
-}
-/deep/.van-tabs--line .van-tabs__wrap {
-  height: 70px;
-  margin: 0 0 10px 0;
-}
-/deep/.van-tab--active {
-  color: red;
-}
-.van-icon {
-  font-size: 20px;
-}
-</style>

+ 0 - 84
src/views/userCenter/dock/parts/alreadyList.vue

@@ -1,84 +0,0 @@
-<template>
-  <div id="alreadyList">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="list" v-for="(item, index) in alreadyLive" :key="index">
-          <el-col :span="4" class="left">
-            <i class="el-icon-video-camera-solid"></i>
-            <!-- <el-button type="primary" size="mini">申请</el-button> -->
-          </el-col>
-          <el-col :span="20" class="right">
-            <p>{{ item.title }}</p>
-            <p>开始时间:{{ item.start_time }}</p>
-            <p>报名截止时间:{{ item.join_end }}</p>
-            <p>简介:{{ item.desc }}</p>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-export default {
-  name: 'alreadyList',
-  props: {
-    alreadyLive: null,
-  },
-  components: {},
-  data: function() {
-    return {};
-  },
-  created() {},
-  methods: {},
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.list {
-  padding: 0 15px 10px 15px;
-  background-color: #fff;
-  border-bottom: 1px solid red;
-  .left {
-    text-align: center;
-    i {
-      font-size: 30px;
-      padding: 15px 0;
-    }
-  }
-  .right {
-    font-size: 14px;
-    color: #666;
-    padding: 0 10px;
-    p:first-child {
-      padding: 5px 0;
-      color: #000;
-    }
-    p:nth-child(2) {
-      padding: 0 0 5px 0;
-    }
-    p:nth-child(3) {
-      padding: 0 0 5px 0;
-    }
-    p:nth-child(4) {
-      padding: 0;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      -webkit-line-clamp: 3;
-      word-break: break-all;
-      display: -webkit-box;
-      -webkit-box-orient: vertical;
-    }
-  }
-}
-</style>

+ 0 - 84
src/views/userCenter/dock/parts/nextList.vue

@@ -1,84 +0,0 @@
-<template>
-  <div id="nextList">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="list" v-for="(item, index) in nextLive" :key="index">
-          <el-col :span="4" class="left">
-            <i class="el-icon-video-camera-solid"></i>
-            <el-button type="primary" size="mini" @click="$router.push({ path: '/userCenter/dock/apply', query: { id: item.id } })">申请</el-button>
-          </el-col>
-          <el-col :span="20" class="right">
-            <p>{{ item.title }}</p>
-            <p>开始时间:{{ item.start_time }}</p>
-            <p>报名截止时间:{{ item.join_end }}</p>
-            <p>简介:{{ item.desc }}</p>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-export default {
-  name: 'nextList',
-  props: {
-    nextLive: null,
-  },
-  components: {},
-  data: function() {
-    return {};
-  },
-  created() {},
-  methods: {},
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.list {
-  padding: 0 15px 10px 15px;
-  background-color: #fff;
-  border-bottom: 1px solid red;
-  .left {
-    text-align: center;
-    i {
-      font-size: 30px;
-      padding: 15px 0;
-    }
-  }
-  .right {
-    font-size: 14px;
-    color: #666;
-    padding: 0 10px;
-    p:first-child {
-      padding: 5px 0;
-      color: #000;
-    }
-    p:nth-child(2) {
-      padding: 0 0 5px 0;
-    }
-    p:nth-child(3) {
-      padding: 0 0 5px 0;
-    }
-    p:nth-child(4) {
-      padding: 0;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      -webkit-line-clamp: 3;
-      word-break: break-all;
-      display: -webkit-box;
-      -webkit-box-orient: vertical;
-    }
-  }
-}
-</style>

+ 0 - 81
src/views/userCenter/matter/detailinfo.vue

@@ -1,81 +0,0 @@
-<template>
-  <div id="">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <detailinfo :detailInfo="detailInfo"></detailinfo>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import detailinfo from '@/layout/matter/detailinfo.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: transaction } = createNamespacedHelpers('transaction');
-export default {
-  name: 'prodDetail',
-  props: {},
-  components: {
-    NavBar,
-    detailinfo, //详情
-  },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    // 产品名称
-    detailInfo: {},
-  }),
-  created() {
-    this.search();
-  },
-  computed: {
-    id() {
-      return this.$route.query.id;
-    },
-  },
-  methods: {
-    ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update', fetch: 'fetch' }),
-
-    async search() {
-      let res = await this.fetch(this.id);
-      console.log(res.data);
-
-      if (this.$checkRes(res)) {
-        this.$set(this, `detailInfo`, res.data);
-      }
-    },
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-}
-</style>

+ 0 - 176
src/views/userCenter/matter/index.vue

@@ -1,176 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <el-col :span="24" class="main">
-            <el-col :span="24" class="one">
-              <van-tabs v-model="active" animated>
-                <van-tab>
-                  <template #title>
-                    <van-icon name="todo-list" />
-                    <p>我的全部</p>
-                  </template>
-                  <wholeList></wholeList>
-                </van-tab>
-                <van-tab>
-                  <template #title>
-                    <van-icon name="column" />
-                    <p>我的洽谈</p>
-                  </template>
-                  <negotiation></negotiation>
-                </van-tab>
-                <van-tab>
-                  <template #title>
-                    <van-icon name="label" />
-                    <p>我的意向</p>
-                  </template>
-                  <intentionList @submit="submit"></intentionList>
-                </van-tab>
-
-                <van-tab>
-                  <template #title>
-                    <van-icon name="label" />
-                    <p>我的交易</p>
-                  </template>
-                  <transaction></transaction>
-                </van-tab>
-              </van-tabs>
-            </el-col>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-    <van-popup v-model="show" position="bottom"
-      ><van-form @submit="onSubmit">
-        <van-field
-          v-model="newform.product_name"
-          name="产品名称"
-          label="产品名称"
-          placeholder="用户名"
-          :rules="[{ required: true, message: '请填写用户名' }]"
-        />
-        <van-field
-          v-model="newform.username"
-          name="购买人名称"
-          label="购买人名称"
-          placeholder="购买人名称"
-          :rules="[{ required: true, message: '请填写购买人名称' }]"
-        />
-        <van-field v-model="newform.market_username" name="营销人名称" label="营销人名称" placeholder="营销人名称" />
-        <van-field v-model="newform.description" name="描述" label="描述" placeholder="描述" />
-        <div style="margin: 16px;">
-          <van-button round block type="info" native-type="submit">
-            提交
-          </van-button>
-        </div>
-      </van-form></van-popup
-    >
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-import NavBar from '@/layout/common/topInfo.vue';
-import wholeList from './parts/wholeList.vue';
-import negotiation from './parts/negotiation.vue';
-import intentionList from './parts/intentionList.vue';
-import transaction from './parts/transaction.vue';
-const { mapActions: transactions } = createNamespacedHelpers('transaction');
-const { mapActions: productpact } = createNamespacedHelpers('productpact');
-export default {
-  name: 'index',
-  props: {},
-  components: { NavBar, wholeList, negotiation, intentionList, transaction },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    img_path: require('@/assets/logo.png'),
-    active: 0,
-    show: false,
-    newform: {},
-  }),
-  created() {},
-  computed: {},
-  methods: {
-    ...transactions({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
-    ...productpact({ productpactCreate: 'create' }),
-    submit(data) {
-      console.log(data);
-      this.show = true;
-      this.$set(this, `newform`, data);
-    },
-    async onSubmit() {
-      this.newform.status = '0';
-      this.newform.transaction_id = this.newform.id;
-      const res = await this.productpactCreate(this.newform);
-      if (this.$checkRes(res)) {
-        this.newform.status = '4';
-        const arr = await this.shenheupdate(this.newform);
-        if (this.$checkRes(arr)) {
-          this.$message({
-            message: '提交交易成功,等待管理员审核,方可交易完成',
-            type: 'success',
-          });
-        }
-      }
-      this.show = false;
-    },
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-  .two {
-    position: fixed;
-    top: 80%;
-
-    left: 10px;
-    z-index: 999;
-  }
-}
-/deep/.van-tab {
-  text-align: center;
-}
-/deep/.van-tabs--line .van-tabs__wrap {
-  height: 70px;
-  margin: 0 0 10px 0;
-}
-/deep/.van-tab--active {
-  color: red;
-}
-.van-icon {
-  font-size: 20px;
-}
-/deep/.van-popup--bottom {
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 300px;
-}
-</style>

+ 0 - 100
src/views/userCenter/matter/parts/intentionList.vue

@@ -1,100 +0,0 @@
-<template>
-  <div id="auditList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <p class="textOver">
-            <span @click="$router.push({ path: '/userCenter/matter/detailinfo', query: { id: item.id } })">{{ item.product_name }}</span>
-            <span style="float:right"><van-button type="info" size="small" @click="submit(item)">交易成功</van-button></span>
-          </p>
-          <p>
-            <span class="ptwo"><span>营销人名称:</span>{{ item.market_username || '暂无' }}</span>
-            <span class="ptwo"><span>购买人名称:</span>{{ item.username || '暂无' }}</span>
-          </p>
-          <!-- <p class="newptwo">
-            <span>状态:</span
-            >{{
-              item.status == '0' ? '正在洽谈' : item.status == '1' ? '达成意向' : item.status == '2' ? '我的交易' : item.status == '4' ? '合同审核中' : '未识别'
-            }}
-          </p> -->
-
-          <p class="textOver"><span>说明:</span>{{ item.description || '暂无' }}</p>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: transaction } = createNamespacedHelpers('transaction');
-
-export default {
-  name: 'auditList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
-    async searchInfo() {
-      let market_userid = this.user.uid;
-      let res = await this.transactionList({ market_userid, status: 1 });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-      }
-    },
-
-    submit(item) {
-      this.$emit('submit', item);
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    p {
-      font-size: 14px;
-      color: #000;
-      padding: 5px 0;
-    }
-    p:first-child {
-      font-size: 16px;
-    }
-    p:nth-child(2) .ptwo {
-      display: inline-block;
-      width: 50%;
-    }
-    p:nth-child(2) .ptwo span:first-child {
-      color: #ccc;
-    }
-    p:last-child span {
-      color: #ccc;
-    }
-  }
-}
-.newptwo {
-  color: #ccc !important;
-}
-</style>

+ 0 - 111
src/views/userCenter/matter/parts/negotiation.vue

@@ -1,111 +0,0 @@
-<template>
-  <div id="auditList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <p class="textOver">
-            <span @click="$router.push({ path: '/userCenter/matter/detailinfo', query: { id: item.id } })">{{ item.product_name }}</span>
-            <span style="float:right"><van-button type="info" size="small" @click="submit(item)">同意交易</van-button> </span>
-          </p>
-          <p>
-            <span class="ptwo"><span>营销人名称:</span>{{ item.market_username || '暂无' }}</span>
-            <span class="ptwo"><span>购买人名称:</span>{{ item.username || '暂无' }}</span>
-          </p>
-          <!-- <p class="newptwo">
-            <span>状态:</span
-            >{{
-              item.status == '0' ? '正在洽谈' : item.status == '1' ? '达成意向' : item.status == '2' ? '我的交易' : item.status == '4' ? '合同审核中' : '未识别'
-            }}
-          </p> -->
-          <p class="textOver"><span>说明:</span>{{ item.description || '暂无' }}</p>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: transaction } = createNamespacedHelpers('transaction');
-
-export default {
-  name: 'auditList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
-    async searchInfo() {
-      let market_userid = this.user.uid;
-      let res = await this.transactionList({ market_userid, status: 0 });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-      }
-    },
-    async submit(item) {
-      item.status = '1';
-      let res = await this.shenheupdate(item);
-      if (this.$checkRes(res)) {
-        this.$message({
-          message: '同意交易提交成功',
-          type: 'success',
-        });
-        this.searchInfo();
-      }
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    p {
-      font-size: 14px;
-      color: #000;
-      padding: 5px 0;
-    }
-    p:first-child {
-      font-size: 16px;
-    }
-    p:nth-child(2) .ptwo {
-      display: inline-block;
-      width: 50%;
-    }
-    p:nth-child(2) .ptwo span:first-child {
-      color: #ccc;
-    }
-    p:last-child span {
-      color: #ccc;
-    }
-  }
-}
-.content {
-  padding: 16px 16px 160px;
-  height: 160px;
-  background-color: aqua;
-}
-.newptwo {
-  color: #ccc !important;
-}
-</style>

+ 0 - 98
src/views/userCenter/matter/parts/transaction.vue

@@ -1,98 +0,0 @@
-<template>
-  <div id="auditList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <p class="textOver">
-            <span @click="$router.push({ path: '/userCenter/matter/detailinfo', query: { id: item.id } })">{{ item.product_name }}</span>
-          </p>
-          <p>
-            <span class="ptwo"><span>营销人名称:</span>{{ item.market_username || '暂无' }}</span>
-            <span class="ptwo"><span>购买人名称:</span>{{ item.username || '暂无' }}</span>
-          </p>
-          <!-- <p class="newptwo">
-            <span>状态:</span
-            >{{
-              item.status == '0' ? '正在洽谈' : item.status == '1' ? '达成意向' : item.status == '2' ? '我的交易' : item.status == '4' ? '合同审核中' : '未识别'
-            }}
-          </p> -->
-          <p class="textOver"><span>说明:</span>{{ item.description || '暂无' }}</p>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: transaction } = createNamespacedHelpers('transaction');
-const { mapActions: expertsaudit } = createNamespacedHelpers('expertsaudit');
-export default {
-  name: 'auditList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
-    async searchInfo() {
-      let market_userid = this.user.uid;
-      let res = await this.transactionList({ market_userid, status: 2 });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-      }
-    },
-
-    async submit(data) {
-      console.log(data);
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    p {
-      font-size: 14px;
-      color: #000;
-      padding: 5px 0;
-    }
-    p:first-child {
-      font-size: 16px;
-    }
-    p:nth-child(2) .ptwo {
-      display: inline-block;
-      width: 50%;
-    }
-    p:nth-child(2) .ptwo span:first-child {
-      color: #ccc;
-    }
-    p:last-child span {
-      color: #ccc;
-    }
-  }
-}
-.newptwo {
-  color: #ccc !important;
-}
-</style>

+ 0 - 97
src/views/userCenter/matter/parts/wholeList.vue

@@ -1,97 +0,0 @@
-<template>
-  <div id="auditList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <p class="textOver">
-            <span @click="$router.push({ path: '/userCenter/matter/detailinfo', query: { id: item.id } })">{{ item.product_name }}</span>
-          </p>
-          <p>
-            <span class="ptwo"><span>营销人名称:</span>{{ item.market_username || '暂无' }}</span>
-            <span class="ptwo"><span>购买人名称:</span>{{ item.username || '暂无' }}</span>
-          </p>
-          <p class="newptwo">
-            <span>状态:</span
-            >{{
-              item.status == '0' ? '正在洽谈' : item.status == '1' ? '达成意向' : item.status == '2' ? '我的交易' : item.status == '4' ? '合同审核中' : '未识别'
-            }}
-          </p>
-          <p class="textOver"><span>说明:</span>{{ item.description || '暂无' }}</p>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: transaction } = createNamespacedHelpers('transaction');
-export default {
-  name: 'auditList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
-    async searchInfo() {
-      let market_userid = this.user.uid;
-      let res = await this.transactionList({ market_userid });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-      }
-    },
-
-    submit() {
-      console.log('submit');
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    p {
-      font-size: 14px;
-      color: #000;
-      padding: 5px 0;
-    }
-    p:first-child {
-      font-size: 16px;
-    }
-    p:nth-child(2) .ptwo {
-      display: inline-block;
-      width: 50%;
-    }
-    p:nth-child(2) .ptwo span:first-child {
-      color: #ccc;
-    }
-    p:last-child span {
-      color: #ccc;
-    }
-  }
-}
-.newptwo {
-  color: #ccc !important;
-}
-</style>

+ 0 - 143
src/views/userCenter/myProduct/detail.vue

@@ -1,143 +0,0 @@
-<template>
-  <div id="detail">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <release :form="form" @onSubmitDraft="onSubmitDraft" @onSubmit="onSubmit"></release>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import release from '@/layout/myProduct/release.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: mapMarketproduct } = createNamespacedHelpers('marketproduct');
-export default {
-  name: 'detail',
-  props: {},
-  components: {
-    NavBar,
-    release, //产品发布
-  },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    // 发布产品
-    form: {},
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    ...mapState(['user']),
-    id() {
-      return this.$route.query.id;
-    },
-  },
-  methods: {
-    ...mapMarketproduct({ productFetch: 'fetch', productCreate: 'create', productUpdate: 'update' }),
-    // 详情
-    async searchInfo() {
-      if (this.id) {
-        let res = await this.productFetch(this.id);
-        if (this.$checkRes(res)) {
-          this.$set(this, `form`, res.data);
-        }
-      }
-    },
-    // 保存草稿
-    async onSubmitDraft({ data }) {
-      if (this.id) {
-        let res = await this.productUpdate(data);
-        if (this.$checkRes(res)) {
-          this.$message({
-            message: '草稿修改成功',
-            type: 'success',
-          });
-          this.$router.push({ path: '/userCenter/myProduct/index' });
-        } else {
-          this.$message.error('草稿修改失败');
-        }
-      } else {
-        data.status = '3';
-        data.userid = this.user.uid;
-        let res = await this.productCreate(data);
-        if (this.$checkRes(res)) {
-          this.$message({
-            message: '草稿创建成功',
-            type: 'success',
-          });
-          this.$router.push({ path: '/userCenter/myProduct/index' });
-        } else {
-          this.$message.error('草稿创建失败');
-        }
-      }
-    },
-    // 信息发布
-    async onSubmit({ data }) {
-      if (this.id) {
-        data.status = '0';
-        let res = await this.productUpdate(data);
-        if (this.$checkRes(res)) {
-          this.$message({
-            message: '信息发布成功',
-            type: 'success',
-          });
-          this.$router.push({ path: '/userCenter/myProduct/index' });
-        } else {
-          this.$message.error('信息发布失败');
-        }
-      } else {
-        data.status = '0';
-        data.userid = this.user.uid;
-        let res = await this.productCreate(data);
-        if (this.$checkRes(res)) {
-          this.$message({
-            message: '信息发布成功',
-            type: 'success',
-          });
-          this.$router.push({ path: '/userCenter/myProduct/index' });
-        } else {
-          this.$message.error('信息发布失败');
-        }
-      }
-    },
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-}
-.foot {
-  position: absolute;
-  bottom: 0;
-}
-</style>

+ 0 - 81
src/views/userCenter/myProduct/detailinfo.vue

@@ -1,81 +0,0 @@
-<template>
-  <div id="">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <prodDetails :productInfo="productInfo"></prodDetails>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import NavBar from '@/layout/common/topInfo.vue';
-import prodDetails from '@/layout/myProduct/prodDetails.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: mapMarketproduct } = createNamespacedHelpers('marketproduct');
-export default {
-  name: 'prodDetail',
-  props: {},
-  components: {
-    NavBar,
-    prodDetails, //详情
-  },
-  data: () => ({
-    // 头部标题
-    title: '',
-    // meta为true
-    isleftarrow: '',
-    // 返回
-    navShow: true,
-    // 产品名称
-    productInfo: {},
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    ...mapState(['user']),
-    id() {
-      return this.$route.query.id;
-    },
-  },
-  methods: {
-    ...mapMarketproduct({ productFetch: 'fetch', productCreate: 'create', productUpdate: 'update', productQuery: 'query' }),
-    async searchInfo() {
-      if (this.id) {
-        let res = await this.productFetch(this.id);
-        if (this.$checkRes(res)) {
-          this.$set(this, `productInfo`, res.data);
-        }
-      }
-    },
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-}
-</style>

+ 0 - 118
src/views/userCenter/myProduct/index.vue

@@ -1,118 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="style">
-        <el-col :span="24" class="top">
-          <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
-        </el-col>
-        <el-col :span="24" class="main">
-          <el-col :span="24" class="one">
-            <van-tabs v-model="active" animated>
-              <van-tab>
-                <template #title>
-                  <van-icon name="todo-list" />
-                  <p>待发布</p>
-                </template>
-                <caogaoList></caogaoList>
-              </van-tab>
-              <van-tab>
-                <template #title>
-                  <van-icon name="column" />
-                  <p>审核中</p>
-                </template>
-                <noauditList></noauditList>
-              </van-tab>
-              <van-tab>
-                <template #title>
-                  <van-icon name="label" />
-                  <p>已发布</p>
-                </template>
-                <auditList></auditList>
-              </van-tab>
-            </van-tabs>
-          </el-col>
-          <el-col :span="24" class="two">
-            <van-button type="primary" @click="$router.push({ path: '/userCenter/myProduct/detail' })">发布产品</van-button>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-import NavBar from '@/layout/common/topInfo.vue';
-import caogaoList from './parts/caogaoList.vue';
-import noauditList from './parts/noauditList.vue';
-import auditList from './parts/auditList.vue';
-
-export default {
-  name: 'index',
-  props: {},
-  components: {
-    NavBar,
-    caogaoList,
-    noauditList,
-    auditList,
-  },
-  data: function() {
-    return {
-      // 头部标题
-      title: '',
-      // meta为true
-      isleftarrow: '',
-      // 返回
-      navShow: true,
-      // 标签
-      active: '1',
-    };
-  },
-  created() {},
-  methods: {},
-  computed: {
-    ...mapState(['user']),
-  },
-  mounted() {
-    this.title = this.$route.meta.title;
-    this.isleftarrow = this.$route.meta.isleftarrow;
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.style {
-  width: 100%;
-  min-height: 667px;
-  position: relative;
-  background-color: #f9fafc;
-}
-.top {
-  height: 46px;
-  overflow: hidden;
-  position: relative;
-  z-index: 999;
-}
-.main {
-  min-height: 570px;
-  .two {
-    position: fixed;
-    top: 80%;
-    left: 10px;
-    z-index: 999;
-  }
-}
-/deep/.van-tab {
-  text-align: center;
-}
-/deep/.van-tabs--line .van-tabs__wrap {
-  height: 70px;
-  margin: 0 0 10px 0;
-}
-/deep/.van-tab--active {
-  color: red;
-}
-.van-icon {
-  font-size: 20px;
-}
-</style>

+ 0 - 126
src/views/userCenter/myProduct/parts/auditList.vue

@@ -1,126 +0,0 @@
-<template>
-  <div id="noauditList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <el-col :span="19" class="messag">
-            <p>
-              <span class="textOver" @click="$router.push({ path: '/userCenter/myProduct/detailinfo', query: { id: item.id } })">{{ item.name }}</span>
-              <span>{{ item.status == '1' ? '审核通过' : '未识别' }}</span>
-            </p>
-            <p>
-              <span class="two"><span>产品类型:</span>{{ item.product_type_name || '暂无' }}</span>
-              <span class="two"><span>研发阶段:</span>{{ item.phase == 1 ? '阶段成果' : item.phase == 2 ? '最终成果' : '暂无' }}</span>
-            </p>
-            <p class="textOver"><span class="three">应用领域:</span>{{ item.field || '暂无' }}</p>
-          </el-col>
-          <el-col :span="5" class="btn">
-            <el-button type="danger" size="mini" @click="deleteBtn(item.id)">删除</el-button>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: mapMarketproduct } = createNamespacedHelpers('marketproduct');
-export default {
-  name: 'noauditList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...mapMarketproduct({ productList: 'query', columnInfo: 'fetch', marketcerate: 'create', productdeltet: 'delete', upup: 'update' }),
-    async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
-      let userid = this.user.uid;
-      const res = await this.productList({ skip, limit, status: 1, userid, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-      }
-    },
-    async deleteBtn(id) {
-      const res = await this.productdeltet(id);
-      if (this.$checkRes(res)) {
-        this.$message({
-          message: '删除信息成功',
-          type: 'success',
-        });
-        this.searchInfo();
-      }
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    .messag {
-      padding: 10px 0;
-      p:first-child {
-        font-size: 16px;
-        padding: 0 0 8px 0;
-        span:first-child {
-          display: inline-block;
-          width: 75%;
-        }
-        span:nth-child(2) {
-          display: inline-block;
-          width: 25%;
-          color: #ff0000;
-          font-weight: bold;
-        }
-      }
-      p:nth-child(2) {
-        font-size: 14px;
-        padding: 0 0 10px 0;
-        .two {
-          display: inline-block;
-          width: 50%;
-          span {
-            color: #ccc;
-          }
-        }
-      }
-      p:nth-child(3) {
-        font-size: 14px;
-        padding: 0 0 10px 0;
-        .three {
-          color: #ccc;
-        }
-      }
-    }
-    .btn {
-      text-align: center;
-    }
-  }
-}
-/deep/.el-button + .el-button {
-  margin-left: 0;
-}
-/deep/.el-button {
-  margin: 5px 0;
-}
-</style>

+ 0 - 147
src/views/userCenter/myProduct/parts/caogaoList.vue

@@ -1,147 +0,0 @@
-<template>
-  <div id="technologyList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <el-col :span="19" class="messag">
-            <p>
-              <span class="textOver" @click="$router.push({ path: '/userCenter/myProduct/detailinfo', query: { id: item.id } })">{{ item.name }}</span>
-              <span>{{ item.status == '2' ? '审核拒绝' : item.status == '3' ? '草稿' : '未识别' }}</span>
-            </p>
-            <p>
-              <span class="two"><span>产品类型:</span>{{ item.product_type_name || '暂无' }}</span>
-              <span class="two"><span>研发阶段:</span>{{ item.phase == 1 ? '阶段成果' : item.phase == 2 ? '最终成果' : '暂无' }}</span>
-            </p>
-            <p class="textOver"><span class="three">应用领域:</span>{{ item.field || '暂无' }}</p>
-          </el-col>
-          <el-col :span="5" class="btn">
-            <el-button
-              type="primary"
-              size="mini"
-              v-if="item.status == '3'"
-              @click="$router.push({ path: '/userCenter/myProduct/detail', query: { id: item.id } })"
-              >编辑</el-button
-            >
-            <el-button type="success" size="mini" v-if="item.status == '3'" @click="releaseBtn(item)">发布</el-button>
-            <el-button type="danger" size="mini" @click="deleteBtn(item.id)">删除</el-button>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: mapMarketproduct } = createNamespacedHelpers('marketproduct');
-export default {
-  name: 'technologyList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...mapMarketproduct({ productList: 'query', columnInfo: 'fetch', marketcerate: 'create', productdeltet: 'delete', upup: 'update' }),
-    async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
-      let userid = this.user.uid;
-      const res = await this.productList({ skip, limit, status: 2, userid, ...info });
-      const resTwo = await this.productList({ skip, limit, status: 3, userid, ...info });
-      var newData = res.data.concat(resTwo.data);
-      if (newData.length != 0) {
-        this.$set(this, `list`, newData);
-      }
-    },
-    async releaseBtn(data) {
-      data.status = 0;
-      const res = await this.upup(data);
-      if (this.$checkRes(res)) {
-        this.$message({
-          message: '信息发布成功',
-          type: 'success',
-        });
-        this.searchInfo();
-      }
-    },
-    async deleteBtn(id) {
-      const res = await this.productdeltet(id);
-      if (this.$checkRes(res)) {
-        this.$message({
-          message: '删除信息成功',
-          type: 'success',
-        });
-        this.searchInfo();
-      }
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    .messag {
-      padding: 10px 0;
-      p:first-child {
-        font-size: 16px;
-        padding: 0 0 8px 0;
-        span:first-child {
-          display: inline-block;
-          width: 75%;
-        }
-        span:nth-child(2) {
-          display: inline-block;
-          width: 25%;
-          color: #ff0000;
-          font-weight: bold;
-        }
-      }
-      p:nth-child(2) {
-        font-size: 14px;
-        padding: 0 0 10px 0;
-        .two {
-          display: inline-block;
-          width: 50%;
-          span {
-            color: #ccc;
-          }
-        }
-      }
-      p:nth-child(3) {
-        font-size: 14px;
-        padding: 0 0 10px 0;
-        .three {
-          color: #ccc;
-        }
-      }
-    }
-    .btn {
-      text-align: center;
-    }
-  }
-}
-/deep/.el-button + .el-button {
-  margin-left: 0;
-}
-/deep/.el-button {
-  margin: 5px 0;
-}
-</style>

+ 0 - 126
src/views/userCenter/myProduct/parts/noauditList.vue

@@ -1,126 +0,0 @@
-<template>
-  <div id="noauditList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <el-col :span="19" class="messag">
-            <p>
-              <span class="textOver" @click="$router.push({ path: '/userCenter/myProduct/detailinfo', query: { id: item.id } })">{{ item.name }}</span>
-              <span>{{ item.status == '0' ? '审核中' : '未识别' }}</span>
-            </p>
-            <p>
-              <span class="two"><span>产品类型:</span>{{ item.product_type_name || '暂无' }}</span>
-              <span class="two"><span>研发阶段:</span>{{ item.phase == 1 ? '阶段成果' : item.phase == 2 ? '最终成果' : '暂无' }}</span>
-            </p>
-            <p class="textOver"><span class="three">应用领域:</span>{{ item.field || '暂无' }}</p>
-          </el-col>
-          <el-col :span="5" class="btn">
-            <el-button type="danger" size="mini" @click="deleteBtn(item.id)">删除</el-button>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: mapMarketproduct } = createNamespacedHelpers('marketproduct');
-export default {
-  name: 'noauditList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...mapMarketproduct({ productList: 'query', columnInfo: 'fetch', marketcerate: 'create', productdeltet: 'delete', upup: 'update' }),
-    async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
-      let userid = this.user.uid;
-      const res = await this.productList({ skip, limit, status: 0, userid, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-      }
-    },
-    async deleteBtn(id) {
-      const res = await this.productdeltet(id);
-      if (this.$checkRes(res)) {
-        this.$message({
-          message: '删除信息成功',
-          type: 'success',
-        });
-        this.searchInfo();
-      }
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.info {
-  border-top: 1px solid #f5f5f5;
-  .list {
-    background: #fff;
-    padding: 0 10px;
-    border-bottom: 1px solid #ccc;
-    .messag {
-      padding: 10px 0;
-      p:first-child {
-        font-size: 16px;
-        padding: 0 0 8px 0;
-        span:first-child {
-          display: inline-block;
-          width: 75%;
-        }
-        span:nth-child(2) {
-          display: inline-block;
-          width: 25%;
-          color: #ff0000;
-          font-weight: bold;
-        }
-      }
-      p:nth-child(2) {
-        font-size: 14px;
-        padding: 0 0 10px 0;
-        .two {
-          display: inline-block;
-          width: 50%;
-          span {
-            color: #ccc;
-          }
-        }
-      }
-      p:nth-child(3) {
-        font-size: 14px;
-        padding: 0 0 10px 0;
-        .three {
-          color: #ccc;
-        }
-      }
-    }
-    .btn {
-      text-align: center;
-    }
-  }
-}
-/deep/.el-button + .el-button {
-  margin-left: 0;
-}
-/deep/.el-button {
-  margin: 5px 0;
-}
-</style>