Merge branch 'master' of http://121.37.12.51:13000/jialong.yu/FE_IASF_client

src/i18n/index.js

@@ -22,6 +22,8 @@ export const messages = {
       speaker: '主讲人',
       series: '演讲系列',
       all: '全部',
+      readDetail: '阅读详情',
+      offline:'线下'
     }
   },
   'en': {
@@ -47,6 +49,8 @@ export const messages = {
       speaker: 'Speaker',
       series: 'Series',
       all: 'All',
+      readDetail: 'Read Detail',
+      offline: 'Offline'
     }
   }
 };

src/mixins/estate/index.js

@@ -30,13 +30,24 @@ export default {
       this.$router.push(path + '&siteId=3')
     },
     tabChangeNewPage(i) {
+      console.log("process.env.NODE_ENV === 'development'",)
+      const devServer = process.env.NODE_ENV === 'development'
+      let path
+      if (devServer) {
+        path = '/estate/survey?id=258'
+        if (i == 1) path = '/estate/event?id=259'
+        if (i == 2) path = '/estate/orgSetup?id=270'
+        if (i == 3) path = '/estate/location?id=261'
+      }else {
+        path = '/estate/survey?id=233'
+        if (i == 1) path = '/estate/event?id=234'
+        if (i == 2) path = '/estate/orgSetup?id=235'
+        if (i == 3) path = '/estate/location?id=236'
+      }
       this.active = i
       // 跳转到固定的长页，这里的id不能变
-      let path = '/estate/survey?id=258'
-      if (i == 1) path = '/estate/event?id=259'
-      if (i == 2) path = '/estate/orgSetup?id=270'
-      if (i == 3) path = '/estate/location?id=261'
-      this.$router.push(path + '&siteId=3')
+      console.log('path=>',path)
+      this.$router.push(path + '&siteId=5')
     }
   }
 };

src/pages/article/activity.vue

@@ -8,6 +8,7 @@
           <div class="meta">{{$t('column.time')}}：{{ form.activityStartTime + ' ~ ' + form.activityEndTime }}</div>
           <div v-if="form.offlineLocation" class="meta">{{$t('column.address')}}：{{ form.offlineLocation }}</div>
           <div v-if="form.onlineLocation" class="meta">{{$t('column.online')}}：{{ form.onlineLocation }}</div>
+          <div v-if="form.offlineLocation" class="meta">{{$t('column.offline')}}：{{ form.offlineLocation }}</div>
           <div v-if="form.keynoteSpeaker" class="meta">{{$t('column.speaker')}}：{{ form.keynoteSpeaker }}</div>
           <div v-if="form.lectureSeries" class="meta">{{$t('column.series')}}：{{ form.lectureSeries }}</div>
 

src/pages/column/index.vue

@@ -34,6 +34,29 @@
               </i>
             </div>
           </div>
+          <div v-if="info.listStyleId === 12" class="forms">
+            <div class="item">
+              <span class="label">{{ $t('column.classification') }}：</span>
+              <el-select v-model="form.classificationId" @change="filter">
+                <el-option :label="$t('column.all')" :value="null"></el-option>
+                <el-option v-for="item in classifications" :key="item.id" :label="item.classificationName"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </div>
+            <div class="item">
+              <span class="label">{{ $t('column.label') }}：</span>
+              <el-select ref="search" v-model="lableId" multiple @change="filter">
+                <el-option v-for="item in labels" :key="item.id" :label="item.labelName" :value="item.id"> </el-option>
+              </el-select>
+            </div>
+            <div class="search">
+              <input type="text" :placeholder="$t('column.titlePlaceholder')" v-model="form.title" />
+              <i class="icon">
+                <img src="@/assets/images/search-white.png" alt="" />
+              </i>
+            </div>
+          </div>
           <!-- 会议活动：筛选+会议活动列表 -->
           <div v-if="info.listStyleId === 15" class="forms">
             <ul class="switch">
