Merge pull request '修复了一些bug' (#117) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/117

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.account=accountinfo.account
-    data.bankcode=accountinfo.bankcode
+    // data.bankcode=accountinfo.bankcode
-    data.bankname=accountinfo.bankname
+    // data.bankname=accountinfo.bankname
-    data.mname=accountinfo.mname
+    // data.mname=accountinfo.mname
+    data.wallectid=accountinfo.wallectid
     console.log(data)
     const res = await post<Liveaddrule>('withdrawal',data);
     if(res.code==0){

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"
 }

src/i18n/zh.ts

@@ -295,5 +295,7 @@ export default {
     guanbishibai:"关闭失败",
     kahaoweikong:"卡号不能为空",
     kaihuhangweikong:"开户行不能为空",
-    shensu:"申诉"
+    shensu:"申诉",
+    querenquxiao: "您确认取消直播吗？",
+    tianjiatixian: "添加提现账户"
 }

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
   },

src/views/mine/Cashout.vue

@@ -3,8 +3,8 @@
         <div class="mingxilist">
             <div class="tabs">
                 <div class="beforetab">{{lan.$t('tixianzhanghu')}}</div>
-                <span class="residue">{{lan.$t('yue')}}：{{ yue }}</span>
+                <span class="residue">{{lan.$t('yue')}}：{{ danwei + yue }}</span>
-                <div class="topbtn topbtn2" @click="navto('/mine/addaccount')">{{lan.$t('tixianzhanghu')}}</div>
+                <div class="topbtn topbtn2" @click="navto('/mine/addaccount')">{{lan.$t('tianjiatixian')}}</div>
                 <div class="topbtn topbtn1" @click="navto('/mine/transaction')">{{lan.$t('tixianjilu')}}</div>
             </div>
             <div class="line"></div>
@@ -103,7 +103,7 @@
                     <div class="label">{{lan.$t('tixianjine')}}</div>
                     <div class="moneynum">
                         <a-input v-model:value="payinfo.money" class="shuru" />
-                        <div>￥</div>
+                        <div>{{danwei}}</div>
                         <div class="cashoutall" @click="all">{{lan.$t('quanbujine')}}</div>
                         <div class="desc">
                             {{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')}}
                 </div>
             </div>
             <div class="cashoutall submit" @click="sub">{{lan.$t('lijitixian')}}</div>
@@ -154,6 +154,7 @@ export default defineComponent({
             console.log(e);
         };
         const yue=ref<number>(store.state.userinfo.moneyValue)
+        const danwei = ref(store.state.userinfo.symbol)
         // const yue = ref<number>(10000);
         // yue.value=store.state.userinfo.money
         const accountlist = ref<Array<any>>([]);
@@ -212,7 +213,8 @@ export default defineComponent({
             accountlist,
             store,
             lan,
-            navto
+            navto,
+            danwei
         };
     },
 });

src/views/mine/ReleaseWebcast.vue

@@ -171,7 +171,9 @@
             </a-form-item>
             <a-form-item :wrapper-col="{ span: 4, offset: 0 }">
                 <a-button @click="onSubmit">{{ lan.$t("fabuzhibo") }}</a-button>
+                <a-button style="margin-left:0.15rem;background-color: red;" @click="isquxiao = true" v-if="isbianji">{{ lan.$t("quxiaozhibo") }}</a-button>
             </a-form-item>
+            
         </a-form>
         <div class="modal-container">
             <a-modal
@@ -206,6 +208,14 @@
                 </div>
             </a-modal>
         </div>
+        <a-modal
+            :title="lan.$t('quxiaozhibo')"
+            v-model:visible="isquxiao"
+            :confirm-loading="confirmLoading"
+            @ok="onquxiao()"
+            >
+            <p>{{ lan.$t("querenquxiao") }}</p>
+        </a-modal>
         <nav-bottom></nav-bottom>
     </div>
 </template>
@@ -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<number> = ref(0);
         const uploadpicprogress: Ref<number> = ref(0);
         const videofile = ref<File>();
@@ -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
         };
     },
 });

