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

src/views/hall/hall.vue

@@ -116,7 +116,8 @@
                     <el-col :span="24">
                       <ul class="demand">
                         <li class="demandList" v-for="(item, index) in demandList" :key="index">
-                          <p>{{ item.name }}</p>
+                          <span class="textOver" style="display:inline-block;width:85%;">{{ item.name }}</span>
+                          <el-button type="primary" size="mini" @click="technologyBtn(item.id)" style="position: relative;top: -5px;">对接</el-button>
                           <p>
                             <span>研发阶段：{{ item.phase == '0' ? '阶段成果' : '最终成果' }}</span>
                             <span>发布时间：{{ item.meta | getDate }}</span>