各种bug

This commit is contained in:
asd 2020-10-28 09:30:56 +08:00
parent 0a512f38f1
commit 34dc5033df
4 changed files with 967 additions and 860 deletions

View File

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

View File

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

View File

@ -1,6 +1,5 @@
<template> <template>
<div class="cashout"> <div class="cashout">
<div class="mingxilist"> <div class="mingxilist">
<div class="tabs"> <div class="tabs">
<div class="beforetab">提现到指定账户</div> <div class="beforetab">提现到指定账户</div>
@ -14,14 +13,27 @@
<div class="label">选择账户</div> <div class="label">选择账户</div>
<!-- <a-radio></a-radio> --> <!-- <a-radio></a-radio> -->
<!-- {{payinfo.type}} --> <!-- {{payinfo.type}} -->
<a-radio-group v-model:value="payinfo.type" @change="onChange"> <a-radio-group
v-model:value="payinfo.type"
@change="onChange"
>
<div class="accountlist"> <div class="accountlist">
<a-radio v-for="(i,j) in accountlist" :key="j" :value="j"> <a-radio
v-for="(i, j) in accountlist"
:key="j"
:value="j"
>
<div class="accountitem"> <div class="accountitem">
<div class="hostinfo" v-if="i.type == 4"> <div class="hostinfo" v-if="i.type == 4">
<div> <div>
<img src="@/static/images/bank.png" alt="" class="icon" /> <img
<span class="accounttype">银行卡</span> src="@/static/images/bank.png"
alt=""
class="icon"
/>
<span class="accounttype"
>银行卡</span
>
</div> </div>
</div> </div>
<div class="hostinfo" v-if="i.type == 2"> <div class="hostinfo" v-if="i.type == 2">
@ -31,7 +43,9 @@
alt="" alt=""
class="icon icon1" class="icon icon1"
/> />
<span class="accounttype">支付宝</span> <span class="accounttype"
>支付宝</span
>
</div> </div>
</div> </div>
<div class="hostinfo" v-if="i.type == 1"> <div class="hostinfo" v-if="i.type == 1">
@ -41,14 +55,17 @@
alt="" alt=""
class="icon icon1" class="icon icon1"
/> />
<span class="accounttype">微信</span> <span class="accounttype"
>微信</span
>
</div> </div>
</div> </div>
<div class="zhanghao">账号6217 **** **** **** 175</div> <div class="zhanghao">
账号6217 **** **** **** 175
</div>
</div> </div>
</a-radio> </a-radio>
<!-- <a-radio :value="2"> <!-- <a-radio :value="2">
<div class="accountitem"> <div class="accountitem">
<div class="hostinfo"> <div class="hostinfo">
@ -81,7 +98,6 @@
</a-radio> --> </a-radio> -->
</div> </div>
</a-radio-group> </a-radio-group>
</div> </div>
<div class="cashoutmoney"> <div class="cashoutmoney">
<div class="label">提现金额</div> <div class="label">提现金额</div>
@ -89,10 +105,19 @@
<a-input v-model:value="payinfo.money" class="shuru" /> <a-input v-model:value="payinfo.money" class="shuru" />
<div></div> <div></div>
<div class="cashoutall" @click="all">全部金额</div> <div class="cashoutall" @click="all">全部金额</div>
<div class="desc">每笔提现收取0.1%服务费最低0.1</div> <div class="desc">
每笔提现收取0.1%服务费最低0.1
</div> </div>
</div> </div>
<div class="ale" v-if="payinfo.money<100 || payinfo.money>parseFloat(yue)">*您的余额只有{{parseFloat(yue)}}最低提现金额100</div> </div>
<div
class="ale"
v-if="
payinfo.money < 100 || payinfo.money > parseFloat(yue)
"
>
*您的余额只有{{ parseFloat(yue) }}最低提现金额100
</div>
</div> </div>
<div class="cashoutall submit" @click="sub">立即提现</div> <div class="cashoutall submit" @click="sub">立即提现</div>
<NavBottom class="navbottom"></NavBottom> <NavBottom class="navbottom"></NavBottom>
@ -103,8 +128,9 @@
<script lang="ts"> <script lang="ts">
import { defineComponent, onMounted, ref, toRaw } from "vue"; import { defineComponent, onMounted, ref, toRaw } from "vue";
import NavBottom from "@/components/NavBottom.vue"; import NavBottom from "@/components/NavBottom.vue";
import { cashout, getwallect } from '@/api'; import { cashout, getwallect } from "@/api";
import store from '@/store'; import store from "@/store";
import { message } from "ant-design-vue";
export default defineComponent({ export default defineComponent({
name: "Cashout", name: "Cashout",
components: { components: {
@ -120,34 +146,52 @@ export default defineComponent({
bankcode: "", bankcode: "",
bankname: "", bankname: "",
international: 0, international: 0,
});
})
const moneychange: (e: number) => void = (e: number) => { const moneychange: (e: number) => void = (e: number) => {
console.log(e); console.log(e);
}; };
// const yue=ref<string>(store.state.userinfo.money) // const yue=ref<string>(store.state.userinfo.money)
const yue=ref<number>(10000) const yue = ref<number>(10000);
// yue.value=store.state.userinfo.money // yue.value=store.state.userinfo.money
const accountlist =ref<Array<any>>([]) const accountlist = ref<Array<any>>([]);
onMounted(async () => { onMounted(async () => {
accountlist.value = await getwallect(); accountlist.value = await getwallect();
console.log(store.state.userinfo);
}); });
function onChange(e: any) { function onChange(e: any) {
console.log(e.target.value); console.log(e.target.value);
payinfo.value.type=e.target.value payinfo.value.type = e.target.value;
// payinfo.value.typeid=toRaw(accountlist.value)[e.target.value].wallectid // payinfo.value.typeid=toRaw(accountlist.value)[e.target.value].wallectid
// payinfo.value.type=toRaw(accountlist.value)[e.target.value].wallectid // payinfo.value.type=toRaw(accountlist.value)[e.target.value].wallectid
} }
function all() { function all() {
payinfo.value.money=yue.value payinfo.value.money = yue.value;
} }
function sub() { function sub() {
console.log(toRaw(payinfo.value)) 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])
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 { return {
money, money,
@ -158,7 +202,7 @@ export default defineComponent({
yue, yue,
sub, sub,
accountlist, accountlist,
store store,
}; };
}, },
}); });
@ -172,7 +216,7 @@ export default defineComponent({
} }
.cashout ::v-deep(.ant-radio) { .cashout ::v-deep(.ant-radio) {
top: 43px; top: 43px;
height:13px height: 13px;
} }
.cashout { .cashout {
.mingxilist { .mingxilist {
@ -243,9 +287,9 @@ export default defineComponent({
.chooseitem { .chooseitem {
display: flex; display: flex;
margin-bottom: 34px; margin-bottom: 34px;
.label{ // .label {
width:150px; // width: 150px;
} // }
.accountlist { .accountlist {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@ -301,9 +345,8 @@ export default defineComponent({
} }
.desc { .desc {
margin-left:17px margin-left: 17px;
} }
} }
} }
} }
@ -319,7 +362,7 @@ export default defineComponent({
font-weight: bold; font-weight: bold;
} }
.ale { .ale {
color:#D12C2E; color: #d12c2e;
font-size: 10px; font-size: 10px;
position: relative; position: relative;
left: 80px; left: 80px;

View File

@ -10,8 +10,11 @@
/> />
</a-form-item> </a-form-item>
<a-form-item label="直播封面" class="item-cover"> <a-form-item label="直播封面" class="item-cover">
<a-upload list-type="picture" :customRequest="uploadspic"> <a-upload list-type="picture" :customRequest="uploadspic" :before-upload="beforeUploadpic">
<div class="upload-image" v-if="!viewCover && form.img.length == 0"> <div
class="upload-image"
v-if="!viewCover && form.img.length == 0"
>
<PlusOutlined <PlusOutlined
style="fontsize: 22px" style="fontsize: 22px"
v-if="uploadpicprogress == 0" v-if="uploadpicprogress == 0"
@ -24,12 +27,15 @@
/> />
</div> </div>
<div class="upload-image" v-else> <div class="upload-image" v-else>
<img style="width: 100%; height: 100%" :src="form.img" /> <img
style="width: 100%; height: 100%"
:src="form.img"
/>
</div> </div>
</a-upload> </a-upload>
</a-form-item> </a-form-item>
<a-form-item label="视频介绍" class="video-introduction"> <a-form-item label="视频介绍" class="video-introduction">
<a-upload list-type="picture" :customRequest="uploads"> <a-upload list-type="picture" :customRequest="uploads" :before-upload="beforeUpload">
<div class="upload-image" v-if="form.fileurl.length == 0"> <div class="upload-image" v-if="form.fileurl.length == 0">
<PlaySquareOutlined <PlaySquareOutlined
style="fontsize: 22px" style="fontsize: 22px"
@ -134,7 +140,7 @@
<div class="title sub-title"> <div class="title sub-title">
{{ lives.data.msg }} {{ lives.data.msg }}
</div> </div>
<div class="confirm-btn">意见反馈</div> <div class="confirm-btn" @click="fankui">意见反馈</div>
</div> </div>
<div class="notice-container" v-else> <div class="notice-container" v-else>
<div class="title">您尚未获得直播资格</div> <div class="title">您尚未获得直播资格</div>
@ -172,6 +178,7 @@ import { getlivest, liveadd, liveinfo, setlive } from "@/api";
import { useRoute } from "vue-router"; import { useRoute } from "vue-router";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import router from '@/router';
export default defineComponent({ export default defineComponent({
name: "ReleaseWebcast", name: "ReleaseWebcast",
@ -259,7 +266,9 @@ export default defineComponent({
viewCover.value = true; viewCover.value = true;
// form.cover = fileList; // form.cover = fileList;
} }
function fankui(){
router.push({path:"/mine/aboutus",query:{selected:3}})
}
const { resetFields, validate, validateInfos } = useForm(form, rules); const { resetFields, validate, validateInfos } = useForm(form, rules);
/** /**
@ -314,6 +323,7 @@ export default defineComponent({
message.error("直播简介不能为空"); message.error("直播简介不能为空");
return; return;
} else { } else {
if(lives.value.status==0){
// subdata.fileid=picinfo. // subdata.fileid=picinfo.
if (id != undefined && id) { if (id != undefined && id) {
/** /**
@ -323,8 +333,14 @@ export default defineComponent({
// setlive(subdata) // setlive(subdata)
} else { } else {
console.log(subdata); console.log(subdata);
console.log(lives.value)
// liveadd(subdata); // liveadd(subdata);
} }
}else{
message.error("您尚未获得直播资格")
}
} }
}) })
.catch((err: unknown) => { .catch((err: unknown) => {
@ -379,7 +395,19 @@ export default defineComponent({
data: unknown; data: unknown;
file: File; file: File;
} }
const ifallowupload=ref<boolean>(false)
function beforeUpload(info?: any){
console.log(info)
if(info.type.split("/")[0]!="video"){
ifallowupload.value=false
message.error("视频介绍的文件格式错误")
return
}else{
ifallowupload.value=true
}
}
async function uploads(file: AntUpload) { async function uploads(file: AntUpload) {
if(ifallowupload.value){
console.log(file); console.log(file);
videofile.value = file.file; videofile.value = file.file;
videos.value[0].addEventListener("durationchange", () => { videos.value[0].addEventListener("durationchange", () => {
@ -396,7 +424,10 @@ export default defineComponent({
form.value.fileurl = res.video.url; form.value.fileurl = res.video.url;
} }
}
const ifallowpic=ref<boolean>(false)
async function uploadspic(file: AntUpload) { async function uploadspic(file: AntUpload) {
if(ifallowpic.value){
const res = await uploadflie(file.file, (info: any) => { const res = await uploadflie(file.file, (info: any) => {
console.log(info); console.log(info);
uploadpicprogress.value = info.percent.toFixed(2) * 100; uploadpicprogress.value = info.percent.toFixed(2) * 100;
@ -408,17 +439,30 @@ export default defineComponent({
form.value.img = res.video.url; form.value.img = res.video.url;
} }
}
getlivest().then((res) => { getlivest().then((res) => {
if (res) { if (res) {
isEntitled.value = true; isEntitled.value = true;
lives.value = res; lives.value = res;
} }
}); });
function beforeUploadpic(info?: any){
console.log(info)
if(info.type.split("/")[0]!='image'){
message.error("封面必须是图片文件")
ifallowpic.value=false
return
}else{
ifallowpic.value=true
}
}
return { return {
labelCol: { span: 4 }, labelCol: { span: 4 },
wrapperCol: { span: 14 }, wrapperCol: { span: 14 },
modalNode: () => document.getElementsByClassName("modal-container")[0], modalNode: () =>
document.getElementsByClassName("modal-container")[0],
validateInfos, validateInfos,
resetFields, resetFields,
viewCover, viewCover,
@ -438,6 +482,11 @@ export default defineComponent({
videofile, videofile,
videos, videos,
lives, lives,
beforeUploadpic,
ifallowpic,
beforeUpload,
ifallowupload,
fankui
}; };
}, },
}); });