diff --git a/App.vue b/App.vue index 9a66f58..b68a331 100644 --- a/App.vue +++ b/App.vue @@ -51,7 +51,6 @@ function getUserInfo() { const sm2_privateKey = config.appInfo.sm2PrivateKey; let sm2_encrypt_result = data.data; let sm2_decrypt_result = sm2_Decrypt(sm2_encrypt_result, sm2_privateKey); - console.log(sm2_decrypt_result); if (typeof sm2_decrypt_result == 'string') sm2_decrypt_result = JSON.parse(sm2_decrypt_result); // 其次,对sm2解密后的结果进行 aes解密 @@ -100,7 +99,7 @@ function oncloseWindow() { function loginCallback(userInfo) { let params = { - username: userInfo, + userInfo, }; $api.createRequest('/app/login', params, 'post').then((resData) => { useUserStore() diff --git a/common/common.css b/common/common.css index 7e4329d..68e0da4 100644 --- a/common/common.css +++ b/common/common.css @@ -464,4 +464,8 @@ html { /* 隐藏超出的文本 */ text-overflow: ellipsis; /* 使用省略号 */ +} + +.grayscale { + filter: grayscale(100%) opacity(0.6); } \ No newline at end of file diff --git a/components/renderCompanyCollectionRecord/renderCompanyCollectionRecord.vue b/components/renderCompanyCollectionRecord/renderCompanyCollectionRecord.vue index e07ec8c..b9d2f53 100644 --- a/components/renderCompanyCollectionRecord/renderCompanyCollectionRecord.vue +++ b/components/renderCompanyCollectionRecord/renderCompanyCollectionRecord.vue @@ -1,36 +1,18 @@ \ No newline at end of file + diff --git a/pages/chat/components/ai-paging.vue b/pages/chat/components/ai-paging.vue index 42699bc..0dc6d79 100644 --- a/pages/chat/components/ai-paging.vue +++ b/pages/chat/components/ai-paging.vue @@ -148,7 +148,7 @@ - - + + + { // 判断浏览器是否有 fristEntry 第一次进入 let fristEntry = uni.getStorageSync('fristEntry') === false ? false : true; // 默认未读 @@ -85,15 +103,69 @@ const handelComponentsRef = (el, index) => { } }; +function handleTouchStart(e) { + startPointX.value = e.touches[0].clientX; + disableTouch.value = false; +} +function handleTouchMove(e) { + const currentX = e.touches[0].clientX; + const diffX = currentX - startPointX.value; + + if (state.current === 0) { + if (diffX > THRESHOLD) { + disableTouch.value = true; + } else { + disableTouch.value = false; + } + return; + } + if (state.current === totalPage - 1) { + if (diffX < -THRESHOLD) { + disableTouch.value = true; + } else { + disableTouch.value = false; + } + return; + } + + disableTouch.value = false; +} + function changeShowTabbar(val) { showTabbar.value = val; } //1 查看消息类型 function changeSwiperType(e) { + const newIndex = e.detail.current; + const lastIndex = state.current; + + const isSwipingRight = newIndex < lastIndex; + const isSwipingLeft = newIndex > lastIndex; + + if (lastIndex === 0 && isSwipingRight) { + disableTouch.value = true; + state.current = 0; + setTimeout(() => { + disableTouch.value = false; + }, 50); + return; + } + + if (lastIndex === totalPage - 1 && isSwipingLeft) { + disableTouch.value = true; + state.current = lastIndex; + + setTimeout(() => { + disableTouch.value = false; + }, 50); + return; + } + const index = e.detail.current; state.current = index; handleTabChange(index); + disableTouch.value = false; } function changeType(index) { state.current = index; diff --git a/pages/login/login.vue b/pages/login/login.vue index 8358398..096b691 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -109,7 +109,9 @@ - 后门 + + + @@ -310,8 +312,7 @@ function complete() { .backdoor{ position: fixed; left: 0; - top: 500rpx; - background: red + bottom: 200rpx; } .input-nx position: relative diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index ca342f7..71f5645 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -49,7 +49,7 @@ 服务专区 - + 实名认证 @@ -106,6 +106,7 @@ import { reactive, inject, watch, ref, onMounted } from 'vue'; import { storeToRefs } from 'pinia'; import Tabbar from '@/components/tabbar/midell-box.vue'; import { onLoad, onShow } from '@dcloudio/uni-app'; +import FileUploader from '@/utils/FileUploader.js'; const { $api, navTo } = inject('globalFunction'); import useUserStore from '@/stores/useUserStore'; const popup = ref(null); @@ -133,6 +134,15 @@ function getUserstatistics() { counts.value = resData.data; }); } + +function selectFile() { + // FileUploader.showMenuAndUpload({ + // success: function (res) { + // alert('上传成功: ' + JSON.stringify(res)); + // }, + // }); +} +function chooseFileUploadTest(pam) {}