From 5af6f8c906b2214d8d00eadd5f6f1c94c1252c82 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 14 Nov 2025 13:23:42 +0800 Subject: [PATCH] =?UTF-8?q?11.14=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 37 +++++++++++++++- pages.json | 43 ++++++++++++++----- pages/live/live.vue | 63 +++++++++++++++++++++------- pages_app/liveReplay/liveReplay.vue | 20 ++++++++- pages_app/replayList/replayList.vue | 10 ++++- pages_app/scanLogin/scanLogin.vue | 2 +- static/default_news_iv.png | Bin 0 -> 6268 bytes static/default_video.png | Bin 0 -> 5776 bytes static/video_icon.png | Bin 0 -> 5908 bytes tsconfig.json | 1 + utils/config.js | 4 +- utils/docUrl.js | 4 +- utils/otherHost.js | 4 +- utils/request.js | 26 ++++++------ 14 files changed, 161 insertions(+), 53 deletions(-) create mode 100644 static/default_news_iv.png create mode 100644 static/default_video.png create mode 100644 static/video_icon.png diff --git a/App.vue b/App.vue index 03c6c85..5f04f10 100644 --- a/App.vue +++ b/App.vue @@ -11,7 +11,7 @@ export default { console.log('打印options'); console.log(options); if(options && options.referrerInfo.extraData && options.referrerInfo.extraData.token){ - uni.setStorageSync("DEV_AUTH_TOKEN_App", options.referrerInfo.extraData.token); + uni.setStorageSync("AUTH_TOKEN_App", options.referrerInfo.extraData.token); uni.setStorageSync("userInfo", options.referrerInfo.extraData.userInfo); }; if(options && options.referrerInfo.extraData && options.referrerInfo.extraData.targetPath){ @@ -50,7 +50,36 @@ export default { // #ifdef APP + console.log("执行onshow") + let temp_token = uni.getStorageSync('AUTH_TOKEN_App'); + uni.setStorageSync('AUTH_TOKEN_App',''); + console.log("temp_token", temp_token); + uni.sendNativeEvent('checkToken', { + msg: 'checkToken' + }, ret => { + console.log('check回调') + console.log(ret) + if(ret.code==0){ + uni.setStorageSync('AUTH_TOKEN_App','') + uni.sendNativeEvent('goTabbarPage', { + msg: 'home' + },ret => { + console.log(ret); + }) + plus.runtime.quit() + }else{ + uni.setStorageSync('AUTH_TOKEN_App',temp_token); + } + }) + uni.onNativeEventReceive((event,data)=>{ + console.log("event", event); + console.log("data", data); + if (event.indexOf("clearToken") > -1){ + uni.setStorageSync('AUTH_TOKEN_App','') + plus.runtime.quit() + } + }) let main = plus.android.runtimeMainActivity(); //为了防止快速点按返回键导致程序退出重写quit方法改为隐藏至后台 plus.runtime.quit = function(){ @@ -68,6 +97,7 @@ export default { }) } }); + // uni.onNativeEventReceive((event, data) => { // console.log("app传递登录信息onshow-------------------"); // console.log("event", event); @@ -84,7 +114,10 @@ export default { // #endif - } catch (error) {} + } catch (error) { + console.log('error'); + console.log(error) + } }, onHide() {}, methods: {}, diff --git a/pages.json b/pages.json index df77aa7..1bc8774 100644 --- a/pages.json +++ b/pages.json @@ -292,6 +292,37 @@ } } }, + { + "path": "login/login", + "style": { + "navigationStyle": "custom", + "navigationBarRightButton":{ "hide": true}, + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, + { + "path": "smsLogin/smsLogin", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, + { + "path": "pwdLogin/pwdLogin", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, { "path": "replayText/replayText", "style": { @@ -418,17 +449,7 @@ // } // } // }, - // { - // "path": "login/login", - // "style": { - // "navigationStyle": "custom", - // "navigationBarRightButton":{ "hide": true}, - // "navigationBarTitleText": "uni-app分页", - // "app": { - // "bounce": "none" - // } - // } - // }, + // { // "path": "video/video", // "style": { diff --git a/pages/live/live.vue b/pages/live/live.vue index 56b5e0a..9f4bb6b 100644 --- a/pages/live/live.vue +++ b/pages/live/live.vue @@ -106,17 +106,24 @@ - - + > + + + { permissionListener.value=uni.createRequestPermissionListener(); console.log('放在onLoad执行'); console.log(permissionListener.value); - permissionListener.value.onConfirm((res)=>{ - console.log("onConfirm"); + permissionListener.value.onRequest((res)=>{ + console.log("onRequest"); if(res.includes("android.permission.CAMERA")){ topTipRef.value?.open(); } }).catch((err)=>{ - console.log("onConfirm error"); + console.log("onRequest error"); console.log(err); }); permissionListener.value.onComplete((res)=>{ @@ -549,6 +557,13 @@ const groupedMeetings = computed(() => { // 页面显示时获取会议列表数据 onShow(() => { + currentPage.value = 1; + hasMoreData.value = true; + meetingList.value = []; + selectedMonth.value = ''; + monthName.value = ''; + selectedProvince.value = ''; + provinceName.value = ''; generateMonthList(); getMeetingList(true); }); @@ -781,8 +796,7 @@ const getStatusText = (status) => { 1: "预告", 2: "直播中", 3: "已结束", - 4: "已完成", - 5: "已取消", + 4: "回放中" }; return statusMap[status] || "预告"; }; @@ -974,6 +988,16 @@ const onRefresh = () => { hasMoreData.value = true; // 调用获取会议列表函数 + if(selectedMonth.value || selectedProvince.value){ + meetingListBySearch(true).finally(() => { + isRefreshing.value = false; + uni.showToast({ + title: "刷新成功", + icon: "none", + duration: 1500, + }); + }); + }else{ getMeetingList(true).finally(() => { // 延迟关闭刷新状态，给用户更好的体验 setTimeout(() => { @@ -986,6 +1010,7 @@ const onRefresh = () => { }, 500); }); }; +} // 上拉加载更多 const onLoadMore = () => { console.log("上拉加载更多"); @@ -995,9 +1020,15 @@ const onLoadMore = () => { currentPage.value++; // 调用API获取更多数据 - getMeetingList(false).finally(() => { - isLoadingMore.value = false; - }); + if(selectedMonth.value || selectedProvince.value){ + meetingListBySearch(false).finally(() => { + isLoadingMore.value = false; + }); + }else{ + getMeetingList(false).finally(() => { + isLoadingMore.value = false; + }); + } }; diff --git a/pages_app/liveReplay/liveReplay.vue b/pages_app/liveReplay/liveReplay.vue index 03b6860..3b6ac1e 100644 --- a/pages_app/liveReplay/liveReplay.vue +++ b/pages_app/liveReplay/liveReplay.vue @@ -79,14 +79,29 @@ @click="playVideo(item)" v-if="item.liveimg" > - + > --> + + + - + + + + {{video.title || video.name}} @@ -84,6 +91,7 @@ import docUrl from '@/utils/docUrl'; import navTo from '@/utils/navTo'; import empty from '@/components/empty/empty.vue'; + import lazyImg from '@/static/default_video.png'; const isAllActive=ref(false) // 响应式数据 const videoList = ref([]); diff --git a/pages_app/scanLogin/scanLogin.vue b/pages_app/scanLogin/scanLogin.vue index 85c022a..74a7dd7 100644 --- a/pages_app/scanLogin/scanLogin.vue +++ b/pages_app/scanLogin/scanLogin.vue @@ -150,7 +150,7 @@ } .main-content { - padding: 80rpx 60rpx; + padding:220rpx 60rpx 20rpx; display: flex; flex-direction: column; align-items: center; diff --git a/static/default_news_iv.png b/static/default_news_iv.png new file mode 100644 index 0000000000000000000000000000000000000000..1a00f5a0faed19a212c93e561ca598cc698c526f GIT binary patch literal 6268 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 literal 0 HcmV?d00001 diff --git a/static/video_icon.png b/static/video_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6e13bcae1535adac36f2c963cb75a9334c96b4ec GIT binary patch literal 5908 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 literal 0 HcmV?d00001 diff --git a/tsconfig.json b/tsconfig.json index d55fe5d..ea9fb78 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -60,5 +60,6 @@ + diff --git a/utils/config.js b/utils/config.js index 73207e9..3e4a7fb 100644 --- a/utils/config.js +++ b/utils/config.js @@ -13,7 +13,7 @@ if(process.env.UNI_PLATFORM =="h5"){ BASE_URL='https://dev-app.igandan.com/app' } }else{ - BASE_URL='https://dev-app.igandan.com/app' - //BASE_URL='https://app.igandan.com/app' + //BASE_URL='https://dev-app.igandan.com/app' + BASE_URL='https://app.igandan.com/app' } export default BASE_URL \ No newline at end of file diff --git a/utils/docUrl.js b/utils/docUrl.js index 9a544d7..c9a5042 100644 --- a/utils/docUrl.js +++ b/utils/docUrl.js @@ -13,7 +13,7 @@ if(process.env.UNI_PLATFORM =="h5"){ DOC_URL='https://dev-doc.igandan.com/app/' } }else{ - DOC_URL='https://dev-doc.igandan.com/app/' - //DOC_URL='https://doc.igandan.com/app/' + //DOC_URL='https://dev-doc.igandan.com/app/' + DOC_URL='https://doc.igandan.com/app/' } export default DOC_URL \ No newline at end of file diff --git a/utils/otherHost.js b/utils/otherHost.js index 1a1cd31..ac2a67f 100644 --- a/utils/otherHost.js +++ b/utils/otherHost.js @@ -7,7 +7,7 @@ let OTHER_HOST='' OTHER_HOST='https://dev-wx.igandan.com' } }else{ - OTHER_HOST='https://dev-wx.igandan.com' - //OTHER_HOST='https://wx.igandan.com' + //OTHER_HOST='https://dev-wx.igandan.com' + OTHER_HOST='https://wx.igandan.com' } export default OTHER_HOST \ No newline at end of file diff --git a/utils/request.js b/utils/request.js index eef1694..bf8bddf 100644 --- a/utils/request.js +++ b/utils/request.js @@ -9,6 +9,7 @@ */ import BASE_URL from "./config.js"; import version from '@/utils/version.js' +import client_type from "@/utils/client_type.js" export const request = (url, data = {}, method = 'post', loading = false, contentType = 'application/json',extraHeader={}) => { if (loading) { @@ -36,12 +37,8 @@ export const request = (url, data = {}, method = 'post', loading = false, conten token = uni.getStorageSync('DEV_AUTH_TOKEN_App'); } }else{ - if (BASE_URL.indexOf('dev') == -1) { - token = uni.getStorageSync('AUTH_TOKEN_App'); - - } else { - token = uni.getStorageSync('DEV_AUTH_TOKEN_App'); - } + token = uni.getStorageSync('AUTH_TOKEN_App'); + } let header = { 'content-type': contentType, @@ -62,7 +59,7 @@ export const request = (url, data = {}, method = 'post', loading = false, conten defaultData = { version: version, user_uuid:userInfo.uuid, - client_type: 'A', //client_type, + client_type:client_type, timestamp:new Date().getTime() } postData={ @@ -79,7 +76,7 @@ export const request = (url, data = {}, method = 'post', loading = false, conten defaultData = { version: version, user_uuid:userInfo.uuid, - client_type: 'A', //client_type, + client_type:client_type, timestamp:new Date().getTime()+"" } @@ -104,12 +101,7 @@ export const request = (url, data = {}, method = 'post', loading = false, conten success: async (res) => { var Authorization_token = res.header.Authorization; if (Authorization_token) { - if (process.env.NODE_ENV === 'development') { - uni.setStorageSync('DEV_AUTH_TOKEN_App', Authorization_token); - } else { - uni.setStorageSync('AUTH_TOKEN_App', Authorization_token); - } - + uni.setStorageSync('AUTH_TOKEN_App', Authorization_token); } if (loading) { uni.hideLoading(); @@ -141,6 +133,12 @@ export const request = (url, data = {}, method = 'post', loading = false, conten e(res.data) }else if(res.data.code==35002){ n(res) + uni.sendNativeEvent('goTabbarPage', { + msg: 'home' + },ret => { + console.log(ret); + }) + plus.runtime.quit() }else{ uni.showToast({ title: res.data.message,