From 5622db0a8d7e0bef342f8b6557b406f3dd5d924a Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Wed, 18 Nov 2020 16:48:51 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mine/Archives.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue index 9a3e44b..ffa5fa8 100644 --- a/src/views/mine/Archives.vue +++ b/src/views/mine/Archives.vue @@ -539,7 +539,7 @@ import { } from "@/api/index"; import { message } from "ant-design-vue"; import { useI18n } from "@/utils/i18n"; -import { provenimg, provenvideo } from '@/utils/common'; +import { provenimg, provenvideo, saveValue } from '@/utils/common'; export default defineComponent({ name: "Archives", @@ -916,6 +916,7 @@ export default defineComponent({ if (reg.test(userinfo.value.email)) { await putmember(uesrinfo); if(lan.$s() != uesrinfo.languageValue){ + saveValue("Lanvuage", uesrinfo.languageValue) location.reload(); } } else { -- 2.47.2 From 3dba6dca46bac184fe34293e3fc6d03edeaf7d68 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Wed, 18 Nov 2020 17:02:44 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.ts | 6 ++++++ src/views/login/Login.vue | 3 ++- src/views/login/Reset.vue | 2 +- src/views/login/Sign.vue | 11 ++++++----- src/views/mine/Archives.vue | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/api/index.ts b/src/api/index.ts index ea1d1d7..7919e90 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -606,6 +606,12 @@ export async function checkuser(data?: any){ newdata.number=data.phone const res = await get('checkUser',newdata); // console.log(res) + if(res.code == 1){ + return { + code: res.code, + msg: res.msg, + } + } return { code: res.code, msg: res.msg, diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue index a5a03b6..9c3d8dc 100644 --- a/src/views/login/Login.vue +++ b/src/views/login/Login.vue @@ -142,7 +142,7 @@ export default defineComponent({ const time = ref(60);//倒计时 const phone = ref(""); // 手机号 const code =ref("") - const myquhao=ref("86") + const userinfo = reactive({ phone: '13152639856', password: '123456' @@ -155,6 +155,7 @@ export default defineComponent({ name: "中国" } ]) + const myquhao=ref(mrqh.value.code) const videolist=ref([{}]) onMounted(async ()=>{ diff --git a/src/views/login/Reset.vue b/src/views/login/Reset.vue index 9078ebf..8e1ad7a 100644 --- a/src/views/login/Reset.vue +++ b/src/views/login/Reset.vue @@ -170,7 +170,7 @@ export default defineComponent({ const next: (e: number) => void = async (e: number) => { if(e==2){ console.log(uinfo) - const res=await checkuser(toRaw(uinfo.value)) + const res: any = await checkuser(toRaw(uinfo.value)) console.log(res.data.memberid) if(res.code==0){ // stepnow.value = e; diff --git a/src/views/login/Sign.vue b/src/views/login/Sign.vue index 5a60f7e..6d68e00 100644 --- a/src/views/login/Sign.vue +++ b/src/views/login/Sign.vue @@ -247,11 +247,7 @@ export default defineComponent({ wrapperCol: 14, }; const time = ref(60); //倒计时初始化 - const phone = ref({ - quhao: "86", - phone: "", - code: "", - }); + const userinfo = ref({ pass: "", passtow: "", @@ -262,6 +258,11 @@ export default defineComponent({ }); const willsay = ref(); const mrqh = computed(() => store.state.qh) + const phone = ref({ + quhao: mrqh.value.code, + phone: "", + code: "", + }); const quhaolist = ref([ { code: "86", diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue index ffa5fa8..e38554c 100644 --- a/src/views/mine/Archives.vue +++ b/src/views/mine/Archives.vue @@ -584,7 +584,7 @@ export default defineComponent({ const quhaolist = ref([]); const mrqh = computed(() => store.state.qh) - const myquhao = ref(""); + const myquhao = ref(mrqh.value.code); const mynewtel = ref(""); -- 2.47.2 From a7024c98affc2c2a2965e08e7cc566d51f7559b8 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Thu, 19 Nov 2020 10:24:09 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=87=BA=E8=BF=9B=E5=BA=A6=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mine/ReleaseWebcast.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue index 79d1ddb..328edc4 100644 --- a/src/views/mine/ReleaseWebcast.vue +++ b/src/views/mine/ReleaseWebcast.vue @@ -518,9 +518,10 @@ export default defineComponent({ } const ifallowpic = ref(false); async function uploadspic(file: AntUpload) { + uploadpicprogress.value = 1; const res = await uploadflie(file.file, (info: any) => { console.log(info); - uploadpicprogress.value = info.percent.toFixed(2) * 100; + uploadpicprogress.value = info.percent.toFixed(2) * 100 || 1; }); console.log(res); -- 2.47.2 From 7a4b7eade6b8e517ea00ed532dd8e00e76b25e50 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Thu, 19 Nov 2020 10:28:07 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E5=9C=A8=E5=B7=A6=E4=BE=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/zhibo.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/zhibo.html b/public/zhibo.html index 4fe61fb..c14d0a3 100644 --- a/public/zhibo.html +++ b/public/zhibo.html @@ -272,7 +272,7 @@
上课人员
- +
-- 2.47.2 From b1f7af7588398050580242fd18b742fb2b11cb3e Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Thu, 19 Nov 2020 10:34:11 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E5=8F=B3?= =?UTF-8?q?=E4=BE=A7=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/room.css | 2 +- public/zhibo.html | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/public/css/room.css b/public/css/room.css index 9519afb..87377d8 100644 --- a/public/css/room.css +++ b/public/css/room.css @@ -53,7 +53,7 @@ video{ .member{ cursor: default; border-bottom-style: solid; - border-width: 1px; + border-width: 0; border-bottom-color: #f0f0f0; } #video-grid{ diff --git a/public/zhibo.html b/public/zhibo.html index c14d0a3..30f76c3 100644 --- a/public/zhibo.html +++ b/public/zhibo.html @@ -8,6 +8,12 @@ + -- 2.47.2 From a91b320b71315eb455e6ec19b1f4736702354363 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Thu, 19 Nov 2020 10:37:32 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/zhibo.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/zhibo.html b/public/zhibo.html index 30f76c3..a5d4995 100644 --- a/public/zhibo.html +++ b/public/zhibo.html @@ -273,9 +273,9 @@
-
+
-
上课人员
+
上课人员