From a75e5a3c022c32fa8424178bcdf390d89f7101ca Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 6 Nov 2020 22:30:17 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=B8=80=E9=83=A8=E5=88=86=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts                  |   4 ++
 src/components/LiveingWatcher.vue |  13 +++-
 src/i18n/en.ts                    |   6 +-
 src/i18n/init.ts                  |  14 +++-
 src/i18n/zh.ts                    |   6 +-
 src/import-png.d.ts               |   5 ++
 src/views/mine/Cashout.vue        |   4 +-
 src/views/mine/ReleaseWebcast.vue |   2 +-
 src/views/regime/Liveing.vue      | 108 +++++++++++++++++++++++++++++-
 9 files changed, 148 insertions(+), 14 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index 8abcb9f..bed7cca 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1024,3 +1024,7 @@ export async function interests() {
     return res.data;
 }
 
+export async function getset() {
+    const res = await get('getset');
+    return res.data;
+}
diff --git a/src/components/LiveingWatcher.vue b/src/components/LiveingWatcher.vue
index 76e82d9..2952764 100644
--- a/src/components/LiveingWatcher.vue
+++ b/src/components/LiveingWatcher.vue
@@ -13,7 +13,7 @@
         </div>
 
         <div class="icons">
-            <img src="@/static/images/camera.png" alt="" class="icon">
+            <img src="@/static/images/camera.png" @click="sendmasg" alt="" class="icon">
             <img src="@/static/images/vol.png" alt="" class="icon">
         </div>
       </div>
@@ -147,5 +147,14 @@
 <script lang="ts">
 import { defineComponent } from "vue";
 
-export default defineComponent({});
+export default defineComponent({
+  setup(prop,context){
+    function sendmasg(){
+      context.emit("sentext")
+    }
+    return {
+      sendmasg
+    }
+  }
+});
 </script>
