Merge pull request 'xbx' (#160) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/160

dist/css/chunk-368207de.ca61222b.css

@@ -1 +1 @@
-.video[data-v-aa5991f0]{width:9.76rem;height:5.63rem;border-radius:.18rem;overflow:hidden;display:flex;flex-direction:column}.video>video[data-v-aa5991f0]{width:100%;height:5.05rem}.video .liveinfo[data-v-aa5991f0]{flex-shrink:0;display:flex;justify-content:space-between;height:.58rem;align-items:center;background-color:#fff}.video .liveinfo .left[data-v-aa5991f0]{display:flex;color:#121212;font-size:.13rem;margin-left:.29rem}.video .liveinfo .left .score[data-v-aa5991f0]{color:#d22c2e;font-size:.13rem}.video .liveinfo .left>div[data-v-aa5991f0]{margin-right:.57rem}.video .liveinfo .left .icon[data-v-aa5991f0]{width:.25rem;height:.24rem;margin-right:.06rem}.video .liveinfo .right[data-v-aa5991f0]{width:.74rem;height:.29rem;border:.01rem solid #08ae98;border-radius:.03rem;margin-right:.29rem;color:#08ae98;cursor:pointer;font-size:.13rem;line-height:.29rem;font-weight:700;text-align:center}.cont[data-v-23b21338]{width:3.16rem;height:5.63rem;background-color:#fff;border-radius:.17rem;padding:0 .28rem;position:relative;overflow:auto}.cont .title[data-v-23b21338]{padding:.23rem 0 .11rem 0;font-size:.13rem;color:#111;line-height:1;border-bottom:.01rem solid #eee;display:flex;justify-content:space-between}.cont .title .more[data-v-23b21338]{color:#999;font-size:.11rem;cursor:pointer}.cont .info .item[data-v-23b21338]{display:flex;align-content:center;justify-content:space-between;margin-top:.23rem;font-size:.1rem}.cont .info .item .stuinfo[data-v-23b21338]{margin:auto 0;margin-left:.11rem;color:#111}.cont .info .item .stuinfo .lessonname[data-v-23b21338]{color:#666}.cont .info .item .takehour[data-v-23b21338]{color:#08ae98;font-size:.11rem;margin:auto 0;text-align:center}.cont .info .item>div>img[data-v-23b21338]{width:.57rem;height:.57rem;border-radius:50%}.cont .refuse[data-v-23b21338]{color:#d22c2e;margin:auto 0;width:.57rem;text-align:center}.cont .cancel[data-v-23b21338]{margin:auto 0;width:.57rem;height:.23rem;border:.01rem solid #09ae99;line-height:.23rem;text-align:center;cursor:pointer;color:#09ae99;border-radius:.03rem}.cont .button[data-v-23b21338]{position:absolute;width:2.6rem;bottom:.28rem;display:flex;justify-content:space-between}.cont .button>div[data-v-23b21338]{width:1.14rem;height:.23rem;border-radius:.03rem;font-size:.1rem;color:#fff;line-height:.23rem;text-align:center}.cont .button .modify[data-v-23b21338]{background-color:#08ae98}.cont .button .del[data-v-23b21338]{background-color:#d12c2e}.cont[data-v-23b21338] .modal-dialog{border-radius:.28rem;overflow:hidden;padding:0;width:5.69rem!important}.cont[data-v-23b21338] .modal-dialog .close{width:.14rem;height:.14rem}.cont[data-v-23b21338] .modal-dialog .yuanyin{margin-top:.13rem;font-size:.11rem;color:#111;font-weight:700}.cont[data-v-23b21338] .modal-dialog .body{display:flex;margin-top:.34rem}.cont[data-v-23b21338] .modal-dialog .body .jubao{font-size:.11rem;color:grey;margin-right:.28rem}.cont[data-v-23b21338] .modal-dialog .body .text{width:3.59rem;height:.85rem;font-size:.11rem}.cont[data-v-23b21338] .modal-dialog .submit-btn{width:.63rem;height:.23rem;background:#08ae98;border-radius:.03rem;font-size:.1rem;font-weight:500;color:#fff;text-align:center;line-height:.23rem;cursor:pointer;user-select:none;margin-top:.57rem}.livedetail[data-v-55dff82c]{width:13.2rem;height:5.63rem}.livedetail .info[data-v-55dff82c]{width:13.21rem;display:flex;justify-content:center}.livedetail .info .liveplay[data-v-55dff82c]{background:#fff;border-radius:.18rem;margin-right:.29rem}.livedetail .review[data-v-55dff82c]{margin-top:.28rem}
+.video[data-v-c218b51c]{width:9.76rem;height:5.63rem;border-radius:.18rem;overflow:hidden;display:flex;flex-direction:column}.video>video[data-v-c218b51c]{width:100%;height:5.05rem}.video .liveinfo[data-v-c218b51c]{flex-shrink:0;display:flex;justify-content:space-between;height:.58rem;align-items:center;background-color:#fff}.video .liveinfo .left[data-v-c218b51c]{display:flex;color:#121212;font-size:.13rem;margin-left:.29rem}.video .liveinfo .left .score[data-v-c218b51c]{color:#d22c2e;font-size:.13rem}.video .liveinfo .left>div[data-v-c218b51c]{margin-right:.57rem}.video .liveinfo .left .icon[data-v-c218b51c]{width:.25rem;height:.24rem;margin-right:.06rem}.video .liveinfo .right[data-v-c218b51c]{width:.74rem;height:.29rem;border:.01rem solid #08ae98;border-radius:.03rem;margin-right:.29rem;color:#08ae98;cursor:pointer;font-size:.13rem;line-height:.29rem;font-weight:700;text-align:center}.cont[data-v-23b21338]{width:3.16rem;height:5.63rem;background-color:#fff;border-radius:.17rem;padding:0 .28rem;position:relative;overflow:auto}.cont .title[data-v-23b21338]{padding:.23rem 0 .11rem 0;font-size:.13rem;color:#111;line-height:1;border-bottom:.01rem solid #eee;display:flex;justify-content:space-between}.cont .title .more[data-v-23b21338]{color:#999;font-size:.11rem;cursor:pointer}.cont .info .item[data-v-23b21338]{display:flex;align-content:center;justify-content:space-between;margin-top:.23rem;font-size:.1rem}.cont .info .item .stuinfo[data-v-23b21338]{margin:auto 0;margin-left:.11rem;color:#111}.cont .info .item .stuinfo .lessonname[data-v-23b21338]{color:#666}.cont .info .item .takehour[data-v-23b21338]{color:#08ae98;font-size:.11rem;margin:auto 0;text-align:center}.cont .info .item>div>img[data-v-23b21338]{width:.57rem;height:.57rem;border-radius:50%}.cont .refuse[data-v-23b21338]{color:#d22c2e;margin:auto 0;width:.57rem;text-align:center}.cont .cancel[data-v-23b21338]{margin:auto 0;width:.57rem;height:.23rem;border:.01rem solid #09ae99;line-height:.23rem;text-align:center;cursor:pointer;color:#09ae99;border-radius:.03rem}.cont .button[data-v-23b21338]{position:absolute;width:2.6rem;bottom:.28rem;display:flex;justify-content:space-between}.cont .button>div[data-v-23b21338]{width:1.14rem;height:.23rem;border-radius:.03rem;font-size:.1rem;color:#fff;line-height:.23rem;text-align:center}.cont .button .modify[data-v-23b21338]{background-color:#08ae98}.cont .button .del[data-v-23b21338]{background-color:#d12c2e}.cont[data-v-23b21338] .modal-dialog{border-radius:.28rem;overflow:hidden;padding:0;width:5.69rem!important}.cont[data-v-23b21338] .modal-dialog .close{width:.14rem;height:.14rem}.cont[data-v-23b21338] .modal-dialog .yuanyin{margin-top:.13rem;font-size:.11rem;color:#111;font-weight:700}.cont[data-v-23b21338] .modal-dialog .body{display:flex;margin-top:.34rem}.cont[data-v-23b21338] .modal-dialog .body .jubao{font-size:.11rem;color:grey;margin-right:.28rem}.cont[data-v-23b21338] .modal-dialog .body .text{width:3.59rem;height:.85rem;font-size:.11rem}.cont[data-v-23b21338] .modal-dialog .submit-btn{width:.63rem;height:.23rem;background:#08ae98;border-radius:.03rem;font-size:.1rem;font-weight:500;color:#fff;text-align:center;line-height:.23rem;cursor:pointer;user-select:none;margin-top:.57rem}.livedetail[data-v-55dff82c]{width:13.2rem;height:5.63rem}.livedetail .info[data-v-55dff82c]{width:13.21rem;display:flex;justify-content:center}.livedetail .info .liveplay[data-v-55dff82c]{background:#fff;border-radius:.18rem;margin-right:.29rem}.livedetail .review[data-v-55dff82c]{margin-top:.28rem}

dist/css/chunk-74d6e86d.85aed290.css

@@ -0,0 +1 @@
+.menu[data-v-528d10ce]{user-select:none;width:1.71rem;height:100%;display:flex;flex-direction:column;background:linear-gradient(0deg,#0edcc2,#50df98,#7ee278,#a2e562)}.menu .user[data-v-528d10ce]{width:100%;height:1.5rem;display:flex;flex-shrink:0;flex-direction:column;align-items:center;justify-content:center}.menu .user .head[data-v-528d10ce]{width:.57rem;height:.57rem;margin-bottom:.15rem;border-radius:50%}.menu .user .name[data-v-528d10ce]{font-size:15rpx;line-height:1;color:#fff}.menu .list[data-v-528d10ce]{position:relative;height:100%;padding-left:.06rem;display:flex;flex-direction:column}.menu .list .item[data-v-528d10ce]{display:flex;align-items:center;height:.5rem;padding:0 .18rem;justify-content:space-between;cursor:pointer}.menu .list .item:hover .route .title[data-v-528d10ce]{font-weight:700}.menu .list .item .route[data-v-528d10ce]{display:flex}.menu .list .item .route .icon[data-v-528d10ce]{width:.15rem;height:.15rem}.menu .list .item .route .title[data-v-528d10ce]{font-size:.13rem;color:#fff;line-height:1;margin-left:.06rem}.menu .list .item .right[data-v-528d10ce]{width:.05rem;height:.1rem}.menu .list .loginout[data-v-528d10ce]{position:absolute;bottom:.1rem}.menu .seltop[data-v-528d10ce]{border-radius:0 0 .25rem 0;box-shadow:0 0 0 .3rem #f5f5f5}.menu .selbottom[data-v-528d10ce]{border-radius:0 .25rem 0 0;box-shadow:0 0 0 .3rem #f5f5f5}.menu .selitem[data-v-528d10ce]{border-radius:.25rem 0 0 .25rem;background-color:#f5f5f5}.menu .selitem .title[data-v-528d10ce]{color:#08ae98!important;font-weight:700}.mine[data-v-76c27e41]{display:flex;flex-direction:column}.mine .body[data-v-76c27e41]{display:flex;width:100%;height:calc(100% - .57rem)}.mine .body .container[data-v-76c27e41]{width:calc(100% - 1.71rem);height:100%;overflow:auto;background-color:#f5f5f5;padding:.23rem}

dist/css/chunk-94cd6d3c.70c0ad11.css

@@ -1 +0,0 @@
-.menu[data-v-4fe19c0c]{user-select:none;width:1.71rem;height:100%;display:flex;flex-direction:column;background:linear-gradient(0deg,#0edcc2,#50df98,#7ee278,#a2e562)}.menu .user[data-v-4fe19c0c]{width:100%;height:1.5rem;display:flex;flex-shrink:0;flex-direction:column;align-items:center;justify-content:center}.menu .user .head[data-v-4fe19c0c]{width:.57rem;height:.57rem;margin-bottom:.15rem;border-radius:50%}.menu .user .name[data-v-4fe19c0c]{font-size:15rpx;line-height:1;color:#fff}.menu .list[data-v-4fe19c0c]{position:relative;height:100%;padding-left:.06rem;display:flex;flex-direction:column}.menu .list .item[data-v-4fe19c0c]{display:flex;align-items:center;height:.5rem;padding:0 .18rem;justify-content:space-between;cursor:pointer}.menu .list .item:hover .route .title[data-v-4fe19c0c]{font-weight:700}.menu .list .item .route[data-v-4fe19c0c]{display:flex}.menu .list .item .route .icon[data-v-4fe19c0c]{width:.15rem;height:.15rem}.menu .list .item .route .title[data-v-4fe19c0c]{font-size:.13rem;color:#fff;line-height:1;margin-left:.06rem}.menu .list .item .right[data-v-4fe19c0c]{width:.05rem;height:.1rem}.menu .list .loginout[data-v-4fe19c0c]{position:absolute;bottom:.1rem}.menu .seltop[data-v-4fe19c0c]{border-radius:0 0 .25rem 0;box-shadow:0 0 0 .3rem #f5f5f5}.menu .selbottom[data-v-4fe19c0c]{border-radius:0 .25rem 0 0;box-shadow:0 0 0 .3rem #f5f5f5}.menu .selitem[data-v-4fe19c0c]{border-radius:.25rem 0 0 .25rem;background-color:#f5f5f5}.menu .selitem .title[data-v-4fe19c0c]{color:#08ae98!important;font-weight:700}.mine[data-v-76c27e41]{display:flex;flex-direction:column}.mine .body[data-v-76c27e41]{display:flex;width:100%;height:calc(100% - .57rem)}.mine .body .container[data-v-76c27e41]{width:calc(100% - 1.71rem);height:100%;overflow:auto;background-color:#f5f5f5;padding:.23rem}

dist/index.html

@@ -61,11 +61,11 @@
             left: 0;
             z-index: 1001;
             display: none;
-        }</style><link href="/css/chunk-04e3a2fa.08ef3a2d.css" rel="prefetch"><link href="/css/chunk-05d3c41a.55076a31.css" rel="prefetch"><link href="/css/chunk-06828374.8e285ce3.css" rel="prefetch"><link href="/css/chunk-07015098.03da786d.css" rel="prefetch"><link href="/css/chunk-073b023e.63bb5798.css" rel="prefetch"><link href="/css/chunk-10d1cf7a.0e433876.css" rel="prefetch"><link href="/css/chunk-21d6a1b9.85832ac1.css" rel="prefetch"><link href="/css/chunk-27236dd2.3992b5d2.css" rel="prefetch"><link href="/css/chunk-2a197f09.b2772b24.css" rel="prefetch"><link href="/css/chunk-34d93bb8.4cba2bdb.css" rel="prefetch"><link href="/css/chunk-371ee143.78141e1e.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-46e3b07d.9259aefd.css" rel="prefetch"><link href="/css/chunk-4cbe0c82.f0a6b24e.css" rel="prefetch"><link href="/css/chunk-4e0b884c.48d44d85.css" rel="prefetch"><link href="/css/chunk-520d8a08.dd761c06.css" rel="prefetch"><link href="/css/chunk-623eb100.c75b32b7.css" rel="prefetch"><link href="/css/chunk-650d0cb1.47d38586.css" rel="prefetch"><link href="/css/chunk-68091c98.14c0db2d.css" rel="prefetch"><link href="/css/chunk-737c53fe.6caedc04.css" rel="prefetch"><link href="/css/chunk-74d7e8d4.4686069f.css" rel="prefetch"><link href="/css/chunk-8db7da34.e8fb3ad7.css" rel="prefetch"><link href="/css/chunk-94cd6d3c.70c0ad11.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-cc7ac8b2.cf93d877.css" rel="prefetch"><link href="/css/chunk-d0ed1ba4.21800f56.css" rel="prefetch"><link href="/css/chunk-da7e1532.17a6e0e0.css" rel="prefetch"><link href="/css/chunk-ef207110.a20941ed.css" rel="prefetch"><link href="/js/chunk-04e3a2fa.9e6a7256.js" rel="prefetch"><link href="/js/chunk-05d3c41a.91415477.js" rel="prefetch"><link href="/js/chunk-06828374.d411ceff.js" rel="prefetch"><link href="/js/chunk-07015098.22f8b33a.js" rel="prefetch"><link href="/js/chunk-073b023e.481ac075.js" rel="prefetch"><link href="/js/chunk-10d1cf7a.05afa329.js" rel="prefetch"><link href="/js/chunk-21d6a1b9.ecc97c3b.js" rel="prefetch"><link href="/js/chunk-27236dd2.6a20330a.js" rel="prefetch"><link href="/js/chunk-2a197f09.31e80702.js" rel="prefetch"><link href="/js/chunk-34d93bb8.99541265.js" rel="prefetch"><link href="/js/chunk-371ee143.db48ebbc.js" rel="prefetch"><link href="/js/chunk-3c7641ed.47b122a8.js" rel="prefetch"><link href="/js/chunk-46e3b07d.d6873afe.js" rel="prefetch"><link href="/js/chunk-4cbe0c82.4f446d66.js" rel="prefetch"><link href="/js/chunk-4e0b884c.9c3a81c9.js" rel="prefetch"><link href="/js/chunk-520d8a08.2b87a45a.js" rel="prefetch"><link href="/js/chunk-623eb100.0d77f748.js" rel="prefetch"><link href="/js/chunk-650d0cb1.7cc3b70b.js" rel="prefetch"><link href="/js/chunk-68091c98.6bc9c5f0.js" rel="prefetch"><link href="/js/chunk-737c53fe.f61ff849.js" rel="prefetch"><link href="/js/chunk-74d7e8d4.02cdd824.js" rel="prefetch"><link href="/js/chunk-8db7da34.67ad115b.js" rel="prefetch"><link href="/js/chunk-94cd6d3c.97ee0e5b.js" rel="prefetch"><link href="/js/chunk-977f0f52.4ec7ef7e.js" rel="prefetch"><link href="/js/chunk-cc7ac8b2.279475fe.js" rel="prefetch"><link href="/js/chunk-d0ed1ba4.02a0fef7.js" rel="prefetch"><link href="/js/chunk-da7e1532.4b71bb2c.js" rel="prefetch"><link href="/js/chunk-ef207110.3414d58c.js" rel="prefetch"><link href="/css/app.54811137.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.bc88fdd8.js" rel="preload" as="script"><link href="/js/chunk-vendors.5e652f88.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.54811137.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but beelink doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><div id="make"></div><script>window.fbAsyncInit = function () {
+        }</style><link href="/css/chunk-04e3a2fa.08ef3a2d.css" rel="prefetch"><link href="/css/chunk-05d3c41a.55076a31.css" rel="prefetch"><link href="/css/chunk-06828374.8e285ce3.css" rel="prefetch"><link href="/css/chunk-07015098.03da786d.css" rel="prefetch"><link href="/css/chunk-10d1cf7a.0e433876.css" rel="prefetch"><link href="/css/chunk-21d6a1b9.85832ac1.css" rel="prefetch"><link href="/css/chunk-27236dd2.3992b5d2.css" rel="prefetch"><link href="/css/chunk-2a197f09.b2772b24.css" rel="prefetch"><link href="/css/chunk-34d93bb8.4cba2bdb.css" rel="prefetch"><link href="/css/chunk-368207de.ca61222b.css" rel="prefetch"><link href="/css/chunk-371ee143.78141e1e.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-46e3b07d.9259aefd.css" rel="prefetch"><link href="/css/chunk-4cbe0c82.f0a6b24e.css" rel="prefetch"><link href="/css/chunk-4e0b884c.48d44d85.css" rel="prefetch"><link href="/css/chunk-520d8a08.dd761c06.css" rel="prefetch"><link href="/css/chunk-5adc613a.6a9bbbf9.css" rel="prefetch"><link href="/css/chunk-623eb100.c75b32b7.css" rel="prefetch"><link href="/css/chunk-650d0cb1.47d38586.css" rel="prefetch"><link href="/css/chunk-68091c98.14c0db2d.css" rel="prefetch"><link href="/css/chunk-737c53fe.6caedc04.css" rel="prefetch"><link href="/css/chunk-74d6e86d.85aed290.css" rel="prefetch"><link href="/css/chunk-74d7e8d4.4686069f.css" rel="prefetch"><link href="/css/chunk-8db7da34.e8fb3ad7.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-cc7ac8b2.cf93d877.css" rel="prefetch"><link href="/css/chunk-da7e1532.17a6e0e0.css" rel="prefetch"><link href="/css/chunk-ef207110.a20941ed.css" rel="prefetch"><link href="/js/chunk-04e3a2fa.9e6a7256.js" rel="prefetch"><link href="/js/chunk-05d3c41a.91415477.js" rel="prefetch"><link href="/js/chunk-06828374.d411ceff.js" rel="prefetch"><link href="/js/chunk-07015098.22f8b33a.js" rel="prefetch"><link href="/js/chunk-10d1cf7a.05afa329.js" rel="prefetch"><link href="/js/chunk-21d6a1b9.ecc97c3b.js" rel="prefetch"><link href="/js/chunk-27236dd2.6a20330a.js" rel="prefetch"><link href="/js/chunk-2a197f09.31e80702.js" rel="prefetch"><link href="/js/chunk-34d93bb8.99541265.js" rel="prefetch"><link href="/js/chunk-368207de.5ef5e087.js" rel="prefetch"><link href="/js/chunk-371ee143.db48ebbc.js" rel="prefetch"><link href="/js/chunk-3c7641ed.47b122a8.js" rel="prefetch"><link href="/js/chunk-46e3b07d.d6873afe.js" rel="prefetch"><link href="/js/chunk-4cbe0c82.4f446d66.js" rel="prefetch"><link href="/js/chunk-4e0b884c.9c3a81c9.js" rel="prefetch"><link href="/js/chunk-520d8a08.2b87a45a.js" rel="prefetch"><link href="/js/chunk-5adc613a.5c5347c1.js" rel="prefetch"><link href="/js/chunk-623eb100.0d77f748.js" rel="prefetch"><link href="/js/chunk-650d0cb1.7cc3b70b.js" rel="prefetch"><link href="/js/chunk-68091c98.6bc9c5f0.js" rel="prefetch"><link href="/js/chunk-737c53fe.f61ff849.js" rel="prefetch"><link href="/js/chunk-74d6e86d.2c5f5b23.js" rel="prefetch"><link href="/js/chunk-74d7e8d4.02cdd824.js" rel="prefetch"><link href="/js/chunk-8db7da34.67ad115b.js" rel="prefetch"><link href="/js/chunk-977f0f52.4ec7ef7e.js" rel="prefetch"><link href="/js/chunk-cc7ac8b2.279475fe.js" rel="prefetch"><link href="/js/chunk-da7e1532.4b71bb2c.js" rel="prefetch"><link href="/js/chunk-ef207110.3414d58c.js" rel="prefetch"><link href="/css/app.54811137.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.a32f8af7.js" rel="preload" as="script"><link href="/js/chunk-vendors.5e652f88.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.54811137.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but beelink doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><div id="make"></div><script>window.fbAsyncInit = function () {
             FB.init({
                 appId: '277826133389999',
                 autoLogAppEvents: true,
                 xfbml: true,
                 version: 'v8.0'
             });
-        };</script><script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script><script src="/js/cropper.min.js"></script><script src="/js/chunk-vendors.5e652f88.js"></script><script src="/js/app.bc88fdd8.js"></script></body></html>
+        };</script><script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script><script src="/js/cropper.min.js"></script><script src="/js/chunk-vendors.5e652f88.js"></script><script src="/js/app.a32f8af7.js"></script></body></html>

dist/js/common.js

@@ -275,6 +275,19 @@ function addMemberView(id) {
   memberElm.attr('id', id);
   memberElm.find('div.member-id').html(id);
   memberElm.css('display', 'flex');
+  memberElm.find("#video-btn").click((el)=>{
+    console.log(el)
+    console.log($(el.target).attr("src"))
+    console.log("video" + id);
+  })
+  memberElm.find("#mic-btn").click((el)=>{
+    console.log($(el.target).attr("src"))
+    console.log("mic" + id);
+  })
+  memberElm.find("#video-btn").removeAttr("id")
+  memberElm.find("#mic-btn").removeAttr("id")
+  
+ console.log("移除")
   memberElm.appendTo($('#member-list'));
 }
 

dist/js/iminit.js

@@ -3,16 +3,39 @@ let options = {
 };
 let tim = TIM.create(options);
 tim.setLogLevel(0);
-// 监听事件，例如：
+function formatDateTime (inputTime) {
-tim.on(TIM.EVENT.SDK_READY, function(event) {
+  var date = new Date(inputTime);
-    // 收到离线消息和会话列表同步完毕通知，接入侧可以调用 sendMessage 等需要鉴权的接口
+  var y = date.getFullYear();
-    // event.name - TIM.EVENT.SDK_READY
+  var m = date.getMonth() + 1;
-  });
+  m = m < 10 ? ('0' + m) : m;
+  var d = date.getDate();
+  d = d < 10 ? ('0' + d) : d;
+  var h = date.getHours();
+  h = h < 10 ? ('0' + h) : h;
+  var minute = date.getMinutes();
+  var second = date.getSeconds();
+  minute = minute < 10 ? ('0' + minute) : minute;
+  second = second < 10 ? ('0' + second) : second;
+  return  h + ':' + minute + ':' + second;
+}
   
   tim.on(TIM.EVENT.MESSAGE_RECEIVED, function(event) {
     // 收到推送的单聊、群聊、群提示、群系统通知的新消息，可通过遍历 event.data 获取消息列表数据并渲染到页面
     // event.name - TIM.EVENT.MESSAGE_RECEIVED
     // event.data - 存储 Message 对象的数组 - [Message]
+    console.log(event.data)
+    for(let i in event.data){
+      if(!event.data[i].payload.text){
+        break;
+      }
+      const list = $("#liaotianliebiao")
+      const html = ` <div>
+      <p>${formatDateTime(event.data[i].time)}</p>
+          <p><span>${event.data[i].nick}:</span>${event.data[i].payload.text}</p>
+      </div>`
+      
+      list.append(html)
+    }
   });
   
   tim.on(TIM.EVENT.MESSAGE_REVOKED, function(event) {
@@ -81,8 +104,104 @@ tim.on(TIM.EVENT.SDK_READY, function(event) {
     //    \- TIM.TYPES.NET_STATE_DISCONNECTED - 未接入网络。接入侧可根据此状态提示“当前网络不可用”。SDK 仍会继续重试，若用户网络恢复，SDK 会自动同步消息  
   });
   genTestUserSig(window.mid).then((res)=>{
-    tim.login({userID: window.mid, userSig: res.data}); 
+    tim.login({userID: window.mid, userSig: res.data}).then(function(imResponse) {
+      console.log(imResponse.data); // 登录成功
+      if (imResponse.data.repeatLogin === true) {
+        // 标识账号已登录，本次登录操作为重复登录。v2.5.1 起支持
+        console.log(imResponse.data.errorInfo);
+      }
+    }).catch(function(imError) {
+      console.warn('login error:', imError); // 登录失败的相关信息
+    });
 
   })
+  tim.on(TIM.EVENT.SDK_READY, function (){
+    tim.updateMyProfile({
+      nick: '我的昵称'
+    });
+    const promise = tim.createGroup({
+        type: TIM.TYPES.GRP_AVCHATROOM,
+        name: 'live',
+        groupID: window.roomid
+    });
+
+    promise.then(function(imResponse) { // 创建成功
+        console.log(imResponse.data.group); // 创建的群的资料
+        tim.joinGroup({
+            groupID:  window.roomid,
+            type: TIM.TYPES.GRP_AVCHATROOM
+        }).then((res)=>{
+            switch (res.data.status) {
+                case TIM.TYPES.JOIN_STATUS_WAIT_APPROVAL: // 等待管理员同意
+                break;
+                case TIM.TYPES.JOIN_STATUS_SUCCESS: // 加群成功
+                console.log(res.data.group); // 加入的群组资料
+                break;
+                case TIM.TYPES.JOIN_STATUS_ALREADY_IN_GROUP: // 已经在群中
+                break;
+                default:
+                break;
+            }
+        }).catch((err)=>{
+            console.log(err)
+        })
+    }).catch(function(imError) {
+        console.warn('createGroup error:', imError); // 创建群组失败的相关信息
+        tim.joinGroup({
+            groupID:  window.roomid,
+            type: TIM.TYPES.GRP_AVCHATROOM
+        }).then((res)=>{
+            switch (res.data.status) {
+                case TIM.TYPES.JOIN_STATUS_WAIT_APPROVAL: // 等待管理员同意
+                break;
+                case TIM.TYPES.JOIN_STATUS_SUCCESS: // 加群成功
+                console.log(res.data.group); // 加入的群组资料
+                break;
+                case TIM.TYPES.JOIN_STATUS_ALREADY_IN_GROUP: // 已经在群中
+                break;
+                default:
+                break;
+            }
+        }).catch((err)=>{
+            console.log(err)
+        })
+    });
+    function sendtext(text){
+      const m = tim.createTextMessage({
+          to: window.roomid,
+          conversationType: TIM.TYPES.CONV_GROUP,
+          payload: {
+              text: text
+          }
+      })
+      const promise = tim.sendMessage(m);
+      promise.then(function(imResponse) {
+          // 发送成功
+          console.log(imResponse);
+           
+            const list = $("#liaotianliebiao")
+            const html = ` <div>
+            <p>${formatDateTime(imResponse.data.message.time)}</p>
+                <p><span>${imResponse.data.message.nick}:</span>${imResponse.data.message.payload.text}</p>
+            </div>`
+            console.log(html)
+            list.append(html)
+      }).catch(function(imError) {
+          // 发送失败
+          console.warn('sendMessage error:', imError);
+      });
+    }
+    $(()=>{
+      $("#fasongxiaoxi").click(()=>{
+        const text = $("#shurukuang").val()
+        console.log(text)
+        sendtext(text)
+        $("#shurukuang").val("")
+      })
+    })
+    
+
+  
+});
 
   // 开始登录 

dist/zhibo.html

@@ -376,47 +376,13 @@
                         </div>
                     </div>
                     <div class="liaotian">
-                        <div class="wenzi">
+                        <div class="wenzi" id="liaotianliebiao">
-                            <div>
+                           
-                                <p>00:00:00</p>
+                            
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
                         </div>
                         <div class="fasongkuang">
-                            <input type="text" placeholder="直播说点什么吧" >
+                            <input type="text" id="shurukuang" placeholder="直播说点什么吧" >
-                            <div class="fasonganniu">
+                            <div class="fasonganniu" id="fasongxiaoxi">
                                 发送
                                 <img src="./img/fasong.png" alt="">
                             </div>

public/js/common.js

@@ -275,6 +275,19 @@ function addMemberView(id) {
   memberElm.attr('id', id);
   memberElm.find('div.member-id').html(id);
   memberElm.css('display', 'flex');
+  memberElm.find("#video-btn").click((el)=>{
+    console.log(el)
+    console.log($(el.target).attr("src"))
+    console.log("video" + id);
+  })
+  memberElm.find("#mic-btn").click((el)=>{
+    console.log($(el.target).attr("src"))
+    console.log("mic" + id);
+  })
+  memberElm.find("#video-btn").removeAttr("id")
+  memberElm.find("#mic-btn").removeAttr("id")
+  
+ console.log("移除")
   memberElm.appendTo($('#member-list'));
 }
 

public/js/iminit.js

@@ -3,16 +3,39 @@ let options = {
 };
 let tim = TIM.create(options);
 tim.setLogLevel(0);
-// 监听事件，例如：
+function formatDateTime (inputTime) {
-tim.on(TIM.EVENT.SDK_READY, function(event) {
+  var date = new Date(inputTime);
-    // 收到离线消息和会话列表同步完毕通知，接入侧可以调用 sendMessage 等需要鉴权的接口
+  var y = date.getFullYear();
-    // event.name - TIM.EVENT.SDK_READY
+  var m = date.getMonth() + 1;
-  });
+  m = m < 10 ? ('0' + m) : m;
+  var d = date.getDate();
+  d = d < 10 ? ('0' + d) : d;
+  var h = date.getHours();
+  h = h < 10 ? ('0' + h) : h;
+  var minute = date.getMinutes();
+  var second = date.getSeconds();
+  minute = minute < 10 ? ('0' + minute) : minute;
+  second = second < 10 ? ('0' + second) : second;
+  return  h + ':' + minute + ':' + second;
+}
   
   tim.on(TIM.EVENT.MESSAGE_RECEIVED, function(event) {
     // 收到推送的单聊、群聊、群提示、群系统通知的新消息，可通过遍历 event.data 获取消息列表数据并渲染到页面
     // event.name - TIM.EVENT.MESSAGE_RECEIVED
     // event.data - 存储 Message 对象的数组 - [Message]
+    console.log(event.data)
+    for(let i in event.data){
+      if(!event.data[i].payload.text){
+        break;
+      }
+      const list = $("#liaotianliebiao")
+      const html = ` <div>
+      <p>${formatDateTime(event.data[i].time)}</p>
+          <p><span>${event.data[i].nick}:</span>${event.data[i].payload.text}</p>
+      </div>`
+      
+      list.append(html)
+    }
   });
   
   tim.on(TIM.EVENT.MESSAGE_REVOKED, function(event) {
@@ -81,8 +104,104 @@ tim.on(TIM.EVENT.SDK_READY, function(event) {
     //    \- TIM.TYPES.NET_STATE_DISCONNECTED - 未接入网络。接入侧可根据此状态提示“当前网络不可用”。SDK 仍会继续重试，若用户网络恢复，SDK 会自动同步消息  
   });
   genTestUserSig(window.mid).then((res)=>{
-    tim.login({userID: window.mid, userSig: res.data}); 
+    tim.login({userID: window.mid, userSig: res.data}).then(function(imResponse) {
+      console.log(imResponse.data); // 登录成功
+      if (imResponse.data.repeatLogin === true) {
+        // 标识账号已登录，本次登录操作为重复登录。v2.5.1 起支持
+        console.log(imResponse.data.errorInfo);
+      }
+    }).catch(function(imError) {
+      console.warn('login error:', imError); // 登录失败的相关信息
+    });
 
   })
+  tim.on(TIM.EVENT.SDK_READY, function (){
+    tim.updateMyProfile({
+      nick: '我的昵称'
+    });
+    const promise = tim.createGroup({
+        type: TIM.TYPES.GRP_AVCHATROOM,
+        name: 'live',
+        groupID: window.roomid
+    });
+
+    promise.then(function(imResponse) { // 创建成功
+        console.log(imResponse.data.group); // 创建的群的资料
+        tim.joinGroup({
+            groupID:  window.roomid,
+            type: TIM.TYPES.GRP_AVCHATROOM
+        }).then((res)=>{
+            switch (res.data.status) {
+                case TIM.TYPES.JOIN_STATUS_WAIT_APPROVAL: // 等待管理员同意
+                break;
+                case TIM.TYPES.JOIN_STATUS_SUCCESS: // 加群成功
+                console.log(res.data.group); // 加入的群组资料
+                break;
+                case TIM.TYPES.JOIN_STATUS_ALREADY_IN_GROUP: // 已经在群中
+                break;
+                default:
+                break;
+            }
+        }).catch((err)=>{
+            console.log(err)
+        })
+    }).catch(function(imError) {
+        console.warn('createGroup error:', imError); // 创建群组失败的相关信息
+        tim.joinGroup({
+            groupID:  window.roomid,
+            type: TIM.TYPES.GRP_AVCHATROOM
+        }).then((res)=>{
+            switch (res.data.status) {
+                case TIM.TYPES.JOIN_STATUS_WAIT_APPROVAL: // 等待管理员同意
+                break;
+                case TIM.TYPES.JOIN_STATUS_SUCCESS: // 加群成功
+                console.log(res.data.group); // 加入的群组资料
+                break;
+                case TIM.TYPES.JOIN_STATUS_ALREADY_IN_GROUP: // 已经在群中
+                break;
+                default:
+                break;
+            }
+        }).catch((err)=>{
+            console.log(err)
+        })
+    });
+    function sendtext(text){
+      const m = tim.createTextMessage({
+          to: window.roomid,
+          conversationType: TIM.TYPES.CONV_GROUP,
+          payload: {
+              text: text
+          }
+      })
+      const promise = tim.sendMessage(m);
+      promise.then(function(imResponse) {
+          // 发送成功
+          console.log(imResponse);
+           
+            const list = $("#liaotianliebiao")
+            const html = ` <div>
+            <p>${formatDateTime(imResponse.data.message.time)}</p>
+                <p><span>${imResponse.data.message.nick}:</span>${imResponse.data.message.payload.text}</p>
+            </div>`
+            console.log(html)
+            list.append(html)
+      }).catch(function(imError) {
+          // 发送失败
+          console.warn('sendMessage error:', imError);
+      });
+    }
+    $(()=>{
+      $("#fasongxiaoxi").click(()=>{
+        const text = $("#shurukuang").val()
+        console.log(text)
+        sendtext(text)
+        $("#shurukuang").val("")
+      })
+    })
+    
+
+  
+});
 
   // 开始登录 

public/zhibo.html

@@ -376,47 +376,13 @@
                         </div>
                     </div>
                     <div class="liaotian">
-                        <div class="wenzi">
+                        <div class="wenzi" id="liaotianliebiao">
-                            <div>
+                           
-                                <p>00:00:00</p>
+                            
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
-                            <div>
-                                <p>00:00:00</p>
-                                <p><span>andy:</span>asdhjfhujaksdhfjkasdjhhjasjhfhjkas</p>
-                            </div>
                         </div>
                         <div class="fasongkuang">
-                            <input type="text" placeholder="直播说点什么吧" >
+                            <input type="text" id="shurukuang" placeholder="直播说点什么吧" >
-                            <div class="fasonganniu">
+                            <div class="fasonganniu" id="fasongxiaoxi">
                                 发送
                                 <img src="./img/fasong.png" alt="">
                             </div>

src/components/LivePlay.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="video">
-    <video :id=" 'a' + time" style="width:100%;height:100%"></video>
+    <video v-if="isvideo" :id=" 'a' + time" style="width:100%;height:100%"></video>
+    <img v-else :src="info.img" style="width:100%;height:100%" alt="">
     <div class="liveinfo">
           <div class="left">
               <div>
@@ -90,7 +91,7 @@
 import { livestart } from '@/api';
 import router from '@/router';
 import { useI18n } from '@/utils/i18n';
-import { defineComponent, onUpdated, ref } from "vue";
+import { defineComponent, onUpdated, ref, watch } from "vue";
 import { onBeforeRouteLeave } from 'vue-router';
 
 export default defineComponent({
@@ -116,19 +117,28 @@ export default defineComponent({
     }
     const time = ref(new Date().getTime())
     let play: any;
-    onUpdated(()=>{
+    const isvideo = ref(true);
-        // console.log(props.url)
+    
-        if(props.info){
+    watch(()=> props.info,()=>{
-          play = window.TCPlayer('a' + time.value, { 
+      if(props.info){
-              fileID: (props.info.livestatus == 0 ? props.info.fileid : props.info.vodid),
+        console.log(props.info)
-              appID: '1303872925' 
+
-          });
+          if(props.info.fileid != '0' || props.info.vodid != ''){
+            play = window.TCPlayer('a' + time.value, { 
+                fileID: (props.info.livestatus == 0 ? props.info.fileid : props.info.vodid),
+                appID: '1303872925' 
+            });
+          }else{
+            isvideo.value = false;
+          }
+          
         }
-       
     })
     onBeforeRouteLeave((to, from, next) => {
       console.log(121)
-      play.dispose()
+      if(play){
+        play.dispose()
+      }
         next()
     })
     // const liveinfo = ref(props.liveinfo)
@@ -136,7 +146,8 @@ export default defineComponent({
       bianji,
       kaishi,
       lan,
-      time
+      time,
+      isvideo
     }
   }
 });

src/components/Menu.vue

@@ -165,7 +165,7 @@ export default defineComponent({
             {  
                 icon: require("../static/images/shipin.png"),
                 sleicon: require("../static/images/zhibo1.png"),
-                name: 'shangchuanshipin',
+                name: 'shangchuanshipint',
                 route: "/mine/video"
             },
             {  

src/i18n/en.ts

@@ -118,6 +118,7 @@ export default {
     baocun: "Save information",
     gerenjieshao: "Please enter your profile",
     shangchuanshipin: "Submit",
+    shangchuanshipint: "Video",
     shipinbiaoti: "Title",
     shurushipinbiaoti: "Please enter your video title",
     shipinfengmian: "Cover",

src/i18n/zh.ts

@@ -121,6 +121,7 @@ export default {
     baocun:"保存信息",
     gerenjieshao:"请输入个人介绍",
     shangchuanshipin:"上传视频",
+    shangchuanshipint:"上传视频",
     shipinbiaoti:"视频标题",
     shurushipinbiaoti:"请输入您的视频标题",
     shipinfengmian:"视频封面",

src/views/mine/ReleaseWebcast.vue

@@ -57,7 +57,6 @@
             <a-form-item
                 :label="lan.$t('shipinjieshao')"
                 class="video-introduction"
-                 :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}"
             >
                 <a-upload
                     list-type="picture"
@@ -390,6 +389,10 @@ export default defineComponent({
             e.preventDefault();
             validate()
                 .then(() => {
+                    // else if (subdata.fileurl == "") {
+                    //     message.error(lan.$t('shipinjieshaoweikong'));
+                    //     return;
+                    // }
                         console.log(seting.value)
 
                     console.log(toRaw(form), 111);
@@ -400,10 +403,7 @@ export default defineComponent({
                     } else if (subdata.img == "") {
                         message.error(lan.$t('zhibofengmianweikong'));
                         return;
-                    } else if (subdata.fileurl == "") {
+                    }  else if (subdata.dateline == "") {
-                        message.error(lan.$t('shipinjieshaoweikong'));
-                        return;
-                    } else if (subdata.dateline == "") {
                         message.error(lan.$t('kaishishijianweikong'));
                         return;
                     } else if (subdata.livetime == "") {