diff --git a/src/api/index.ts b/src/api/index.ts index 9e94f61..8abcb9f 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -339,10 +339,11 @@ export async function cashout(data?: any,accountinfo?: any){ console.log(data,'tixian') console.log(accountinfo) - data.account=accountinfo.account - data.bankcode=accountinfo.bankcode - data.bankname=accountinfo.bankname - data.mname=accountinfo.mname + // data.account=accountinfo.account + // data.bankcode=accountinfo.bankcode + // data.bankname=accountinfo.bankname + // data.mname=accountinfo.mname + data.wallectid=accountinfo.wallectid console.log(data) const res = await post('withdrawal',data); if(res.code==0){ diff --git a/src/i18n/en.ts b/src/i18n/en.ts index 40e1201..2e1d784 100644 --- a/src/i18n/en.ts +++ b/src/i18n/en.ts @@ -295,5 +295,7 @@ export default { fengmianyaoqiu2:"File size limit: 2m", kahaoweikong:"Card number cannot be empty", kaihuhangweikong:"Swiftcode cannot be empty", - shensu:"Appeal" + shensu:"Appeal", + querenquxiao: "Are you sure to cancel the live broadcast?", + tianjiatixian: "Add a withdrawal account" } \ No newline at end of file diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts index 37acb74..c303757 100644 --- a/src/i18n/zh.ts +++ b/src/i18n/zh.ts @@ -295,5 +295,7 @@ export default { guanbishibai:"关闭失败", kahaoweikong:"卡号不能为空", kaihuhangweikong:"开户行不能为空", - shensu:"申诉" + shensu:"申诉", + querenquxiao: "您确认取消直播吗?", + tianjiatixian: "添加提现账户" } \ No newline at end of file diff --git a/src/store/index.ts b/src/store/index.ts index 7c3fadc..f7ae927 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -47,6 +47,7 @@ export default createStore({ willsayValue: [{name: "0", level: 0}], zoneStr: "中途岛GMT-11:00", zoneid: 1, + symbol: "$" }, islogin: false }, diff --git a/src/views/mine/Cashout.vue b/src/views/mine/Cashout.vue index 48c8123..34290a0 100644 --- a/src/views/mine/Cashout.vue +++ b/src/views/mine/Cashout.vue @@ -3,8 +3,8 @@
{{lan.$t('tixianzhanghu')}}
- {{lan.$t('yue')}}:{{ yue }} -
{{lan.$t('tixianzhanghu')}}
+ {{lan.$t('yue')}}:{{ danwei + yue }} +
{{lan.$t('tianjiatixian')}}
{{lan.$t('tixianjilu')}}
@@ -103,7 +103,7 @@
{{lan.$t('tixianjine')}}
-
+
{{danwei}}
{{lan.$t('quanbujine')}}
{{lan.$t('tixianzhu')}} @@ -116,7 +116,7 @@ payinfo.money < 100 || payinfo.money > parseFloat(yue) " > - *{{lan.$t('yueshu')}} {{ parseFloat(yue) }},{{lan.$t('zuiditixian')}} + *{{lan.$t('yueshu')}} {{danwei + parseFloat(yue) }},{{lan.$t('zuiditixian')}}
{{lan.$t('lijitixian')}}
@@ -154,6 +154,7 @@ export default defineComponent({ console.log(e); }; const yue=ref(store.state.userinfo.moneyValue) + const danwei = ref(store.state.userinfo.symbol) // const yue = ref(10000); // yue.value=store.state.userinfo.money const accountlist = ref>([]); @@ -212,7 +213,8 @@ export default defineComponent({ accountlist, store, lan, - navto + navto, + danwei }; }, }); diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue index 2ac07d3..1adb364 100644 --- a/src/views/mine/ReleaseWebcast.vue +++ b/src/views/mine/ReleaseWebcast.vue @@ -171,7 +171,9 @@ {{ lan.$t("fabuzhibo") }} + {{ lan.$t("quxiaozhibo") }} + + +

{{ lan.$t("querenquxiao") }}

+
@@ -226,7 +236,7 @@ import RankList from "./RankList.vue"; import { previewCover } from "@/utils/common"; import { FromSend, ImgInfo } from "@/types/index"; import { uploadflie } from "@/utils/vod"; -import { getlivest, liveadd, liveinfo, setlive } from "@/api"; +import { cancellive, getlivest, liveadd, liveinfo, setlive } from "@/api"; import { useRoute } from "vue-router"; import dayjs from "dayjs"; import { message } from "ant-design-vue"; @@ -255,7 +265,7 @@ export default defineComponent({ livenumber: "", desc: "", }); - + const isquxiao = ref(false) const uploadprogress: Ref = ref(0); const uploadpicprogress: Ref = ref(0); const videofile = ref(); @@ -344,6 +354,7 @@ export default defineComponent({ * todo 需要后台返回年份 */ const id = useRoute().query.id; + const isbianji = ref(id); if (id != null && typeof id == "string") { liveinfo(parseInt(id)).then((res) => { form.value = res; @@ -519,6 +530,17 @@ export default defineComponent({ return current && current < now; } + function onquxiao(){ + isquxiao.value = false; + if (id != null && typeof id == "string") { + cancellive(parseInt(id), 3).then((res)=>{ + if(res){ + router.push("/regime/live") + } + }) + } + } + return { labelCol: { span: 4 }, wrapperCol: { span: 14 }, @@ -549,7 +571,10 @@ export default defineComponent({ ifallowupload, fankui, lan, - disabledDate + disabledDate, + isbianji, + onquxiao, + isquxiao }; }, }); diff --git a/src/views/mine/Transaction.vue b/src/views/mine/Transaction.vue index f4d1af8..0479be9 100644 --- a/src/views/mine/Transaction.vue +++ b/src/views/mine/Transaction.vue @@ -24,8 +24,7 @@ {{i.created_at}} {{i.statusname}} - $ - + {{i.money}} {{lan.$t('chakanxiangqing')}} diff --git a/src/views/mine/Transactiondetail.vue b/src/views/mine/Transactiondetail.vue index dca1ce2..dc948a4 100644 --- a/src/views/mine/Transactiondetail.vue +++ b/src/views/mine/Transactiondetail.vue @@ -29,9 +29,9 @@
{{accountinfo.created_at}}
-
+
{{lan.$t('laiyuan')}}
-
{{accountinfo.typename}}
+
{{accountinfo.sourcetitle}}
{{lan.$t('fanhui')}}
@@ -58,7 +58,7 @@
{{lan.$t('tixianzhuangtai')}}
-
{{accountinfo.statusname}}
+
{{accountinfo.statusname}}
@@ -83,7 +83,7 @@
{{lan.$t('shoukuanzhanghu')}}
-
{{accountinfo.typename}}    {{i.account}}
+
{{accountinfo.typename}}    {{accountinfo.account}}
diff --git a/src/views/mine/Wallet.vue b/src/views/mine/Wallet.vue index 585491c..2bf4f66 100644 --- a/src/views/mine/Wallet.vue +++ b/src/views/mine/Wallet.vue @@ -186,8 +186,8 @@ {{i.created_at}} {{i.typename}} - -¥{{i.money}} - +¥{{i.money}} + -{{i.money}} + +{{i.money}} 查看详情 diff --git a/src/views/regime/SignupStu.vue b/src/views/regime/SignupStu.vue index 09f06f5..fd729f4 100644 --- a/src/views/regime/SignupStu.vue +++ b/src/views/regime/SignupStu.vue @@ -4,7 +4,7 @@
直播报名学生
- +
@@ -20,7 +20,7 @@
所在国家: - {{i.live}} + {{i.country}}
@@ -179,7 +179,7 @@ export default defineComponent({ }); const title=ref('') const condition = ref({ - title:"", + keyword:"", id:Number(useRoute().query.liveid) }) onMounted(async () => {