\ No newline at end of file
diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index 2e1d784..384ed2f 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -189,7 +189,6 @@ export default {
     xuanzezhanghu: "Select account",
     tixianjine: "Withdrawal amount",
     quanbujine: "Total amount",
-    tixianzhu: "Note: 0.1% service fee will be charged for each withdrawal, with a minimum of ￥ 0.1",
     yueshu: "Your balance is only",
     zuiditixian: "Minimum withdrawal amount ￥ 100",
     mingxichaxun: "Details inquiry",
@@ -297,5 +296,8 @@ export default {
     kaihuhangweikong:"Swiftcode cannot be empty",
     shensu:"Appeal",
     querenquxiao: "Are you sure to cancel the live broadcast?",
-    tianjiatixian: "Add a withdrawal account"
+    tianjiatixian: "Add a withdrawal account",
+    shichangtishi:"",
+    renshutishi: '',
+    tixianzhu: "",
 }
\ No newline at end of file
diff --git a/src/i18n/init.ts b/src/i18n/init.ts
index 790a4c8..95d7fa2 100644
--- a/src/i18n/init.ts
+++ b/src/i18n/init.ts
@@ -1,9 +1,19 @@
 import zh from "./zh"
 import en from "./en"
+import { getset } from '@/api';
+getset().then((res: any)=>{
+    zh.shichangtishi = `最短${res.timeLowerLimit}min, 最长${res.timeCeiling}min`
+    en.shichangtishi = `The shortest is ${res.timeLowerLimit}min and the longest is ${res.timeCeiling}min`
+    zh.renshutishi = `最少${res.lowerLimit}人, 最多${res.numberCeiling}人`
+    en.shichangtishi = `Minimum ${res.lowerLimit} person, maximum ${res.numberCeiling} people`
+    zh.tixianzhu = `注：每笔提现收取${res.sxf}服务费，最低${ res.symbol + res.minmoney }`
+    en.tixianzhu = `Note: ${res.sxf} service fee will be charged for each withdrawal, with a minimum of ${ res.symbol + res.minmoney }`
+})
+
 export default {
     locale: "zh", //默认语言
     messages: {
-        zh,
-        en
+        zh: zh,
+        en: en
     }
 }
\ No newline at end of file
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index c303757..7b8c2f4 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -192,7 +192,6 @@ export default {
     xuanzezhanghu:"选择账户",
     tixianjine:"提现金额",
     quanbujine:"全部金额",
-    tixianzhu:"注：每笔提现收取0.1%服务费，最低￥0.1",
     yueshu:"您的余额只有",
     zuiditixian:"最低提现金额￥100",
     mingxichaxun:"明细查询",
@@ -297,5 +296,8 @@ export default {
     kaihuhangweikong:"开户行不能为空",
     shensu:"申诉",
     querenquxiao: "您确认取消直播吗？",
-    tianjiatixian: "添加提现账户"
+    tianjiatixian: "添加提现账户",
+    shichangtishi:"",
+    renshutishi: '',
+    tixianzhu:"",
 }
\ No newline at end of file
diff --git a/src/import-png.d.ts b/src/import-png.d.ts
index 48bb383..9feb1f7 100644
--- a/src/import-png.d.ts
+++ b/src/import-png.d.ts
@@ -13,4 +13,9 @@ declare module "ant-design-vue/es/locale/zh_CN" {
     export default value;
 }
 
+declare module 'tim-js-sdk'{
+    const value: any;
+    export default value;
+}
+
 declare var FB: any;
\ No newline at end of file
diff --git a/src/views/mine/Cashout.vue b/src/views/mine/Cashout.vue
index 34290a0..9b991c4 100644
--- a/src/views/mine/Cashout.vue
+++ b/src/views/mine/Cashout.vue
@@ -126,7 +126,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, ref, toRaw } from "vue";
+import { computed, defineComponent, onMounted, ref, toRaw } from "vue";
 import NavBottom from "@/components/NavBottom.vue";
 import { cashout, getwallect } from "@/api";
 import store from "@/store";
@@ -154,7 +154,7 @@ export default defineComponent({
             console.log(e);
         };
         const yue=ref<number>(store.state.userinfo.moneyValue)
-        const danwei = ref(store.state.userinfo.symbol)
+        const danwei = computed(() => store.state.userinfo.symbol)
         // const yue = ref<number>(10000);
         // yue.value=store.state.userinfo.money
         const accountlist = ref<Array<any>>([]);
diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index 1adb364..b445d2b 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -143,7 +143,7 @@
                     type="number"
                 />
                 <span class="unit">{{ lan.$t("fenzhong") }}</span>
-                <div style="color: red;font-size: 0.12rem;line-height: 1.3;">*最短30min, 最长120min</div>
+                <div style="color: red;font-size: 0.12rem;line-height: 1.3;">*{{ lan.$t('shichangtishi') }}</div>
             </a-form-item>
             <a-form-item
                 :label="lan.$t('zhiborenshu')"
diff --git a/src/views/regime/Liveing.vue b/src/views/regime/Liveing.vue
index 2adbea5..38b3f46 100644
--- a/src/views/regime/Liveing.vue
+++ b/src/views/regime/Liveing.vue
@@ -9,7 +9,7 @@
         </div>
         </div>
         <div class="info">
-            <LiveingWatcher></LiveingWatcher>
+            <LiveingWatcher @sentext="sendtext"></LiveingWatcher>
             <div class="LivePlaying">
                 <LivePlaying></LivePlaying>
                 <div class="comment">
@@ -190,7 +190,7 @@
 }
 </style>
 <script lang="ts">
-import { defineComponent, onMounted, ref } from "vue";
+import { defineComponent, onMounted, ref, resolveComponent } from "vue";
 import LivePlaying from "@/components/LivePlaying.vue";
 import LiveingWatcher from "@/components/LiveingWatcher.vue";
 import TRTC from "trtc-js-sdk"
@@ -199,6 +199,7 @@ import { useRoute } from 'vue-router';
 import store from '@/store';
 import { message } from 'ant-design-vue';
 import { useI18n } from '@/utils/i18n';
+import TIM from 'tim-js-sdk';
 
 export default defineComponent({
     components: {
@@ -217,6 +218,7 @@ export default defineComponent({
         const roominfo = ref<any>([]);
         console.log(useRoute())
         const id = useRoute().query.id;
+        let tim: any;
         TRTC.checkSystemRequirements().then((result: any) => {
             if(!result) {
                 message.error(lan.$t('buzhichitonghua'))
@@ -351,6 +353,87 @@ export default defineComponent({
                 // }
                 fun()
             });
+
+            // im 初始化
+            tim = TIM.create({
+                SDKAppID: 1400400340
+            }); // SDK 实例通常用 tim 表示
+            tim.setLogLevel(0);
+            tim.on(TIM.EVENT.MESSAGE_RECEIVED, function(event: any) {
+                // 收到推送的单聊、群聊、群提示、群系统通知的新消息，可通过遍历 event.data 获取消息列表数据并渲染到页面
+                // event.name - TIM.EVENT.MESSAGE_RECEIVED
+                // event.data - 存储 Message 对象的数组 - [Message]
+                for(const i in event.data){
+                    console.log(event.data[i])
+                }
+            });
+            tim.on(TIM.EVENT.GROUP_LIST_UPDATED, function(event: any) {
+                // 收到群组列表更新通知，可通过遍历 event.data 获取群组列表数据并渲染到页面
+                // event.name - TIM.EVENT.GROUP_LIST_UPDATED
+                // event.data - 存储 Group 对象的数组 - [Group]
+                console.log(event.data)
+            });
+            tim.login({userID: store.state.userinfo.memberid.toString(), userSig: userSig}).then((res: any)=>{
+                console.log(res.data); // 登录成功
+                if (res.data.repeatLogin === true) {
+                    // 标识账号已登录，本次登录操作为重复登录。v2.5.1 起支持
+                    console.log(res.data.errorInfo);
+                }
+               
+            }).catch(function(imError: any) {
+                console.warn('login error:', imError); // 登录失败的相关信息
+            });
+            tim.on(TIM.EVENT.SDK_READY, function (){
+                const promise = tim.createGroup({
+                    type: TIM.TYPES.GRP_AVCHATROOM,
+                    name: 'live',
+                    groupID: roominfo.value.roomid
+                });
+                promise.then(function(imResponse: any) { // 创建成功
+                    console.log(imResponse.data.group); // 创建的群的资料
+                    tim.joinGroup({
+                        groupID:  roominfo.value.roomid,
+                        type: TIM.TYPES.GRP_AVCHATROOM
+                    }).then((res: any)=>{
+                        switch (res.data.status) {
+                            case TIM.TYPES.JOIN_STATUS_WAIT_APPROVAL: // 等待管理员同意
+                            break;
+                            case TIM.TYPES.JOIN_STATUS_SUCCESS: // 加群成功
+                            console.log(res.data.group); // 加入的群组资料
+                            break;
+                            case TIM.TYPES.JOIN_STATUS_ALREADY_IN_GROUP: // 已经在群中
+                            break;
+                            default:
+                            break;
+                        }
+                    }).catch((err: any)=>{
+                        console.log(err)
+                    })
+                }).catch(function(imError: any) {
+                    console.warn('createGroup error:', imError); // 创建群组失败的相关信息
+                    tim.joinGroup({
+                        groupID:  roominfo.value.roomid,
+                        type: TIM.TYPES.GRP_AVCHATROOM
+                    }).then((res: any)=>{
+                        switch (res.data.status) {
+                            case TIM.TYPES.JOIN_STATUS_WAIT_APPROVAL: // 等待管理员同意
+                            break;
+                            case TIM.TYPES.JOIN_STATUS_SUCCESS: // 加群成功
+                            console.log(res.data.group); // 加入的群组资料
+                            break;
+                            case TIM.TYPES.JOIN_STATUS_ALREADY_IN_GROUP: // 已经在群中
+                            break;
+                            default:
+                            break;
+                        }
+                    }).catch((err: any)=>{
+                        console.log(err)
+                    })
+                });
+              
+            });
+
+
         }
         async function fenxiang(){
             console.log(localStream)
@@ -387,6 +470,24 @@ export default defineComponent({
             });
         }
 
+        function sendtext(){
+            const message = tim.createTextMessage({
+                to: roominfo.value.roomid,
+                conversationType: TIM.TYPES.CONV_GROUP,
+                payload: {
+                    text: 'Hello world!'
+                }
+            });
+            const promise = tim.sendMessage(message);
+            promise.then(function(imResponse: any) {
+                // 发送成功
+                console.log(imResponse);
+            }).catch(function(imError: any) {
+                // 发送失败
+                console.warn('sendMessage error:', imError);
+            });
+        }
+
         onMounted(async ()=>{
             const si = setInterval(async ()=>{
                 if(store.state.userinfo.memberid != 0 && store.state.userinfo.memberid){
@@ -405,7 +506,8 @@ export default defineComponent({
             roominfo,
             guanbi,
             visible,
-            lan
+            lan,
+            sendtext
         }
     },
 });

From 133048364f92e1396fdbda4570fb46f10e658acb Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 6 Nov 2020 22:42:07 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=8F=82=E4=B8=8E=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/init.ts                  | 8 ++++++++
 src/views/mine/ReleaseWebcast.vue | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/init.ts b/src/i18n/init.ts
index 95d7fa2..b05a295 100644
--- a/src/i18n/init.ts
+++ b/src/i18n/init.ts
@@ -1,13 +1,21 @@
 import zh from "./zh"
 import en from "./en"
 import { getset } from '@/api';
+import { geti18n } from '@/utils/i18n';
 getset().then((res: any)=>{
     zh.shichangtishi = `最短${res.timeLowerLimit}min, 最长${res.timeCeiling}min`
     en.shichangtishi = `The shortest is ${res.timeLowerLimit}min and the longest is ${res.timeCeiling}min`
     zh.renshutishi = `最少${res.lowerLimit}人, 最多${res.numberCeiling}人`
+    en.renshutishi = `At least ${res.lowerLimit}, at most ${res.numberCeiling}`
     en.shichangtishi = `Minimum ${res.lowerLimit} person, maximum ${res.numberCeiling} people`
     zh.tixianzhu = `注：每笔提现收取${res.sxf}服务费，最低${ res.symbol + res.minmoney }`
     en.tixianzhu = `Note: ${res.sxf} service fee will be charged for each withdrawal, with a minimum of ${ res.symbol + res.minmoney }`
+    const i18n = geti18n();
+    const loc = i18n.locale.value;
+    i18n.locale.value = '';
+    i18n.locale.value = loc;
+    console.log('i18n')
+
 })
 
 export default {
diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index b445d2b..439d4b9 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -156,7 +156,7 @@
                     :placeholder="lan.$t('shuruzhiborenshu')"
                     type="number"
                 />
-                <div style="color: red;font-size: 0.12rem;line-height: 1.3;">*最少1人, 最多4人</div>
+                <div style="color: red;font-size: 0.12rem;line-height: 1.3;">*{{ lan.$t('renshutishi') }}</div>
 
             </a-form-item>
             <a-form-item :label="lan.$t('zhibojianjie')" class="brief">

From 45180ae026d57b748d665b25d0a270a69384b742 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 6 Nov 2020 22:46:40 +0800
Subject: [PATCH 03/10] menu

---
 src/components/Menu.vue | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index e0ef828..cda7c59 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -185,11 +185,22 @@ export default defineComponent({
 
         const userinfo = computed(() => store.state.userinfo)
         // 设置当前路由
-        for(const i in list){
-            console.log(list[i].route==useRoute().path)
-            if(list[i].route == useRoute().path){
-                selnum.value = parseInt(i);
+        const routelist = [
+            ["/mine/archives"],
+            ['/mine/webcast'],
+            ['/mine/video'],
+            ['/mine/wallet', '/mine/cashout', '/mine/addaccount', '/mine/transaction', '/mine/transactionxq'],
+            ['/mine/liststatistic'],
+            ['/mine/aboutus']
+        ]
+        for(const i in routelist){
+            for(const j in routelist[i]){
+                console.log(routelist[i][j]==useRoute().path)
+                if(routelist[i][j] == useRoute().path){
+                    selnum.value = parseInt(i);
+                }
             }
+            
         }
         /**
          * 跳转路由与赋值对应的下标

From 013cae84af841c9320426249f3c5bef2b56450bf Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 6 Nov 2020 22:51:42 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts            | 5 +++--
 src/views/login/Login.vue   | 2 +-
 src/views/login/Reset.vue   | 2 +-
 src/views/login/Sign.vue    | 2 +-
 src/views/mine/Archives.vue | 8 ++++----
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index bed7cca..6b2714a 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -673,8 +673,9 @@ interface SendSms{
     msg: string;
 }
 
-export async function sendsms(phone: string, type: number): Promise<boolean>{
-    const res = await post<SendSms>("SendSms", {phone, type});
+export async function sendsms(code: string ,phone: string): Promise<boolean>{
+    const type = code == '86' ? 0 : 1;
+    const res = await post<SendSms>("SendSms", {phone: code + phone, type});
     console.log(res);
     if(res.code == 0){
         message.success(res.msg);
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 812cc27..2084d99 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -188,7 +188,7 @@ export default defineComponent({
         }
         lock = true;
         console.log(myquhao.value,"quhao")
-        sendsms(myquhao.value + phone.value, 0);
+        sendsms(myquhao.value, phone.value);
         const timestep = setInterval(() => {
         console.log(11112);
      
diff --git a/src/views/login/Reset.vue b/src/views/login/Reset.vue
index 936dc0b..9078ebf 100644
--- a/src/views/login/Reset.vue
+++ b/src/views/login/Reset.vue
@@ -138,7 +138,7 @@ export default defineComponent({
           return;
       }
       lock = true;
-      sendsms(uinfo.value.quhao + uinfo.value.phone, 0);
+      sendsms(uinfo.value.quhao, uinfo.value.phone);
       const timestep = setInterval(() => {
         console.log(11112);
         time.value = time.value - 1;
diff --git a/src/views/login/Sign.vue b/src/views/login/Sign.vue
index d5f5a6d..330a0e2 100644
--- a/src/views/login/Sign.vue
+++ b/src/views/login/Sign.vue
@@ -285,7 +285,7 @@ export default defineComponent({
                 return;
             }
             lock = true;
-            sendsms(phone.value.quhao + phone.value.phone, 0);
+            sendsms(phone.value.quhao, phone.value.phone);
             const timestep = setInterval(() => {
                 console.log(phone);
                 time.value = time.value - 1;
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 3dc90ed..12af251 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -348,7 +348,7 @@
                                 <div
                                     @click="
                                         sendVerificationCode(
-                                            userinfo.code + userinfo.mobile
+                                            userinfo.code , userinfo.mobile
                                         )
                                     "
                                     class="confirm-btn"
@@ -411,7 +411,7 @@
                                 />
                                 <div
                                     @click="
-                                        sendVerificationCode(myquhao + mynewtel)
+                                        sendVerificationCode(myquhao , mynewtel)
                                     "
                                     class="confirm-btn"
                                 >
@@ -678,11 +678,11 @@ export default defineComponent({
         /**
          * 发送验证码
          */
-        function sendVerificationCode(tel: string): void {
+        function sendVerificationCode(code: string ,tel: string): void {
             if (remainTime.value === 0) {
                 computedVerificationCode();
                 console.log(tel, "send");
-                sendsms(tel, 0);
+                sendsms(code, tel);
             }
         }
         // 绑定手机号是否是第二步

From 15e2acbbe07b2cb86f3cea38195bd6a7d9dc8e89 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 6 Nov 2020 22:55:30 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LiveingCount.vue  | 2 +-
 src/components/ReviewItem.vue    | 2 +-
 src/components/ReviewItemtwo.vue | 2 +-
 src/views/regime/VideoInfo.vue   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/LiveingCount.vue b/src/components/LiveingCount.vue
index 70c9d21..a4279d5 100644
--- a/src/components/LiveingCount.vue
+++ b/src/components/LiveingCount.vue
@@ -157,7 +157,7 @@
         width: 57px;
         height: 57px;
         border-radius: 50%;
-        background-color: #0f0;
+        // background-color: #0f0;
       }
     }
   }
diff --git a/src/components/ReviewItem.vue b/src/components/ReviewItem.vue
index aeb1949..76693cf 100644
--- a/src/components/ReviewItem.vue
+++ b/src/components/ReviewItem.vue
@@ -63,7 +63,7 @@
             width: 57px;
             height: 57px;
             border-radius: 50%;
-            background-color: #0f0;
+            // background-color: #0f0;
 
         }
         .name{
diff --git a/src/components/ReviewItemtwo.vue b/src/components/ReviewItemtwo.vue
index 4896bc6..5bbff9e 100644
--- a/src/components/ReviewItemtwo.vue
+++ b/src/components/ReviewItemtwo.vue
@@ -33,7 +33,7 @@
             width: 45px;
             height: 45px;
             border-radius: 50%;
-            background-color: #0f0;
+            // background-color: #0f0;
 
         }
         .name{
diff --git a/src/views/regime/VideoInfo.vue b/src/views/regime/VideoInfo.vue
index 92ba954..826bb9d 100644
--- a/src/views/regime/VideoInfo.vue
+++ b/src/views/regime/VideoInfo.vue
@@ -4,7 +4,7 @@
             <VideoPlay :url="result.fileurl"></VideoPlay>
             <VideoCont :videoid="result.videoid"  :date="result.createdAt" :watch="result.watch" :share="result.share" :status="result.status"></VideoCont>
         </div>
-        <VideoReview class="review"></VideoReview>
+        <VideoReview class="review" v-if="result.status == 1"></VideoReview>
     </div>
 </template>
 <style lang="scss" scoped>

From cf1e2ed76816810a97272831cbe924d5c167c5e3 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 6 Nov 2020 23:00:25 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E7=9B=B4=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/regime/Live.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/regime/Live.vue b/src/views/regime/Live.vue
index 694142b..626a751 100644
--- a/src/views/regime/Live.vue
+++ b/src/views/regime/Live.vue
@@ -187,7 +187,7 @@ export default defineComponent({
   setup() {
     const lan: any = useI18n();
     const page = ref(1);
-    const tabindex = ref(1);
+    const tabindex = ref<number | string>(1);
     const livelist = ref<LivelistInfo>({
         code: 0,
         total: 0,
@@ -200,7 +200,11 @@ export default defineComponent({
     });
     async function tab(){
         input.value = '';
-        livelist.value = await getlivelist({ status: tabindex.value});
+        let index: string | number = '';
+        if(tabindex.value != 1){
+            index = tabindex.value
+        }
+        livelist.value = await getlivelist({ status: index});
 
     }
     function tabchange(e: number): void {

From 739c31116ec50e992551ba941a2ffc0f50b178e3 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 6 Nov 2020 23:02:32 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NavTop.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 0fb74c2..a15a9d9 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -328,7 +328,10 @@ export default defineComponent({
             
         }
         function toindex(){
-            router.push("/")
+            if(!store.state.islogin){
+               return ; 
+            }
+            router.push("/mine/archives")
         }
 
         return {

From 86121ed4f083204335d3d618d85e11306b397ca9 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 6 Nov 2020 23:08:08 +0800
Subject: [PATCH 08/10] z-index

---
 src/views/login/About.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login/About.vue b/src/views/login/About.vue
index 1c20c7b..39fd596 100644
--- a/src/views/login/About.vue
+++ b/src/views/login/About.vue
@@ -195,7 +195,7 @@ export default defineComponent({
     align-items: center;
     position: fixed;
     top: 0;
-    z-index: 9999;
+    z-index: 99;
     .navcontent{
       width: 910px;
       margin: 0 auto;

From 6b8ca9b79793854617018e8cd72c646107a398cc Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 6 Nov 2020 23:10:44 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E7=9B=B4=E6=92=ADstatus=20=E4=B8=BA?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index 6b2714a..066afa1 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -948,7 +948,7 @@ export async function liveinfo(id: number): Promise<any>{
 }
 
 export async function setlive(data: any){
-    data.status = 0;
+    data.status = data.livestatus;
     const info = await put("live/" + data.id, data)
     console.log(info.data)
     if(info.code==0){

From 945a99d4ab6d493b15c864ad41e2ddb5013ce0f1 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 6 Nov 2020 23:41:23 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LiveItem.vue       |  9 ++---
 src/components/LiveingWatcher.vue | 61 +++++++++----------------------
 src/views/regime/Liveing.vue      | 34 ++++++++++++++---
 3 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/src/components/LiveItem.vue b/src/components/LiveItem.vue
index 9406c75..b63d46b 100644
--- a/src/components/LiveItem.vue
+++ b/src/components/LiveItem.vue
@@ -174,15 +174,12 @@ export default defineComponent({
         const lan: any = useI18n();
         function navto(){
             let url = '';
-            switch (props.type) {
+            switch (props.status) {
                 case 1:
-                    url = '/regime/livedetail';
+                    url = '/regime/liveing';
                     break;
-                case 2:
+                default:
                     url = '/regime/livedetail';
-                    break;
-                case 3:
-                    url = '/regeime/liveing';
             }
             console.log(props.zid);
             if(props.zid != undefined){
diff --git a/src/components/LiveingWatcher.vue b/src/components/LiveingWatcher.vue
index 2952764..6ce4a95 100644
--- a/src/components/LiveingWatcher.vue
+++ b/src/components/LiveingWatcher.vue
@@ -5,56 +5,20 @@
     
     </div>
     <div class="info">
-      <div class="item">
+      <div class="item" v-for="(item,index) in list" :key="index">
         <div style="display:flex">
           <div class="stuinfo">
-            <div>andy</div>
+            <div>{{item.name}}</div>
           </div>
         </div>
 
         <div class="icons">
-            <img src="@/static/images/camera.png" @click="sendmasg" alt="" class="icon">
-            <img src="@/static/images/vol.png" alt="" class="icon">
+            <img src="@/static/images/camera.png" @click="cameta(item.memberid)" alt="" class="icon">
+            <img src="@/static/images/vol.png" alt="" class="icon" @click="vol(item.memberid)">
         </div>
       </div>
 
-       <div class="item">
-        <div style="display:flex">
-          <div class="stuinfo">
-            <div>andy</div>
-          </div>
-        </div>
-
-        <div class="icons">
-            <img src="@/static/images/camera.png" alt="" class="icon">
-            <img src="@/static/images/vol.png" alt="" class="icon">
-        </div>
-      </div>
-
-       <div class="item">
-        <div style="display:flex">
-          <div class="stuinfo">
-            <div>andy</div>
-          </div>
-        </div>
-         <div class="icons">
-            <img src="@/static/images/camera.png" alt="" class="icon">
-            <img src="@/static/images/vol.png" alt="" class="icon">
-        </div>
-      </div>
-
-       <div class="item">
-        <div style="display:flex">
-          <div class="stuinfo">
-            <div>andy</div>
-          </div>
-        </div>
-
-         <div class="icons">
-            <img src="@/static/images/camera.png" alt="" class="icon">
-            <img src="@/static/images/vol.png" alt="" class="icon">
-        </div>
-      </div>
+     
     </div>
   </div>
 </template>
@@ -148,12 +112,21 @@
 import { defineComponent } from "vue";
 
 export default defineComponent({
+  props:{
+    list:{
+      type: Array
+    }
+  },
   setup(prop,context){
-    function sendmasg(){
-      context.emit("sentext")
+    function cameta(id: number){
+      context.emit("cameta", id)
+    }
+    function vol(id: number){
+      context.emit("vol", id)
     }
     return {
-      sendmasg
+      cameta,
+      vol
     }
   }
 });
diff --git a/src/views/regime/Liveing.vue b/src/views/regime/Liveing.vue
index 38b3f46..4df75b3 100644
--- a/src/views/regime/Liveing.vue
+++ b/src/views/regime/Liveing.vue
@@ -9,7 +9,7 @@
         </div>
         </div>
         <div class="info">
-            <LiveingWatcher @sentext="sendtext"></LiveingWatcher>
+            <LiveingWatcher :list="roominfo.studentlist" @cameta="sendtext" @vol="senvol"></LiveingWatcher>
             <div class="LivePlaying">
                 <LivePlaying></LivePlaying>
                 <div class="comment">
@@ -325,7 +325,7 @@ export default defineComponent({
             
             client = TRTC.createClient({
                 mode: 'rtc',
-                sdkAppId: '1400400340',
+                sdkAppId: '1400435767',
                 userId: store.state.userinfo.memberid,
                 userSig: userSig
             });
@@ -470,20 +470,42 @@ export default defineComponent({
             });
         }
 
-        function sendtext(){
-            const message = tim.createTextMessage({
+        function sendtext(id: number){
+            const m = tim.createTextMessage({
                 to: roominfo.value.roomid,
                 conversationType: TIM.TYPES.CONV_GROUP,
                 payload: {
-                    text: 'Hello world!'
+                    text: `beelinkMuteUserId:${id},isClose:0`
                 }
             });
-            const promise = tim.sendMessage(message);
+            const promise = tim.sendMessage(m);
             promise.then(function(imResponse: any) {
                 // 发送成功
                 console.log(imResponse);
+                message.success("发送命令成功")
             }).catch(function(imError: any) {
                 // 发送失败
+                message.error("发送命令失败")
+                console.warn('sendMessage error:', imError);
+            });
+        }
+        function sendvol(id: number){
+            const m = tim.createTextMessage({
+                to: roominfo.value.roomid,
+                conversationType: TIM.TYPES.CONV_GROUP,
+                payload: {
+                    text: `beelinkTurnOffTheCameraUserId:${id},isClose:1
+0`
+                }
+            });
+            const promise = tim.sendMessage(m);
+            promise.then(function(imResponse: any) {
+                // 发送成功
+                console.log(imResponse);
+                message.success("发送命令成功")
+            }).catch(function(imError: any) {
+                // 发送失败
+                message.error("发送命令失败")
                 console.warn('sendMessage error:', imError);
             });
         }