处理提测前的样式问题
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
This commit is contained in:
parent
c4b4ec323a
commit
226a24b06b
@ -2,6 +2,8 @@
|
||||
import { useStatus } from '@/store/status'
|
||||
import { useUserStore } from '@/store'
|
||||
import { useProvideUserModal } from '@/hooks'
|
||||
import {useAuth} from "@/store/auth";
|
||||
const {token} = useAuth()
|
||||
import ws from '@/connect'
|
||||
const { statusBarHeight } = useStatus()
|
||||
const { uid, isShow } = useProvideUserModal()
|
||||
@ -10,10 +12,13 @@ const root = document.documentElement
|
||||
root.style.setProperty('--statusBarHeight', `${statusBarHeight.value}px`)
|
||||
const handleWebview = () => {
|
||||
let statusBarHeight = window?.plus?.navigator?.getStatusbarHeight()
|
||||
plus.webview.currentWebview().setStyle({
|
||||
const webview = plus.webview.currentWebview()
|
||||
webview.setStyle({
|
||||
top: statusBarHeight,
|
||||
bottom: 0,
|
||||
})
|
||||
// console.log(webview)
|
||||
token.value = webview.token
|
||||
}
|
||||
const init = () => {
|
||||
userStore.loadSetting()
|
||||
|
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="custom-search-input">
|
||||
<div class="custom-input">
|
||||
<tm-input
|
||||
class="search-input"
|
||||
placeholder="请输入…"
|
||||
@ -13,7 +13,9 @@
|
||||
:showClear="true"
|
||||
@clear="clearInput"
|
||||
placeholderStyle="color:#BABABA"
|
||||
:disabled="props?.disabled"
|
||||
></tm-input>
|
||||
<div v-if="props?.disabled" class="custom-input-disabled"></div>
|
||||
</div>
|
||||
</template>
|
||||
<script setup>
|
||||
@ -21,6 +23,7 @@ import { defineProps, defineEmits, reactive, watch } from 'vue'
|
||||
const props = defineProps({
|
||||
searchText: String,
|
||||
first_talk_record_infos: Object,
|
||||
disabled: Boolean,
|
||||
})
|
||||
const state = reactive({
|
||||
searchText: '', //搜索内容
|
||||
@ -45,8 +48,9 @@ const inputSearchText = (e) => {
|
||||
}
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
.custom-search-input {
|
||||
.custom-input {
|
||||
width: 100%;
|
||||
position: relative;
|
||||
.search-input {
|
||||
width: 100%;
|
||||
}
|
||||
@ -58,5 +62,13 @@ const inputSearchText = (e) => {
|
||||
content: '\e82a';
|
||||
color: #d2d2d5;
|
||||
}
|
||||
|
||||
.custom-input-disabled {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
@ -4,12 +4,14 @@
|
||||
<div class="item-main-label">
|
||||
<span class="text-[32rpx] font-regular">{{ props?.item?.label }}</span>
|
||||
</div>
|
||||
<div class="item-main-value" >
|
||||
<span class="text-[32rpx] font-regular" v-if="props?.item?.value && props?.item?.value.length < 29">
|
||||
<div class="item-main-value" @click="toManagePage(props?.item)">
|
||||
<span
|
||||
class="text-[32rpx] font-regular"
|
||||
v-if="props?.item?.value && props?.item?.value.length < 29"
|
||||
>
|
||||
{{ props?.item?.value }}
|
||||
</span>
|
||||
<img
|
||||
@click="toManagePage(props?.item)"
|
||||
v-if="
|
||||
props?.item?.hasPointer &&
|
||||
(props?.isManager ||
|
||||
@ -31,7 +33,10 @@
|
||||
></tm-switch>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item-sub" v-if="props?.item?.value && props?.item?.value.length > 28">
|
||||
<div
|
||||
class="item-sub"
|
||||
v-if="props?.item?.value && props?.item?.value.length > 28"
|
||||
>
|
||||
<span class="text-[32rpx] font-regular">{{ props?.item?.value }}</span>
|
||||
</div>
|
||||
<div class="item-sub cab1" v-if="props?.item?.subValue">
|
||||
@ -65,8 +70,15 @@ const props = defineProps({
|
||||
})
|
||||
const emits = defineEmits(['toManagePage', 'changeSwitch'])
|
||||
const toManagePage = (item) => {
|
||||
if (
|
||||
props?.item?.hasPointer &&
|
||||
(props?.isManager ||
|
||||
(!props?.isManager &&
|
||||
props?.item?.label !== t('chat.settings.groupName')))
|
||||
) {
|
||||
emits('toManagePage', item.label)
|
||||
}
|
||||
}
|
||||
const modelValue = computed(() => {
|
||||
let switchStatus = false
|
||||
if (
|
||||
|
@ -96,7 +96,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="chat-records-search chat-settings-card">
|
||||
<customInput></customInput>
|
||||
<customInput :disabled="true"></customInput>
|
||||
<div class="record-search-types">
|
||||
<div
|
||||
class="record-search-types-each"
|
||||
|
@ -104,15 +104,7 @@
|
||||
<div class="content">
|
||||
<div class="root">
|
||||
<div class="searchRoot" @click="toSearchPage">
|
||||
<tm-input
|
||||
placeholder="请输入…"
|
||||
color="#F9F9FD"
|
||||
:round="1"
|
||||
prefix="tmicon-search"
|
||||
prefixColor="#46299D"
|
||||
placeholderStyle="color:#BABABA"
|
||||
class="input_search"
|
||||
></tm-input>
|
||||
<customInput :disabled="true"></customInput>
|
||||
</div>
|
||||
<div class="contentRoot">
|
||||
<chatItem
|
||||
@ -128,6 +120,7 @@
|
||||
</div>
|
||||
</template>
|
||||
<script setup>
|
||||
import customInput from '@/components/custom-input/custom-input.vue'
|
||||
import { ref, watch, computed } from 'vue'
|
||||
import { onShow, onLoad } from '@dcloudio/uni-app'
|
||||
import { useChatList } from '@/store/chatList/index.js'
|
||||
|
@ -446,7 +446,11 @@ const inputSearchText = (e) => {
|
||||
}
|
||||
|
||||
//点击取消搜索
|
||||
const cancelSearch = () => {}
|
||||
const cancelSearch = () => {
|
||||
uni.navigateBack({
|
||||
delta: 1,
|
||||
})
|
||||
}
|
||||
|
||||
//查询数据
|
||||
const queryAllSearch = () => {
|
||||
|
@ -4,8 +4,8 @@ import { userInfoApi } from "@/api/user";
|
||||
|
||||
import {ref} from 'vue'
|
||||
export const useAuth = createGlobalState(() => {
|
||||
// const token = useStorage('token', '', uniStorage)
|
||||
const token = ref('79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b894b54078d04d4ee86e494023bfc12a4fe79d044f22bef01b0b5f132e8ca151dcd3a1a4150e348641300c622b8af98cfd5d41fb24a8409b2b49446a766ea3886f587db124e0eb7d849ed33e6618fdf2c7f')
|
||||
const token = useStorage('token', '', uniStorage)
|
||||
// const token = ref('79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b897937e719454eda6de1352a14497a54063c2ae13c2b1418f2689268102faffee874777ce1312eb7d9399eaa8cf58674aa86c9b85ad9300293c0a3369ed429536bbea4fcb092b78466ea53a44a2b2b1c1a')
|
||||
const refreshToken = useStorage('refreshToken', '', uniStorage)
|
||||
const userInfo = useStorage('userInfo', {}, uniStorage)
|
||||
const leaderList = useStorage('leaderList', [], uniStorage)
|
||||
|
Loading…
Reference in New Issue
Block a user