diff --git a/jiuyi/node_modules/.vue-global-types/vue_99_0_0_0.d.ts b/jiuyi/node_modules/.vue-global-types/vue_99_0_0_0.d.ts new file mode 100644 index 00000000..72f1004c --- /dev/null +++ b/jiuyi/node_modules/.vue-global-types/vue_99_0_0_0.d.ts @@ -0,0 +1,121 @@ +// @ts-nocheck +export {}; + +; declare global { + const __VLS_intrinsicElements: __VLS_IntrinsicElements; + const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any }; + const __VLS_unref: typeof import('vue').unref; + const __VLS_placeholder: any; + + type __VLS_NativeElements = __VLS_SpreadMerge; + type __VLS_IntrinsicElements = import('vue/jsx-runtime').JSX.IntrinsicElements; + type __VLS_Element = import('vue/jsx-runtime').JSX.Element; + type __VLS_GlobalComponents = import('vue').GlobalComponents; + type __VLS_GlobalDirectives = import('vue').GlobalDirectives; + type __VLS_IsAny = 0 extends 1 & T ? true : false; + type __VLS_PickNotAny = __VLS_IsAny extends true ? B : A; + type __VLS_SpreadMerge = Omit & B; + type __VLS_WithComponent = + N1 extends keyof LocalComponents ? N1 extends N0 ? Pick : { [K in N0]: LocalComponents[N1] } : + N2 extends keyof LocalComponents ? N2 extends N0 ? Pick : { [K in N0]: LocalComponents[N2] } : + N3 extends keyof LocalComponents ? N3 extends N0 ? Pick : { [K in N0]: LocalComponents[N3] } : + Self extends object ? { [K in N0]: Self } : + N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N1] } : + N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N2] } : + N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N3] } : + { [K in N0]: unknown }; + type __VLS_FunctionalComponentProps = + '__ctx' extends keyof __VLS_PickNotAny ? K extends { __ctx?: { props?: infer P } } ? NonNullable

