Merge pull request 'xbx' (#70) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/70
2020-10-25 22:44:37 +08:00 · 2020-10-25 22:44:37 +08:00 · 9ba1183ed7
commit 9ba1183ed7
parent c783850d36 b5e81088af
26 changed files with 399 additions and 157 deletions
--- a/public/index.html
+++ b/public/index.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh_CN">
  <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
--- a/src/App.vue
+++ b/src/App.vue
@ -3,7 +3,9 @@
    <router-link to="/">Home</router-link> |
    <router-link to="/about">About</router-link>
  </div> --> 
-  <router-view/>
+  <a-config-provider :locale="locale">
+    <router-view/>
+  </a-config-provider>
 </template>
 <script lang="ts">
 import { defineComponent } from 'vue';
@ -12,6 +14,8 @@ import store from './store';
 import { getValue } from './utils/common';
 import { provideI18n } from "@/utils/i18n"
 import i18ninit from "@/i18n/init"
+import enUS from 'ant-design-vue/es/locale/en_US';
+import zhCN from 'ant-design-vue/es/locale/zh_CN';

 export default defineComponent({
  setup(){
@ -22,11 +26,17 @@ export default defineComponent({
    }else{
      router.push("/")
    }
+    return{
+      locale: zhCN
+    }
  }
 })
 </script>

 <style lang="scss">
+div {
+  user-select: none;
+}
 .one-line-hide {
  overflow: hidden;
  text-overflow: ellipsis;
--- a/src/api/index.ts
+++ b/src/api/index.ts
@ -901,4 +901,36 @@ export async function usersig(userid: number) {
        return '';
    }
    return res.data;
+}
+
+export async function liveinfo(id: number): Promise<any>{
+    const liveinfo = (await get<LiveInfo>(`live/${id}`)).data;
+    return {
+        liveid: liveinfo.liveid,
+        title: liveinfo.title,
+        img: liveinfo.img,
+        fileid: liveinfo.fileid,
+        fileurl: liveinfo.fileurl,
+        fileduration: liveinfo.fileduration,
+        dateline: liveinfo.dateline,
+        livetime: liveinfo.livetime,
+        livenumber: liveinfo.livenumber,
+        desc: liveinfo.desc
+    }
+}
+
+export async function setlive(data: any){
+    const info = await put("live/" + data.id, data)
+    console.log(info.data)
+    
+}
+
+
+export async function getlivest() {
+    const res = await get<any>("checkReleaseLive");
+    if(res.data.status != 0) {
+        return res.data;
+    } else {
+        return false;
+    }
 }
--- a/src/components/LivePlay.vue
+++ b/src/components/LivePlay.vue
@ -20,7 +20,7 @@
                  <span class="score">5.0分</span>
              </div>
          </div>
-          <div class="right">
+          <div class="right" @click="bianji">
              编辑信息
          </div>
      </div>
@ -77,6 +77,7 @@
 }
 </style>
 <script lang="ts">
+import router from '@/router';
 import { defineComponent, ref } from "vue";

 export default defineComponent({
@ -84,10 +85,15 @@ export default defineComponent({
    info: Object
  },
  setup(props) {
-    console.log(1);
+    console.log(props.info);
+    function bianji(){
+      if(props.info != undefined){
+        router.push("/mine/webcast?id=" + props.info.liveid)
+      }
+    }
    // const liveinfo = ref(props.liveinfo)
    return {
-      // liveinfo
+      bianji
    }
  },
 });
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@ -3,7 +3,7 @@
        <div class="user" style="overflow: hidden;">
            <div class="user" :class="{'seltop': selnum == 0}">
                <img :src="userinfo.img" alt="" class="head">
-                <div class="name">{{userinfo.username}}</div>
+                <div class="name">{{userinfo.name}}</div>
            </div>
        </div>
        
--- a/src/components/NavBottom.vue
+++ b/src/components/NavBottom.vue
@ -1,9 +1,9 @@
 <template>
    <div class="nav-bottom">
-        <div class="nav-container">
+        <div class="nav-container" :style="color">
            <div v-for="(item, index) in navArray" :key="index" class="nav-item" @click="navto(item.route)">{{ item.name }}</div>
        </div>
-        <div class="copyright">Beelink公司版权所有  2019—2022</div>
+        <div class="copyright" :style="color">Beelink公司版权所有  2019—2022</div>
    </div>
 </template>

@ -12,7 +12,9 @@ import router from '@/router';
 import { defineComponent } from 'vue';

 export default defineComponent({
-    name: 'NavBottom',
+    props:{
+        color: Object
+    }, 
    setup(){
        interface Nav{
            name: string;
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@ -18,8 +18,8 @@
                    <div class="name">{{userinfo.zoneStr}}</div>
                    <img src="@/static/images/jiantou2.png" alt="" class="down">
                </div>
-                <template v-slot:overlay>
-                    <a-menu>
+                <template v-slot:overlay >
+                    <a-menu style="max-height:70vh;overflow: auto;">
                        <!-- 时区 -->
                        <a-menu-item  v-for="(i,j) in zonelist" :key="j" @click="zonechange(i.zoneid)">
                            <div class="selitem">
@ -47,7 +47,7 @@
                    <img src="@/static/images/jiantou2.png" alt="" class="down">
                </div>
                <template v-slot:overlay>
-                    <a-menu>
+                    <a-menu style="max-height:70vh;overflow: auto;">
                        <!-- 货币 -->
                        <a-menu-item  v-for="(i,j) in currencylist" :key="j">
                            <div class="selitem" @click="currencychange(i.value)">
@ -74,7 +74,7 @@
                    <img src="@/static/images/jiantou2.png" alt="" class="down">
                </div>
                <template v-slot:overlay>
-                    <a-menu>
+                    <a-menu style="max-height:70vh;overflow: auto;">
                        <!-- 语言 -->
                        <a-menu-item  v-for="(i,j) in languagelist" :key="j">
                            <div class="selitem" @click="setlanguage(i.value)">
@ -215,7 +215,7 @@ export default defineComponent({
            updatedAt: "2020-08-19 11:54:59",
            value: "1"
        }])
-        const languagelist=ref<any>({
+        const languagelist=ref<any>([{
            alias: "",
            code: "104110011000",
            createdAt: "2020-08-14 11:08:28",
@ -226,7 +226,7 @@ export default defineComponent({
            publish: 1,
            updatedAt: "2020-08-14 11:08:28",
            value: "zh"
-        })
+        }])
        console.log(types.value)
        interface Nav{
            name: string;
--- a/src/components/VideoCont.vue
+++ b/src/components/VideoCont.vue
@ -35,6 +35,16 @@
    <div class="button">
      <div class="modify" @click="update(videoid)">修改该视频</div>
      <div class="del" @click="drop(videoid)">删除该视频</div>
+      <a-modal
+        title="确认删除"
+        v-model:visible="visible"
+        :confirm-loading="confirmLoading"
+        @ok="handleOk"
+        okText="确定"
+        cancelText="取消"
+      >
+        <p>您确认删除该视频吗？</p>
+      </a-modal>
    </div>
  </div>
 </template>
@ -108,7 +118,7 @@
 <script lang="ts">
 import { videodel } from '@/api';
 import router from '@/router';
-import { defineComponent } from "vue";
+import { defineComponent, ref } from "vue";
 import { useRoute } from 'vue-router';

 export default defineComponent({
@ -131,16 +141,32 @@ export default defineComponent({
    },
    setup(){
        console.log(1)
+        const visible = ref(false);
+        const confirmLoading = ref(false);
+        let id = 0;
        function drop(e: number){
-            console.log(e)
-            videodel(e)
+            console.log(e);
+            id = e;
+            visible.value = true;
        }
        function update(e: number) {
             router.push("/mine/video?id="+e)
        }
+        function handleOk() {
+         
+          confirmLoading.value = true;
+            videodel(id).then(()=>{
+              visible.value = false;
+              confirmLoading.value = false;
+              router.back()
+            })
+        }
        return{
            drop,
-            update
+            update,
+            confirmLoading,
+            visible,
+            handleOk
        }
    }
 });
--- a/src/import-png.d.ts
+++ b/src/import-png.d.ts
@ -1,4 +1,14 @@
 declare module "*.png" {
    const value: any;
    export default value;
+}
+
+declare module "ant-design-vue/es/locale/en_US" {
+    const value: any;
+    export default value;
+}
+
+declare module "ant-design-vue/es/locale/zh_CN" {
+    const value: any;
+    export default value;
 }
--- a/src/router/index.ts
+++ b/src/router/index.ts
@ -127,7 +127,11 @@ const routes: Array<RouteRecordRaw> = [
    name: 'Share',
    component: () => import('../views/login/Share.vue')
  },
-
+  {
+    path: '/about',
+    name: 'About',
+    component: () => import('../views/login/About.vue')
+  }
 ]

 const router = createRouter({
--- a/src/store/index.ts
+++ b/src/store/index.ts
@ -51,6 +51,7 @@ export default createStore({
  },
  mutations: {
    setUserInfo(state, userinfo){
+      userinfo.money = userinfo.money.toString()
      state.userinfo = userinfo
    },
    login(state, islogin: boolean){
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@ -93,4 +93,6 @@ export interface LivelistInfo {
    code: number;
    msg: string;
    total: number;
-}
+}
+
+
--- a/src/views/login/About.vue
+++ b/src/views/login/About.vue
@ -1,5 +1,46 @@
 <template>
  <div class="about">
+    <div class="topnav">
+      <div class="navcontent">
+        <div class="left">
+          <img src="@/static/images/logo.png" alt="" class="logo">
+          <span class="orgname">Beelink</span>
+        </div>
+        <div class="right">
+          <div>立即登录</div>
+          <div class="signnow">立即注册</div>
+          <div class="line"></div>
+           <a-dropdown :trigger="['click']" :getPopupContainer="triggerNode => triggerNode.parentNode">
+                <div class="item" style="display: flex;align-items: center;" @click="e => e.preventDefault()">
+                    <img src="@/static/images/yuyan.png" alt="" class="icon">
+                    <div>{{userinfo.language}}</div>
+                    <img src="@/static/images/jiantou2.png" alt="" class="arrow">
+                </div>
+                <template v-slot:overlay>
+                    <a-menu style="max-height:70vh;overflow: auto;">
+                        <!-- 语言 -->
+                        <a-menu-item  v-for="(i,j) in languagelist" :key="j">
+                            <div class="selitem" @click="setlanguage(i.value)">
+                                <span>{{i.name}}</span>
+                            </div>
+                        </a-menu-item>
+                        <!-- <a-menu-item key="1">
+                            <div class="selitem">
+                                <span>时区2cc</span>
+                            </div>
+                        </a-menu-item>
+                        <a-menu-item key="3">
+                            <div class="selitem">
+                                <span>时区3c</span>
+                            </div>
+                        </a-menu-item> -->
+                    </a-menu>
+                </template>
+            </a-dropdown>
+          
+        </div>
+      </div>
+    </div>
    <div class="top">
      <div class="titlebox">
        <div class="title">beelink</div>
@ -70,21 +111,39 @@
      </div>
    </div>
    <div class="bottomnav">
-      <NavBottom></NavBottom>
+      <NavBottom :color="{'color': '#fff'}"></NavBottom>
    </div>
  </div>
 </template>

 <script lang="ts">
-import { defineComponent, ref } from "vue";
+import { computed, defineComponent, ref } from "vue";
 import NavBottom from '@/components/NavBottom.vue';
+import store from '@/store';
 export default defineComponent({
-  name: "About",
  components: {
    NavBottom
  },
  setup() {
-    return {};
+    const languagelist=ref<any>([{
+        alias: "",
+        code: "104110011000",
+        createdAt: "2020-08-14 11:08:28",
+        deletedAt: null,
+        dictionaryid: 210,
+        name: "中文",
+        position: 1,
+        publish: 1,
+        updatedAt: "2020-08-14 11:08:28",
+        value: "zh"
+    }])
+    const userinfo = computed(() => {
+        return store.state.userinfo;
+    })
+    return {
+      languagelist,
+      userinfo
+    };
  },
 });
 </script>
@ -96,6 +155,69 @@ export default defineComponent({
  color:white!important
 }
 .about {
+  .topnav{
+    width: 100%;
+    height: 57px;
+    background: white;
+    display: flex;
+    align-items: center;
+    position: fixed;
+    top: 0;
+    z-index: 9999;
+    .navcontent{
+      width: 910px;
+      margin: 0 auto;
+      display:flex;
+      justify-content: space-between;
+      align-items: center;
+      .left{
+        .logo{
+          width: 38px;
+          height: 36px;
+          margin-right:6px;
+        }
+        .orgname{
+          color: #0DBBA4;
+          font-size: 20px;
+          font-weight: bold;
+        }
+      }
+      .right{
+        width: 282px;
+        font-size: 11px;
+        color:#111111;
+        display: flex;
+        align-items: center;
+        .signnow{
+          width: 85px;
+          height: 23px;
+          background: linear-gradient(90deg, #00DAC2, #42DE9D, #87E062, #D0EB3D, #FFFA18);
+          border-radius: 11px;
+          color: white;
+          text-align: center;
+          line-height: 23px;
+          margin-left: 26px;
+          margin-right: 23px;
+        }
+        .line{
+          width: 1px;
+          height: 18px;
+          background: #EEEEEE;
+          margin-right: 23px;
+        }
+        .icon{
+          width: 14px;
+          height: 14px;
+          margin-right: 6px;
+        }
+        .arrow{
+          width: 9px;
+          height: 5px;
+          margin-left: 28px;
+        }
+      }
+    }
+  }
  .top {
    width: 100%;
    height: 512px;
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@ -105,7 +105,7 @@
          您利用碎片时间，轻轻松松学会各种语言。
        </div>
        <div class="relation">
-          <div class="more">了解更多</div>
+          <div class="more" @click="navto()">了解更多</div>
          <img src="@/static/images/tel.png" alt="" class="icon">
          <div>136-0111-1111</div> 

@ -224,6 +224,10 @@ export default defineComponent({
      console.log(e)
      router.push("/regime/videoinfo?id="+e)
    }
+
+    function navto(){
+      router.push("/about")
+    }
    return {
      formLayout,
      tabselected,
@ -239,7 +243,8 @@ export default defineComponent({
      myquhao,
      sublogin,
      videolist,
-      tovideoxq
+      tovideoxq,
+      navto
    };
  },
 });
--- a/src/views/mine/Addaccount.vue
+++ b/src/views/mine/Addaccount.vue
@ -1,11 +1,6 @@
 <template>
  <div class="cashout">
-    <a-breadcrumb separator=">">
-      <a-breadcrumb-item>Home</a-breadcrumb-item>
-      <a-breadcrumb-item href=""> Application Center </a-breadcrumb-item>
-      <a-breadcrumb-item href=""> Application List </a-breadcrumb-item>
-      <a-breadcrumb-item>An Application</a-breadcrumb-item>
-    </a-breadcrumb>
+    
    <div class="mingxilist">
      <div class="tabs">
        <div class="beforetab">新增账户</div>
@ -24,7 +19,7 @@
          >
            <a-radio :value="4">
              <img src="@/static/images/bank.png" alt="" class="icon icon1" />
-              <span>银行卡zzz</span>
+              <span>银行卡</span>
            </a-radio>
            <a-radio :value="2">
              <img src="@/static/images/walletzfb.png" alt="" class="icon" />
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@ -34,14 +34,14 @@
                    <div class="input-box teach-lang">
                        <div class="label">教授</div>
                        <a-select
-                            v-model:value="userinfo.tlanguage"
+                            v-model:value="userinfo.tlanguageValue"
                            style="width: 171px"
                            size="small"
                            ref="select"
                            :getPopupContainer="triggerNode => triggerNode.parentNode"
                        >
-                            <a-select-option v-for="(item, index) in ['英语', '法语']" :key="index" :value="item">
-                                {{ item }}
+                            <a-select-option v-for="(item, index) in chiveslist[1]" :key="index" :value="item.languageid">
+                                {{ item.name }}
                            </a-select-option>
                        </a-select>
                    </div>
@ -148,14 +148,14 @@
                    <div class="input-box time-zone-box">
                        <div class="label">时区</div>
                        <a-select
-                            v-model:value="userinfo.zoneStr"
+                            v-model:value="userinfo.zoneid"
                            style="width: 171px"
                            size="small"
                            ref="select"
                            :getPopupContainer="triggerNode => triggerNode.parentNode"
                        >
-                            <a-select-option v-for="(item, index) in ['北京 GMT +08:00']" :key="index" :value="item">
-                                {{ item }}
+                            <a-select-option v-for="(item, index) in zonelist" :key="index" :value="item.zoneid">
+                                {{item.city}}{{item.gmt}}
                            </a-select-option>
                        </a-select>
                    </div>
@ -168,21 +168,21 @@
                            ref="select"
                            :getPopupContainer="triggerNode => triggerNode.parentNode"
                        >
-                            <a-select-option v-for="(item, index) in ['人民币']" :key="index" :value="item">
-                                {{ item }}
+                            <a-select-option v-for="(item, index) in currencylist" :key="index" :value="item.value">
+                                {{item.value}}{{item.name}}
                            </a-select-option>
                        </a-select>
                    </div>
                    <div class="input-box time-zone">
                        <div class="label">语言</div>
                        <a-select
-                            v-model:value="userinfo.language"
+                            v-model:value="userinfo.languageValue"
                            style="width: 171px"
                            size="small"
                            ref="select"
                            :getPopupContainer="triggerNode => triggerNode.parentNode"
                        >
-                            <a-select-option v-for="(item, index) in languages" :key="index" :value="item.name">
+                            <a-select-option v-for="(item, index) in languages" :key="index" :value="item.value">
                                {{ item.name }}
                            </a-select-option>
                        </a-select>
@ -287,7 +287,7 @@ import { uploadflie } from "@/utils/vod"
 import store from '@/store';
 import smile from "@/static/images/smile.png"
 import smilet from "@/static/images/smilet.png"
-import { changetel, checksmscode, editpassword, getarchives, getlanguages, getquhaolist, putmember, sendsms } from "@/api/index"
+import { changetel, checksmscode, editpassword, getarchives, getcurrencys, getlanguages, getquhaolist, getzonelist, putmember, sendsms } from "@/api/index"
 import { message } from 'ant-design-vue';

 export default defineComponent({
@ -321,11 +321,32 @@ export default defineComponent({

        const mynewtel = ref<string>("");
        const isSecondStep: Ref<boolean> = ref(false);
+        const currencylist=ref<any>([{
+            alias: "CNY",
+            code: "104110041000",
+            createdAt: "2020-08-19 11:54:59",
+            deletedAt: null,
+            dictionaryid: 241,
+            name: "人民币￥",
+            position: 1,
+            publish: 1,
+            updatedAt: "2020-08-19 11:54:59",
+            value: "1"
+        }])
+        const zonelist=ref<any>([{
+            city: "中途岛",
+            gmt: "GMT-11:00",
+            id: "Pacific/Midway",
+            zoneid: 1
+
+        }])
        onMounted(async ()=>{
            chiveslist.value = await getarchives()
            languages.value = await getlanguages()
-            quhaolist.value=await getquhaolist()
-            myquhao.value=quhaolist.value[0].code
+            quhaolist.value = await getquhaolist()
+            myquhao.value = quhaolist.value[0].code
+            currencylist.value = await getcurrencys()
+            zonelist.value=await getzonelist()
            console.log(quhaolist.value,"listsssss")
        })

@ -503,28 +524,29 @@ export default defineComponent({
            //  for(let i in toRaw(formData.value).willsay){
            //     console.log(toRaw(formData.value).willsay[i])
            // }
+            const uesrinfo = toRaw(formData.value)
            for(let m=0;m<toRaw(chiveslist.value).length;m++){
-                for(const i in toRaw(formData.value).willsayValue){
+                for(const i in uesrinfo.willsayValue){
                // console.log(toRaw(formData.value).willsayValue[i])
               
-                    if(typeof toRaw(formData.value).willsay[i].name=='string'){
+                    if(typeof uesrinfo.willsay[i].name=='string'){
                       
                        // console.log(toRaw(chiveslist.value))
-                        if(toRaw(formData.value).willsay[i].name==toRaw(chiveslist.value)[m].name){
-                            toRaw(formData.value).willsayValue[i].name=toRaw(chiveslist.value)[m].languageid
+                        if(uesrinfo.willsay[i].name==toRaw(chiveslist.value)[m].name){
+                            uesrinfo.willsayValue[i].name=toRaw(chiveslist.value)[m].languageid
                        }
                    }else{
-                        toRaw(formData.value).willsayValue[i].name=toRaw(formData.value).willsay[i].name
+                        uesrinfo.willsayValue[i].name=uesrinfo.willsay[i].name
                        
                    }
                     
-               toRaw(formData.value).willsayValue[i].level=toRaw(formData.value).willsay[i].level
+               uesrinfo.willsayValue[i].level=uesrinfo.willsay[i].level
                }
            }
-            console.log(toRaw(formData.value).willsayValue)
+            console.log(uesrinfo)
           
-            console.log(toRaw(formData.value));
-            putmember(toRaw(formData.value))
+            // console.log(toRaw(formData.value));
+            putmember(uesrinfo)
            // putmember(toRaw(formData.value)).then((res) => {
            //     console.log(res)
            // })
@ -604,7 +626,9 @@ export default defineComponent({
            mynewtel,
            quhaolist,
            getquhao,
-            myquhao
+            myquhao,
+            currencylist,
+            zonelist
        }
    }
 });
--- a/src/views/mine/Cashout.vue
+++ b/src/views/mine/Cashout.vue
@ -1,11 +1,6 @@
 <template>
  <div class="cashout">
-    <a-breadcrumb separator=">">
-      <a-breadcrumb-item>Home</a-breadcrumb-item>
-      <a-breadcrumb-item href=""> Application Center </a-breadcrumb-item>
-      <a-breadcrumb-item href=""> Application List </a-breadcrumb-item>
-      <a-breadcrumb-item>An Application</a-breadcrumb-item>
-    </a-breadcrumb>
+    
    <div class="mingxilist">
      <div class="tabs">
        <div class="beforetab">提现到指定账户</div>
--- a/src/views/mine/Cashoutdetail.vue
+++ b/src/views/mine/Cashoutdetail.vue
@ -1,11 +1,6 @@
 <template>
  <div class="transaction">
-      <a-breadcrumb separator=">">
-      <a-breadcrumb-item>Home</a-breadcrumb-item>
-      <a-breadcrumb-item href=""> Application Center </a-breadcrumb-item>
-      <a-breadcrumb-item href=""> Application List </a-breadcrumb-item>
-      <a-breadcrumb-item>An Application</a-breadcrumb-item>
-    </a-breadcrumb>
+    
         <div class="mingxilist">
      <div class="tabs">
        <div class="beforetab">提现记录详情</div>
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@ -75,7 +75,7 @@
          v-model:value="form.startTime"
          placeholder="请设置您的开始时间"
        /> -->
-        <a-date-picker @change="startchange" placeholder="请设置您的开始时间" />
+        <a-date-picker show-time :value="form.dateline" @change="startchange" placeholder="请设置您的开始时间" />
      </a-form-item>
      <a-form-item
        label="直播时长"
@ -122,22 +122,22 @@
        <template v-slot:closeIcon>
          <img src="@/static/images/delete.png" class="close" />
        </template>
-        <div class="notice-container report" v-if="0">
+        <div class="notice-container report" v-if="lives.status == 1">
          <div class="title">您尚未获得直播资格</div>
          <div class="title sub-title">
-            您被 学生XXX<span class="red">举报，发生违规行为</span
-            >,如有疑问，点击反馈
+            {{lives.data.msg}}
          </div>
          <div class="confirm-btn">意见反馈</div>
        </div>
        <div class="notice-container" v-else>
          <div class="title">您尚未获得直播资格</div>
          <div class="title sub-title">
-            上一周/月您在平台视频点击量为
+            <!-- 上一周/月您在平台视频点击量为
            <span class="red">第24名</span>，要在前
-            <span class="bule">20名</span> 才能获得直播资格
+            <span class="bule">20名</span> 才能获得直播资格 -->
+            {{lives.msg}}
          </div>
-          <rank-list></rank-list>
+          <rank-list :list="lives.data"></rank-list>
        </div>
      </a-modal>
    </div>
@ -161,7 +161,9 @@ import RankList from "./RankList.vue";
 import { previewCover } from "@/utils/common";
 import { FromSend, ImgInfo } from "@/types/index";
 import { uploadflie } from "@/utils/vod";
-import { liveadd } from "@/api";
+import { getlivest, liveadd, liveinfo, setlive } from "@/api";
+import { useRoute } from 'vue-router';
+import dayjs from 'dayjs';

 export default defineComponent({
  name: "ReleaseWebcast",
@ -173,7 +175,7 @@ export default defineComponent({
  },
  setup() {
    // 表单数据
-    const form = reactive({
+    const form = ref({
      title: "",
      img: "",
      fileid: "",
@ -189,6 +191,7 @@ export default defineComponent({
    const uploadpicprogress: Ref<number> = ref(0);
    const videofile = ref<File>();
    const videos = ref<Array<any>>([]);
+    const lives = ref<any>({});
    /**
     * 验证直播时间
     */
@ -255,33 +258,50 @@ export default defineComponent({
     * 表单提交
     */

-    const subdata = reactive({
-      title: "",
-      img: "",
-      fileid: "",
-      fileurl: "",
-      fileduration: "",
-      dateline: "",
-      livetime: "",
-      livenumber: "",
-      desc: "",
-    });
-
+    // const subdata = ref({
+    //   title: "",
+    //   img: "",
+    //   fileid: "",
+    //   fileurl: "",
+    //   fileduration: "",
+    //   dateline: "",
+    //   livetime: "",
+    //   livenumber: "",
+    //   desc: "",
+    // });
+    /**
+     * todo 需要后台返回年份
+     */
+    const id = useRoute().query.id
+    if(id != null && typeof id == 'string'){
+      liveinfo(parseInt(id)).then((res)=>{
+        form.value = res;
+      })
+    }
    const onSubmit = (e: FromSend) => {
      e.preventDefault();
      validate()
        .then(() => {
          //   console.log(toRaw(form),111);
-          const subdata = toRaw(form);
+          const subdata: any = toRaw(form.value);
          //   subdata.fileid=picinfo.
-          console.log(subdata);
-          liveadd(subdata);
+          if(id != undefined && id){
+            /**
+             * todo 提交会报错
+             */
+            subdata.id = id;
+            setlive(subdata)
+          }else{
+            console.log(subdata);
+            liveadd(subdata);
+          }
+          
        })
        .catch((err: unknown) => {
          console.log("error", err);
        });
    };
-    const isEntitled: Ref<boolean> = ref(true);
+    const isEntitled: Ref<boolean> = ref(false);
    /**
     * 隐藏无资格提示
     */
@ -294,14 +314,13 @@ export default defineComponent({
     */

    function startchange(e: string): void {
-      const month = new Date(e).getMonth()+1
-      console.log(new Date(e).getFullYear()+"-"+month+'-'+new Date(e).getDate())
-      form.dateline =
-        new Date(e).getFullYear() +
-        "-" +
-        month +
-        "-" +
-        new Date(e).getDate();
+      // const month = new Date(e).getMonth()+1
+      // console.log(new Date(e).getFullYear()+"-"+month+'-'+new Date(e).getDate())
+      // console.log(e.toString())
+      const time = dayjs(new Date(e))
+      const timestr = time.year() + "-" + (time.month() + 1) + "-" + time.date() + " " + time.hour() + ":" + time.minute() + ":" + time.second()
+      console.log(timestr)
+      form.value.dateline = timestr;
    }
    /**
     *  上传文件
@ -324,7 +343,7 @@ export default defineComponent({
      videofile.value = file.file;
      videos.value[0].addEventListener("durationchange", () => {
        console.log(videos.value[0].duration);
-        form.fileduration = videos.value[0].duration;
+        form.value.fileduration = videos.value[0].duration;
      });
      const res = await uploadflie(file.file, (info: any) => {
        console.log(info);
@ -332,8 +351,8 @@ export default defineComponent({
      });
      console.log(res);

-      form.fileid = res.fileId;
-      form.fileurl = res.video.url;
+      form.value.fileid = res.fileId;
+      form.value.fileurl = res.video.url;
    }

    async function uploadspic(file: AntUpload) {
@ -345,9 +364,16 @@ export default defineComponent({

      //  picinfo.fileId=res.fileId
      //  picinfo.url=res.video.url
-      form.img = res.video.url;
+      form.value.img = res.video.url;
    }

+    getlivest().then((res) => {
+      if(res){
+        isEntitled.value = true;
+        lives.value = res;
+      }
+    })
+
    return {
      labelCol: { span: 4 },
      wrapperCol: { span: 14 },
@ -370,6 +396,7 @@ export default defineComponent({
      startchange,
      videofile,
      videos,
+      lives
    };
  },
 });
--- a/src/views/mine/Transaction.vue
+++ b/src/views/mine/Transaction.vue
@ -1,11 +1,6 @@
 <template>
  <div class="transaction">
-      <a-breadcrumb separator=">">
-      <a-breadcrumb-item>Home</a-breadcrumb-item>
-      <a-breadcrumb-item href=""> Application Center </a-breadcrumb-item>
-      <a-breadcrumb-item href=""> Application List </a-breadcrumb-item>
-      <a-breadcrumb-item>An Application</a-breadcrumb-item>
-    </a-breadcrumb>
+     
         <div class="mingxilist">
     <div class="mingxitop">
       <div><span class="tabtitle">明细查询</span>
--- a/src/views/mine/Transactiondetail.vue
+++ b/src/views/mine/Transactiondetail.vue
@ -1,11 +1,6 @@
 <template>
  <div class="transaction">
-      <a-breadcrumb separator=">">
-      <a-breadcrumb-item>Home</a-breadcrumb-item>
-      <a-breadcrumb-item href=""> Application Center </a-breadcrumb-item>
-      <a-breadcrumb-item href=""> Application List </a-breadcrumb-item>
-      <a-breadcrumb-item>An Application</a-breadcrumb-item>
-    </a-breadcrumb>
+      
      <div class="mingxilist" v-if="query.ifwithdrawal!=1">
        <div class="tabs">
          <div class="beforetab">交易明细详情</div>
--- a/src/views/mine/Wallet.vue
+++ b/src/views/mine/Wallet.vue
@ -1,11 +1,5 @@
 <template>
  <div class="wallet">
-    <a-breadcrumb separator=">">
-      <a-breadcrumb-item>Home</a-breadcrumb-item>
-      <a-breadcrumb-item href=""> Application Center </a-breadcrumb-item>
-      <a-breadcrumb-item href=""> Application List </a-breadcrumb-item>
-      <a-breadcrumb-item>An Application</a-breadcrumb-item>
-    </a-breadcrumb>
    <div class="top">
      <div class="mywallet">
        <div class="topinfo">
@ -194,7 +188,7 @@
              <td>{{i.typename}}</td>
              <td class="moneyadd moneyreverse" v-if="i.type==2">-￥{{i.money}}</td>
              <td class="moneyadd " v-else>+￥{{i.money}}</td>
-              <td @click="navto(4,i.accountid)">查看详情{{i.accountid}}</td>
+              <td @click="navto(4,i.accountid)">查看详情</td>
            </tr>
         
          </tbody>
@ -258,7 +252,9 @@ export default defineComponent({
      salelist.value=await saleinfo({bdate:dateString[0],edate:dateString[1],status:state.value,page:page.value});
    }
    async function del(e: number){
-      deleteaccount(e)
+      await deleteaccount(e);
+      accountlist.value = await getwallect();
+        
    }
    async function pagechange(e: any) {
      console.log(e)
@ -482,7 +478,7 @@ export default defineComponent({
      height: 226px;
      background: white;
      border-radius: 17px;
-      margin-left: 17px;
+      margin-right: 17px;
      margin-bottom: 17px;
      .hostinfo {
        display: flex;
--- a/src/views/regime/Liveing.vue
+++ b/src/views/regime/Liveing.vue
@ -1,11 +1,6 @@
 <template>
    <div class="liveing">
-        <a-breadcrumb separator=">">
-        <a-breadcrumb-item>Home</a-breadcrumb-item>
-        <a-breadcrumb-item href=""> Application Center </a-breadcrumb-item>
-        <a-breadcrumb-item href=""> Application List </a-breadcrumb-item>
-        <a-breadcrumb-item>An Application</a-breadcrumb-item>
-        </a-breadcrumb>
+      
        <div class="top">
        <div class="left">直播页面</div>
        <div class="right">
--- a/src/views/regime/Video.vue
+++ b/src/views/regime/Video.vue
@ -8,10 +8,10 @@
        <div :class="tabindex == 0 ? 'on' : ''" @click="tabchange(0)">
          审核中
        </div>
-        <div :class="tabindex == 1 ? 'on' : ''" @click="tabchange(1)">
+        <div :class="tabindex == 2 ? 'on' : ''" @click="tabchange(2)">
          未通过
        </div>
-        <div :class="tabindex == 2 ? 'on' : ''" @click="tabchange(2)">
+        <div :class="tabindex == 1 ? 'on' : ''" @click="tabchange(1)">
          已发布
        </div>
      </div>
@ -52,7 +52,7 @@
        :share="i.share"
      ></VideoItem>
    </div>
-    <div class="list" v-if="tabindex == 1">
+    <div class="list" v-if="tabindex == 2">
      <VideoItem
        v-for="(i, j) in videolist.data"
        :key="j"
@ -67,7 +67,7 @@
        :share="i.share"
      ></VideoItem>
    </div>
-    <div class="list" v-if="tabindex == 2">
+    <div class="list" v-if="tabindex == 1">
      <VideoItem
        v-for="(i, j) in videolist.data"
        :key="j"
@ -228,7 +228,7 @@ export default defineComponent({
    });
    async function tabchange(e: number) {
      tabindex.value = e;
-      videolist.value = await getvideolist({title: input.value,page:page.value,status:e});
+      videolist.value = await getvideolist({title: input.value,page:page.value,status:e == 4 ? '' : 0});
      // console.log(videolist)
    }
    async function sel(){
--- a/src/views/regime/week.vue
+++ b/src/views/regime/week.vue
@ -6,7 +6,7 @@
                上一周
            </div>
            2020年10月
-            <a-button type="primary" class="button"> 月日历 </a-button>
+            <a-button type="primary" class="button" @click="navto()"> 月日历 </a-button>
            <div @click="zhou++">
                下一周
                <img src="" alt="" />
@ -211,6 +211,7 @@ import { defineComponent, ref, watch } from "vue";
 import { getDay, gethour, getminute, gettime, getweek } from "@/utils/date";
 import store from '@/store';
 import { getdatelist, userinfo } from '@/api';
+import router from '@/router';

 export default defineComponent({
    props: {},
@ -247,9 +248,13 @@ export default defineComponent({
            console.log(week.value);
            getdates(userid)
        });
+        function navto(){
+            router.push("/regime/date")
+        }
        return {
            zhou,
            week,
+            navto
        };
    },
 });
--- a/yarn.lock
+++ b/yarn.lock
@ -2577,9 +2577,9 @@ caniuse-api@^3.0.0:
    lodash.uniq "^4.5.0"

 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001135:
-  version "1.0.30001150"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001150.tgz#6d0d829da654b0b233576de00335586bc2004df1"
-  integrity sha512-kiNKvihW0m36UhAFnl7bOAv0i1K1f6wpfVtTF5O5O82XzgtBnb05V0XeV3oZ968vfg2sRNChsHw8ASH2hDfoYQ==
+  version "1.0.30001151"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001151.tgz#1ddfde5e6fff02aad7940b4edb7d3ac76b0cb00b"
+  integrity sha512-Zh3sHqskX6mHNrqUerh+fkf0N72cMxrmflzje/JyVImfpknscMnkeJrlFGJcqTmaa0iszdYptGpWMJCRQDkBVw==

 case-sensitive-paths-webpack-plugin@^2.3.0:
  version "2.3.0"
@ -3354,9 +3354,9 @@ dashdash@^1.12.0:
    assert-plus "^1.0.0"

 dayjs@^1.9.1:
-  version "1.9.3"
-  resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.9.3.tgz#b7f94b22ad2a136a4ca02a01ab68ae893fe1a268"
-  integrity sha512-V+1SyIvkS+HmNbN1G7A9+ERbFTV9KTXu6Oor98v2xHmzzpp52OIJhQuJSTywWuBY5pyAEmlwbCi1Me87n/SLOw==
+  version "1.9.4"
+  resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.9.4.tgz#fcde984e227f4296f04e7b05720adad2e1071f1b"
+  integrity sha512-ABSF3alrldf7nM9sQ2U+Ln67NRwmzlLOqG7kK03kck0mw3wlSSEKv/XhKGGxUjQcS57QeiCyNdrFgtj9nWlrng==

 debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
  version "2.6.9"
@ -3699,9 +3699,9 @@ ejs@^2.6.1:
  integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==

 electron-to-chromium@^1.3.571:
-  version "1.3.582"
-  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.582.tgz#1adfac5affce84d85b3d7b3dfbc4ade293a6ffc4"
-  integrity sha512-0nCJ7cSqnkMC+kUuPs0YgklFHraWGl/xHqtZWWtOeVtyi+YqkoAOMGuZQad43DscXCQI/yizcTa3u6B5r+BLww==
+  version "1.3.583"
+  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.583.tgz#47a9fde74740b1205dba96db2e433132964ba3ee"
+  integrity sha512-L9BwLwJohjZW9mQESI79HRzhicPk1DFgM+8hOCfGgGCFEcA3Otpv7QK6SGtYoZvfQfE3wKLh0Hd5ptqUFv3gvQ==

 elliptic@^6.5.3:
  version "6.5.3"
@ -7937,9 +7937,9 @@ sass-graph@2.2.5:
    yargs "^13.3.2"

 sass-loader@^10.0.2:
-  version "10.0.3"
-  resolved "https://registry.npmjs.org/sass-loader/-/sass-loader-10.0.3.tgz#9e2f1bfdd6355f2adde4e4835d838b020bf800b0"
-  integrity sha512-W4+FV5oUdYy0PnC11ZoPrcAexODgDCa3ngxoy5X5qBhZYoPz9FPjb6Oox8Aa0ZYEyx34k8AQfOVuvqefOSAAUQ==
+  version "10.0.4"
+  resolved "https://registry.npmjs.org/sass-loader/-/sass-loader-10.0.4.tgz#ec7181096947d078d60a1d76d527f47c19b151d8"
+  integrity sha512-zhdZ8qvZM4iL5XjLVEjJLvKWvC+MB+hHgzL2x/Nf7UHpUNmPYsJvypW79bW39g4LZ603dH/dRSsRYzJJIljtdA==
  dependencies:
    klona "^2.0.4"
    loader-utils "^2.0.0"
@ -8864,9 +8864,9 @@ trim-newlines@^1.0.0:
  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=

 trtc-js-sdk@^4.6.5:
-  version "4.6.5"
-  resolved "https://registry.npmjs.org/trtc-js-sdk/-/trtc-js-sdk-4.6.5.tgz#a093ccc9637a17f75403ae5e68ef1f193d513d39"
-  integrity sha512-ggRHhbGh9t32FKUZIJTIBQEcqT1nCTogpg0nzhUc0BtHuhDy1Gq8HA8f7EztV03Wqny7sbxL4k60IdEB9YY3EQ==
+  version "4.6.6"
+  resolved "https://registry.npmjs.org/trtc-js-sdk/-/trtc-js-sdk-4.6.6.tgz#b5ff002381f2dd1b8bf8cbcab7d46c4a70a07a44"
+  integrity sha512-H5ktpbz+13iwR34AfKBDIHxT5cu21BJDlJ4Sbm1WyQAP2RFmBwJCZHJdoDKkuukLU6f+EjITG6bWrioec4bCUw==

 "true-case-path@^1.0.2":
  version "1.0.3"
@ -9273,9 +9273,9 @@ vue-loader@^15.9.2:
    vue-style-loader "^4.1.0"

 vue-router@^4.0.0-0:
-  version "4.0.0-beta.13"
-  resolved "https://registry.npmjs.org/vue-router/-/vue-router-4.0.0-beta.13.tgz#4611d09a9e44f231cc401ecc294a7f2dcb30e6a6"
-  integrity sha512-dYv9qpHPaojQlfujViiTkPkf1Bf5RCFzkCkdVFc1cENzWJYAGJanpIHiyjyKoM4u7IDFBZMItci+U4ieaEWA8A==
+  version "4.0.0-rc.1"
+  resolved "https://registry.npmjs.org/vue-router/-/vue-router-4.0.0-rc.1.tgz#42f41315849163a1243886c9aa6d7c14f24fd003"
+  integrity sha512-N3SSOIiRFo1/D6EkHGuahUSuyDvFhKizN5zVXkALX7wv0hYYndV49KwzRF5lKsAIt+OlDl7y+sNmwNewb7a4iw==

 vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
  version "4.1.2"