Merge pull request 'zj' (#87) from zj into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/87
This commit is contained in:
asd 2020-10-28 09:34:02 +08:00
commit 4bc3f290b6
7 changed files with 1100 additions and 867 deletions

View File

@ -42,5 +42,11 @@ div {
text-overflow: ellipsis;
white-space: nowrap;
}
input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button {
-webkit-appearance: none;
}
input[type="number"]{
-moz-appearance: textfield;
}
</style>

View File

@ -189,6 +189,19 @@ export async function videoadd( form: any,data: any) {
}
}
/**
*
*/
export async function setvideo(data?: any) {
console.log(data,11110)
const res=await put<Liveaddrule>('video/'+data.id,data)
if(res.code==0){
message.success("修改成功")
}else{
message.error(res.msg)
}
}
/**
*
*/

View File

@ -1,6 +1,6 @@
<template>
<div class="nav">
<div class="logo" :style="{'background-color': types == 0 ? 'unset' : ''}">
<div class="logo" :style="{'background-color': types == 0 ? 'unset' : ''}" @click="toindex">
<img src="@/static/images/logo.png" alt="" class="img">
<div class="title" :style="{'color': types == 0 ? '#07AD97' : ''}">Beelink</div>
@ -183,12 +183,14 @@
}
}
</style>
<script lang="ts">
import { editsystemsetting, getcurrencys, getlanguages, getzonelist } from '@/api';
import router from '@/router';
import store from '@/store';
import { computed, defineComponent, onMounted, ref } from 'vue';
import { useRoute } from 'vue-router';
import axios from 'axios'
export default defineComponent({
props:{
@ -199,6 +201,9 @@ export default defineComponent({
},
setup(props){
// console.log(useRoute().currentRoute.value.name)
axios.get("//api.map.baidu.com/location/ip?ak=YoG7yXzGNdKSDpAjvl7DpBaESaqzUKhT").then((res)=>{
console.log(res,"llllkljsdkoj")
})
const routes = useRoute();
console.log(routes.path);
const types = ref(props.type)
@ -295,6 +300,9 @@ export default defineComponent({
function setlanguage(e?: any){
editsystemsetting({language:e})
}
function toindex(){
router.push("/")
}
return {
nav,
@ -308,7 +316,8 @@ export default defineComponent({
currencychange,
languagelist,
setlanguage,
nowroute
nowroute,
toindex
}
}
})

View File

@ -47,6 +47,7 @@
import { defineComponent, ref } from "vue";
import NavBottom from "@/components/NavBottom.vue";
import { feedback } from '@/api';
import { useRoute } from 'vue-router';
export default defineComponent({
name: "Aboutus",
components: {
@ -55,6 +56,11 @@ export default defineComponent({
setup() {
const tabindex=ref(1)
const value = ref("")
console.log(useRoute().query)
const selected=useRoute().query.selected
if(useRoute().query.selected){
tabindex.value=Number(selected)
}
const tabchange: (e: number) => void = (e: number) => {
console.log(e);
tabindex.value=e

View File

@ -1,55 +1,72 @@
<template>
<div class="cashout">
<div class="mingxilist">
<div class="tabs">
<div class="beforetab">提现到指定账户</div>
<span class="residue">余额{{yue}}</span>
<div class="topbtn topbtn2">提现到指定账户</div>
<div class="topbtn topbtn1">提现记录</div>
</div>
<div class="line"></div>
<div class="choose">
<div class="chooseitem">
<div class="label">选择账户</div>
<!-- <a-radio></a-radio> -->
<!-- {{payinfo.type}} -->
<a-radio-group v-model:value="payinfo.type" @change="onChange">
<div class="accountlist">
<a-radio v-for="(i,j) in accountlist" :key="j" :value="j">
<div class="accountitem">
<div class="hostinfo" v-if="i.type==4">
<div>
<img src="@/static/images/bank.png" alt="" class="icon" />
<span class="accounttype">银行卡</span>
</div>
</div>
<div class="hostinfo" v-if="i.type==2">
<div>
<img
src="@/static/images/walletzfb.png"
alt=""
class="icon icon1"
/>
<span class="accounttype">支付宝</span>
</div>
</div>
<div class="hostinfo" v-if="i.type==1">
<div>
<img
src="@/static/images/walletweixin.png"
alt=""
class="icon icon1"
/>
<span class="accounttype">微信</span>
</div>
</div>
<div class="zhanghao">账号6217 **** **** **** 175</div>
</div>
</a-radio>
<!-- <a-radio :value="2">
<div class="cashout">
<div class="mingxilist">
<div class="tabs">
<div class="beforetab">提现到指定账户</div>
<span class="residue">余额{{ yue }}</span>
<div class="topbtn topbtn2">提现到指定账户</div>
<div class="topbtn topbtn1">提现记录</div>
</div>
<div class="line"></div>
<div class="choose">
<div class="chooseitem">
<div class="label">选择账户</div>
<!-- <a-radio></a-radio> -->
<!-- {{payinfo.type}} -->
<a-radio-group
v-model:value="payinfo.type"
@change="onChange"
>
<div class="accountlist">
<a-radio
v-for="(i, j) in accountlist"
:key="j"
:value="j"
>
<div class="accountitem">
<div class="hostinfo" v-if="i.type == 4">
<div>
<img
src="@/static/images/bank.png"
alt=""
class="icon"
/>
<span class="accounttype"
>银行卡</span
>
</div>
</div>
<div class="hostinfo" v-if="i.type == 2">
<div>
<img
src="@/static/images/walletzfb.png"
alt=""
class="icon icon1"
/>
<span class="accounttype"
>支付宝</span
>
</div>
</div>
<div class="hostinfo" v-if="i.type == 1">
<div>
<img
src="@/static/images/walletweixin.png"
alt=""
class="icon icon1"
/>
<span class="accounttype"
>微信</span
>
</div>
</div>
<div class="zhanghao">
账号6217 **** **** **** 175
</div>
</div>
</a-radio>
<!-- <a-radio :value="2">
<div class="accountitem">
<div class="hostinfo">
<div>
@ -79,264 +96,290 @@
<div class="zhanghao">账号6217 **** **** **** 175</div>
</div>
</a-radio> -->
</div>
</a-radio-group>
</div>
<div class="cashoutmoney">
<div class="label">提现金额</div>
<div class="moneynum">
<a-input v-model:value="payinfo.money" class="shuru" />
<div></div>
<div class="cashoutall" @click="all">全部金额</div>
<div class="desc">
每笔提现收取0.1%服务费最低0.1
</div>
</div>
</div>
<div
class="ale"
v-if="
payinfo.money < 100 || payinfo.money > parseFloat(yue)
"
>
*您的余额只有{{ parseFloat(yue) }}最低提现金额100
</div>
</div>
</a-radio-group>
<div class="cashoutall submit" @click="sub">立即提现</div>
<NavBottom class="navbottom"></NavBottom>
</div>
<div class="cashoutmoney">
<div class="label">提现金额</div>
<div class="moneynum">
<a-input v-model:value="payinfo.money" class="shuru" />
<div></div>
<div class="cashoutall" @click="all">全部金额</div>
<div class="desc">每笔提现收取0.1%服务费最低0.1</div>
</div>
</div>
<div class="ale" v-if="payinfo.money<100 || payinfo.money>parseFloat(yue)">*您的余额只有{{parseFloat(yue)}}最低提现金额100</div>
</div>
<div class="cashoutall submit" @click="sub">立即提现</div>
<NavBottom class="navbottom"></NavBottom>
</div>
</div>
</template>
<script lang="ts">
import { defineComponent, onMounted, ref, toRaw } from "vue";
import NavBottom from "@/components/NavBottom.vue";
import { cashout, getwallect } from '@/api';
import store from '@/store';
import { cashout, getwallect } from "@/api";
import store from "@/store";
import { message } from "ant-design-vue";
export default defineComponent({
name: "Cashout",
components: {
NavBottom,
},
setup() {
const money = ref(0);
const payinfo=ref<any>({
type:0,
money:0,
account :"",
mname:"",
bankcode:"",
bankname:"",
international:0,
name: "Cashout",
components: {
NavBottom,
},
setup() {
const money = ref(0);
const payinfo = ref<any>({
type: 0,
money: 0,
account: "",
mname: "",
bankcode: "",
bankname: "",
international: 0,
});
const moneychange: (e: number) => void = (e: number) => {
console.log(e);
};
// const yue=ref<string>(store.state.userinfo.money)
const yue = ref<number>(10000);
// yue.value=store.state.userinfo.money
const accountlist = ref<Array<any>>([]);
})
const moneychange: (e: number) => void = (e: number) => {
console.log(e);
};
// const yue=ref<string>(store.state.userinfo.money)
const yue=ref<number>(10000)
// yue.value=store.state.userinfo.money
const accountlist =ref<Array<any>>([])
onMounted(async () => {
accountlist.value = await getwallect();
console.log(store.state.userinfo);
});
function onChange(e: any) {
console.log(e.target.value);
payinfo.value.type = e.target.value;
// payinfo.value.typeid=toRaw(accountlist.value)[e.target.value].wallectid
// payinfo.value.type=toRaw(accountlist.value)[e.target.value].wallectid
}
function all() {
payinfo.value.money = yue.value;
}
function sub() {
console.log(toRaw(payinfo.value));
onMounted(async () => {
accountlist.value=await getwallect();
});
function onChange(e: any) {
console.log(e.target.value);
payinfo.value.type=e.target.value
// payinfo.value.typeid=toRaw(accountlist.value)[e.target.value].wallectid
// payinfo.value.type=toRaw(accountlist.value)[e.target.value].wallectid
}
function all(){
payinfo.value.money=yue.value
}
function sub(){
console.log(toRaw(payinfo.value))
console.log(toRaw(payinfo.value))
payinfo.value.money=Number(payinfo.value.money)
cashout(toRaw(payinfo.value),toRaw(accountlist.value)[payinfo.value.type])
}
return {
money,
moneychange,
payinfo,
onChange,
all,
yue,
sub,
accountlist,
store
};
},
payinfo.value.money = Number(payinfo.value.money);
console.log(toRaw(payinfo.value));
if (accountlist.value.length == 0) {
message.error("您的账户列表为空,请先添加");
return;
} else if (payinfo.value.money < 100) {
message.error("最低提现金额为100");
return;
} else if (payinfo.value.money > yue.value) {
message.error("余额不足");
} else {
cashout(
toRaw(payinfo.value),
toRaw(accountlist.value)[payinfo.value.type]
);
}
// cashout(
// toRaw(payinfo.value),
// toRaw(accountlist.value)[payinfo.value.type]
// );
}
return {
money,
moneychange,
payinfo,
onChange,
all,
yue,
sub,
accountlist,
store,
};
},
});
</script>
<style lang="scss" scoped>
.cashout ::v-deep(.ant-breadcrumb) > span:last-child {
color: #08ae98;
color: #08ae98;
}
.cashout ::v-deep(.ant-radio-wrapper) {
display: flex;
display: flex;
}
.cashout ::v-deep(.ant-radio) {
top: 43px;
height:13px
top: 43px;
height: 13px;
}
.cashout {
.mingxilist {
width: 1150px;
// height: 533px;
background: white;
border-radius: 18px;
margin-top: 18px;
.tabs {
display: flex;
flex-wrap: nowrap;
padding-top: 35px;
padding-left: 40px;
.residue {
font-size: 11px;
margin: auto 0;
color: #08ae98;
position: relative;
left: -30px;
}
.topbtn {
// width: 89px;
height: 17px;
padding-left: 14px;
padding-right: 14px;
line-height: 17px;
border: 1px solid #08ae98;
border-radius: 3px;
font-size: 10px;
color: #08ae98;
font-weight: 500;
margin: auto 0;
}
.topbtn2 {
margin-left: 642px;
}
.topbtn1 {
padding-left: 9px;
padding-right: 9px;
color: #d12c2e;
border: 1px solid #d12c2e;
margin-left: 11px;
}
}
.line {
width: 1070px;
height: 1px;
background: #eeeeee;
margin: 0 auto;
margin-top: 11px;
}
.beforetab {
color: #121212;
font-size: 13px;
line-height: 35px;
font-weight: bold;
margin-right: 57px;
}
.choose {
margin-top: 28px;
margin-left: 40px;
.label {
color: #808080;
font-size: 11px;
margin-right: 28px;
}
.chooseitem {
display: flex;
margin-bottom: 34px;
.label{
width:150px;
}
.accountlist {
display: flex;
flex-wrap: wrap;
.accountitem {
// width: 200px;
padding-bottom: 16px;
padding-right: 20px;
border: 1px solid #dcdfe0;
background: white;
border-radius: 17px;
margin-left: 17px;
margin-right: 46px;
margin-bottom: 17px;
.hostinfo {
display: flex;
padding-top: 17px;
.icon {
width: 47px;
height: 29px;
margin-right: 11px;
margin-left: 17px;
}
.icon1 {
width: 29px !important;
height: 29px !important;
}
.accounttype {
font-size: 13px;
color: #111111;
.mingxilist {
width: 1150px;
// height: 533px;
background: white;
border-radius: 18px;
margin-top: 18px;
.tabs {
display: flex;
flex-wrap: nowrap;
padding-top: 35px;
padding-left: 40px;
.residue {
font-size: 11px;
margin: auto 0;
color: #08ae98;
position: relative;
left: -30px;
}
.topbtn {
// width: 89px;
height: 17px;
padding-left: 14px;
padding-right: 14px;
line-height: 17px;
border: 1px solid #08ae98;
border-radius: 3px;
font-size: 10px;
color: #08ae98;
font-weight: 500;
}
margin: auto 0;
}
.zhanghao {
color: #111111;
font-size: 10px;
margin-top: 38px;
margin-left: 17px;
.topbtn2 {
margin-left: 642px;
}
.topbtn1 {
padding-left: 9px;
padding-right: 9px;
color: #d12c2e;
border: 1px solid #d12c2e;
margin-left: 11px;
}
}
}
}
.cashoutmoney {
display: flex;
.moneynum {
display: flex;
font-size: 11px;
line-height: 23px;
color: #808080;
.shuru {
width: 171px;
height: 23px;
margin-right: 8px;
}
.desc{
margin-left:17px
}
.line {
width: 1070px;
height: 1px;
background: #eeeeee;
margin: 0 auto;
margin-top: 11px;
}
}
}
.cashoutall {
.beforetab {
color: #121212;
font-size: 13px;
line-height: 35px;
font-weight: bold;
margin-right: 57px;
}
.choose {
margin-top: 28px;
margin-left: 40px;
.label {
color: #808080;
font-size: 11px;
margin-right: 28px;
}
.chooseitem {
display: flex;
margin-bottom: 34px;
// .label {
// width: 150px;
// }
.accountlist {
display: flex;
flex-wrap: wrap;
.accountitem {
// width: 200px;
padding-bottom: 16px;
padding-right: 20px;
border: 1px solid #dcdfe0;
background: white;
border-radius: 17px;
margin-left: 17px;
margin-right: 46px;
margin-bottom: 17px;
.hostinfo {
display: flex;
padding-top: 17px;
.icon {
width: 47px;
height: 29px;
margin-right: 11px;
margin-left: 17px;
}
.icon1 {
width: 29px !important;
height: 29px !important;
}
.accounttype {
font-size: 13px;
color: #111111;
font-weight: 500;
}
}
.zhanghao {
color: #111111;
font-size: 10px;
margin-top: 38px;
margin-left: 17px;
}
}
}
}
.cashoutmoney {
display: flex;
.moneynum {
display: flex;
font-size: 11px;
line-height: 23px;
color: #808080;
.shuru {
width: 171px;
height: 23px;
margin-right: 8px;
}
.desc {
margin-left: 17px;
}
}
}
}
.cashoutall {
width: 67px;
height: 23px;
line-height: 23px;
background: #08ae98;
border-radius: 3px;
color:white;
color: white;
text-align: center;
margin-left: 23px;
font-weight: bold;
}
.ale{
color:#D12C2E;
font-size: 10px;
position: relative;
left: 80px;
top: 11px;
}
.submit{
font-size:10px;
font-weight: 500;
position: relative;
top: 56px;
left: 20px;
}
}
}
.ale {
color: #d12c2e;
font-size: 10px;
position: relative;
left: 80px;
top: 11px;
}
.submit {
font-size: 10px;
font-weight: 500;
position: relative;
top: 56px;
left: 20px;
}
}
.navbottom {
padding-top: 250px;
padding-bottom: 30px;
}
.navbottom {
padding-top: 250px;
padding-bottom: 30px;
}
}
</style>

View File

@ -10,7 +10,7 @@
/>
</a-form-item>
<a-form-item label="视频封面" class="video-cover">
<a-upload list-type="picture" :customRequest="uploadspic">
<a-upload list-type="picture" :customRequest="uploadspic" :before-upload="beforeUpload">
<div class="upload-image" v-if="!viewCover && form.img.length == 0">
<PlusOutlined
style="fontsize: 22px"
@ -109,8 +109,9 @@ import NavBottom from "@/components/NavBottom.vue";
import { previewCover } from "@/utils/common";
import { FromSend, ImgInfo, VideoInfo } from "@/types";
import { uploadflie } from "@/utils/vod";
import { videoadd, videodetail } from "@/api";
import { setvideo, videoadd, videodetail } from "@/api";
import { useRoute } from 'vue-router';
import { message } from 'ant-design-vue';
export default defineComponent({
name: "ReleaseWebcast",
@ -137,7 +138,7 @@ export default defineComponent({
});
onMounted(async () => {
if(useRoute().query.id){
console.log(useRoute().query.id)
console.log(useRoute().query.id,"knijkdbj")
form.value = await videodetail(useRoute().query.id,1)
console.log(form.value,"fornm")
}
@ -189,71 +190,136 @@ export default defineComponent({
const uploadpicprogress: Ref<number> = ref(0);
const videofile = ref<File>();
const videos = ref<Array<any>>([]);
const ifalowupload=ref<boolean>(false)
interface AntUpload {
action: string;
data: unknown;
file: File;
}
async function uploadspic(file: AntUpload) {
const res = await uploadflie(file.file, (info: any) => {
console.log(info);
uploadpicprogress.value = info.percent.toFixed(2) * 100;
});
console.log(res);
form.value.img = res.video.url;
if(ifalowupload.value){
const res = await uploadflie(file.file, (info: any) => {
console.log(info);
uploadpicprogress.value = info.percent.toFixed(2) * 100;
});
console.log(res);
form.value.img = res.video.url;
}else{
return
}
}
/**
* 上传视频
*/
const uploadprogress: Ref<number> = ref(0);
const uploadprogress: Ref<number> = ref(0);
const ifallowvideo=ref<boolean>(false)
async function uploads(file: AntUpload) {
uploadprogress.value=0
form.value.video=[""]
console.log(file);
videofile.value = file.file;
videos.value[0].addEventListener("durationchange", () => {
console.log(videos.value[0].duration);
form.value.fileduration = videos.value[0].duration;
});
const res = await uploadflie(file.file, (info: any) => {
console.log(info);
uploadprogress.value = info.percent.toFixed(2) * 100;
});
console.log(res);
if(ifallowvideo.value){
uploadprogress.value=0
form.value.video=[""]
console.log(file);
videofile.value = file.file;
videos.value[0].addEventListener("durationchange", () => {
console.log(videos.value[0].duration);
form.value.fileduration = videos.value[0].duration;
});
const res = await uploadflie(file.file, (info: any) => {
console.log(info);
uploadprogress.value = info.percent.toFixed(2) * 100;
});
console.log(res);
form.value.fileid = res.fileId;
form.value.fileurl = res.video.url;
form.value.video[0]=res.video.url
form.value.fileid = res.fileId;
form.value.fileurl = res.video.url;
form.value.video[0]=res.video.url
uploadprogress.value=0
}
}
function beforeVideoUpload(info?: any){
console.log(info)
if(info.type.split("/")[0]!="video"){
ifallowvideo.value
message.error("文件必须是视频格式")
}else{
ifallowvideo.value=true
}
}
/**
* 表单提交
*/
const routes=useRoute()
const onSubmit = async (e: FromSend) => {
e.preventDefault();
console.log(toRaw(form.value), 111);
videoadd(form, toRaw(form.value));
console.log(toRaw(form.value).video[0].length)
console.log(routes.query,"adsadsa")
const subdata=toRaw(form.value)
if(subdata.title==""){
message.error("标题不能为空")
return
}else if(subdata.img==""){
message.error("封面不能为空")
return
}else if(subdata.fileurl==""){
message.error("视频文件不能为空")
}else if(subdata.desc==""){
message.error("视频简介不能为空")
}
else{
if(routes.query.id){
form.value.id=routes.query.id
console.log('edi')
setvideo(form.value)
}else{
videoadd(form, toRaw(form.value));
}
// videoadd(form, toRaw(form.value));
}
// videoadd(form, toRaw(form.value));
};
function beforeUpload(info?: any){
console.log(info.type)
if(info.type.split('/')[0]!="image"){
message.error("上传文件必须是图片格式")
ifalowupload.value=false
return
}else{
ifalowupload.value=true
}
}
return {
labelCol: { span: 4 },
wrapperCol: { span: 14 },
form,
viewCover,
previewImage,
previewCover,
coverChange,
cancelCover,
beforeCoverUpload,
onSubmit,
uploadpicprogress,
uploadspic,
uploadprogress,
uploads,
videofile,
videos,
removeFile
labelCol: { span: 4 },
wrapperCol: { span: 14 },
form,
viewCover,
previewImage,
previewCover,
coverChange,
cancelCover,
beforeCoverUpload,
onSubmit,
uploadpicprogress,
uploadspic,
uploadprogress,
uploads,
videofile,
videos,
removeFile,
beforeUpload,
ifalowupload,
beforeVideoUpload
};
},
});

File diff suppressed because it is too large Load Diff