1

src/components/upload.vue

@@ -73,9 +73,10 @@ export default {
       this.dialogVisible = false;
     },
     handleRemove(file, fileList) {
-      let index = fileList.findIndex(f => _.isEqual(f, file));
-      this.$emit('delete', index);
-      return false;
+      return true;
+      // let index = fileList.findIndex(f => _.isEqual(f, file));
+      // this.$emit('delete', index);
+      // return false;
     },
     outLimit() {
       this.$message.error(`只允许上传${this.limit}个文件`);

src/views/adminCenter/dockInfo/parts/dockInfo.vue

@@ -44,7 +44,18 @@
             <el-input v-model="form.organizer" placeholder="请输入承办方"></el-input>
           </el-form-item>
           <el-form-item label="对接会视频">
-            <upload :limit="1" :data="form.file_path" type="file_path" listType="" :url="'/files/imgpath/upload'" @upload="uploadSuccess"></upload>
+            <upload
+              :limit="1"
+              :data="form.file_path"
+              type="file_path"
+              listType=""
+              :url="'/files/imgpath/upload'"
+              @upload="uploadSuccess"
+              @delete="uploadDelete"
+            ></upload>
+          </el-form-item>
+          <el-form-item label="视频文件标题">
+            <el-input v-model="form.videointro" placeholder="请输入视频文件标题"></el-input>
           </el-form-item>
           <el-form-item label="状态">
             <el-radio v-model="form.status" label="1">开始</el-radio>
@@ -119,6 +130,9 @@ export default {
     uploadSuccess({ type, data }) {
       this.$set(this.form, `${type}`, data.uri);
     },
+    uploadDelete() {
+      console.log('AS');
+    },
   },
   computed: {
     ...mapState(['user']),

src/views/hall/direct.vue

@@ -47,44 +47,57 @@
                 <el-col :span="24" class="title">
                   <span style="color: rgb(255, 132, 0);">现场</span>
                   <span>直播</span>
-                  <span>上一个</span>
-                  <el-button type="primary" size="mini" @click="nextvideo()">下一个</el-button>
+                  <el-button @click="bofang" type="primary" size="mini">播放</el-button>
                 </el-col>
                 <el-col :span="24" class="video">
-                  <!-- <video
+                  <el-col :span="24" v-if="videodisplay == 'list'" class="videointro" :style="{ height: `${this.user.role == 3 ? '350px' : '395px'}` }">
+                    {{ dockInfo.videointro }}
+                  </el-col>
+                  <video
                     :src="dockInfo.file_path"
                     autoplay=""
                     controls="controls"
                     :style="{ height: `${this.user.role == 3 ? '350px' : '395px'}`, width: '100%' }"
+                    v-else
                   >
                     您的浏览器不支持 video 标签。
                   </video>
-                  <div class="box">
+                  <div class="box" :style="{ height: `${this.user.role == 3 ? '350px' : '395px'}`, width: '100%' }">
                     <div class="con1">
                       <el-col class="lunboList" :span="24" v-for="(item, index) in lunboList" :key="index">
-                        <p>
-                          <span>[{{ item.date }}]</span>
-                          <span>{{ item.type == '0' ? '欢迎' : item.type == '1' ? '祝贺' : '' }}</span>
-                          <span v-if="item.type == '0' || item.type == '2'">{{ item.login_name }}</span>
-                          <span v-if="item.type == '1'">{{ item.market_username }}</span>
-                          <span v-if="item.type == '1'">和</span>
-                          <span v-if="item.type == '1'">{{ item.username }}</span>
-                          <span v-if="item.type == '1'">{{
-                            item.status == '0'
-                              ? '正在洽谈'
-                              : item.status == '1'
-                              ? '达成意向'
-                              : item.status == '2'
-                              ? '交易完成'
-                              : item.status == '3'
-                              ? '取消交易'
-                              : item.status == '4'
-                              ? '交易待确定'
-                              : '暂无'
-                          }}</span>
-                          <span v-if="item.type == '0'">位临现场</span>
-                          <span v-if="item.type == '2'">{{ item.remark }}</span>
-                        </p>
+                        <div>
+                          <p>[{{ item.date }}]</p>
+                          <p>
+                            <span>{{ item.type == '0' ? '欢迎' : item.type == '1' ? '祝贺' : '' }}</span>
+                            <span v-if="item.type == '0' || item.type == '2'">{{ item.login_name }}</span>
+                            <span v-if="item.type == '1'">{{ item.market_username }}</span>
+                            <span v-if="item.type == '1'">和</span>
+                            <span v-if="item.type == '1'">{{ item.username }}</span>
+                            <span v-if="item.type == '1'">{{
+                              item.status == '0'
+                                ? '正在洽谈'
+                                : item.status == '1'
+                                ? '达成意向'
+                                : item.status == '2'
+                                ? '交易完成'
+                                : item.status == '3'
+                                ? '取消交易'
+                                : item.status == '4'
+                                ? '交易待确定'
+                                : '暂无'
+                            }}</span>
+                            <span v-if="item.type == '0'">位临现场</span>
+                            <span v-if="item.type == '2'">{{ item.remark }}</span>
+                            <span v-if="item.type == '0' || item.type == '1'">
+                              <el-image :src="hand" style="width: 15px;top: 12px;left: 5px;margin:0 0 0 5px;"></el-image>
+                              <el-image :src="hand" style="width: 15px;top: 12px;left: 5px;margin:0 0 0 5px;"></el-image>
+                              <el-image :src="hand" style="width: 15px;top: 12px;left: 5px;margin:0 0 0 5px;"></el-image>
+                              <el-image :src="hand" style="width: 15px;top: 12px;left: 5px;margin:0 0 0 5px;"></el-image>
+                              <el-image :src="hand" style="width: 15px;top: 12px;left: 5px;margin:0 0 0 5px;"></el-image>
+                              <el-image :src="hand" style="width: 15px;top: 12px;left: 5px;margin:0 0 0 5px;"></el-image>
+                            </span>
+                          </p>
+                        </div>
                       </el-col>
                     </div>
                   </div>
@@ -97,14 +110,8 @@
                         <el-button @click="send" size="mini" round style="background: #ff8500;color: #fff;">发送</el-button>
                       </el-col>
                     </el-row>
-                  </div> -->
+                  </div>
                   <!-- <videoPlayer ref="videoPlayer" :options="videoOptions" class="vjs-custom-skin videoPlayer" :playsinline="true" /> -->
-                  <el-col :span="24">
-                    <el-col :span="24" style="height:400px;">
-                      <p v-if="videodisplay == 'list'" @click="dakai()">{{ videoListInfo.name }}</p>
-                      <video :src="videoListInfo.file_path" autoplay="" controls="controls" v-else style="height:200px;"></video>
-                    </el-col>
-                  </el-col>
                 </el-col>
               </el-col>
               <el-col :span="12" class="right">
@@ -466,24 +473,7 @@ export default {
     // videoPlayer,
   },
   data: () => ({
-    videoListInfo: {},
-    videoList: [
-      {
-        num: '1',
-        name: '第一个视频 ',
-        file_path: require('@a/video.mp4'),
-      },
-      {
-        num: '2',
-        name: '第二个视频 ',
-        file_path: require('@a/video1.mp4'),
-      },
-      {
-        num: '3',
-        name: '第三个视频 ',
-        file_path: require('@a/video.mp4'),
-      },
-    ],
+    hand: require('@/assets/emotion/flower.gif'),
     videodisplay: 'list',
     activeName: 'second',
     //搜索判断用
@@ -578,31 +568,11 @@ export default {
     this.$set(this, `dock_id`, this.$route.query.id);
     // 对接会详情
     await this.searchdock();
-    this.fangvideo();
   },
   methods: {
-    // 放第一个视频
-    fangvideo() {
-      console.log(this.videoList);
-      for (const val of this.videoList) {
-        console.log(val);
-      }
-      this.$set(this, `videoListInfo`, this.videoList[0]);
-    },
-    dakai() {
+    bofang() {
       this.videodisplay = 'detail';
     },
-    // 下一个
-    nextvideo() {
-      console.log(this.videoList[key]);
-      // let data = this.videoListInfo;
-      // if (data.num == '1') {
-      //   this.$set(this, `videoListInfo`, this.videoList[1]);
-      // } else if (data.num == '2') {
-      //   this.$set(this, `videoListInfo`, this.videoList[2]);
-      // }
-      // this.videodisplay = 'list';
-    },
     ...mapProduct({ mapProductQuery: 'newquery' }),
     ...market({ marketFetch: 'fetch', operaFetch: 'operaFetch', sendMsg: 'operationCreate' }),
     ...dock({ dockQuery: 'query', dockFetch: 'fetch', goodsquery: 'goodsquery' }),
@@ -643,7 +613,7 @@ export default {
       this.$set(this.statNum, `tyjb`, arr.data.length);
       // 洽谈合作
       let qthe = await this.tquery({ status: 0, dockid: this.id });
-      this.$set(this.statNum, `qthz`, qthe.total);
+      this.$set(this.statNum, `qthz`, arr.data.length);
       // 达成意向
       let dcyx = await this.tquery({ status: 1, dockid: this.id });
       for (const val of dcyx.data) {
@@ -830,6 +800,17 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.videointro {
+  padding: 110px 30px;
+  font-size: 35px;
+  color: #6e042c;
+  text-align: center;
+  font-family: cursive;
+  -webkit-text-stroke: 1px;
+  letter-spacing: 3px;
+  -webkit-text-stroke: 1px #f18d2c;
+  -webkit-text-fill-color: transparent;
+}
 .textOver {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -936,7 +917,7 @@ export default {
   margin: 0 10px 10px 10px;
   border: 2px solid #ccc;
   width: 97%;
-  // background-color: #000;
+  background-color: #000;
 }
 .livemain .livevideo .right {
   height: 460px;
@@ -1525,17 +1506,18 @@ export default {
   top: 0;
   z-index: 999;
   width: 100%;
-  height: 300px;
-  overflow: hidden;
+  overflow: auto;
   .lunboList {
-    height: 30px;
-    line-height: 30px;
-    padding: 0 10px;
+    padding: 10px 20px;
     font-weight: bold;
     color: #ffffff8f;
-    p {
+    p:nth-child(1) {
       font-size: 16px;
     }
+    p:nth-child(2) {
+      font-size: 20px;
+      padding: 10px 0;
+    }
   }
   // .lunboList:first-child {
   //   color: #ff0000;