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

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/238
This commit is contained in:
luyuan 2020-12-07 14:11:35 +08:00
commit 87fe739f60
10 changed files with 14 additions and 14 deletions

4
dist/index.html vendored
View File

@ -61,11 +61,11 @@
left: 0;
z-index: 1001;
display: none;
}</style><meta property="og:type" content="website"><meta property="og:title" content="分享测试测试"><meta property="og:description" content="分享描述"><meta property="og:image" content="http://1303872925.vod2.myqcloud.com/7db674eavodcq1303872925/a5d03b0c5285890810149245655/vrLgNu2JaBkA.png"><meta property="og:url" content="https://beelink.theluyuan.com/"><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-0d9de69e.0e433876.css" rel="prefetch"><link href="/css/chunk-18d6ebc2.07c0f4a4.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-2b71f1e5.182b1bb8.css" rel="prefetch"><link href="/css/chunk-2f334deb.71bbd542.css" rel="prefetch"><link href="/css/chunk-371ee143.78141e1e.css" rel="prefetch"><link href="/css/chunk-39b973ba.0e433876.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-41b71764.3243d28f.css" rel="prefetch"><link href="/css/chunk-4663db36.3eaba60f.css" rel="prefetch"><link href="/css/chunk-46e3b07d.9259aefd.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-6e7aa5b1.9851e10f.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-7582a703.b7f6c0c7.css" rel="prefetch"><link href="/css/chunk-8d0dacb4.b6d4145a.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-da7e1532.17a6e0e0.css" rel="prefetch"><link href="/css/chunk-ebdb96a0.d22f743d.css" rel="prefetch"><link href="/css/chunk-ef207110.a20941ed.css" rel="prefetch"><link href="/js/chunk-04e3a2fa.644947cf.js" rel="prefetch"><link href="/js/chunk-05d3c41a.eb6172e6.js" rel="prefetch"><link href="/js/chunk-06828374.396a639e.js" rel="prefetch"><link href="/js/chunk-07015098.7c0388de.js" rel="prefetch"><link href="/js/chunk-0d9de69e.e6b0519c.js" rel="prefetch"><link href="/js/chunk-18d6ebc2.705d439f.js" rel="prefetch"><link href="/js/chunk-27236dd2.6a20330a.js" rel="prefetch"><link href="/js/chunk-2a197f09.a0d9b395.js" rel="prefetch"><link href="/js/chunk-2b71f1e5.1586a6db.js" rel="prefetch"><link href="/js/chunk-2f334deb.2bce887c.js" rel="prefetch"><link href="/js/chunk-371ee143.62e576aa.js" rel="prefetch"><link href="/js/chunk-39b973ba.b9a3c15b.js" rel="prefetch"><link href="/js/chunk-3c7641ed.dd17d310.js" rel="prefetch"><link href="/js/chunk-41b71764.2ddfaa5a.js" rel="prefetch"><link href="/js/chunk-4663db36.8cb98f8c.js" rel="prefetch"><link href="/js/chunk-46e3b07d.8d0bf85c.js" rel="prefetch"><link href="/js/chunk-4e0b884c.d8b10441.js" rel="prefetch"><link href="/js/chunk-520d8a08.2b87a45a.js" rel="prefetch"><link href="/js/chunk-623eb100.fb6643e0.js" rel="prefetch"><link href="/js/chunk-650d0cb1.35a1fd6a.js" rel="prefetch"><link href="/js/chunk-68091c98.6bc9c5f0.js" rel="prefetch"><link href="/js/chunk-6e7aa5b1.3223b150.js" rel="prefetch"><link href="/js/chunk-737c53fe.0cedc2aa.js" rel="prefetch"><link href="/js/chunk-74d6e86d.dd675539.js" rel="prefetch"><link href="/js/chunk-7582a703.6d0001bc.js" rel="prefetch"><link href="/js/chunk-8d0dacb4.e4bf4f99.js" rel="prefetch"><link href="/js/chunk-977f0f52.162b9d9d.js" rel="prefetch"><link href="/js/chunk-da7e1532.4b71bb2c.js" rel="prefetch"><link href="/js/chunk-ebdb96a0.cbefff6f.js" rel="prefetch"><link href="/js/chunk-ef207110.58ca6790.js" rel="prefetch"><link href="/css/app.34a59d15.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.a3e2a15a.js" rel="preload" as="script"><link href="/js/chunk-vendors.60dc9ef4.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.34a59d15.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><meta property="og:type" content="website"><meta property="og:title" content="分享测试测试"><meta property="og:description" content="分享描述"><meta property="og:image" content="http://1303872925.vod2.myqcloud.com/7db674eavodcq1303872925/a5d03b0c5285890810149245655/vrLgNu2JaBkA.png"><meta property="og:url" content="https://beelink.theluyuan.com/"><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-0d9de69e.0e433876.css" rel="prefetch"><link href="/css/chunk-18d6ebc2.07c0f4a4.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-2b71f1e5.182b1bb8.css" rel="prefetch"><link href="/css/chunk-2f334deb.71bbd542.css" rel="prefetch"><link href="/css/chunk-371ee143.78141e1e.css" rel="prefetch"><link href="/css/chunk-39b973ba.0e433876.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-41b71764.3243d28f.css" rel="prefetch"><link href="/css/chunk-4663db36.3eaba60f.css" rel="prefetch"><link href="/css/chunk-46e3b07d.9259aefd.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-6e7aa5b1.9851e10f.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-7582a703.b7f6c0c7.css" rel="prefetch"><link href="/css/chunk-8d0dacb4.b6d4145a.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-da7e1532.17a6e0e0.css" rel="prefetch"><link href="/css/chunk-ebdb96a0.d22f743d.css" rel="prefetch"><link href="/css/chunk-ef207110.a20941ed.css" rel="prefetch"><link href="/js/chunk-04e3a2fa.644947cf.js" rel="prefetch"><link href="/js/chunk-05d3c41a.eb6172e6.js" rel="prefetch"><link href="/js/chunk-06828374.396a639e.js" rel="prefetch"><link href="/js/chunk-07015098.7c0388de.js" rel="prefetch"><link href="/js/chunk-0d9de69e.e6b0519c.js" rel="prefetch"><link href="/js/chunk-18d6ebc2.705d439f.js" rel="prefetch"><link href="/js/chunk-27236dd2.6a20330a.js" rel="prefetch"><link href="/js/chunk-2a197f09.a0d9b395.js" rel="prefetch"><link href="/js/chunk-2b71f1e5.1586a6db.js" rel="prefetch"><link href="/js/chunk-2f334deb.2bce887c.js" rel="prefetch"><link href="/js/chunk-371ee143.62e576aa.js" rel="prefetch"><link href="/js/chunk-39b973ba.b9a3c15b.js" rel="prefetch"><link href="/js/chunk-3c7641ed.98a67f5d.js" rel="prefetch"><link href="/js/chunk-41b71764.2ddfaa5a.js" rel="prefetch"><link href="/js/chunk-4663db36.8cb98f8c.js" rel="prefetch"><link href="/js/chunk-46e3b07d.02b73dde.js" rel="prefetch"><link href="/js/chunk-4e0b884c.d8b10441.js" rel="prefetch"><link href="/js/chunk-520d8a08.2b87a45a.js" rel="prefetch"><link href="/js/chunk-623eb100.fb6643e0.js" rel="prefetch"><link href="/js/chunk-650d0cb1.35a1fd6a.js" rel="prefetch"><link href="/js/chunk-68091c98.6bc9c5f0.js" rel="prefetch"><link href="/js/chunk-6e7aa5b1.3223b150.js" rel="prefetch"><link href="/js/chunk-737c53fe.0cedc2aa.js" rel="prefetch"><link href="/js/chunk-74d6e86d.dd675539.js" rel="prefetch"><link href="/js/chunk-7582a703.6d0001bc.js" rel="prefetch"><link href="/js/chunk-8d0dacb4.e4bf4f99.js" rel="prefetch"><link href="/js/chunk-977f0f52.162b9d9d.js" rel="prefetch"><link href="/js/chunk-da7e1532.4b71bb2c.js" rel="prefetch"><link href="/js/chunk-ebdb96a0.cbefff6f.js" rel="prefetch"><link href="/js/chunk-ef207110.58ca6790.js" rel="prefetch"><link href="/css/app.34a59d15.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.d803c836.js" rel="preload" as="script"><link href="/js/chunk-vendors.60dc9ef4.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.34a59d15.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/jquery-3.2.1.min.js"></script><div id="xiangqingdivadsensedisplaynone" style="display:none;"><script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:inline-block;width:728px;height:90px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="9189068072"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><div id="guanlidivadsensedisplaynone" style="display:none;"><ins class="adsbygoogle" style="display:inline-block;width:450px;height:380px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="4213570423"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><script>$("meta[property='og:title']")[0].content = "测试动态"</script><script src="/js/chunk-vendors.60dc9ef4.js"></script><script src="/js/app.a3e2a15a.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/jquery-3.2.1.min.js"></script><div id="xiangqingdivadsensedisplaynone" style="display:none;"><script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:inline-block;width:728px;height:90px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="9189068072"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><div id="guanlidivadsensedisplaynone" style="display:none;"><ins class="adsbygoogle" style="display:inline-block;width:450px;height:380px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="4213570423"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><script>$("meta[property='og:title']")[0].content = "测试动态"</script><script src="/js/chunk-vendors.60dc9ef4.js"></script><script src="/js/app.d803c836.js"></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -87,14 +87,14 @@ export function getweek(time: string, id: string,zhou?: number){
console.log(now, 11111)
if(zhou != undefined){
now = now.day(now.day() + (zhou * 6));
now = now.day(now.day() + (zhou * 7));
}
const yue = (now.month() + 1 < 10 ? '0' + (now.month() + 1) : (now.month() + 1));
const day = now.date() // 当前天
zhou = now.day(); // 当前周几
const year = now.year()
const startd = now.day(0).date();
const start = `${year}-${yue}-${startd > 9 ? startd : '0' + startd}`
const startd = now.day(0);
const start = `${startd.year()}-${(startd.month() + 1 < 10 ? '0' + (startd.month() + 1) : (startd.month() + 1))}-${startd.date() > 9 ? startd.date() : '0' + startd.date()}`
interface Date{
day: string;
list?: Array<any>;