Merge branch 'master' of https://dd.tall.wiki/gitea/binbin0314/green.v0.3

4 years ago · 97d216f6e1
10 changed files with 135 additions and 73 deletions
--- a/.env
+++ b/.env
@ -1,3 +1,3 @@
 VUE_APP_MODE=production
 VUE_APP_PREVIEW=false
-VUE_APP_URL=http://www.sxwikionline.com/
+VUE_APP_URL=http://www.sxgreenvalley.com/
--- a/.env.development
+++ b/.env.development
@ -1,10 +1,10 @@
 VUE_APP_MODE=development
 VUE_APP_NODE_ENV=development
 VUE_APP_SCENE=greenvalley
-VUE_APP_BASE_URL=http://www.sxwikionline.com/
-VUE_APP_API_URL=http://www.sxwikionline.com/gateway
+VUE_APP_BASE_URL=http://www.sxgreenvalley.com/
+VUE_APP_API_URL=http://www.sxgreenvalley.com/gateway
 VUE_APP_PROXY_URL=/gateway
-VUE_APP_PUBLIC_PATH=/greenvalley
+VUE_APP_PUBLIC_PATH=/
 VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws
 VUE_APP_TITLE=绿谷在线
 VUE_APP_DESCRIPTION=绿谷在线管理后台
--- a/.env.production
+++ b/.env.production
@ -1,10 +1,10 @@
 VUE_APP_MODE=production
 VUE_APP_NODE_ENV=production
 VUE_APP_SCENE=greenvalley
-VUE_APP_BASE_URL=http://www.sxwikionline.com/
-VUE_APP_API_URL=http://www.sxwikionline.com/gateway
+VUE_APP_BASE_URL=http://www.sxgreenvalley.com/
+VUE_APP_API_URL=http://www.sxgreenvalley.com/gateway
 VUE_APP_PROXY_URL=/gateway
-VUE_APP_PUBLIC_PATH=/greenvalley
+VUE_APP_PUBLIC_PATH=/
 VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws
 VUE_APP_TITLE=绿谷在线
 VUE_APP_DESCRIPTION=绿谷在线管理后台
--- a/src/components/FooterPage/FooterPage.vue
+++ b/src/components/FooterPage/FooterPage.vue
@ -14,28 +14,28 @@
        </div>
        <div class="box flex-1 d-flex flex-column" style="padding-left: 13%">
          <div class="title">发现</div>
-          <span>创新挑战</span>
-          <span>创新平台</span>
-          <span>孵化平台</span>
-          <span>产业平台</span>
-          <span>在线社区</span>
+          <span @click="$router.push('/Challenge/Solicitation')" class="pointer">创新挑战</span>
+          <span @click="$router.push('/NewPlatform/NewCore')" class="pointer">创新平台</span>
+          <span @click="$router.push('/IncubationPlatform/MakerSpace')" class="pointer">孵化平台</span>
+          <span @click="$router.push('/Industry/Union')" class="pointer">产业平台</span>
+          <span @click="$router.push('/Community')" class="pointer">交流社区</span>
        </div>
        <div class="box flex-1 d-flex flex-column">
          <div class="title">资讯</div>
-          <span>行业资讯</span>
-          <span>活动公告</span>
-          <span>国家政策</span>
-          <span>行业资讯</span>
-          <span>省级政策</span>
+          <span @click="$router.push('/ItInformation')" class="pointer">行业资讯</span>
+          <span @click="$router.push('/Activity')" class="pointer">活动公告</span>
+          <span @click="$router.push('/Policy')" class="pointer">创新政策</span>
        </div>
        <div class="box flex-1 d-flex flex-column">
          <div class="title">联系我们</div>
-          <span>我要入驻</span>
-          <span>人才招聘</span>
+          <span @click="$router.push('/ContactUs')" class="pointer">人才招聘</span>
          <div class="font-bold-24 mt-3" style="font-style: italic">0351-5223175</div>
        </div>
        <div class="box">
-          <img class="pic" src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/logo/lvgu.jpg" />
+          <img
+            class="pic"
+            src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/logo/lvgu.jpg"
+          />
        </div>
      </div>
    </div>
--- a/src/components/Index/IndexNewList.vue
+++ b/src/components/Index/IndexNewList.vue
@ -42,28 +42,28 @@
    </div>
    <div class="policy-box" v-if="lists && lists[i].news && lists[i].news.length>0">
      <div :key="index" class="div-box mb-2" v-for="(item, index) in lists[i].news">
-        <div @click="jumpDetails(item)" class="d-flex flex-nowrap" style="cursor: pointer">
-          <!-- <div class="time d-flex flex-column align-center mr-5" v-if="item.releaseTime">
-            <span class="font-20">{{ monthEnglish[item.releaseTime.split('-')[1] - 1] }}.</span>
-            <span class="font-bold-32 day">{{ item.releaseTime.split(' ')[0].split('-')[2] }}</span>
-          </div>-->
+        <div @click="jumpDetails(item,i)" class="d-flex flex-nowrap" style="cursor: pointer">
          <div class="d-flex flex-1 flex-column">
            <div class="item-title">{{ item.title }}</div>
            <div class="original"></div>
