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

This commit is contained in:
luyuan 2020-11-03 14:32:29 +08:00
commit 56e8571d6d
Signed by: theluyuan
GPG Key ID: A7972FD973317FF3
4 changed files with 518 additions and 353 deletions

View File

@ -293,4 +293,7 @@ export default {
fengmianyaoqiu:"Cover requirements:", fengmianyaoqiu:"Cover requirements:",
fengmianyaoqiu1:"File extension: JPG, png", fengmianyaoqiu1:"File extension: JPG, png",
fengmianyaoqiu2:"File size limit: 2m", fengmianyaoqiu2:"File size limit: 2m",
kahaoweikong:"Card number cannot be empty",
kaihuhangweikong:"Swiftcode cannot be empty",
shensu:"Appeal"
} }

View File

@ -292,5 +292,8 @@ export default {
chushihuashibai:"初始化本地流失败", chushihuashibai:"初始化本地流失败",
buzhichifenxiang:"您的浏览器不支持屏幕分享请下载新版chrome", buzhichifenxiang:"您的浏览器不支持屏幕分享请下载新版chrome",
xuanzefenxiangneirong:"请选择分享的内容", xuanzefenxiangneirong:"请选择分享的内容",
guanbishibai:"关闭失败" guanbishibai:"关闭失败",
kahaoweikong:"卡号不能为空",
kaihuhangweikong:"开户行不能为空",
shensu:"申诉"
} }

View File