: never + : T extends (props: infer P, ...args: any) => any ? P : + {}; + type __VLS_IsFunction = K extends keyof T + ? __VLS_IsAny extends false + ? unknown extends T[K] + ? false + : true + : false + : false; + type __VLS_NormalizeComponentEvent = ( + __VLS_IsFunction extends true + ? Props + : __VLS_IsFunction extends true + ? { [K in onEvent]?: Events[Event] } + : __VLS_IsFunction extends true + ? { [K in onEvent]?: Events[CamelizedEvent] } + : Props + ) & Record; + // fix https://github.com/vuejs/language-tools/issues/926 + type __VLS_UnionToIntersection = (U extends unknown ? (arg: U) => unknown : never) extends ((arg: infer P) => unknown) ? P : never; + type __VLS_OverloadUnionInner = U & T extends (...args: infer A) => infer R + ? U extends T + ? never + : __VLS_OverloadUnionInner & U & ((...args: A) => R)> | ((...args: A) => R) + : never; + type __VLS_OverloadUnion = Exclude< + __VLS_OverloadUnionInner<(() => never) & T>, + T extends () => never ? never : () => never + >; + type __VLS_ConstructorOverloads = __VLS_OverloadUnion extends infer F + ? F extends (event: infer E, ...args: infer A) => any + ? { [K in E & string]: (...args: A) => void; } + : never + : never; + type __VLS_NormalizeEmits = __VLS_PrettifyGlobal< + __VLS_UnionToIntersection< + __VLS_ConstructorOverloads & { + [K in keyof T]: T[K] extends any[] ? { (...args: T[K]): void } : never + } + > + >; + type __VLS_PrettifyGlobal = { [K in keyof T]: T[K]; } & {}; + type __VLS_PickFunctionalComponentCtx = NonNullable<__VLS_PickNotAny< + '__ctx' extends keyof __VLS_PickNotAny ? K extends { __ctx?: infer Ctx } ? Ctx : never : any + , T extends (props: any, ctx: infer Ctx) => any ? Ctx : any + >>; + type __VLS_OmitStringIndex = { + [K in keyof T as string extends K ? never : K]: T[K]; + }; + type __VLS_UseTemplateRef = Readonly>; + + function __VLS_getVForSourceType>(source: T): [ + item: T extends number ? number + : T extends string ? string + : T extends any[] ? T[number] + : T extends Iterable ? T1 + : any, + index: number, + ][]; + function __VLS_getVForSourceType(source: T): [ + item: T[keyof T], + key: keyof T, + index: number, + ][]; + // @ts-ignore + function __VLS_getSlotParams(slot: T): Parameters<__VLS_PickNotAny, (...args: any[]) => any>>; + // @ts-ignore + function __VLS_getSlotParam(slot: T): Parameters<__VLS_PickNotAny, (...args: any[]) => any>>[0]; + function __VLS_asFunctionalDirective(dir: T): T extends import('vue').ObjectDirective + ? NonNullable + : T extends (...args: any) => any + ? T + : (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void; + function __VLS_makeOptional(t: T): { [K in keyof T]?: T[K] }; + function __VLS_asFunctionalComponent any ? InstanceType : unknown>(t: T, instance?: K): + T extends new (...args: any) => any + ? (props: (K extends { $props: infer Props } ? Props : any) & Record, ctx?: any) => __VLS_Element & { + __ctx?: { + attrs?: any; + slots?: K extends { $slots: infer Slots } ? Slots : any; + emit?: K extends { $emit: infer Emit } ? Emit : any; + expose?(exposed: K): void; + props?: (K extends { $props: infer Props } ? Props : any) & Record; + } + } + : T extends () => any ? (props: {}, ctx?: any) => ReturnType + : T extends (...args: any) => any ? T + : (_: {} & Record, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {} & Record } }; + function __VLS_functionalComponentArgsRest any>(t: T): 2 extends Parameters['length'] ? [any] : []; + function __VLS_asFunctionalElement(tag: T, endTag?: T): (attrs: T & Record) => void; + function __VLS_asFunctionalSlot(slot: S): (props: NonNullable extends (props: infer P) => any ? P : {}) => void; + function __VLS_tryAsConstant(t: T): T; +} diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js index cbca85b5..b53e91ea 100644 --- a/jiuyi2/common/js/config.js +++ b/jiuyi2/common/js/config.js @@ -6,9 +6,9 @@ const config = { // host: 'h5api', // #endif // #ifndef H5 - // host: 'http://91f.xyz:8080', + host: 'http://91f.xyz:8080', // host: 'https://1a880cd5.r24.cpolar.top/', - host: 'http://aere2w.natappfree.cc', + // host: 'http://aere2w.natappfree.cc', // #endif // 支付方式配置 payType: { diff --git a/jiuyi2/components/mine/noAuth.vue b/jiuyi2/components/mine/noAuth.vue new file mode 100644 index 00000000..7e877c1d --- /dev/null +++ b/jiuyi2/components/mine/noAuth.vue @@ -0,0 +1,21 @@ + + + + + \ No newline at end of file diff --git a/jiuyi2/node_modules/.vue-global-types/vue_99_0_0_0.d.ts b/jiuyi2/node_modules/.vue-global-types/vue_99_0_0_0.d.ts index 130f5375..72f1004c 100644 --- a/jiuyi2/node_modules/.vue-global-types/vue_99_0_0_0.d.ts +++ b/jiuyi2/node_modules/.vue-global-types/vue_99_0_0_0.d.ts @@ -7,18 +7,14 @@ export {}; const __VLS_unref: typeof import('vue').unref; const __VLS_placeholder: any; - const __VLS_nativeElements = { - ...{} as SVGElementTagNameMap, - ...{} as HTMLElementTagNameMap, - }; - + type __VLS_NativeElements = __VLS_SpreadMerge; type __VLS_IntrinsicElements = import('vue/jsx-runtime').JSX.IntrinsicElements; type __VLS_Element = import('vue/jsx-runtime').JSX.Element; type __VLS_GlobalComponents = import('vue').GlobalComponents; type __VLS_GlobalDirectives = import('vue').GlobalDirectives; type __VLS_IsAny = 0 extends 1 & T ? true : false; type __VLS_PickNotAny = __VLS_IsAny extends true ? B : A; - type __VLS_unknownDirective = (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void; + type __VLS_SpreadMerge = Omit & B; type __VLS_WithComponent = N1 extends keyof LocalComponents ? N1 extends N0 ? Pick : { [K in N0]: LocalComponents[N1] } : N2 extends keyof LocalComponents ? N2 extends N0 ? Pick : { [K in N0]: LocalComponents[N2] } : @@ -81,19 +77,12 @@ export {}; }; type __VLS_UseTemplateRef = Readonly>; - function __VLS_getVForSourceType(source: number): [number, number][]; - function __VLS_getVForSourceType(source: string): [string, number][]; - function __VLS_getVForSourceType(source: T): [ - item: T[number], - index: number, - ][]; - function __VLS_getVForSourceType }>(source: T): [ - item: T extends { [Symbol.iterator](): Iterator } ? T1 : never, - index: number, - ][]; - // #3845 - function __VLS_getVForSourceType }>(source: T): [ - item: number | (Exclude extends { [Symbol.iterator](): Iterator } ? T1 : never), + function __VLS_getVForSourceType>(source: T): [ + item: T extends number ? number + : T extends string ? string + : T extends any[] ? T[number] + : T extends Iterable ? T1 + : any, index: number, ][]; function __VLS_getVForSourceType(source: T): [ @@ -109,21 +98,24 @@ export {}; ? NonNullable : T extends (...args: any) => any ? T - : __VLS_unknownDirective; - function __VLS_withScope(ctx: T, scope: K): ctx is T & K; + : (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void; function __VLS_makeOptional(t: T): { [K in keyof T]?: T[K] }; function __VLS_asFunctionalComponent any ? InstanceType : unknown>(t: T, instance?: K): T extends new (...args: any) => any - ? (props: (K extends { $props: infer Props } ? Props : any) & Record, ctx?: any) => __VLS_Element & { __ctx?: { - attrs?: any, - slots?: K extends { $slots: infer Slots } ? Slots : any, - emit?: K extends { $emit: infer Emit } ? Emit : any - } & { props?: (K extends { $props: infer Props } ? Props : any) & Record; expose?(exposed: K): void; } } + ? (props: (K extends { $props: infer Props } ? Props : any) & Record, ctx?: any) => __VLS_Element & { + __ctx?: { + attrs?: any; + slots?: K extends { $slots: infer Slots } ? Slots : any; + emit?: K extends { $emit: infer Emit } ? Emit : any; + expose?(exposed: K): void; + props?: (K extends { $props: infer Props } ? Props : any) & Record; + } + } : T extends () => any ? (props: {}, ctx?: any) => ReturnType : T extends (...args: any) => any ? T : (_: {} & Record, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {} & Record } }; - function __VLS_asFunctionalElement(tag: T, endTag?: T): (_: T & Record) => void; function __VLS_functionalComponentArgsRest any>(t: T): 2 extends Parameters['length'] ? [any] : []; - function __VLS_normalizeSlot(s: S): S extends () => infer R ? (props: {}) => R : S; + function __VLS_asFunctionalElement(tag: T, endTag?: T): (attrs: T & Record) => void; + function __VLS_asFunctionalSlot(slot: S): (props: NonNullable extends (props: infer P) => any ? P : {}) => void; function __VLS_tryAsConstant(t: T): T; } diff --git a/jiuyi2/pages/mine/myComment.vue b/jiuyi2/pages/mine/myComment.vue index cfe7826b..358a370a 100644 --- a/jiuyi2/pages/mine/myComment.vue +++ b/jiuyi2/pages/mine/myComment.vue @@ -99,22 +99,6 @@ function getLst() { }) } - - -// 重载视频列表 -function refreshVideoList() { - list.pageNum = 1 - list.total = 0 - getList() -} - -// 获取更多视频列表 -function getMoreVideoList() { - if (list.data.length >= list.total) return - list.pageNum++ - getList() -} - // 获取我的评论 function getList(id) { api.mine.myComment({ diff --git a/jiuyi2/pages/news/chat/chat.vue b/jiuyi2/pages/news/chat/chat.vue index 33a67513..21bb310e 100644 --- a/jiuyi2/pages/news/chat/chat.vue +++ b/jiuyi2/pages/news/chat/chat.vue @@ -204,7 +204,7 @@ function sendMsg(param) { let request = api.news.sendUserMsg // if (msg.type == 'GROUP') request = api.news.sendGroupMsg - // if (msg.isCustomer) request = api.news.sendCusomterService + // if (msg.isCustomer) request = api.news.sendCusomterService // 发送消息 request({ @@ -295,10 +295,8 @@ function emojiTap(val) { // 点击工具栏 function handleTool(val) { - if (toolStatus.value === val) { - toolStatus.value = 'input' - return - } + if (toolStatus.value === val) toolStatus.value = 'input' + else toolStatus.value = val } // 获取更多消息记录 @@ -412,9 +410,7 @@ function onFocus() { // 输入语音 function voiceSend(message) { console.log('handlePlusSend', message) - sendMsg({ - message, - }) + sendMsg(message) } // 监听滚动 diff --git a/jiuyi2/pages/news/chat/jy-voice.vue b/jiuyi2/pages/news/chat/jy-voice.vue index cc2dbedf..3f56827d 100644 --- a/jiuyi2/pages/news/chat/jy-voice.vue +++ b/jiuyi2/pages/news/chat/jy-voice.vue @@ -16,265 +16,274 @@ \ No newline at end of file diff --git a/jiuyi2/pages/news/myQr.vue b/jiuyi2/pages/news/myQr.vue index 4c5be626..20dfb6cb 100644 --- a/jiuyi2/pages/news/myQr.vue +++ b/jiuyi2/pages/news/myQr.vue @@ -2,6 +2,8 @@ // 我的二维码 import uQRCode from '@/common/js/uqrcode.js' +// 未实名认证 +import noAuth from '@/components/mine/noAuth.vue' import { ref, reactive, @@ -60,7 +62,11 @@ function init() {