-            <div :class="i === 0 ? 'item-content1' : 'item-content'">
+            <div class="item-content1" v-if="i === 0">
              <span v-dompurify-html="item.content"></span>
-              <!-- {{ item.content }} -->
            </div>
+            <div class="item-content" v-else>
+              <span v-dompurify-html="item.intro"></span>
            </div>
          </div>
        </div>
      </div>
    </div>
+    <div v-else>
+      <a-skeleton />
+    </div>
+  </div>
 </template>

 <script>
 import { mapState, mapMutations } from 'vuex';
-import { front } from 'config/api';
 export default {
  name: 'IndexNewList',
  props: {
@ -84,9 +84,13 @@ export default {
    ...mapMutations('home', ['setActDetail']),

    // 跳转到详情界面
-    jumpDetails(item) {
+    jumpDetails(item, i) {
      this.setActDetail(item);
+      if (i === 0) {
        this.$router.push('/ItDetails');
+      } else {
+        this.$router.push('/ActDetails');
+      }
    },
  },
 };
--- a/src/config/api.js
+++ b/src/config/api.js
@ -52,6 +52,9 @@ export const industryInfo = params => axios.post(`${greenvalley}/industryInfo/be
 // 查询活动公告列表
 export const front = params => axios.post(`${activity}/query/front`, params);

+// 查询活动公告详情
+export const activeDetail = params => axios.post(`${activity}/query/detail`, params);
+
 // 申请加入活动
 export const apply = params => axios.post(`${activity}/apply`, params);

--- a/src/plugins/ant-design-vue.js
+++ b/src/plugins/ant-design-vue.js
@ -41,6 +41,7 @@ import {
  Steps,
  Divider,
  Card,
+  Skeleton,
 } from 'ant-design-vue';
 import { ConfigProvider } from 'ant-design-vue';
 Vue.component(ConfigProvider.name, ConfigProvider);
@ -76,6 +77,7 @@ Vue.use(Tooltip);
 Vue.use(Steps);
 Vue.use(Divider);
 Vue.use(Card);
+Vue.use(Skeleton);

 Vue.prototype.$message = message;
 Vue.prototype.$notification = notification;
--- a/src/views/Activity/ActDetails.vue
+++ b/src/views/Activity/ActDetails.vue
@ -4,39 +4,56 @@
      <div class="policy-title">
        <span>{{ actDetail.title }}</span>
      </div>
+      <!--  && hdDetail.content -->
+      <div v-if="hdDetail !== null">
        <div class="policy-info">
          <div>
            <span>
-            <a-icon class="baseColor" style="font-size: 14px; margin-right: 10px" type="clock-circle" />
-            <span>{{ actDetail.releaseTime }} - {{ actDetail.closeTime }}</span>
+              <a-icon
+                class="baseColor"
+                style="font-size: 14px; margin-right: 10px"
+                type="clock-circle"
+              />
+              <span>
+                {{ hdDetail.releaseTime }}
+                <span v-if="hdDetail.closeTime">- {{ hdDetail.closeTime }}</span>
+              </span>
            </span>
            <span style="margin-left: 60px">
              <a-icon class="baseColor" style="margin-right: 10px" type="environment" />
-            <span>{{ actDetail.address }}</span>
+              <span>{{ hdDetail.address }}</span>
            </span>
          </div>
          <!-- </div> -->
          <!-- <div class="policy-info"> -->
        </div>
-      <div class="policy-content" v-dompurify-html="actDetail.content"></div>
+        <div class="policy-content" v-dompurify-html="hdDetail.content"></div>
        <div class="policy-other">
          <div>
            <span style="font-size: 14px">会议主题：</span>
-          <span>{{ actDetail.theme }}</span>
+            <span>{{ hdDetail.theme }}</span>
          </div>
          <div>
-          <span>{{ actDetail.organization }}</span>
+            <span>{{ hdDetail.organization }}</span>
          </div>
          <div>
            <span style="font-size: 14px">主讲嘉宾：</span>
-          <span>{{ actDetail.name }}</span>
+            <span>{{ hdDetail.name }}</span>
+          </div>
+          <div v-if="hdDetail.other">其他事宜:{{ hdDetail.other }}</div>
        </div>
-        <div v-if="actDetail.other">其他事宜:{{ actDetail.other }}</div>
+        <a-button
+          disabled
+          style="margin: 50px 25px"
+          v-if="hdDetail.releaseTime && Date.parse(hdDetail.releaseTime) < Date.parse(nowData)"
+        >报名已结束</a-button>
+        <enroll
+          :act-name="hdDetail.title"
+          :activity-id="hdDetail.activityId"
+          style="margin: 50px 25px"
+          v-else
+        />
      </div>
-      <a-button disabled style="margin: 50px 25px" v-if="actDetail.releaseTime && Date.parse(actDetail.releaseTime) < Date.parse(nowData)">
-        报名已结束
-      </a-button>
-      <enroll :act-name="actDetail.title" :activity-id="actDetail.activityId" style="margin: 50px 25px" v-else />
    </div>
  </div>
 </template>
@ -44,14 +61,17 @@
 <script>
 import { mapState } from 'vuex';
 import Enroll from './components/Enroll.vue';
+import { activeDetail } from 'config/api';
+
 export default {
  name: 'ActDetails',
  components: { Enroll },
  data() {
-    return { nowData: '' };
+    return { nowData: '', hdDetail: null };
  },
  computed: mapState('home', ['actDetail']),
-  created() {
+  async created() {
+    await this.getData();
    // 获取当前时间
    var aData = new Date();
    // console.log(aData); //Wed Aug 21 2019 10:00:58 GMT+0800 (中国标准时间)
@ -69,7 +89,25 @@ export default {
      aData.getSeconds();
    // console.log(this.nowData); //2019-8-20
  },
-  methods: {},
+  methods: {
+    // 获取活动公告列表
+    async getData() {
+      try {
+        const params = {
+          param: {
+            activityId: this.actDetail.activityId,
+          },
+        };
+        const res = await activeDetail(params);
+        const { data, msg, code } = res.data;
+        if (code === 200) {
+          this.hdDetail = data;
+        }
+      } catch (error) {
+        // console.log(error);
+      }
+    },
+  },
 };
 </script>

--- a/src/views/FirstPage/FirstPage.vue
+++ b/src/views/FirstPage/FirstPage.vue
@ -8,7 +8,7 @@
    <rotation />
    <div class="inner">
      <a-row>
-        <a-col :span="18">
+        <a-col :span="18" id="hy-news">
          <a-row>
            <a-col :key="server.id" :span="8" v-for="server in services">
              <div @click="$router.push(server.path)" class="mr-4 d-flex pointer">
@ -34,7 +34,7 @@
              </div>
            </a-col>
          </a-row>
-          <a-row class="mt-8 mr-4">
+          <a-row class="mt-8 mr-4 flex-1">
            <a-col :span="24">
              <div class="white d-flex flex-column justify-center">
                <index-new-list :i="0" :lists="lists" />
@ -42,7 +42,7 @@
            </a-col>
          </a-row>
        </a-col>
-        <a-col :span="6">
+        <a-col :span="6" :style="{ height: height }" class="hd-news">
          <div class="white d-flex flex-column justify-center">
            <index-new-list :i="1" :lists="lists" />
          </div>
@ -134,6 +134,7 @@ export default {
          news: [],
        },
      ],
+      height: '',
    };
  },
  computed: mapState('home', ['actList', 'actIpCon', 'actCurrent']),
@ -143,6 +144,10 @@ export default {
    this.getIndustryInfoLists();
    this.getFrontLists();
  },
+  mounted() {
+    var oDiv = document.getElementById('hy-news');
+    this.height = oDiv.offsetHeight + 60 + 'px';
+  },
  methods: {
    ...mapActions('home', ['getIndustryInfoList', 'getFrontList']),

@ -247,4 +252,12 @@ export default {
 .server-box img {
  transition: all 0.2s ease 0s;
 }
+
+.hy-news {
+  height: 746px;
+}
+
+.hd-news {
+  background: white;
+}
 </style>
--- a/src/views/IncubationPlatform/Children/place/EntitySpace.vue
+++ b/src/views/IncubationPlatform/Children/place/EntitySpace.vue
@ -42,13 +42,15 @@
        <div class="circular"></div>
        <div style="margin-left: 40px">公共实验室</div>
      </div>
-      <div class="center-content">
+      <div class="center-content d-flex flex-column">
+        <span>
          公共实验室位于太原市师范街50号山西省生物研究院有限公司，总面积1320平方米。
          建有“医药生物技术山西省重点实验室”、“山西省发酵工程中试基地”及“山西省乳品
          发酵中试基地”等省级科技创新平台；具有检验检测机构资质认定证书（CMA）；实验室
          拥有20万以上仪器设备26台套，包括AKTA蛋白纯化系统、多功能酶标仪、原子吸收光谱仪、
          液相色谱仪、万级无菌工作间、P2实验室等多种高端、大型实验仪器设备；可提供生物医药、
          食品检测、食用菌、肠道微生物等方面的科学实验、检验检测、小试中试等技术服务与科研成果转化。
+        </span>
        <img
          class="center-img"
          src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210120/eb472126971a47438a3227df967ed2cb.png"