@ -1,392 +1,541 @@
<template> <template>
<div class="cashout"> <div class="cashout">
<div class="mingxilist">
<div class="mingxilist"> <div class="tabs">
<div class="tabs"> <div class="beforetab">{{ lan.$t("xinzengzhanghu") }}</div>
<div class="beforetab">{{lan.$t('xinzengzhanghu')}}</div>
</div>
<div class="line"></div>
<div class="choose">
<div class="label"><span style="color:red">*</span>{{lan.$t('xuanzezhanghu')}}</div>
<!-- <a-radio></a-radio> -->
<div v-if="lan.$s()=='zh'">
<a-radio-group
name="radioGroup"
class="accountlist"
@change="onChange"
v-model:value="accountinfo.type"
>
<a-radio :value="4">
<img src="@/static/images/bank.png" alt="" class="icon icon1" />
<span>{{lan.$t('yinhangka')}}</span>
</a-radio>
<a-radio :value="2">
<img src="@/static/images/walletzfb.png" alt="" class="icon" />
<span>{{lan.$t('zhifubao')}}</span>
</a-radio>
<a-radio :value="1">
<img src="@/static/images/walletweixin.png" alt="" class="icon" />
<span>{{lan.$t('weixin')}}</span>
</a-radio>
</a-radio-group>
</div>
<div v-else>
<a-radio-group
name="radioGroup"
v-model="paytypeforign"
class="accountlist"
@change="onChange1"
:default-value="1"
>
<a-radio :value="1">
<img
src="@/static/images/foreignbank.png"
alt=""
class="icon icon1"
/>
<span>{{lan.$t('yinhangka')}}</span>
</a-radio>
<a-radio :value="2">
<img src="@/static/images/paypi.png" alt="" class="icon" />
<span>payple</span>
</a-radio>
</a-radio-group>
</div>
</div>
<div class="cashoutmoney" v-if="accountinfo.type == 4 && lan.$s()=='zh'">
<a-form >
<div>
<div class="infoitem">
<span class="label label1"><span style="color:red">*</span>{{lan.$t('xingming')}}</span>
<a-input v-model:value="accountinfo.mname" class="shuru" :placeholder="lan.$t('shuruxingming')" />
</div> </div>
<div class="infoitem"> <div class="line"></div>
<span class="label label1"><span style="color:red">*</span>{{lan.$t('kahao')}}</span> <div class="choose">
<a-input <div class="label">
v-model:value="accountinfo.bankcode" <span style="color: red">*</span
class="shuru" >{{ lan.$t("xuanzezhanghu") }}
:placeholder="lan.$t('shurukahao')" </div>
/> <!-- <a-radio></a-radio> -->
<div v-if="lan.$s() == 'zh'">
<a-radio-group
name="radioGroup"
class="accountlist"
@change="onChange"
v-model:value="accountinfo.type"
>
<a-radio :value="4">
<img
src="@/static/images/bank.png"
alt=""
class="icon icon1"
/>
<span>{{ lan.$t("yinhangka") }}</span>
</a-radio>
<a-radio :value="2">
<img
src="@/static/images/walletzfb.png"
alt=""
class="icon"
/>
<span>{{ lan.$t("zhifubao") }}</span>
</a-radio>
<a-radio :value="1">
<img
src="@/static/images/walletweixin.png"
alt=""
class="icon"
/>
<span>{{ lan.$t("weixin") }}</span>
</a-radio>
</a-radio-group>
</div>
<div v-else>
<a-radio-group
name="radioGroup"
v-model="paytypeforign"
class="accountlist"
@change="onChange1"
:default-value="1"
>
<a-radio :value="4">
<img
src="@/static/images/foreignbank.png"
alt=""
class="icon icon1"
/>
<span>{{ lan.$t("yinhangka") }}</span>
</a-radio>
<a-radio :value="3">
<img
src="@/static/images/paypi.png"
alt=""
class="icon"
/>
<span>payple</span>
</a-radio>
</a-radio-group>
</div>
</div> </div>
<div class="infoitem"> <div
<span class="label label1"><span style="color:red">*</span>{{lan.$t('kaihuhang')}}</span> class="cashoutmoney"
<a-input v-if="accountinfo.type == 4 && lan.$s() == 'zh'"
v-model:value="accountinfo.bankname" >
class="shuru shuru2" <a-form>
:placeholder="lan.$t('shurukaihuhang')" <div>
/> <div class="infoitem">
<span class="label label1"
><span style="color: red">*</span
>{{ lan.$t("xingming") }}</span
>
<a-input
v-model:value="accountinfo.mname"
class="shuru"
:placeholder="lan.$t('shuruxingming')"
/>
</div>
<div class="infoitem">
<span class="label label1"
><span style="color: red">*</span
>{{ lan.$t("kahao") }}</span
>
<a-input
v-model:value="accountinfo.bankcode"
class="shuru"
:placeholder="lan.$t('shurukahao')"
/>
</div>
<div class="infoitem">
<span class="label label1"
><span style="color: red">*</span
>{{ lan.$t("kaihuhang") }}</span
>
<a-input
v-model:value="accountinfo.bankname"
class="shuru shuru2"
:placeholder="lan.$t('shurukaihuhang')"
/>
</div>
</div>
</a-form>
</div>
<div
class="cashoutmoney"
v-if="accountinfo.type == 2 && lan.$s() == 'zh'"
>
<div>
<div class="infoitem">
<span class="label label1"
><span style="color: red">*</span
>{{ lan.$t("zhanghao") }}</span
>
<a-input
v-model:value="accountinfo.account"
class="shuru"
:placeholder="lan.$t('shuruzhifubao')"
/>
</div>
</div>
</div>
<div
class="cashoutmoney"
v-if="accountinfo.type == 1 && lan.$s() == 'zh'"
>
<div class="label label1">
<span style="color: red">*</span
>{{ lan.$t("saomabangding") }}
</div>
<div class="ewmbox">
<img
src="@/static/images/erweima.png"
alt=""
class="ewmpic"
/>
<div class="desc">{{ lan.$t("zhu") }}</div>
<div class="desc desc1">
{{ lan.$t("weixinbangding") }}
</div>
</div>
</div> </div>
</div>
</a-form>
</div>
<div class="cashoutmoney" v-if="accountinfo.type == 2 && lan.$s()=='zh'">
<div>
<div class="infoitem">
<span class="label label1"><span style="color:red">*</span>{{lan.$t('zhanghao')}}</span>
<a-input
v-model:value="accountinfo.account"
class="shuru"
:placeholder="lan.$t('shuruzhifubao')"
/>
</div>
</div>
</div>
<div class="cashoutmoney" v-if="accountinfo.type == 1 && lan.$s()=='zh'">
<div class="label label1"><span style="color:red">*</span>{{lan.$t('saomabangding')}}</div>
<div class="ewmbox">
<img src="@/static/images/erweima.png" alt="" class="ewmpic" />
<div class="desc">{{lan.$t('zhu')}}</div>
<div class="desc desc1">
{{lan.$t('weixinbangding')}}
</div>
</div>
</div>
<div class="cashoutmoney" v-if="paytypeforign == 1 && lan.$s()=='en'"> <div
<div> class="cashoutmoney"
<div class="infoitem"> v-if="paytypeforign == 4 && lan.$s() == 'en'"
<span class="label label1"><span style="color:red">*</span>{{lan.$t('zhanghuming')}}</span> >
<a-input v-model="accountinfo.mname" class="shuru" :placeholder="lan.$t('shuruxingming')" /> <div>
</div> <div class="infoitem">
<div class="infoitem"> <span class="label label1"
<span class="label label1"><span style="color:red">*</span>{{lan.$t('yinhangzhanghu')}}</span> ><span style="color: red">*</span
<a-input >{{ lan.$t("zhanghuming") }}</span
v-model="accountinfo.bankcode" >
class="shuru shuru2" <a-input
:placeholder="shurukahao" v-model:value="accountinfo.mname"
/> class="shuru"
</div> :placeholder="lan.$t('shuruxingming')"
<div class="infoitem infoitem1"> />
<div class="label label1 label2"> <span style="color:red">*</span>{{lan.$t(yinhangbic)}} /swift code </div> </div>
<a-input <div class="infoitem">
v-model="accountinfo.bankname" <span class="label label1"
class="shuru shuru1" ><span style="color: red">*</span
:placeholder="lan.$t('shurukaihuhang')" >{{ lan.$t("yinhangzhanghu") }}</span
/> >
</div> <a-input
</div> v-model:value="accountinfo.bankcode"
</div> class="shuru shuru2"
:placeholder="lan.$t('shurukahao')"
/>
</div>
<div class="infoitem infoitem1">
<div class="label label1 label2">
<span style="color: red">*</span
>{{ lan.$t(yinhangbic) }} /swift code
</div>
<a-input
v-model:value="accountinfo.bankname"
class="shuru shuru1"
:placeholder="lan.$t('shurukaihuhang')"
/>
</div>
</div>
</div>
<div class="cashoutmoney" v-if="paytypeforign == 2 && lan.$s()=='en'"> <div
<div> class="cashoutmoney"
<div class="infoitem"> v-if="paytypeforign == 3 && lan.$s() == 'en'"
<span class="label label1"><span style="color:red">*</span>{{lan.$t('zhanghao')}}</span> >
<a-input <div>
v-model:value="accountinfo.account" <div class="infoitem">
class="shuru" <span class="label label1"
:placeholder="lan.$t('shuruzhanghao')" ><span style="color: red">*</span
/> >{{ lan.$t("zhanghao") }}</span
</div> >
<a-input
v-model:value="accountinfo.account"
class="shuru"
:placeholder="lan.$t('shuruzhanghao')"
/>
</div>
</div>
</div>
<div class="cashoutall submit" @click="sub">
{{ lan.$t("tijiao") }}
</div>
<NavBottom class="navbottom"></NavBottom>
</div> </div>
</div>
<div class="cashoutall submit" @click="sub">{{lan.$t('tijiao')}}</div>
<NavBottom class="navbottom"></NavBottom>
</div> </div>
</div>
</template> </template>
<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 { accountadd, editaccount, getaccountinfo } from '@/api'; import { accountadd, editaccount, getaccountinfo } from "@/api";
import { useRoute } from 'vue-router'; import { useRoute } from "vue-router";
import { useI18n } from '@/utils/i18n'; import { useI18n } from "@/utils/i18n";
import { message } from "ant-design-vue";
export default defineComponent({ export default defineComponent({
name: "Cashout", name: "Cashout",
components: { components: {
NavBottom, NavBottom,
}, },
setup() { setup() {
const lan: any = useI18n(); const lan: any = useI18n();
const money = ref(0); const money = ref(0);
const paytype = ref(4); const paytype = ref(4);
const paytypeforign = ref(1); const paytypeforign = ref(4);
const accountinfo = ref<any>({ const accountinfo = ref<any>({
type: 4, type: 4,
account:"", account: "",
mname: "", mname: "",
bankcode: "", bankcode: "",
bankname: "", bankname: "",
}); });
interface Changes { interface Changes {
target: { target: {
value: number; value: number;
};
}
const onChange: (e: Changes) => void = (e: Changes) => {
console.log("radio checked", e.target.value);
paytype.value = e.target.value;
accountinfo.value.type = e.target.value;
}; };
} const onChange1: (e: Changes) => void = (e: Changes) => {
console.log("radio checked", e.target.value);
paytypeforign.value = e.target.value;
};
function sub() {
console.log(toRaw(accountinfo.value), 11);
// cosnole.log(useRoute().query.id)
const accountinfofin = toRaw(accountinfo.value);
if (lan.$s() == "zh") {
if (accountinfofin.type == 4) {
console.log(paytype.value);
if (accountinfofin.mname == "") {
message.error(lan.$t("xingmingweikong"));
} else if (accountinfofin.bankcode == "") {
message.error(lan.$t("kahaoweikong"));
} else if (accountinfofin.bankname == "") {
message.error(lan.$t("kaihuhangweikong"));
} else {
if (toRaw(accountinfo.value).accountid) {
console.log(300);
editaccount(toRaw(accountinfo.value).accountid);
} else {
console.log(111);
accountadd(toRaw(accountinfo.value));
}
}
} else if (accountinfofin.type == 2) {
if (accountinfofin.account == "") {
message.error(lan.$t("zhanghaoweikong"));
} else {
if (toRaw(accountinfo.value).accountid) {
console.log(300);
editaccount(toRaw(accountinfo.value).accountid);
} else {
console.log(111);
accountadd(toRaw(accountinfo.value));
}
}
} else if (accountinfofin.type == 1) {
if (toRaw(accountinfo.value).accountid) {
console.log(300);
editaccount(toRaw(accountinfo.value).accountid);
} else {
console.log(111);
accountadd(toRaw(accountinfo.value));
}
}
} else if (lan.$s() == "en") {
if (paytypeforign.value == 4) {
console.log(paytype.value);
if (accountinfo.value.mname == "") {
message.error(lan.$t("xingmingweikong"));
} else if (accountinfo.value.bankcode == "") {
message.error(lan.$t("kahaoweikong"));
} else if (accountinfo.value.bankname == "") {
message.error(lan.$t("kaihuhangweikong"));
} else {
if (toRaw(accountinfo.value).accountid) {
editaccount(toRaw(accountinfo.value).accountid);
} else {
accountadd(toRaw(accountinfo.value));
}
}
} else if (paytypeforign.value == 3) {
console.log(3333)
if (accountinfo.value.account == "") {
message.error(lan.$t("zhanghaoweikong"));
} else {
if (toRaw(accountinfo.value).accountid) {
console.log(300);
editaccount(toRaw(accountinfo.value).accountid);
} else {
console.log(111);
accountadd(toRaw(accountinfo.value));
}
}
}
}
// if (accountinfofin.account == "") {
// message.error(lan.$t("zhanghaoweikong"));
// } else {
// if (toRaw(accountinfo.value).accountid) {
// console.log(300);
// editaccount(toRaw(accountinfo.value).accountid);
// } else {
// console.log(111);
// accountadd(toRaw(accountinfo.value));
// }
// }
}
const ifchina = ref(true);
const onChange: (e: Changes) => void = (e: Changes) => { onMounted(async () => {
console.log("radio checked", e.target.value); if (useRoute().query.id) {
paytype.value = e.target.value; accountinfo.value = await getaccountinfo(useRoute().query.id);
accountinfo.value.type=e.target.value // console.log(await getaccountinfo(useRoute().query.id),233)
}; }
const onChange1: (e: Changes) => void = (e: Changes) => { // useRoute().query.id
console.log("radio checked", e.target.value); });
paytypeforign.value = e.target.value; return {
}; money,
function sub(){ onChange,
console.log(toRaw(accountinfo.value),11) paytype,
// cosnole.log(useRoute().query.id) ifchina,
if(toRaw(accountinfo.value).accountid){ paytypeforign,
console.log(300) onChange1,
editaccount(toRaw(accountinfo.value).accountid) sub,
}else{ accountinfo,
console.log(111) lan,
accountadd(toRaw(accountinfo.value)) };
} },
}
const ifchina = ref(true);
onMounted(async () => {
if(useRoute().query.id){
accountinfo.value=await getaccountinfo(useRoute().query.id)
// console.log(await getaccountinfo(useRoute().query.id),233)
}
// useRoute().query.id
})
return {
money,
onChange,
paytype,
ifchina,
paytypeforign,
onChange1,
sub,
accountinfo,
lan
};
},
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.cashout ::v-deep(.ant-breadcrumb) > span:last-child { .cashout ::v-deep(.ant-breadcrumb) > span:last-child {
color: #08ae98; color: #08ae98;
} }
.cashout ::v-deep(.ant-radio-wrapper) { .cashout ::v-deep(.ant-radio-wrapper) {
display: flex; display: flex;
} }
.cashout ::v-deep(.ant-radio-checked) ::v-deep(.ant-radio-inner) { .cashout ::v-deep(.ant-radio-checked) ::v-deep(.ant-radio-inner) {
border-color: #08ae98 !important; border-color: #08ae98 !important;
} }
.cashout ::v-deep(.ant-radio-inner::after) { .cashout ::v-deep(.ant-radio-inner::after) {
background: #08ae98 !important; background: #08ae98 !important;
} }
// .cashout ::v-deep(.ant-radio) { // .cashout ::v-deep(.ant-radio) {
// // top: 43px; // // top: 43px;
// } // }
.cashout { .cashout {
.mingxilist { .mingxilist {
width: 1150px; width: 1150px;
// height: 533px; // height: 533px;
background: white; background: white;
border-radius: 18px; border-radius: 18px;
margin-top: 18px; margin-top: 18px;
.tabs { .tabs {
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
padding-top: 35px; padding-top: 35px;
padding-left: 40px; padding-left: 40px;
.residue { .residue {
font-size: 11px; font-size: 11px;
margin: auto 0; margin: auto 0;
color: #08ae98; color: #08ae98;
position: relative; position: relative;
left: -30px; left: -30px;
} }
.topbtn { .topbtn {
// width: 89px; // width: 89px;
height: 17px; height: 17px;
padding-left: 14px; padding-left: 14px;
padding-right: 14px; padding-right: 14px;
line-height: 17px; line-height: 17px;
border: 1px solid #08ae98; border: 1px solid #08ae98;
border-radius: 3px; border-radius: 3px;
font-size: 10px; font-size: 10px;
color: #08ae98; color: #08ae98;
font-weight: 500; font-weight: 500;
margin: auto 0; margin: auto 0;
} }
.topbtn2 { .topbtn2 {
margin-left: 642px; margin-left: 642px;
} }
.topbtn1 { .topbtn1 {
padding-left: 9px; padding-left: 9px;
padding-right: 9px; padding-right: 9px;
color: #d12c2e; color: #d12c2e;
border: 1px solid #d12c2e; border: 1px solid #d12c2e;
margin-left: 11px; margin-left: 11px;
} }
} }
.line { .line {
width: 1070px; width: 1070px;
height: 1px; height: 1px;
background: #eeeeee; background: #eeeeee;
margin: 0 auto; margin: 0 auto;
margin-top: 11px; margin-top: 11px;
} }
.beforetab { .beforetab {
color: #121212; color: #121212;
font-size: 13px; font-size: 13px;
line-height: 35px; line-height: 35px;
font-weight: bold; font-weight: bold;
margin-right: 57px; margin-right: 57px;
} }
.choose { .choose {
margin-top: 28px; margin-top: 28px;
margin-left: 40px; margin-left: 40px;
display: flex; display: flex;
.accountlist { .accountlist {
display: flex; display: flex;
color: #404040; color: #404040;
font-size: 11px; font-size: 11px;
.icon { .icon {
width: 17px; width: 17px;
height: 17px; height: 17px;
margin-right: 6px; margin-right: 6px;
}
.icon1 {
width: 28px;
height: 18px;
}
}
} }
.icon1 { .label {
width: 28px; color: #808080;
height: 18px; font-size: 11px;
margin-right: 28px;
} }
} .label1 {
} margin-left: 40px;
.label {
color: #808080;
font-size: 11px;
margin-right: 28px;
}
.label1 {
margin-left: 40px;
}
.label2{
width: 90px;
word-wrap:break-word!important
}
.cashoutmoney {
display: flex;
margin-top: 31px;
.infoitem {
margin-bottom: 28px;
}
.infoitem1{
display: flex;
}
.shuru {
width: 171px;
height: 23px;
margin-left: 30px;
}
.shuru1 {
margin-left: -15px;
}
.shuru2{
margin-left:18px
}
.ewmbox {
display: flex;
.ewmpic {
width: 114px;
height: 114px;
margin-right: 23px;
} }
.desc { .label2 {
color: #666666; width: 90px;
font-size: 10px; word-wrap: break-word !important;
// line-height: 114px;
margin: auto 0;
} }
.desc1 { .cashoutmoney {
width: 149px; display: flex;
position: relative; margin-top: 31px;
top: 10px; .infoitem {
margin-bottom: 28px;
}
.infoitem1 {
display: flex;
}
.shuru {
width: 171px;
height: 23px;
margin-left: 30px;
}
.shuru1 {
margin-left: -15px;
}
.shuru2 {
margin-left: 18px;
}
.ewmbox {
display: flex;
.ewmpic {
width: 114px;
height: 114px;
margin-right: 23px;
}
.desc {
color: #666666;
font-size: 10px;
// line-height: 114px;
margin: auto 0;
}
.desc1 {
width: 149px;
position: relative;
top: 10px;
}
}
}
.cashoutall {
width: 67px;
height: 23px;
line-height: 23px;
background: #08ae98;
border-radius: 3px;
color: white;
text-align: center;
margin-left: 23px;
font-weight: bold;
}
.submit {
font-size: 10px;
font-weight: 500;
position: relative;
top: 56px;
left: 20px;
} }
}
} }
.cashoutall {
width: 67px;
height: 23px;
line-height: 23px;
background: #08ae98;
border-radius: 3px;
color: white;
text-align: center;
margin-left: 23px;
font-weight: bold;
}
.submit {
font-size: 10px;
font-weight: 500;
position: relative;
top: 56px;
left: 20px;
}
}
.navbottom { .navbottom {
padding-top: 250px; padding-top: 250px;
padding-bottom: 30px; padding-bottom: 30px;
} }
} }
</style> </style>

View File

@ -86,7 +86,11 @@
<div class="right">{{accountinfo.typename}}&nbsp;&nbsp;&nbsp;&nbsp;{{i.account}}</div> <div class="right">{{accountinfo.typename}}&nbsp;&nbsp;&nbsp;&nbsp;{{i.account}}</div>
</div> </div>
<div class="back" @click="navto(2)">{{lan.$t('fanhui')}}</div> <div style="display:flex">
<div class="back" @click="navto(2)">{{lan.$t('fanhui')}}</div>
<div class="back fail" @click="navto(3)">{{lan.$t('shensu')}}</div>
</div>
</div> </div>
<NavBottom class="navbottom"></NavBottom> <NavBottom class="navbottom"></NavBottom>
</div> </div>
@ -135,6 +139,8 @@ export default defineComponent({
path: url, path: url,
query:{ifsale:id } query:{ifsale:id }
}); });
}else if(index==3){
router.push({ path: "/mine/aboutus", query: { selected: 3 } });
}else{ }else{
router.push({ router.push({
path: url path: url
@ -205,10 +211,14 @@ export default defineComponent({
margin-top: 57px; margin-top: 57px;
margin-left: 63px; margin-left: 63px;
} }
.fail{
background: #D12C2E;
}
} }
.navbottom{ .navbottom{
padding-top: 75px; padding-top: 75px;
padding-bottom: 30px; padding-bottom: 30px;
} }
} }
</style> </style>