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

.eslintrc.js

@@ -11,7 +11,7 @@ module.exports = {
     'max-len': [
       'warn',
       {
-        code: 250,
+        code: 10000,
       },
     ],
     'no-unused-vars': 'off',

src/store/index.js

@@ -26,6 +26,7 @@ import apply from './live/apply';
 import market from './market/market';
 import channel from './live/channel';
 import channelVideo from './live/channelVideo';
+import flower from './live/flower';
 // 专家
 import expertsuser from './market/exportuser';
 // 产品
@@ -78,6 +79,7 @@ export default new Vuex.Store({
     market,
     channel,
     channelVideo,
+    flower,
     // 专家
     expertsuser,
     // 产品

src/store/live/flower.js

@@ -0,0 +1,42 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import _ from 'lodash';
+Vue.use(Vuex);
+const api = {
+  flowerInfo: `/api/live/flower`,
+};
+const state = () => ({});
+const mutations = {};
+
+const actions = {
+  async query({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.flowerInfo}`, {
+      skip,
+      limit,
+      ...info,
+    });
+    return res;
+  },
+  async create({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.flowerInfo}`, payload);
+    return res;
+  },
+  async fetch({ commit }, payload) {
+    const res = await this.$axios.$get(`${api.flowerInfo}/${payload}`);
+    return res;
+  },
+  async update({ commit }, { id, ...data }) {
+    const res = await this.$axios.$post(`${api.flowerInfo}/update/${id}`, data);
+    return res;
+  },
+  async delete({ commit }, payload) {
+    const res = await this.$axios.$delete(`${api.flowerInfo}/${payload}`);
+    return res;
+  },
+};
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

src/views/halltwo/detail.vue

@@ -220,35 +220,7 @@
         </el-col>
         <el-col :span="24" class="four">
           <div class="w_1200">
-            <el-col :span="10" class="seek">
-              <el-col :span="24" class="title">
-                <p>专家咨询:</p>
-              </el-col>
-              <el-col :span="24" class="text">
-                <p>工作日：08:30~17:00</p>
-                <p>咨询电话：</p>
-                <p>0431-81666508</p>
-              </el-col>
-            </el-col>
-            <el-col :span="10" class="seek">
-              <el-col :span="24" class="title">
-                <p>业务联系:</p>
-              </el-col>
-              <el-col :span="24" class="text">
-                <p>长春中科北斗工程技术有限公司</p>
-                <p>联系人：刘经理</p>
-                <p>电话：18604328977</p>
-                <p>邮箱：18889898@qq.com</p>
-              </el-col>
-            </el-col>
-            <el-col :span="4" class="seek">
-              <el-col :span="24" class="title">
-                <p>活动帮微信:</p>
-              </el-col>
-              <el-col :span="24" class="text">
-                <el-image :src="url5" style="width:130px;height:130px"></el-image>
-              </el-col>
-            </el-col>
+            <ywlx></ywlx>
           </div>
         </el-col>
         <el-col :span="24" class="footer">
@@ -266,7 +238,7 @@ const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
 const { mapActions: transaction } = createNamespacedHelpers('transaction');
 const { mapActions: market } = createNamespacedHelpers('market');
 import liveFoot from '@/layout/live/foot.vue';
-
+import ywlx from './parts/ywlx.vue';
 export default {
   metaInfo() {
     return { title: this.$route.meta.title };
@@ -275,6 +247,7 @@ export default {
   props: {},
   components: {
     liveFoot,
+    ywlx,
   },
   data: function() {
     return {

src/views/halltwo/directTwo.vue

@@ -42,51 +42,53 @@
             <el-col :span="24" class="twodown">
               <el-col :span="5" class="txt">
                 <span>已经到场</span>
-                <span>{{ statNum.tszx }}</span
+                <span>{{ statNum.tszx || 0 }}</span
                 >人
               </el-col>
               <el-col :span="5" class="txt">
                 <span>实现对接</span>
-                <span>{{ statNum.jywc }}</span
+                <span>{{ statNum.jywc || 0 }}</span
                 >次
               </el-col>
               <el-col :span="5" class="txt">
                 <span>产生意向</span>
-                <span>{{ statNum.qthz }}</span
+                <span>{{ statNum.qthz || 0 }}</span
                 >次
               </el-col>
               <el-col :span="5" class="txt">
                 <span>项目数</span>
-                <span>{{ statNum.czxm }}</span
+                <span>{{ statNum.czxm || 0 }}</span
                 >项
               </el-col>
               <el-col :span="5" class="txt">
                 <span>贺信</span>
-                <span>0</span>封
+                <span>{{ statNum.zhhx || 0 }}</span
+                >封
               </el-col>
               <el-col :span="5" class="txt">
                 <span>同时在线</span>
-                <span>{{ statNum.tszx }}</span
+                <span>{{ statNum.tszx || 0 }}</span
                 >人
               </el-col>
               <el-col :span="5" class="txt">
                 <span>正在对接</span>
-                <span>{{ statNum.qthz }}</span
+                <span>{{ statNum.qthz || 0 }}</span
                 >人
               </el-col>
               <el-col :span="5" class="txt">
                 <span>达成意向</span>
-                <span>{{ statNum.dcyx }}</span
+                <span>{{ statNum.dcyx || 0 }}</span
                 >次
               </el-col>
               <el-col :span="5" class="txt">
                 <span>需求数</span>
-                <span>{{ statNum.czxq }}</span
+                <span>{{ statNum.czxq || 0 }}</span
                 >项
               </el-col>
               <el-col :span="5" class="txt">
                 <span>鲜花</span>
-                <span>0</span>束
+                <span>{{ statNum.zhxh || 0 }}</span
+                >束
               </el-col>
             </el-col>
           </div>
@@ -234,25 +236,7 @@
         </el-col>
         <el-col :span="24" class="four">
           <div class="w_1200">
-            <el-col :span="24" class="info">
-              <el-col :span="8" class="left">
-                <h1>专家咨询：</h1>
-                <p>工作日：08:30~17:00</p>
-                <p>咨询电话：</p>
-                <p>0431-81666508</p>
-              </el-col>
-              <el-col :span="8" class="left">
-                <h1>业务联系：</h1>
-                <p>长春中科北斗工程技术有限公司</p>
-                <p>联系人：刘经理</p>
-                <p>电话：18604328977</p>
-                <p>邮箱：18889898@qq.com</p>
-              </el-col>
-              <el-col :span="8" class="left right">
-                <h1>活动帮微信：</h1>
-                <el-image :src="erweima" style="width:132px;height:132px;"></el-image>
-              </el-col>
-            </el-col>
+            <ywlx></ywlx>
           </div>
         </el-col>
       </el-col>
@@ -276,14 +260,18 @@ import expert from './parts/expert.vue';
 // 公共聊天
 import dockchat from './parts/dockchat.vue';
 // 学校列表
-
 import { schoolList } from '@/util/school.js';
+// 广告位
 import { adveronetList } from '@/util/adveronet.js';
+// 业务联系
+import ywlx from './parts/ywlx.vue';
+
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: dock } = createNamespacedHelpers('dock');
 const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
 const { mapActions: transaction } = createNamespacedHelpers('transaction');
 const { mapActions: market } = createNamespacedHelpers('market');
+const { mapActions: flower } = createNamespacedHelpers('flower');
 var moment = require('moment');
 export default {
   metaInfo() {
@@ -303,6 +291,8 @@ export default {
     expert,
     // 公共聊天
     dockchat,
+    // 业务联系
+    ywlx,
   },
   data: function() {
     return {
@@ -349,17 +339,8 @@ export default {
       // 指导单位
       zdcom: require('@a/zh_17.png'),
       jscom: require('@a/zh_18.png'),
-      erweima: require('@a/二维码.jpg'),
       // 项目数
-      statNum: {
-        tszx: 0,
-        tyjb: 0,
-        qthz: 0,
-        dcyx: 0,
-        jywc: 0,
-        czxm: 0,
-        czxq: 0,
-      },
+      statNum: {},
       // 倒计时
       djs: '',
     };
@@ -372,6 +353,7 @@ export default {
     ...expertsuser({ expertQuery: 'query' }),
     ...transaction({ tquery: 'query' }),
     ...market({ marketFetch: 'fetch', operaFetch: 'operaFetch', sendMsg: 'operationCreate', operaQuery: 'operaQuery' }),
+    ...flower({ flowerquery: 'query' }),
     async searchInfo() {
       // 查询展会详情
       if (this.id) {
@@ -454,6 +436,16 @@ export default {
       if (tszx) {
         this.$set(this.statNum, `tszx`, tszx.total);
       }
+      // 查询贺信
+      let zhhx = await this.flowerquery({ type: 'flower', dock_id: this.id });
+      if (this.$checkRes(zhhx)) {
+        this.$set(this.statNum, `zhhx`, zhhx.total);
+      }
+      // 花
+      let zhxh = await this.flowerquery({ type: 'hand', dock_id: this.id });
+      if (this.$checkRes(zhxh)) {
+        this.$set(this.statNum, `zhxh`, zhxh.total);
+      }
     },
     // 倒计时
     setTime(end) {
@@ -814,7 +806,7 @@ export default {
         height: 225px;
         overflow: hidden;
         .schoolList {
-          width: 204px;
+          width: 215px;
           height: 225px;
           margin: 0 30px 0 0;
           text-align: center;
@@ -844,6 +836,9 @@ export default {
             }
           }
         }
+        .schoolList:nth-child(5) {
+          margin: 0;
+        }
         .schoolList:hover {
           cursor: pointer;
           .image {
@@ -901,23 +896,6 @@ export default {
   .four {
     border-top: 2px solid #305798;
     height: 250px;
-    .info {
-      .left {
-        h1 {
-          padding: 15px 0;
-          font-weight: bold;
-          color: #4d4d4d;
-        }
-        p {
-          font-size: 16px;
-          color: #4d4d4d;
-          padding: 5px 0;
-        }
-      }
-      .right {
-        text-align: center;
-      }
-    }
   }
 }
 </style>

src/views/halltwo/expertxmcg.vue

@@ -75,25 +75,7 @@
         </el-col>
         <el-col :span="24" class="four">
           <div class="w_1200">
-            <el-col :span="24" class="info">
-              <el-col :span="8" class="left">
-                <h1>专家咨询：</h1>
-                <p>工作日：08:30~17:00</p>
-                <p>咨询电话：</p>
-                <p>0431-81666508</p>
-              </el-col>
-              <el-col :span="8" class="left">
-                <h1>业务联系：</h1>
-                <p>长春中科北斗工程技术有限公司</p>
-                <p>联系人：刘经理</p>
-                <p>电话：18604328977</p>
-                <p>邮箱：18889898@qq.com</p>
-              </el-col>
-              <el-col :span="8" class="left right">
-                <h1>活动帮微信：</h1>
-                <el-image :src="erweima" style="width:132px;height:132px;"></el-image>
-              </el-col>
-            </el-col>
+            <ywlx></ywlx>
           </div>
         </el-col>
       </el-col>
@@ -105,6 +87,7 @@
 </template>
 
 <script>
+import ywlx from './parts/ywlx.vue';
 import page from '@/components/pagination.vue';
 import liveFoot from '@/layout/live/foot.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
@@ -120,6 +103,7 @@ export default {
   components: {
     liveFoot,
     page,
+    ywlx,
   },
   data: function() {
     return {

src/views/halltwo/parts/dockchat.vue

@@ -39,6 +39,7 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: chat } = createNamespacedHelpers('chat');
+const { mapActions: flower } = createNamespacedHelpers('flower');
 import _ from 'lodash';
 var moment = require('moment');
 export default {
@@ -65,6 +66,7 @@ export default {
   },
   methods: {
     ...chat(['query', 'create']),
+    ...flower({ flowercreate: 'create' }),
     // 查询列表
     async search() {
       const res = await this.query({ skip: 0, limit: 10, dock_id: this.dock_id });
@@ -102,6 +104,17 @@ export default {
         let res = await this.create(object);
         this.$checkRes(res, null, res.errmsg || '发言失败');
       }
+      // 创建花，贺信
+      let data = {
+        type: type,
+        dock_id: this.dock_id,
+      };
+      if (type == 'flower') {
+        data.name = '贺信';
+      } else {
+        data.name = '束花';
+      }
+      let res = await this.flowercreate(data);
     },
     // 切换图片
     isEmotion(word) {

src/views/halltwo/parts/ywlx.vue

@@ -0,0 +1,68 @@
+<template>
+  <div id="ywlx">
+    <el-row>
+      <el-col :span="24" class="info">
+        <el-col :span="8" class="left">
+          <h1>专家咨询：</h1>
+          <p>工作日：08:30~17:00</p>
+          <p>咨询电话：</p>
+          <p>0431-81666508</p>
+        </el-col>
+        <el-col :span="8" class="left">
+          <h1>业务联系：</h1>
+          <p>长春中科北斗工程技术有限公司</p>
+          <p>联系人：刘经理</p>
+          <p>电话：18604328977</p>
+          <p>邮箱：18889898@qq.com</p>
+        </el-col>
+        <el-col :span="8" class="left right">
+          <h1>活动帮微信：</h1>
+          <el-image :src="erweima" style="width:132px;height:132px;"></el-image>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  name: 'ywlx',
+  props: {},
+  components: {},
+  data: function() {
+    return {
+      erweima: require('@a/二维码.jpg'),
+    };
+  },
+  created() {},
+  methods: {},
+  computed: {
+    ...mapState(['user']),
+  },
+  watch: {},
+};
+</script>
+
+<style lang="less" scoped>
+.info {
+  .left {
+    h1 {
+      padding: 15px 0;
+      font-weight: bold;
+      color: #4d4d4d;
+    }
+    p {
+      font-size: 16px;
+      color: #4d4d4d;
+      padding: 5px 0;
+    }
+  }
+  .right {
+    text-align: center;
+  }
+}
+</style>

src/views/halltwo/shoolDetail.vue

@@ -54,25 +54,7 @@
         </el-col>
         <el-col :span="24" class="four">
           <div class="w_1200">
-            <el-col :span="24" class="info">
-              <el-col :span="8" class="left">
-                <h1>专家咨询：</h1>
-                <p>工作日：08:30~17:00</p>
-                <p>咨询电话：</p>
-                <p>0431-81666508</p>
-              </el-col>
-              <el-col :span="8" class="left">
-                <h1>业务联系：</h1>
-                <p>长春中科北斗工程技术有限公司</p>
-                <p>联系人：刘经理</p>
-                <p>电话：18604328977</p>
-                <p>邮箱：18889898@qq.com</p>
-              </el-col>
-              <el-col :span="8" class="left right">
-                <h1>活动帮微信：</h1>
-                <el-image :src="erweima" style="width:132px;height:132px;"></el-image>
-              </el-col>
-            </el-col>
+            <ywlx></ywlx>
           </div>
         </el-col>
       </el-col>
@@ -84,10 +66,12 @@
 </template>
 
 <script>
+import ywlx from './parts/ywlx.vue';
 import liveFoot from '@/layout/live/foot.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: dock } = createNamespacedHelpers('dock');
 import { schoolList } from '@/util/school.js';
+
 var moment = require('moment');
 
 export default {
@@ -98,6 +82,7 @@ export default {
   props: {},
   components: {
     liveFoot,
+    ywlx,
   },
   data: function() {
     return {
@@ -298,6 +283,7 @@ export default {
       overflow: hidden;
       background-color: #fff;
       box-shadow: 0 5px 15px rgba(33, 82, 203, 0.35);
+      border-bottom: 1px solid rgba(33, 82, 203, 0.35);
       padding: 30px;
       .title {
         font-family: '微软雅黑';

src/views/halltwo/xmcg.vue

@@ -84,25 +84,7 @@
         </el-col>
         <el-col :span="24" class="four">
           <div class="w_1200">
-            <el-col :span="24" class="info">
-              <el-col :span="8" class="left">
-                <h1>专家咨询：</h1>
-                <p>工作日：08:30~17:00</p>
-                <p>咨询电话：</p>
-                <p>0431-81666508</p>
-              </el-col>
-              <el-col :span="8" class="left">
-                <h1>业务联系：</h1>
-                <p>长春中科北斗工程技术有限公司</p>
-                <p>联系人：刘经理</p>
-                <p>电话：18604328977</p>
-                <p>邮箱：18889898@qq.com</p>
-              </el-col>
-              <el-col :span="8" class="left right">
-                <h1>活动帮微信：</h1>
-                <el-image :src="erweima" style="width:132px;height:132px;"></el-image>
-              </el-col>
-            </el-col>
+            <ywlx></ywlx>
           </div>
         </el-col>
       </el-col>
@@ -114,6 +96,7 @@
 </template>
 
 <script>
+import ywlx from './parts/ywlx.vue';
 import liveFoot from '@/layout/live/foot.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: dock } = createNamespacedHelpers('dock');
@@ -127,6 +110,7 @@ export default {
   props: {},
   components: {
     liveFoot,
+    ywlx,
   },
   data: function() {
     return {

src/views/halltwo/xmdj.vue

@@ -61,25 +61,7 @@
         </el-col>
         <el-col :span="24" class="four">
           <div class="w_1200">
-            <el-col :span="24" class="info">
-              <el-col :span="8" class="left">
-                <h1>专家咨询：</h1>
-                <p>工作日：08:30~17:00</p>
-                <p>咨询电话：</p>
-                <p>0431-81666508</p>
-              </el-col>
-              <el-col :span="8" class="left">
-                <h1>业务联系：</h1>
-                <p>长春中科北斗工程技术有限公司</p>
-                <p>联系人：刘经理</p>
-                <p>电话：18604328977</p>
-                <p>邮箱：18889898@qq.com</p>
-              </el-col>
-              <el-col :span="8" class="left right">
-                <h1>活动帮微信：</h1>
-                <el-image :src="erweima" style="width:132px;height:132px;"></el-image>
-              </el-col>
-            </el-col>
+            <ywlx></ywlx>
           </div>
         </el-col>
       </el-col>
@@ -91,6 +73,7 @@
 </template>
 
 <script>
+import ywlx from './parts/ywlx.vue';
 import liveFoot from '@/layout/live/foot.vue';
 import techDetail from '@/views/market/detail/techDetail.vue';
 import achiDetail from '@/views/market/detail/achiDetail.vue';
@@ -113,6 +96,7 @@ export default {
     achiDetail,
     busiDetail,
     expeDetail,
+    ywlx,
   },
   data: function() {
     return {