src/views/mine/Transaction.vue

@@ -24,8 +24,7 @@
               <td>{{i.created_at}}</td>
               <td class="moneyadd">{{i.statusname}}</td>
               <td>
-                <span v-if="international==1">$</span>
+                
-                <span v-else>￥</span>
                 {{i.money}}
               </td>
               <td @click="navto(3,i.withdrawalid)">{{lan.$t('chakanxiangqing')}}</td>

src/views/mine/Transactiondetail.vue

@@ -29,9 +29,9 @@
             <div class="right">{{accountinfo.created_at}}</div>
           </div>
 
-          <div class="infoitem">
+          <div class="infoitem" v-if="accountinfo.type != 2">
             <div class="left">{{lan.$t('laiyuan')}}</div>
-            <div class="right">{{accountinfo.typename}}</div>
+            <div class="right">{{accountinfo.sourcetitle}}</div>
           </div>
           <div class="back" @click="navto(1,2)">{{lan.$t('fanhui')}}</div>
          
@@ -58,7 +58,7 @@
         </div>
           <div class="infoitem">
             <div class="left">{{lan.$t('tixianzhuangtai')}}</div>
-             <div class="right" >{{accountinfo.statusname}}</div>
+             <div class="right" style="color: red;" >{{accountinfo.statusname}}</div>
             <!-- <div class="right" v-if="accountinfo.status==1">直播收入</div>
             <div class="right" v-if="accountinfo.status==2">提现</div>
             <div class="right" v-if="accountinfo.status==3">后台充值</div> -->
@@ -83,7 +83,7 @@
 
           <div class="infoitem">
             <div class="left">{{lan.$t('shoukuanzhanghu')}}</div>
-            <div class="right">{{accountinfo.typename}}&nbsp;&nbsp;&nbsp;&nbsp;{{i.account}}</div>
+            <div class="right">{{accountinfo.typename}}&nbsp;&nbsp;&nbsp;&nbsp;{{accountinfo.account}}</div>
           </div>
         
         <div style="display:flex">

src/views/mine/Wallet.vue

@@ -186,8 +186,8 @@
             <tr v-for="(i,j) in salelist.data" :key="j">
               <td>{{i.created_at}}</td>
               <td>{{i.typename}}</td>
-              <td class="moneyadd moneyreverse" v-if="i.type==2">-￥{{i.money}}</td>
+              <td class="moneyadd moneyreverse" v-if="i.type==2">-{{i.money}}</td>
-              <td class="moneyadd " v-else>+￥{{i.money}}</td>
+              <td class="moneyadd " v-else>+{{i.money}}</td>
               <td style="cursor: pointer;" @click="navto(4,i.accountid)">查看详情</td>
             </tr>
          

src/views/regime/SignupStu.vue

@@ -4,7 +4,7 @@
       <div class="title">直播报名学生</div>
       <div class="sel">
         <img src="@/static/images/sousuo.png" alt="" class="icon" />
-           <input type="text" placeholder="请输入想要搜索的学生姓名" v-model="condition.title" @keyup.enter="search(condition)"/>
+           <input type="text" placeholder="请输入想要搜索的学生姓名" v-model="condition.keyword" @keyup.enter="search(condition)"/>
       </div>
     </div>
     <div class="mid">
@@ -20,7 +20,7 @@
 
               <div class="infoitem">
                 <span class="label">所在国家:</span>
-                <span class="one-line-hide">{{i.live}}</span>
+                <span class="one-line-hide">{{i.country}}</span>
               </div>
 
               <div class="infoitem">
@@ -179,7 +179,7 @@ export default defineComponent({
     });
     const title=ref('')
     const condition = ref<any>({
-      title:"",
+      keyword:"",
       id:Number(useRoute().query.liveid)
     })
     onMounted(async () => {