guhongwei 4 jaren geleden
bovenliggende
commit
b77a896029

+ 7 - 7
README.md

@@ -27,24 +27,24 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
 
 测试用户接口
 超级管理员
-http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/home/index&type=0&openid=o3ORKt8yN1OHAJWrX1ApOf2vWM5U
+http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt8yN1OHAJWrX1ApOf2vWM5U
 
 测试合作机构管理员
-http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/home/index&type=0&openid=o3ORKt5e0Xkt14t4UfJyiKNfWdFI
+http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt5e0Xkt14t4UfJyiKNfWdFI
 
 测试合作机构业务管理员
-http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/home/index&type=0&openid=o3ORKt0piAr7qAJ_yvO-QywHtPgc
+http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt0piAr7qAJ_yvO-QywHtPgc
 
 临时
-http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/home/index&type=0&openid=o3ORKtyLBFA09hrQM3F2mYAkexfo
+http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKtyLBFA09hrQM3F2mYAkexfo
 
 个人
-http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/home/index&type=0&openid=o3ORKt-mgL0w8r3ZqNRTH01Kfbko
+http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt-mgL0w8r3ZqNRTH01Kfbko
 
 企业
-http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/home/index&type=0&openid=o3ORKt5VIqOJ_8F3eE69qYMu7I2o
+http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt5VIqOJ_8F3eE69qYMu7I2o
 
 专家
-http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/home/index&type=0&openid=o3ORKt0F_bQkB6hWqN7xzNz-OdqI
+http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt0F_bQkB6hWqN7xzNz-OdqI
 
 

+ 4 - 4
src/layout/common/footInfo.vue

@@ -3,10 +3,6 @@
     <el-row>
       <el-col :span="24" class="footInfo">
         <van-tabbar route>
-          <van-tabbar-item to="/home/index">
-            <!-- <van-image width="60" height="60" :src="index" /> -->
-            <p class="text">首页</p>
-          </van-tabbar-item>
           <van-tabbar-item to="/live/index">
             <!-- <van-image width="60" height="60" :src="index" /> -->
             <p class="text">直播大厅</p>
@@ -15,6 +11,10 @@
             <!-- <van-image width="60" height="60" :src="question" /> -->
             <p class="text">科技超市</p>
           </van-tabbar-item>
+          <van-tabbar-item to="/service/index">
+            <!-- <van-image width="60" height="60" :src="question" /> -->
+            <p class="text">创新服务</p>
+          </van-tabbar-item>
           <van-tabbar-item to="/user/index">
             <!-- <van-image width="60" height="60" :src="user" /> -->
             <p class="text">个人中心</p>

+ 0 - 119
src/layout/home/achieveList.vue

