Limengbo 4 роки тому
батько
коміт
9a2883ee94
5 змінених файлів з 55 додано та 60 видалено
  1. 41 16
      package-lock.json
  2. 5 17
      src/index.html
  3. 1 1
      src/js/main.js
  4. BIN
      src/static/icon.png
  5. 8 26
      src/style/index.less

+ 41 - 16
package-lock.json

@@ -446,7 +446,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz",
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -2046,6 +2047,7 @@
       "resolved": "https://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.7.tgz",
       "integrity": "sha1-LR0kMXr7ir6V1tLAsHtXgTU52Cg=",
       "dev": true,
+      "optional": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -2589,7 +2591,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "depd": {
       "version": "1.1.2",
@@ -3148,7 +3151,8 @@
       "version": "1.3.0",
       "resolved": "https://registry.npm.taobao.org/extsprintf/download/extsprintf-1.3.0.tgz",
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "fast-deep-equal": {
       "version": "2.0.1",
@@ -3409,7 +3413,8 @@
           "version": "2.1.1",
           "resolved": false,
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -3433,13 +3438,15 @@
           "version": "1.0.0",
           "resolved": false,
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": false,
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3456,19 +3463,22 @@
           "version": "1.1.0",
           "resolved": false,
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": false,
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": false,
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3599,7 +3609,8 @@
           "version": "2.0.3",
           "resolved": false,
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3613,6 +3624,7 @@
           "resolved": false,
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3629,6 +3641,7 @@
           "resolved": false,
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3637,13 +3650,15 @@
           "version": "0.0.8",
           "resolved": false,
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3664,6 +3679,7 @@
           "resolved": false,
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3752,7 +3768,8 @@
           "version": "1.0.1",
           "resolved": false,
           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3766,6 +3783,7 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3861,7 +3879,8 @@
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
           "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3903,6 +3922,7 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3924,6 +3944,7 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3972,13 +3993,15 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -4945,7 +4968,8 @@
       "version": "0.1.1",
       "resolved": "https://registry.npm.taobao.org/jsbn/download/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "jsesc": {
       "version": "1.3.0",
@@ -8099,7 +8123,8 @@
       "version": "0.14.5",
       "resolved": "https://registry.npm.taobao.org/tweetnacl/download/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "type-is": {
       "version": "1.6.18",

+ 5 - 17
src/index.html

@@ -11,30 +11,18 @@
 </head>
 <body>
   <div class="container">
-    <div class="header">智能共享白板</div>
+    <div class="header"> <img src="${require('./static/icon.png')}" alt="" style="vertical-align: middle;"> 智能共享白板</div>
+    <div class="title">
+      <p></p>
+    </div>
     <div class="video">
-      <div class="title">
-        <p></p>
-        <!-- <div id="btn">
-            <label>
-                <input type="radio" name="type" id="adviceRadio2" value="desktopUrl" checked hidden/>
-                <label for="adviceRadio2" class="advice"></label>
-                <span class="radio-name">会议视频</span>
-            </label>
-            <label>
-                <input type="radio" name="type" id="adviceRadio1" value="boardUrl" hidden/>
-                <label for="adviceRadio1" class="advice"></label>
-                <span class="radio-name">白板视频</span>
-            </label>
-        </div> -->
-      </div>
       <div class="big-video" id="bigVideo">
       </div>
       <div class="small-video" id="smallVideo">
       </div>
     </div>
     <div class="err" style="display: none">暂无观看权限,请联系管理员</div>
-    <div class="footer">COPYRIGHT (©) 2018 智能共享白板. 京ICP备12019481号-5</div>
+    <div class="footer"></div>
   </div>
 </body>
 </html>

+ 1 - 1
src/js/main.js

@@ -12,7 +12,7 @@ $(document).ready(function() {
   const desktopUrl = JSON.parse(dataList).shareTask.desktopUrl;
   const title = JSON.parse(dataList).shareTask.title;
   const shareJoinUserId =  JSON.parse(dataList).shareJoinUser.id;
-  $('.title p').html(title)
+  $('.title p').html('主会场:' + title)
   console.log(boardUrl)
   console.log(desktopUrl)
   let bigVideo = new FlvJsPlayer({

BIN
src/static/icon.png


+ 8 - 26
src/style/index.less

@@ -10,40 +10,22 @@
     height: 108px;
     background: #fff;
     line-height: 108px;
-    padding-left: 251px;
+    padding-left: 70px;
     font-size: 30px;
   }
+  .title {
+    font-size: 24px;
+    color: #000;
+    position: absolute;
+    right: 10px;
+    top: 38px;
+  }
   .video {
     flex: 1;
     width: 100%;
     background: #000;
     padding:  10px 0;
     box-sizing: border-box;
-    .title {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      width: 100%;
-      font-size: 24px;
-      color: #fff;
-      margin-left: 50px;
-      #btn {
-        font-size: 18px; 
-        .advice{
-          height: 12px;
-          width: 12px;
-          display: inline-block;
-          background-image: url('https://caiyunupload.b0.upaiyun.com/newweb/imgs/icon-unchecked.png');
-          background-repeat: no-repeat;
-          background-position: center;
-          vertical-align: middle;
-          margin-top: -4px;
-        }
-        input[type="radio"]:checked + .advice{
-          background-image: url('https://caiyunupload.b0.upaiyun.com/newweb/imgs/icon-checked.png');
-        }
-      }
-    }
     .big-video,
     .small-video {
       width: 49%;