Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj

This commit is contained in:
asd
2020-10-28 17:31:10 +08:00
7 changed files with 141 additions and 112 deletions

4
src/import-png.d.ts vendored
View File

@@ -11,4 +11,6 @@ declare module "ant-design-vue/es/locale/en_US" {
declare module "ant-design-vue/es/locale/zh_CN" {
const value: any;
export default value;
}
}
declare var FB: any;

View File

@@ -53,6 +53,7 @@ export default createStore({
setUserInfo(state, userinfo){
userinfo.money = userinfo.money.toString()
state.userinfo = userinfo
state.islogin = true;
},
login(state, islogin: boolean){
state.islogin = islogin;

View File

@@ -80,7 +80,7 @@
<div class="lessons">
<!-- @click="tovideoxq(i.videoid)" -->
<div class="lessonitem" v-for="(i,j) in videolist" :key="j" @click="todetail(i.videoid)">
<div class="lessonitem" v-for="(i,j) in videolist" :key="j">
<img :src="i.img" alt="" class="pic"/>
<div class="lessonname">
<div>{{i.title}}</div>
@@ -92,7 +92,7 @@
<div class="icons">
<img src="@/static/images/weixin.png" alt="" class="icon" />
<img src="@/static/images/weibo.png" alt="" class="icon" />
<img src="@/static/images/facebook.png" alt="" class="icon" />
<img src="@/static/images/facebook.png" alt="" class="icon" @click="slogin(3)" />
</div>
</div>
</div>
@@ -249,9 +249,18 @@ export default defineComponent({
function navto(){
router.push("/about")
}
function todetail(e?: number){
router.push("/regime/videoinfo?id="+e)
function slogin(index: number){
console.log(index)
if(index == 3){
window.FB.login(function(response: any){
console.log(response)
// handle the response
});
}
}
return {
formLayout,
tabselected,
@@ -269,8 +278,8 @@ export default defineComponent({
videolist,
tovideoxq,
navto,
todetail,
lan
lan,
slogin
};
},
});

View File

@@ -367,6 +367,7 @@ export default defineComponent({
position: relative;
left: 80px;
top: 11px;
display: inline-block;
}
.submit {
font-size: 10px;