@@ -1,119 +0,0 @@
-<template>
-  <div id="achieveList">
-    <el-row>
-      <el-col :span="24" class="achieve">
-        <el-col :span="24" class="top">
-          <el-col :span="20" class="topTxt">
-            <van-icon name="label-o" />
-            <span>科技产品</span>
-          </el-col>
-          <el-col :span="4" class="link">
-            <el-link :underline="false" @click.native="$router.push({ path: '/market/index' })">MORE</el-link>
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="info">
-          <span v-if="list.length > 0">
-            <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-              <p>
-                <span></span>
-                <span class="textOver">{{ item.title }}</span>
-              </p>
-              <p>类型:{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : '暂无' }}</p>
-            </el-col>
-          </span>
-          <span v-else>
-            <el-col :span="24" class="noList">
-              暂无数据
-            </el-col>
-          </span>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: marketproduct } = createNamespacedHelpers('marketproduct');
-export default {
-  name: 'achieveList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...marketproduct({ productFetch: 'fetch', productCreate: 'create', productUpdate: 'update', productQuery: 'query' }),
-    async searchInfo({ skip = 0, limit = 4, ...info } = {}) {
-      const res = await this.productQuery({ skip, limit, ...info });
-      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>
-.achieve {
-  padding: 0 10px;
-  .top {
-    height: 30px;
-    line-height: 30px;
-    .topTxt {
-      .van-icon {
-        top: 2px;
-        color: #2c69fe;
-      }
-      span {
-        padding: 0 0 0 5px;
-      }
-    }
-    .link {
-      text-align: center;
-      .el-link {
-        font-weight: bold;
-      }
-    }
-  }
-  .info {
-    .list {
-      border-bottom: 1px solid #ccc;
-      font-size: 14px;
-      padding: 10px 0;
-      p:first-child {
-        font-weight: bold;
-        padding: 0 0 5px 0;
-        span:first-child {
-          display: inline-block;
-          width: 4px;
-          height: 10px;
-          background: #2c69fe;
-          margin: 0 5px 0 0px;
-        }
-      }
-      p:last-child {
-        font-size: 12px;
-      }
-    }
-    .noList {
-      text-align: center;
-      padding: 30px 0;
-    }
-  }
-}
-</style>

+ 0 - 112
src/layout/home/clickBtn.vue

@@ -1,112 +0,0 @@
-<template>
-  <div id="clickBtn">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="btn">
-          <el-col :span="12" class="btnDiv">
-            <div @click="$router.push({ path: '/market/index' })">
-              <el-image :src="onePic"></el-image>
-              <p>科技成果</p>
-            </div>
-          </el-col>
-          <el-col :span="12" class="btnDiv">
-            <div @click="$router.push({ path: '/market/detail' })">
-              <el-image :src="twoPic"></el-image>
-              <p>解决供求</p>
-            </div>
-          </el-col>
-          <el-col :span="12" class="btnDiv">
-            <div @click="$router.push({ path: '/market/index' })">
-              <el-image :src="threePic"></el-image>
-              <p>科技活动</p>
-            </div>
-          </el-col>
-          <el-col :span="12" class="btnDiv">
-            <div @click="$router.push({ path: '/market/index' })">
-              <el-image :src="fourPic"></el-image>
-              <p>科技专家</p>
-            </div>
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="message">
-          <van-notice-bar left-icon="volume-o" :scrollable="false">
-            <van-swipe vertical class="notice-swipe" :autoplay="3000" :show-indicators="false">
-              <van-swipe-item v-for="(item, index) in list" :key="index">{{ item.title }}</van-swipe-item>
-            </van-swipe>
-          </van-notice-bar>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: dock } = createNamespacedHelpers('dock');
-export default {
-  name: 'clickBtn',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      onePic: require('@/assets/achieve.png'),
-      twoPic: require('@/assets/huodong.png'),
-      threePic: require('@/assets/huodong.png'),
-      fourPic: require('@/assets/export.png'),
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...dock({ dockQuery: 'query', palcefetch: 'fetch' }),
-    async searchInfo({ skip = 0, limit = 4, ...info } = {}) {
-      let res = await this.dockQuery({ skip, limit, ...info });
-      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>
-.notice-swipe {
-  height: 40px;
-  line-height: 40px;
-}
-/deep/.van-notice-bar {
-  color: #000;
-  background-color: #fff;
-}
-.info {
-  .btn {
-    border-bottom: 1px solid #ccc;
-    .btnDiv {
-      padding: 10px 0;
-      text-align: center;
-      div {
-        .el-image {
-          width: 30px;
-          height: 30px;
-        }
-        p {
-          font-size: 18px;
-          font-family: 楷体;
-          padding: 5px 0 0 0;
-        }
-      }
-    }
-  }
-}
-</style>

+ 0 - 140
src/layout/home/exportList.vue

@@ -1,140 +0,0 @@
-<template>
-  <div id="exportList">
-    <el-row>
-      <el-col :span="24" class="achieve">
-        <el-col :span="24" class="top">
-          <el-col :span="20" class="topTxt">
-            <van-icon name="label-o" />
-            <span>科技专家</span>
-          </el-col>
-          <el-col :span="4" class="link">
-            <el-link :underline="false" @click.native="$router.push({ path: '/market/index' })">MORE</el-link>
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="info">
-          <span v-if="list.length > 0">
-            <el-col
-              :span="12"
-              class="list"
-              @click.native="$router.push({ path: '/market/exportDetail', query: { id: item.id } })"
-              v-for="(item, index) in list"
-              :key="index"
-            >
-              <div>
-                <el-image :src="item.img_path"></el-image>
-                <p>
-                  <span class="textOver">{{ item.name }}</span>
-                  <span class="textOver">{{ item.addr }}</span>
-                </p>
-              </div>
-              <div class="textOver">职务:{{ item.position || '暂无' }}</div>
-            </el-col>
-          </span>
-          <span v-else>
-            <el-col :span="24" class="noList">
-              暂无数据
-            </el-col>
-          </span>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
-export default {
-  name: 'exportList',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      list: [],
-    };
-  },
-  created() {
-    this.searchInfo();
-  },
-  methods: {
-    ...expertsuser({ expertQuery: 'query' }),
-    async searchInfo({ skip = 0, limit = 4, ...info } = {}) {
-      const res = await this.expertQuery({ skip, limit, ...info });
-      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>
-.achieve {
-  padding: 0 10px;
-  .top {
-    height: 30px;
-    line-height: 30px;
-    .topTxt {
-      .van-icon {
-        top: 2px;
-        color: #2c69fe;
-      }
-      span {
-        padding: 0 0 0 5px;
-      }
-    }
-    .link {
-      text-align: center;
-      .el-link {
-        font-weight: bold;
-      }
-    }
-  }
-  .info {
-    .list {
-      font-size: 14px;
-      background: #f6f6f6;
-      margin: 10px;
-      width: 44%;
-      padding: 15px;
-      div:first-child {
-        float: left;
-        width: 100%;
-        .el-image {
-          float: left;
-          width: 40%;
-          height: 50px;
-          border-radius: 90px;
-        }
-        p {
-          float: left;
-          width: 51%;
-          padding: 0 5px;
-          span {
-            display: inline-block;
-            width: 100%;
-          }
-        }
-      }
-      div:last-child {
-        float: left;
-        width: 100%;
-        padding: 5px 0 0 0;
-      }
-    }
-    .noList {
-      text-align: center;
-      padding: 30px 0;
-    }
-  }
-}
-</style>

+ 0 - 50
src/layout/home/swipeList.vue

@@ -1,50 +0,0 @@
-<template>
-  <div id="swipeList">
-    <el-row>
-      <el-col :span="24" class="info">
-        <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
-          <van-swipe-item>1</van-swipe-item>
-          <van-swipe-item>2</van-swipe-item>
-          <van-swipe-item>3</van-swipe-item>
-          <van-swipe-item>4</van-swipe-item>
-        </van-swipe>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-export default {
-  name: 'swipeList',
-  props: {},
-  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: 10px;
-}
-.my-swipe .van-swipe-item {
-  color: #fff;
-  font-size: 20px;
-  line-height: 150px;
-  text-align: center;
-  background-color: #39a9ed;
-}
-</style>

+ 7 - 7
src/router/index.js

@@ -19,13 +19,6 @@ const routes = [
     meta: { title: '错误页面', isleftarrow: false },
     component: () => import('../views/error.vue'),
   },
-  // 首页
-  {
-    path: '/home/index',
-    name: 'home_index',
-    meta: { title: '首页', isleftarrow: false },
-    component: () => import('../views/home/index.vue'),
-  },
   // 直播大厅
   {
     path: '/live/index',
@@ -76,6 +69,13 @@ const routes = [
     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: '/userCenter/myProduct/index',

+ 0 - 128
src/views/home/index.vue

@@ -1,128 +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">
-            <swipeList></swipeList>
-          </el-col>
-          <el-col :span="24" class="two">
-            <clickBtn></clickBtn>
-          </el-col>
-          <el-col :span="24" class="three">
-            <achieveList></achieveList>
-          </el-col>
-          <el-col :span="24" class="four">
-            <exportList></exportList>
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="foot">
-          <footInfo></footInfo>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, mapMutations, createNamespacedHelpers } from 'vuex';
-import NavBar from '@/layout/common/topInfo.vue';
-import footInfo from '@/layout/common/footInfo.vue';
-import swipeList from '@/layout/home/swipeList.vue';
-import clickBtn from '@/layout/home/clickBtn.vue';
-import achieveList from '@/layout/home/achieveList.vue';
-import exportList from '@/layout/home/exportList.vue';
-const jwt = require('jsonwebtoken');
-export default {
-  metaInfo() {
-    return {
-      title: '科技平台',
-    };
-  },
-  name: 'index',
-  props: {},
-  components: {
-    NavBar,
-    footInfo,
-    swipeList, //轮播
-    clickBtn, //功能按钮
-    achieveList, //科技成果
-    exportList, //咨询专家
-  },
-  data: function() {
-    return {
-      // 头部标题
-      title: '',
-      // meta为true
-      isleftarrow: '',
-      // 返回
-      navShow: true,
-    };
-  },
-  created() {
-    if (this.token) {
-      this.sesstoken();
-    }
-  },
-  methods: {
-    ...mapMutations(['setUser']),
-    sesstoken() {
-      sessionStorage.setItem('token', this.token);
-      let user = jwt.decode(this.token);
-      this.setUser(user);
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-    token() {
-      return this.$route.query.token;
-    },
-  },
-  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;
-  margin: 0 0 50px 0;
-  .one {
-    // margin: 0 0 15px 0;
-    background-color: #ffffff;
-  }
-  .two {
-    margin: 0 0 15px 0;
-    background-color: #ffffff;
-  }
-  .three {
-    margin: 0 0 15px 0;
-    background-color: #ffffff;
-  }
-  .four {
-    margin: 0 0 15px 0;
-    background-color: #ffffff;
-  }
-}
-.foot {
-  position: absolute;
-  bottom: 0;
-}
-</style>

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

@@ -0,0 +1,30 @@
+<template>
+  <div id="index">
+    <p>创新服务</p>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  name: 'index',
+  props: {},
+  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></style>