@@ -52,18 +75,22 @@
               </el-select>
             </div>
           </div>
+         
           <div class="contents">
-            <el-tree v-if="!isFilter && showNav && columns.length" class="columns" ref="leftColumn" :data="columns"
+            <template v-if="!isFilter && showNav && columns.length && !columns.find(i=>i.children.length) && info.listStyleId !==55">
+             </template>
+
+            <el-tree v-else class="columns" ref="leftColumn" :data="columns"
               highlight-current :expand-on-click-node="false" default-expand-all :props="defaultProps" node-key="id"
               icon-class="el-icon-arrow-down" @node-click="(item) => columnClick(item, 1)">
               <span class="custom-tree-node" slot-scope="{ node, data }" style="padding-left: 10px;">
                 <span :title="node.label">{{ node.label }}</span>
               </span>
             </el-tree>
-
-            <div class="article-wrap">
+            <template v-if="info.listStyleId === 12">
+              <div class="article-wrap">
               <ul class="articles">
-                <li v-for="(item, i) in articles" :key="i" :class="{'news-notice': info.listStyleId === 55}" @click="toArtice(item)">
+                <li v-for="(item, i) in articles" :key="i" :class="{'news-notice': info.listStyleId === 55}" class="readDetail" @click="toArtice(item)">
                   <template v-if="info.listStyleId === 55">
                     <div class="releaseTime">
                       <p class="d">{{ item.date }}</p>
@@ -72,17 +99,18 @@
                     <div class="news-title">{{ item.title }}</div>
                   </template>
                   <template v-else>
+                    <img class="pic" :src="item.titleImg" alt="" onerror="javascript:this.src='./images/1.png';" />
                     <div class="texts">
                       <p v-if="(item.listStyleId === 10 || item.listStyleId === 15) && item.classificationName"
                         class="type">
                         {{ item.classificationName }}
                       </p>
-                      <h6>{{ item.title }}</h6>
-                      <template v-if="item.listStyleId === 11">
+                      <h6 class="titleDes">{{ item.title }}</h6>
+                      <template v-if="item.listStyleId === 11 || item.listStyleId == 12">
                         <span class="meta">{{ item.releaseTime }}</span>
                         <div class="des" v-html="item.mainBody"></div>
                       </template>
-                      <span v-if="item.listStyleId === 10" class="meta">{{ item.releaseTime }} {{ item.labelName && ' | ' +
+                      <span v-if="item.listStyleId === 10 " class="meta">{{ item.releaseTime }} {{ item.labelName && ' | ' +
                         item.labelName }}</span>
                       <template v-if="item.listStyleId === 15 || item.listStyleId === 16">
                         <div v-if="item.keynoteSpeaker" class="meta m-b-10">
@@ -99,8 +127,9 @@
                           <img class="icon" src="@/assets/images/online.png" alt="" /> {{ item.onlineLocation }}
                         </div>
                       </template>
+                      <el-button type="primary" class="readDetailBtn">{{ $t('column.readDetail') }}</el-button>
                     </div>
-                    <img class="pic" :src="item.titleImg" alt="" onerror="javascript:this.src='./images/1.png';" />
+                    
                   </template>
                 </li>
               </ul>
@@ -109,6 +138,9 @@
                   layout="total, prev, pager, next" :total="total"></el-pagination>
               </div>
             </div>
+            </template>
+            <template v-else>
+            </template>
           </div>
         </div>
         <div class="right">
@@ -736,6 +768,23 @@ export default {
   }
 
   .articles {
+    .readDetail {
+      justify-content: flex-start;
+      align-items: flex-start;
+      .titleDes {
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 1;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+      .readDetailBtn {
+        margin-top: 4rem;
+      }
+      .texts {
+        flex-grow: 1;
+      }
+    }
     li {
       display: flex;
       justify-content: space-between;
@@ -892,6 +941,7 @@ export default {
       border-bottom: 1px solid #ddd;
     }
 
+
     .right {
       padding-top: 30px;
     }