Merge pull request 'dist' (#244) from xbx into master

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

dist/index.html

@@ -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-0d9de69e.0e433876.css" rel="prefetch"><link href="/css/chunk-18d6ebc2.07c0f4a4.css" rel="prefetch"><link href="/css/chunk-1f21263e.b9051f93.css" rel="prefetch"><link href="/css/chunk-21b42480.6808bbcc.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-2fe3a393.9e89625b.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-520d8a08.dd761c06.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-74d6e86d.85aed290.css" rel="prefetch"><link href="/css/chunk-7582a703.b7f6c0c7.css" rel="prefetch"><link href="/css/chunk-7da0eb18.409b8eb7.css" rel="prefetch"><link href="/css/chunk-8d0dacb4.b6d4145a.css" rel="prefetch"><link href="/css/chunk-922d780a.e11df9e0.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-a4a29886.aa3c0949.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-0d9de69e.9b497785.js" rel="prefetch"><link href="/js/chunk-18d6ebc2.705d439f.js" rel="prefetch"><link href="/js/chunk-1f21263e.93577762.js" rel="prefetch"><link href="/js/chunk-21b42480.bd68920f.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-2fe3a393.3c22fe3d.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-520d8a08.fa8b550a.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-74d6e86d.014b0140.js" rel="prefetch"><link href="/js/chunk-7582a703.6d0001bc.js" rel="prefetch"><link href="/js/chunk-7da0eb18.889148b0.js" rel="prefetch"><link href="/js/chunk-8d0dacb4.e4bf4f99.js" rel="prefetch"><link href="/js/chunk-922d780a.54ca79a7.js" rel="prefetch"><link href="/js/chunk-977f0f52.162b9d9d.js" rel="prefetch"><link href="/js/chunk-a4a29886.574f1892.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.3feb420b.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.a6d6b02b.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.3feb420b.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-0d9de69e.0e433876.css" rel="prefetch"><link href="/css/chunk-18d6ebc2.07c0f4a4.css" rel="prefetch"><link href="/css/chunk-19951b38.61589eff.css" rel="prefetch"><link href="/css/chunk-1f21263e.b9051f93.css" rel="prefetch"><link href="/css/chunk-21b42480.6808bbcc.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-3326ceee.61cdda7f.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-4663db36.3eaba60f.css" rel="prefetch"><link href="/css/chunk-520d8a08.dd761c06.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-74d6e86d.85aed290.css" rel="prefetch"><link href="/css/chunk-7582a703.b7f6c0c7.css" rel="prefetch"><link href="/css/chunk-7da0eb18.409b8eb7.css" rel="prefetch"><link href="/css/chunk-8d0dacb4.b6d4145a.css" rel="prefetch"><link href="/css/chunk-922d780a.e11df9e0.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-a4a29886.aa3c0949.css" rel="prefetch"><link href="/css/chunk-cc8e1c64.f7e12b4b.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-0d9de69e.9b497785.js" rel="prefetch"><link href="/js/chunk-18d6ebc2.705d439f.js" rel="prefetch"><link href="/js/chunk-19951b38.ac7b67af.js" rel="prefetch"><link href="/js/chunk-1f21263e.93577762.js" rel="prefetch"><link href="/js/chunk-21b42480.bd68920f.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-3326ceee.c535d5c4.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-4663db36.8cb98f8c.js" rel="prefetch"><link href="/js/chunk-520d8a08.fa8b550a.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-74d6e86d.014b0140.js" rel="prefetch"><link href="/js/chunk-7582a703.6d0001bc.js" rel="prefetch"><link href="/js/chunk-7da0eb18.889148b0.js" rel="prefetch"><link href="/js/chunk-8d0dacb4.e4bf4f99.js" rel="prefetch"><link href="/js/chunk-922d780a.54ca79a7.js" rel="prefetch"><link href="/js/chunk-977f0f52.162b9d9d.js" rel="prefetch"><link href="/js/chunk-a4a29886.574f1892.js" rel="prefetch"><link href="/js/chunk-cc8e1c64.454fd776.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.3feb420b.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.736e09e7.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.3feb420b.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.a6d6b02b.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.736e09e7.js"></script></body></html>

src/api/index.ts

@@ -814,6 +814,7 @@ interface LiveInfo {
     created_at: string;
     updated_at: string;
     livestatus: number;
+    overdue: number;
 }
 
 interface StudentList {

src/i18n/en.ts

@@ -311,6 +311,8 @@ export default {
     shouru1: "Live Revenue=Actual attendess x Actual duration x unit price",
     shouru2: "1 on 1, 20€/hour; 1 on N, 10€/hour/person, (1<N<=4)",
     shouru3: "Attention! You can only change the currency once!",
+    shouru4: "Live broadcast earnings on the same day, the next day after successful background audit into the wallet.",
+    shouru5: "The actual length of attendance shall not exceed the length of the teacher's broadcast of the live course.",
     tishi: "Tip",
     querentuichu: "You confirm to exit?",
     huobitishi: "Attention! You can only change the currency once on Beelink platform!",
@@ -342,8 +344,11 @@ export default {
     qingxuanzefenxiangtujing:"Please select share channel",
     lijifenxiang:"Share now",
     zhibobaomingxuesheng:"Live broadcast of student registration",
+    chaoguoshijian:"ou only can reply the live class within 7 days ago.",
+    queding:"Ok",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu: "",
-    zhibotishi: ""
+    zhibotishi: "",
+    zhiboshijian:""
 }

src/i18n/init.ts

@@ -14,8 +14,10 @@ getset().then((res: any)=>{
     en.tixianzhu = `Note: ${res.sxf} service fee will be charged for each withdrawal, with a minimum of ${ res.symbol + res.minmoney }`
     zh.zuiditixian = "最低提现金额" + res.symbol + res.minwithdraw
     en.zuiditixian = "Minimum withdrawal amount " + res.symbol + res.minwithdraw
-    zh.zhibotishi = `直播资格按照每周浏览量排名，前${res.views}名具备直播资格。`
-    en.zhibotishi = `Teachers who have Weekly Top ${res.views} video visitors could get this privilege.`
+    zh.zhibotishi = `直播资格按照上周浏览量排名，前${res.views}名具备直播资格。`
+    en.zhibotishi = `According to the ranking of views last week, the top ${res.views} are eligible for live streaming`
+    zh.zhiboshijian = `提示您只能发布 ${res.releaseLiveDay} 天以内的直播课`
+    en.zhiboshijian = `You can only post live classes for ${res.releaseLiveDay} days!`
     const i18n = geti18n();
     const loc = i18n.locale.value;
     i18n.locale.value = '';

src/i18n/zh.ts

@@ -311,6 +311,8 @@ export default {
     shouru1: "直播收入=实际参加学生数x参加时长x单价",
     shouru2: "单价：1对1，20欧/小时；1对N，10欧/小时/人（1<N<=4）",
     shouru3: "请注意，货币一旦修改，不能变动",
+    shouru4: "当天直播收益，次日后台审核成功后进入钱包。",
+    shouru5: "实际参加时长不超过老师发布直播课程的时长。",
     tishi: "提示",
     querentuichu: "您确认退出？",
     huobitishi: "请注意，货币一旦修改，不能变动。",
@@ -342,8 +344,11 @@ export default {
     qingxuanzefenxiangtujing:"请选择分享途径",
     lijifenxiang:"立即分享",
     zhibobaomingxuesheng:"直播报名学生",
+    chaoguoshijian:"已经超过7天，无法回看。",
+    queding:"确定",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu:"",
-    zhibotishi:""
+    zhibotishi:"",
+    zhiboshijian:""
 }

src/store/index.ts

@@ -65,7 +65,8 @@ export default createStore({
       symbol: "",
       timeCeiling: "",
       timeLowerLimit: "",
-      views:0
+      views:0,
+      releaseLiveDay: ""
     },
     qh: {
       code: "",

src/views/mine/ReleaseWebcast.vue

@@ -130,6 +130,8 @@
                         (triggerNode) => triggerNode.parentNode
                     "
                 />
+                <div style="color: red;font-size: 0.12rem;line-height: 1.3;">*{{ lan.$t('zhiboshijian') }}</div>
+
             </a-form-item>
             <a-form-item
                 :label="lan.$t('zhiboshichang')"
@@ -560,7 +562,7 @@ export default defineComponent({
         function disabledDate(current: any){
             console.log(current + 0)
             const now = dayjs().date(dayjs().date() - 1);
-            const enow = dayjs().date(dayjs().date() + 29);
+            const enow = dayjs().date(dayjs().date() + parseInt(seting.value.releaseLiveDay) - 1);
 
             return current && (current < now || current > enow);
         }

src/views/mine/Wallet.vue

@@ -207,6 +207,8 @@
       <p>{{lan.$t('shouru1')}}</p>
       <p>{{lan.$t('shouru2')}}</p>
       <p style="color:#D12C2E">{{lan.$t('shouru3')}}</p>
+      <p>{{lan.$t('shouru4')}}</p>
+      <p>{{lan.$t('shouru5')}}</p>
     
     </a-modal>
     <NavBottom class="navbottom"></NavBottom>

src/views/regime/Livedetail.vue

@@ -10,6 +10,16 @@
     <infoad></infoad>
 
     <VideoReview class="review" v-if="liveinfo.livestatus == 2" :videoinfo="liveinfo.score"></VideoReview>
+     <a-modal v-model:visible="visible" :closable="false">
+       <template #footer>
+       
+        <a-button key="submit" type="primary" @click="visible = false">
+          {{lan.$t('queding')}}
+        </a-button>
+      </template>
+      <p>{{lan.$t('chaoguoshijian')}}</p>
+      
+    </a-modal>
   </div>
 </template>
 <style lang="scss" scoped>
@@ -53,14 +63,21 @@ export default defineComponent({
     console.log(useRoute().query.id);
     const id = useRoute().query.id;
     const liveinfo = ref<any>({})
+    const visible = ref(false)
+    const lan = useI18n()
     if (typeof id == "string") {
         getliveinfo(parseInt(id)).then((res) => {
+            if(res.overdue == 1){
+              visible.value = true;
+            }
             liveinfo.value = res;
             console.log(res)
         });
     }
     return {
-        liveinfo
+        liveinfo,
+        visible,
+        lan
     }
   },
 });