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

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

src/api/index.ts

@@ -204,6 +204,7 @@ export async function setvideo(data?: any) {
     const res=await put<Liveaddrule>('video/'+data.id,data)
     if(res.code==0){
         message.success(res.msg)
+        router.push("/regime/video")
     }else{
         message.error(res.msg)
     }
@@ -943,8 +944,15 @@ export async function liveinfo(id: number): Promise<any>{
 }
 
 export async function setlive(data: any){
+    data.status = 0;
     const info = await put("live/" + data.id, data)
     console.log(info.data)
+    if(info.code==0){
+        message.success(info.msg)
+        router.push("/regime/live")
+    }else{
+        message.error(info.msg)
+    }
     
 }
 

src/components/LiveCount.vue

@@ -9,7 +9,7 @@
             <div style="display: flex">
                 <img :src="i.img" alt="" />
                 <div class="stuinfo">
-                    <div>{{ i.name }} {{zid}}</div>
+                    <div>{{ i.name }}</div>
                     <div class="lessonname">{{ i.interest }}</div>
                 </div>
             </div>

src/components/LivePlay.vue

@@ -21,10 +21,10 @@
               </div>
           </div>
           <div style="display: flex">
-            <div class="right" @click="bianji">
+            <div class="right" @click="bianji" v-if="info.livestatus == 0">
               {{lan.$t('bianjixinxi')}}
             </div>
-            <div class="right" @click="kaishi">
+            <div class="right" @click="kaishi" v-if="info.livestatus == 0">
               {{lan.$t('kaishizhibo')}}
             </div>
           </div>

src/views/mine/Transaction.vue

@@ -20,7 +20,7 @@
           </thead>
           <tbody>
             <tr v-for="(i,j) in withdrawallist.data" :key="j">
-              <td>{{i.typename}}    {{i.account}}</td>
+              <td>{{i.typename}}&nbsp;&nbsp;&nbsp;&nbsp;{{i.account}}</td>
               <td>{{i.created_at}}</td>
               <td class="moneyadd">{{i.statusname}}</td>
               <td>
@@ -34,8 +34,11 @@
        
           </tbody>
         </table>
+        <template v-if="!withdrawallist.total">
+            <a-empty />
+        </template>
         <div class="pages">
-          <a-pagination v-model:current="page" :total="withdrawallist.total" :showLessItems="true" @change="pagechange"/>
+          <a-pagination v-if="withdrawallist.total" v-model:current="page" :total="withdrawallist.total" :showLessItems="true" @change="pagechange"/>
         </div>
       </div>
       <NavBottom class="navbottom"></NavBottom>

src/views/mine/Transactiondetail.vue

@@ -83,7 +83,7 @@
 
           <div class="infoitem">
             <div class="left">{{lan.$t('shoukuanzhanghu')}}</div>
-            <div class="right">{{accountinfo.typename}}</div>
+            <div class="right">{{accountinfo.typename}}&nbsp;&nbsp;&nbsp;&nbsp;{{i.account}}</div>
           </div>
         
         <div style="display:flex">

src/views/mine/Wallet.vue

@@ -193,9 +193,12 @@
          
           </tbody>
         </table>
+        <template v-if="!salelist.total">
+            <a-empty />
+        </template>
       </div>
       <div class="pages">
-        <a-pagination v-model:current="page" :total="salelist.total" :showLessItems="true" @change="pagechange"/>
+        <a-pagination v-if="salelist.total" v-model:current="page" :total="salelist.total" :showLessItems="true" @change="pagechange"/>
       </div>
     </div>
     <NavBottom class="navbottom"></NavBottom>

src/views/regime/Live.vue

@@ -63,8 +63,11 @@
             :zid="i.liveid"
         ></LiveItem>
     </div>
+    <template v-if="!livelist.total">
+            <a-empty />
+    </template>
     <div class="pages">
-        <a-pagination v-model:current="page" :total="livelist.total" :showLessItems="true" />
+        <a-pagination v-if="livelist.total" v-model:current="page" :total="livelist.total" :showLessItems="true" />
     </div>
   </div>
 </template>

src/views/regime/SignupStu.vue

@@ -49,7 +49,9 @@
             </div>
           </div>
         </div>
-
+        <template v-if="!teacherlikedlist.total">
+            <a-empty />
+        </template>
       </div>
     </div>
     <!-- <div class="pages">

src/views/regime/Subscriber.vue

@@ -50,11 +50,13 @@
             </div>
           </div>
         </div>
-
+        <template v-if="!teacherlikedlist.total">
+            <a-empty />
+      </template>
       </div>
     </div>
     <div class="pages">
-      <a-pagination v-model:current="page" :total="teacherlikedlist.total" :showLessItems="true" @change="pagechange"/>
+      <a-pagination v-if="teacherlikedlist.total" v-model:current="page" :total="teacherlikedlist.total" :showLessItems="true" @change="pagechange"/>
     </div>
   </div>
 </template>

src/views/regime/Video.vue

@@ -20,7 +20,11 @@
         <input type="text"  :placeholder="lan.$t('shipinsousuo')"  @keyup.enter="sel()" v-model="input"/>
       </div>
     </div>
+    <template v-if="!videolist.total">
+        <a-empty />
+    </template>
     <div class="list" v-if="tabindex == 4">
+      
       <VideoItem
         v-for="(i, j) in videolist.data"
         :key="j"
@@ -86,7 +90,7 @@
       ></VideoItem>
     </div>
     <div class="pages">
-      <a-pagination v-model:current="page" :total="videolist.total" :showLessItems="true" @change="pagechange" />
+      <a-pagination v-if="videolist.total" v-model:current="page" :total="videolist.total" :showLessItems="true" @change="pagechange" />
     </div>
   </div>
 </template>

src/views/regime/week.vue

@@ -6,7 +6,7 @@
                 上一周
             </div>
             {{week.year}}年{{week.yue}}月
-            <a-button type="primary" class="button" @click="navto()"> 月日历 </a-button>
+            <a-button type="primary" class="button" @click="navto('/regime/date')"> 月日历 </a-button>
             <div @click="zhou++">
                 下一周
                 <img src="../../static/images/right.png" alt="" />
@@ -46,7 +46,7 @@
                 </div>
                 <div v-for="i in 7" :key="i" >
                     <div class="day">
-                        <div :class="zhuangtai(week.date[i -1].list[item - 1].zhuangtai)" v-if="week.date[i -1].list[item - 1].title != ''" :style="{'top': (week.date[i -1].list[item - 1].start / 60 * 0.63) + 'rem', 'min-height': (week.date[i -1].list[item - 1].num / 60 * 0.63) + 'rem' }">
+                        <div :class="zhuangtai(week.date[i -1].list[item - 1].zhuangtai)" v-if="week.date[i -1].list[item - 1].title != ''" :style="{'top': (week.date[i -1].list[item - 1].start / 60 * 0.63) + 'rem', 'min-height': (week.date[i -1].list[item - 1].num / 60 * 0.63) + 'rem' }" @click="tolive(week.date[i -1].list[item - 1])">
                             <div class="one-line-hide" style="max-width: 1.5rem">
                                 {{week.date[i -1].list[item - 1].title}}
                             </div>
@@ -189,6 +189,7 @@
                             justify-content: center;
                             font-size: 11px;
                             border-radius: 6px;
+                            z-index: 999;
                             overflow: hidden;
                             > div:last-child {
                                 font-size: 11px;
@@ -276,6 +277,7 @@ export default defineComponent({
                             week.value.date[j].list[gethour(res[i].dateline)].title = res[i].title
                             week.value.date[j].list[gethour(res[i].dateline)].time = gettime(res[i].dateline, res[i].livetime)
                             week.value.date[j].list[gethour(res[i].dateline)].zhuangtai = res[i].livestatus
+                            week.value.date[j].list[gethour(res[i].dateline)].zid = res[i].liveid
                         }
                     }
                 }
@@ -315,8 +317,19 @@ export default defineComponent({
                     return 'old'
             }
         }
-        function navto(){
+        function navto(url: string){
-            router.push("/regime/date")
+            router.push(url)
+        }
+        function tolive(data: any){
+            let url = '';
+            console.log(data)
+            if(data.zhuangtai != 1){
+                url = '/regime/livedetail?id=' + data.zid
+            }else{
+                url = '/regime/liveing?id=' + data.zid
+            }
+            console.log(url)
+            router.push(url)
         }
         return {
             zhou,
@@ -325,7 +338,8 @@ export default defineComponent({
             zhuangtai,
             top,
             times,
-            xs
+            xs,
+            tolive
         };
     },
 });