Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp

# Conflicts: # jiuyi2/common/js/config.js # jiuyi2/components/index/indexVideo.vue # jiuyi2/pages/shop/commodity/components/jy-commodity-foot/index.vue # jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat.js # jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat_modules_group-module__js.js # jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat_modules_group-module__js.js.map # jiuyi2/unpackage/dist/cache/.vite/deps/_metadata.json # jiuyi2/unpackage/dist/cache/.vite/deps/crypto-js.js # jiuyi2/unpackage/dist/cache/.vite/deps/crypto-js.js.map # jiuyi2/unpackage/dist/cache/.vite/deps/tim-upload-plugin.js # jiuyi2/unpackage/dist/cache/.vite/deps/tim-upload-plugin.js.map # jiuyi2/vite.config.js
2025-02-15 16:30:06 +08:00 · 2025-02-15 16:30:06 +08:00 · 0afeee6877
parent 12437feec2 684f621e4b
commit 0afeee6877
30 changed files with 7180 additions and 10476 deletions
--- a/jiuyi2/components/news/msgList.vue
+++ b/jiuyi2/components/news/msgList.vue
@ -1,162 +1,223 @@
 <script setup>
-	/**
-	 * 消息列表
-	 */
-	import api from '@/api/index.js'
-	import {
-		ref,
-		computed,
-		reactive,
-		onMounted,
-		onUnmounted,
-		getCurrentInstance,
-	} from 'vue'
-	// 腾讯云聊天
-	import TencentCloudChat from '@tencentcloud/chat';
-	// 工具库
-	import util from '@/common/js/util.js'
-	import {
-		useStore,
-	} from 'vuex'
-	const store = useStore()
-	const userinfo = computed(() => {
-		let result = store.state.userinfo
-		return result
-	})
+/**
+ * 消息列表
+ */
+import api from '@/api/index.js'
+import {
+	ref,
+	computed,
+	reactive,
+	onMounted,
+	onUnmounted,
+	getCurrentInstance,
+} from 'vue'
+// 腾讯云聊天
+import TencentCloudChat from '@tencentcloud/chat';
+// 工具库
+import util from '@/common/js/util.js'
+import {
+	useStore,
+} from 'vuex'
+const {
+	proxy
+} = getCurrentInstance()
+const store = useStore()
+const userinfo = computed(() => {
+	let result = store.state.userinfo
+	return result
+})

-	// 右滑菜单
-	const rightOption = [{
-			text: '删除',
-			style: {
-				backgroundColor: '#F85050'
-			},
-			fn: (item) => delMsg(item)
-		},
-		// {
-		// 	text: '设为已读',
-		// 	style: {
-		// 		backgroundColor: '#00ADEE'
-		// 	},
-		// }
-	]
+// 右滑菜单
+const rightOption = [{
+	text: '删除',
+	style: {
+		backgroundColor: '#F85050'
+	},
+	fn: (item) => delMsg(item)
+}, {
+	text: '设为已读',
+	style: {
+		backgroundColor: '#00ADEE'
+	},
+	fn: (item) => setRead(item)
+},]

-	// 系统
-	const systemRightOption = [{
-		text: '删除',
-		style: {
-			backgroundColor: '#F85050'
-		},
-	}, {
-		text: '设为已读',
-		style: {
-			backgroundColor: '#00ADEE'
-		},
-	}, ]
+// 系统
+const systemRightOption = [{
+	text: '删除',
+	style: {
+		backgroundColor: '#F85050'
+	},
+}, {
+	text: '设为已读',
+	style: {
+		backgroundColor: '#00ADEE'
+	},
+},]

-	// 用户列表
-	const list = reactive([])
+// 用户列表
+const list = reactive([])

-	onMounted(() => {
+onMounted(() => {
+	getList()
+	addListener()
+})
+
+onUnmounted(() => {
+	removeListener()
+})
+
+// 开启监听消息
+function addListener() {
+	let onMessageReceived = function (event) {
 		getList()
-		addListener()
+	}
+
+	uni.$chat.on(TencentCloudChat.EVENT.CONVERSATION_LIST_UPDATED, onMessageReceived);
+}
+
+// 移除监听
+function removeListener() {
+	uni.$chat.on(TencentCloudChat.EVENT.CONVERSATION_LIST_UPDATED);
+}
+
+// 获取朋友列表
+function getList() {
+	api.news.getMessageList({
+		query: {
+			userId: userinfo.value.id,
+		}
+	}).then(rs => {
+		if (rs.code == 200) {
+			list.data = handleList(rs.data);
+			return
+		}
+		util.alert({
+			content: rs.msg,
+			showCancel: false,
+		})
+	})
+}
+
+/**
+ * 消息列表
+ * @param {Object} item
+ */
+function handleList(list) {
+	list.forEach(item => {
+		item.callbackJson = JSON.parse(item.callbackJson);
+
+		if (item.groupId != null) {
+			item.unreadCount = getGroupNoReadNum(item.groupId)
+		}
 	})

-	onUnmounted(() => {
-		removeListener()
-	})
+	return list
+}

-	// 开启监听消息
-	function addListener() {
-		let onMessageReceived = function(event) {
-			getList()
-		}
-
-		uni.$chat.on(TencentCloudChat.EVENT.CONVERSATION_LIST_UPDATED, onMessageReceived);
+// 查询群聊未读数量
+function getGroupNoReadNum(groupId) {
+	// 验证sdk是否准备完毕
+	let isReady = uni.$chat.isReady();
+	if (!isReady) {
+		setTimeout(function () {
+			getGroupNoReadNum(groupId);
+		}, 200);
+		return
 	}

-	// 移除监听
-	function removeListener() {
-		uni.$chat.on(TencentCloudChat.EVENT.CONVERSATION_LIST_UPDATED);
-	}
+	const unreadCount = uni.$chat.getTotalUnreadMessageCount('GROUP', groupId);

-	// 获取朋友列表
-	function getList() {
-		api.news.getMessageList({
-			query: {
-				userId: userinfo.value.id,
-			}
-		}).then(rs => {
-			if (rs.code == 200) {
-				// 
-				return
-			}
-			util.alert({
-				content: rs.msg,
-				showCancel: false,
-			})
-		})
-	}
+	return unreadCount;
+}

-	// 点击用户
-	function handleUser(item) {
-		uni.navigateTo({
-			url: util.setUrl('/pages/index/videoHome', {
-				userId: item.userId,
-			})
-		})
-	}
+// // 点击用户
+// function handleUser(item) {
+// 	uni.navigateTo({
+// 		url: util.setUrl('/pages/index/videoHome', {
+// 			userId: item.userId,
+// 		})
+// 	})
+// }

-	// 跳转
-	function navigateToPage(path) {
-		uni.navigateTo({
-			url: path
-		});
-	}
+// // 跳转
+// function navigateToPage(path) {
+// 	uni.navigateTo({
+// 		url: path
+// 	});
+// }

-	/**
-	 * 去聊天
-	 * @param {Object} item
-	 */
-	function handleChat(item) {
-		console.log('item', item)
-		let param = {
-			type: item.type
-		}
-		// 单聊
-		if (item.type == 'C2C') {
-			param.name = `${item.userProfile.nick}`
-			param.msgId = `${item.userProfile.userID}`
-		}
+/**
+ * 去聊天
+ * @param {Object} item
+ */
+function handleChat(item) {
+	let param = {};
+	// 单聊
+	if (item.groupId == null) {
+		param.type = 'C2C'
+		param.name = `${item.callbackJson.from_name}`
+		param.msgId = `${item.callbackJson.from_id}`
+	} else {
 		// 群聊
-		else if (item.type == 'GROUP') {
-			param.name = `${item.groupProfile.name}(${item.groupProfile.memberCount})`
-			param.msgId = `${item.groupProfile.groupID}`
-		}
-		// 
-		util.toChat(param)
+		param.type = 'GROUP'
+		param.name = `${item.groupChatDTO.name}`
+		param.msgId = `${item.groupId}`
+		param.num = `${item.groupChatDTO.memberCount}`
+	}
+	// 
+	util.toChat(param)
+}
+
+/**
+ * 菜单
+ * @param {Object} ev 默认事件
+ * @param {Object} item 单项
+ */
+function handleMenu(ev, item) {
+	console.log('ev', ev, item)
+	ev.content.fn(item)
+	proxy.$refs.swipeAction.closeAll()
+}
+
+// 删除会话
+function delMsg(item) {
+	// 验证sdk是否准备完毕
+	let isReady = uni.$chat.isReady();
+	if (!isReady) {
+		setTimeout(function () {
+			delMsg(item);
+		}, 200);
+		return
 	}

-	/**
-	 * 菜单
-	 * @param {Object} ev 默认事件
-	 * @param {Object} item 单项
-	 */
-	function handleMenu(ev, item) {
-		console.log('ev', ev, item)
-		ev.content.fn(item)
-		proxy.$refs.swipeAction.closeAll()
+	let conversationId = item.groupId == null ? `C2C${item.fromId}` : `GROUP${item.groupId}`;
+
+	uni.$chat.deleteConversation(conversationId).then(rs => { 
+		getList()
+	})
+}
+
+// 标为已读
+function setRead(item) {
+	// 验证sdk是否准备完毕
+	let isReady = uni.$chat.isReady();
+	if (!isReady) {
+		setTimeout(function () {
+			setRead(item);
+		}, 200);
+		return
 	}

-	// 删除会话
-	function delMsg(item) {
-		uni.$chat.deleteConversation({
-			conversationIDList: [item.conversationID],
-			clearHistoryMessage: false,
-		}).then(rs => {
-			// 
-			getList()
-		})
-	}
+	let conversationId = item.groupId == null ? `C2C${item.fromId}` : `GROUP${item.groupId}`;
+	uni.$chat.setMessageRead({
+		conversationID: conversationId,
+	}).then(rs => {
+		getList()
+	})
+}
+
+
 </script>

 <template>
@ -167,7 +228,7 @@
 					<!-- <uni-swipe-action-item :right-options="systemRightOption">
 						<view class="item rows ptb20 plr30">
 							<view class="image wh90 pr">
-								<image class="cir" src="/static/msg1.png" mode="aspectFill" />
+								<image class="cir wh90" src="/static/msg1.png" mode="aspectFill" />
 								<view class="dot pa t0 r0 cir" v-if="1"></view>
 							</view>

@ -178,8 +239,8 @@
 								<view class="desc thd mt10 c666 f24">新增一位关注，快看看是谁吧~</view>
 							</view>
 						</view>
-					</uni-swipe-action-item> -->
-					<!-- <uni-swipe-action-item :right-options="systemRightOption">
+					</uni-swipe-action-item>
+					<uni-swipe-action-item :right-options="systemRightOption">
 						<view class="item rows ptb20 plr30">
 							<view class="image wh90 pr">
 								<image class="cir wh90" src="/static/msg1.png" mode="aspectFill" />
@ -193,12 +254,12 @@
 								<view class="desc thd mt10 c666 f24">快去看看吧~</view>
 							</view>
 						</view>
-					</uni-swipe-action-item> -->
+					</uni-swipe-action-item>

-					<!-- <uni-swipe-action-item :right-options="systemRightOption">
+					<uni-swipe-action-item :right-options="systemRightOption">
 						<view class="item rows ptb20 plr30">
 							<view class="image wh90 pr">
-								<image class="cir" src="/static/msg2.png" mode="aspectFill" />
+								<image class="cir wh90" src="/static/msg2.png" mode="aspectFill" />
 								<view class="dot pa t0 r0 cir" v-if="0"></view>
 							</view>

@ -211,71 +272,72 @@
 							</view>
 						</view>
 					</uni-swipe-action-item> -->
-					<uni-swipe-action-item :right-options="rightOption" v-for="(item, index) in list" :key="index"
-						@click="handleMenu($event,item)">
+
+					<uni-swipe-action-item :right-options="rightOption" v-for="(item, index) in list.data" :key="index"
+						@click="handleMenu($event, item)">
 						<view class="item rows ptb20 plr30" @click="handleChat(item)">
 							<view class="image wh90 pr">
-								<template v-if="item.type == 'GROUP'">
-									<image class="cir wh90" :src="item.groupProfile.avatar" mode="aspectFill" />
+								<template v-if="item.groupId == null">
+									<image class="cir wh90" :src="item.callbackJson.from_url" mode="aspectFill" />
 								</template>
-								<template v-else-if="item.type == 'C2C'">
-									<image class="cir wh90" :src="item.userProfile.avatar" mode="aspectFill" />
+								<template v-else>
+									<image class="cir wh90" :src="item.groupChatDTO.groupFaceUrl" mode="aspectFill" />
 								</template>
-								<!-- <view class="mark pa t0 r0 cfff f22 cir" v-if="item.unreadCount">{{item.unreadCount}}</view> -->
+								<view class="mark pa t0 r0 cfff f22 cir" v-if="item.unreadCount">{{ item.unreadCount }}
+								</view>
 							</view>
-
 							<view class="col f1 ml20">
 								<view class="rows">
-									<view class="name f1 thd c333 f32">
-										<template v-if="item.type == 'GROUP'">
-											<text>{{ item.groupProfile.name }}</text>
-										</template>
-										<template v-else-if="item.type == 'C2C'">
-											<text>{{item.userProfile.nick}}</text>
-										</template>
-									</view>
+									<template v-if="item.groupId == null">
+										<view class="name f1 thd c333 f32">{{ item.callbackJson.from_name }}</view>
+									</template>
+									<template v-else>
+										<view class="name f1 thd c333 f32">{{ item.groupChatDTO.name }}</view>
+									</template>
 									<view class="datetime c999 f22">
-										{{ util.formatTime('MM-dd HH:mm',item.lastMessage.lastTime) }}</view>
+										{{ util.formatTime('MM-dd HH:mm', item.createTime) }}</view>
 								</view>
-								<view class="desc thd mt10 c666 f24">{{item.lastMessage.messageForShow}}</view>
+								<view class="desc thd mt10 c666 f24">{{
+									item.callbackJson.callback_json[0].MsgContent.Text }}</view>
 							</view>
 						</view>
 					</uni-swipe-action-item>
 					<view class="mtb20 tac c999 f20">到底啦~</view>
 				</view>
 			</uni-swipe-action>
-
 		</scroll-view>
 	</view>
 </template>

 <style lang="scss">
-	// 朋友列表
-	.firendBox {
-		height: 100%;
+// 朋友列表
+.firendBox {
+	height: 100%;

-		.scroll {
-			height: 100%;
+	.scroll {
+		height: 100%;
+	}
+
+	// 列表
+	.list {
+
+		// 消息提示点
+		.mark,
+		.dot {
+			background-color: #FF6B17;
+			text-align: center;
+			line-height: 30rpx;
 		}

-		// 列表
-		.list {
+		.mark {
+			width: 30rpx;
+			height: 30rpx;
+		}

-			// 消息提示点
-			.mark,
-			.dot {
-				background-color: #FF6B17;
-			}
-
-			.mark {
-				width: 30rpx;
-				height: 30rpx;
-			}
-
-			.dot {
-				width: 20rpx;
-				height: 20rpx;
-			}
+		.dot {
+			width: 20rpx;
+			height: 20rpx;
 		}
 	}
+}
 </style>
--- a/jiuyi2/node_modules/.vue-global-types/vue_3.3_false.d.ts
+++ b/jiuyi2/node_modules/.vue-global-types/vue_3.3_false.d.ts
@ -0,0 +1,132 @@
+// @ts-nocheck
+export {};
+
+; declare module 'vue' {
+	export interface GlobalComponents { }
+	export interface GlobalDirectives { }
+}
+; 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;
+
+	const __VLS_nativeElements = {
+		...{} as SVGElementTagNameMap,
+		...{} as HTMLElementTagNameMap,
+	};
+
+	type __VLS_IntrinsicElements = import('vue/jsx-runtime').JSX.IntrinsicElements;
+	type __VLS_Element = import('vue/jsx-runtime').JSX.Element;
+	type __VLS_GlobalComponents = import('vue').GlobalComponents & Pick<typeof import('vue'), 'Transition' | 'TransitionGroup' | 'KeepAlive' | 'Suspense' | 'Teleport'>;
+	type __VLS_GlobalDirectives = import('vue').GlobalDirectives;
+	type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
+	type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
+	type __VLS_unknownDirective = (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void;
+	type __VLS_WithComponent<N0 extends string, LocalComponents, N1 extends string, N2 extends string, N3 extends string> =
+		N1 extends keyof LocalComponents ? N1 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N1] } :
+		N2 extends keyof LocalComponents ? N2 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N2] } :
+		N3 extends keyof LocalComponents ? N3 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N3] } :
+		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<T, K> =
+		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: { props?: infer P } } ? NonNullable<P> : never
+		: T extends (props: infer P, ...args: any) => any ? P :
+		{};
+	type __VLS_IsFunction<T, K> = K extends keyof T
+		? __VLS_IsAny<T[K]> extends false
+		? unknown extends T[K]
+		? false
+		: true
+		: false
+		: false;
+	type __VLS_NormalizeComponentEvent<Props, Events, onEvent extends keyof Props, Event extends keyof Events, CamelizedEvent extends keyof Events> = (
+		__VLS_IsFunction<Props, onEvent> extends true
+			? Props
+			: __VLS_IsFunction<Events, Event> extends true
+				? { [K in onEvent]?: Events[Event] }
+				: __VLS_IsFunction<Events, CamelizedEvent> extends true
+					? { [K in onEvent]?: Events[CamelizedEvent] }
+					: Props
+	) & Record<string, unknown>;
+	// fix https://github.com/vuejs/language-tools/issues/926
+	type __VLS_UnionToIntersection<U> = (U extends unknown ? (arg: U) => unknown : never) extends ((arg: infer P) => unknown) ? P : never;
+	type __VLS_OverloadUnionInner<T, U = unknown> = U & T extends (...args: infer A) => infer R
+		? U extends T
+		? never
+		: __VLS_OverloadUnionInner<T, Pick<T, keyof T> & U & ((...args: A) => R)> | ((...args: A) => R)
+		: never;
+	type __VLS_OverloadUnion<T> = Exclude<
+		__VLS_OverloadUnionInner<(() => never) & T>,
+		T extends () => never ? never : () => never
+	>;
+	type __VLS_ConstructorOverloads<T> = __VLS_OverloadUnion<T> extends infer F
+		? F extends (event: infer E, ...args: infer A) => any
+		? { [K in E & string]: (...args: A) => void; }
+		: never
+		: never;
+	type __VLS_NormalizeEmits<T> = __VLS_PrettifyGlobal<
+		__VLS_UnionToIntersection<
+			__VLS_ConstructorOverloads<T> & {
+				[K in keyof T]: T[K] extends any[] ? { (...args: T[K]): void } : never
+			}
+		>
+	>;
+	type __VLS_PrettifyGlobal<T> = { [K in keyof T]: T[K]; } & {};
+	type __VLS_PickFunctionalComponentCtx<T, K> = NonNullable<__VLS_PickNotAny<
+		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: infer Ctx } ? Ctx : never : any
+		, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
+	>>;
+	type __VLS_UseTemplateRef<T> = Readonly<import('vue').ShallowRef<T | null>>;
+
+	function __VLS_getVForSourceType(source: number): [number, number, number][];
+	function __VLS_getVForSourceType(source: string): [string, number, number][];
+	function __VLS_getVForSourceType<T extends any[]>(source: T): [
+		item: T[number],
+		key: number,
+		index: number,
+	][];
+	function __VLS_getVForSourceType<T extends { [Symbol.iterator](): Iterator<any> }>(source: T): [
+		item: T extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never, 
+		key: number,
+		index: undefined,
+	][];
+	// #3845
+	function __VLS_getVForSourceType<T extends number | { [Symbol.iterator](): Iterator<any> }>(source: T): [
+		item: number | (Exclude<T, number> extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never), 
+		key: number,
+		index: undefined,
+	][];
+	function __VLS_getVForSourceType<T>(source: T): [
+		item: T[keyof T],
+		key: keyof T,
+		index: number,
+	][];
+	// @ts-ignore
+	function __VLS_getSlotParams<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>;
+	// @ts-ignore
+	function __VLS_getSlotParam<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>[0];
+	function __VLS_asFunctionalDirective<T>(dir: T): T extends import('vue').ObjectDirective
+		? NonNullable<T['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>
+		: T extends (...args: any) => any
+			? T
+			: __VLS_unknownDirective;
+	function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
+	function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
+	function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
+		T extends new (...args: any) => any
+		? (props: (K extends { $props: infer Props } ? Props : any) & Record<string, unknown>, 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<string, unknown>; expose?(exposed: K): void; } }
+		: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
+		: T extends (...args: any) => any ? T
+		: (_: {} & Record<string, unknown>, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {} & Record<string, unknown> } };
+	function __VLS_elementAsFunction<T>(tag: T, endTag?: T): (_: T & Record<string, unknown>) => void;
+	function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
+	function __VLS_normalizeSlot<S>(s: S): S extends () => infer R ? (props: {}) => R : S;
+	function __VLS_tryAsConstant<const T>(t: T): T;
+}
--- a/jiuyi2/pages/index/index.nvue
+++ b/jiuyi2/pages/index/index.nvue
@ -84,7 +84,7 @@
 		},
 	])
 	// tab下标
-	const tabIndex = ref('')
+	const tabIndex = ref(1)
 	// 起始值
 	const startY = ref(0)
 	// 上一个播放索引
@ -149,8 +149,8 @@
 		discOffsetTop.value = systemInfo.safeAreaInsets.top + 44 + 30
 		// 特效完成高度
 		complete2Top.value = systemInfo.safeAreaInsets.top + 44 + 150
-		// 推荐
-		handle_tab(1)
+		// 获取列表
+		tabCurrent.value.getList()

 		// 判断是否提醒过闹铃
 		if (!uni.getStorageSync('alarmAlt')) {
@ -269,6 +269,7 @@

 	// 重载推荐列表
 	function refreshRecList() {
+		console.log('refreshRecList')
 		recList.pageNum = 1
 		recList.total = 0
 		getRecList()
@ -292,7 +293,7 @@
 				pageSize: recList.pageSize,
 			}
 		}).then(rs => {
-			console.log('getRecList then', rs)
+			console.log('getRecList then')
 			handleListData(rs, recList)
 		})
 	}
@ -531,7 +532,6 @@
 			readSecondAdd()
 		}
 		tabIndex.value = index
-		console.log('load', tab[tabIndex.value].load)
 		// 根据是否加载过判断 播放还是获取
 		if (tabCurrent.value.load && proxy.$refs[`videoRef${index}`]) proxy.$refs[`videoRef${index}`][current[index]]
 			.play()
--- a/jiuyi2/pages/login/lock.vue
+++ b/jiuyi2/pages/login/lock.vue
@ -58,7 +58,7 @@

 <template>
 	<view class="container pr fmid fdc">
-		<view class="title f40 b">输入二级密码解锁未成年模式</view>
+		<view class="title f40 b">输入登录密码解锁未成年模式</view>

 		<view class="account mtb20 c666 f32">当前账号: {{userinfo.phoneNumber}}</view>

--- a/jiuyi2/pages/mine/setting/secondPwd.vue
+++ b/jiuyi2/pages/mine/setting/secondPwd.vue
@ -41,7 +41,6 @@
 	const userinfo = computed(() => {
 		let result = store.state.userinfo
 		if (result.hasSecondCipher) mode.value = 'check'
-		console.log('userinfo', result)
 		return result
 	})

@ -188,19 +187,12 @@
 		<view class="container ver mt10p" v-if="mode === 'check'">
 			<view class="title c333 f54">验证二级密码</view>
 			<view class="content mt50 c666 f32">请输入二级密码用于验证</view>
-
-			<view class="pwd">
-				<codeInput v-model:modelValue="form.rePwd" />
-			</view>
-
-<!-- 			<view class="inputBox mt50 ptb10 plr30">
+			<view class="inputBox mt50 ptb10 plr30">
 				<input type="number" :maxlength="6" v-model="form.pwd" :focus="true" placeholder="六位数字密码" />
-			</view> -->
+			</view>

 			<view class="btn lg black mtb50 plr50" @click="handleCheck">验证</view>
 		</view>
-
-		<view v-show="false">{{userinfo}}</view>
 	</view>

 	<!-- 安全键盘 -->
--- a/jiuyi2/pages/news/group-chat/index.vue
+++ b/jiuyi2/pages/news/group-chat/index.vue
@ -111,14 +111,13 @@
 		}).then(rs => {
 			if (rs.code == 200) {
 				util.alert('创建成功')
-				return

-				// 
 				setTimeout(() => {
 					form.name = ''
 					form.groupFaceUrl = ''
 					uni.navigateBack()
 				}, 2000)
+
 				return
 			}
 			util.alert({
--- a/jiuyi2/pages/release/commodity.vue
+++ b/jiuyi2/pages/release/commodity.vue
@ -38,8 +38,6 @@
 				form.id = detail.id
 				// 商品规格
 				form.categoryId = detail.categoryId
-				// 
-				form.categoryCode = detail.categoryCode
 				// 商品价格
 				form.price = detail.price
 				// 商品名称
@ -169,7 +167,6 @@
 		if (index == categoryIndex.value) return
 		categoryIndex.value = index
 		form.categoryId = category[categoryIndex.value].id
-		form.categoryCode = category[categoryIndex.value].categoryCode
 	}

 	// 发布商品
@ -211,7 +208,7 @@
 				<view class="imgList mt20">
 					<view class="imgs" v-for="(item,index) in form.sliderImage">
 						<image class="wh120 br10" :src="item" mode="aspectFill" />
-						<view class="close" @click="removeImage(index)">
+						<view class="close">
 							<uni-icons type="clear" color="#f00" size="40rpx" />
 						</view>
 					</view>
--- a/jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat.js.map
+++ b/jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat.js.map
--- a/jiuyi2/unpackage/dist/cache/.vite/deps/chunk-TDUMLE5V.js
+++ b/jiuyi2/unpackage/dist/cache/.vite/deps/chunk-TDUMLE5V.js
@ -0,0 +1,17 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+var __commonJS = (cb, mod) => function __require2() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+
+export {
+  __require,
+  __commonJS
+};
+//# sourceMappingURL=chunk-TDUMLE5V.js.map
--- a/jiuyi2/unpackage/dist/cache/.vite/deps/chunk-TDUMLE5V.js.map
+++ b/jiuyi2/unpackage/dist/cache/.vite/deps/chunk-TDUMLE5V.js.map
@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": [],
+  "sourcesContent": [],
+  "mappings": "",
+  "names": []
+}
--- a/jiuyi2/unpackage/dist/cache/.vite/deps/js-pinyin.js
+++ b/jiuyi2/unpackage/dist/cache/.vite/deps/js-pinyin.js
--- a/jiuyi2/unpackage/dist/cache/.vite/deps/js-pinyin.js.map
+++ b/jiuyi2/unpackage/dist/cache/.vite/deps/js-pinyin.js.map
--- a/jiuyi2/unpackage/dist/cache/.vite/deps/lodash.js
+++ b/jiuyi2/unpackage/dist/cache/.vite/deps/lodash.js
--- a/jiuyi2/unpackage/dist/cache/.vite/deps/lodash.js.map
+++ b/jiuyi2/unpackage/dist/cache/.vite/deps/lodash.js.map
--- a/jiuyi2/unpackage/dist/cache/.vite/deps/package.json
+++ b/jiuyi2/unpackage/dist/cache/.vite/deps/package.json
@ -0,0 +1,3 @@
+{
+  "type": "module"
+}
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@ -6,6 +6,7 @@ import uni from '@dcloudio/vite-plugin-uni';
 // let target = 'http://91f.xyz:8080'
 let target = 'http://d5si5v.natappfree.cc'

+
 export default defineConfig({
 	plugins: [uni()],
 	server: {
--- a/service/App.vue
+++ b/service/App.vue
@ -1,12 +1,40 @@
 <script>
-	export default {
-		onLaunch() {},
-		onShow() {},
-		onHide() {}
-	}
+// 工具库
+import util from '@/common/js/util';
+// vuex
+import store from '@/store/index.js'
+export default {
+	onLaunch() {
+		// 登录令牌
+		const token = uni.getStorageSync('token')
+		// 用户信息
+		const userinfo = uni.getStorageSync('userinfo') 
+
+		// 如果登录保活
+		if (token) {
+			// 用户信息
+			if (userinfo) store.commit('setState', {
+				key: 'userinfo',
+				value: userinfo
+			})
+
+			// 腾讯im登录
+			util.getUserinfo().then(rs => {
+				util.loginTencent(userinfo)
+			})
+		} else {
+			// 如果未登录，跳转到登录页面
+			uni.redirectTo({
+				url: '/pages/login/login'
+			});
+		}
+	},
+	onShow() { },
+	onHide() { }
+}
 </script>

 <style lang="scss">
-	/*每个页面公共css */
-	@import "./common/css/style.scss";
-</style>
+/*每个页面公共css */
+@import "./common/css/style.scss";
+</style>
--- a/service/api/login.js
+++ b/service/api/login.js
@ -14,14 +14,27 @@ const login = {
 			method: 'GET',
 		})
 	},
-
+	
 	/**
-	 * 用户密码登录接口
+	 * 客服登录接口
 	 * @param {Object} param
 	 */
 	userLoginByPassword(param) {
 		return util.request({
-			url: '/user/login',
+			url: '/user/customerService/login',
+			query: param.query,
+			load: true,
+		})
+	},
+	
+
+	/**
+	 * 客服退出登录
+	 * @param {Object} param
+	 */
+	userLoginOut(param) {
+		return util.request({
+			url: '/user/customerService/logout',
 			data: param.data,
 			load: true,
 		})
--- a/service/common/js/config.js
+++ b/service/common/js/config.js
@ -5,10 +5,7 @@ const config = {
 	host: 'http://localhost:5173',
 	// #endif
 	// #ifndef H5
-	host: 'http://91f.xyz:8080',
-	// host: 'http://192.168.0.110:8080',
-	// host: 'http://192.168.0.105:8080',
-	// host: 'http://192.168.0.114:8080',
+	host: 'https://1a4b9ed1.r24.cpolar.top/',
 	// #endif
 	// 支付方式配置
 	payType: {
--- a/service/common/js/util.js
+++ b/service/common/js/util.js
@ -5,8 +5,6 @@ import config from '@/common/js/config.js'
 // 接口
 import api from '@/api/index.js'

-const msgType = {}
-
 // 工具库
 const util = {
 	//	配置参数
@ -68,14 +66,14 @@ const util = {
 				showCancel: obj.showCancel,
 				cancelText: obj.cancelText,
 				success: res => {
-					obj.success ? obj.success(res) : () => {}
+					obj.success ? obj.success(res) : () => { }
 					resolve(res)
 				},
 				fail: err => {
-					obj.fail ? obj.fail(err) : () => {}
+					obj.fail ? obj.fail(err) : () => { }
 					reject(err)
 				},
-				complete: res => {}
+				complete: res => { }
 			})
 		})
 	},
@ -135,6 +133,9 @@ const util = {
 					//	
 					reject(res)
 				},
+				complete(rs) {
+					console.log('upload complete', rs)
+				}
 			})
 		})
 	},
@ -191,11 +192,11 @@ const util = {

 			if (token) params.header["Authorization"] = `Bearer ${token}`

-			// console.log('request url', url)
-			// console.log('request data', params.data)
-			// console.log('request header', params.header)
-			// console.log('params.responseType', url, params.responseType)
-			//	发起网络请求
+			console.log('request url', url)
+			console.log('request data', params.data)
+			console.log('request header', params.header)
+			console.log('params.responseType', url, params.responseType)
+			// 发起网络请求
 			uni.request({
 				// 请求地址
 				url: url,
@ -212,7 +213,7 @@ const util = {
 				responseType: params.responseType || 'text',
 				// 请求成功返回
 				success: res => {
-					console.log('request success', url, res, params.data ? params.data : '')
+					// console.log('request success', url, res, params.data ? params.data : '')
 					// 关闭加载效果
 					if (params.load) {
 						uni.hideLoading()
@ -920,7 +921,7 @@ const util = {
 		const file_suffix = util.config[{
 			'file': 'file_suffix',
 			'audio': 'audio_suffix',
-		} [type]]
+		}[type]]
 		let result = ''
 		if (url) result = file_suffix.find(item => item.id === url.split('.').pop().toLowerCase())
 		return result
@ -1046,7 +1047,7 @@ const util = {
 									obj.fail ? obj.fail('no data') : ''
 								}
 								break
-								// app支付
+							// app支付
 							case "app":
 								uni.requestPayment({
 									provider: "wxpay",
@ -1068,7 +1069,7 @@ const util = {
 								break
 						}
 						break
-						// 支付宝支付
+					// 支付宝支付
 					case "2":
 						switch (obj.method) {
 							// app支付
@ -1093,7 +1094,7 @@ const util = {
 								break
 						}
 						break
-						// 钱包支付
+					// 钱包支付
 					case "4":
 						obj.success ? obj.success(rs) : ''
 						result_goto('success')
@ -1165,7 +1166,7 @@ const util = {
 				util.alert("您拒绝了授权");

 				// 失败
-				obj.fail ? obj.fail(res) : (res) => {};
+				obj.fail ? obj.fail(res) : (res) => { };
 			},
 			complete() {
 				// 结束
@ -1365,11 +1366,11 @@ const util = {
 		return new Promise((resolve, reject) => {
 			// 是否在微信小程序限制范围内
 			if (!['scope.userInfo', 'scope.userLocation', 'scope.userLocationBackground',
-					'scope.address',
-					'scope.record', 'scope.writePhotosAlbum', 'scope.camera',
-					'scope.invoice',
-					'scope.invoiceTitle', 'scope.werun'
-				].includes(obj.scope)) {
+				'scope.address',
+				'scope.record', 'scope.writePhotosAlbum', 'scope.camera',
+				'scope.invoice',
+				'scope.invoiceTitle', 'scope.werun'
+			].includes(obj.scope)) {
 				resolve({
 					msg: '不在限制范围内',
 				})
@ -1425,7 +1426,7 @@ const util = {
 			uni.$emit('login')

 			setTimeout(() => {
-				uni.switchTab({
+				uni.reLaunch({
 					url: '/pages/index/index'
 				})
 			}, 500)
@ -1729,7 +1730,7 @@ const util = {
 			}
 		});
 	},
-	showToastAndRedirect(title, icon = 'none', fun = () => {}) {
+	showToastAndRedirect(title, icon = 'none', fun = () => { }) {
 		uni.showToast({
 			title,
 			icon,
--- a/service/main.js
+++ b/service/main.js
@ -3,12 +3,14 @@ import App from './App'
 import store from '@/store';
 // 
 import Vuex from 'vuex'
+// 通用方法
+import util from '@/common/js/util';

 import TIM from '@tencentcloud/chat';

-const chat = TencentCloudChat.create({
-	SDKAppID: 0,
-})
+// const chat = TencentCloudChat.create({
+// 	SDKAppID: 0,
+// })

 // 集成聊天
 uni.$TIM = TIM
--- a/service/pages.json
+++ b/service/pages.json
@ -24,7 +24,7 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
-		},
+		}
 	],

 	"globalStyle": {
--- a/service/pages/index/index.vue
+++ b/service/pages/index/index.vue
@ -33,6 +33,12 @@
 		}
 	])

+	
+	// // 用户信息
+	// const userinfo = computed(() => {
+	// 	return store.state.userinfo
+	// })
+
 	/**
 	 * 去聊天
 	 * @param {Number} item 聊天对象
@ -74,8 +80,7 @@
 			<view class="">商家订单管理</view>
 			<uni-icons type="right" />
 		</view>
-
-		<!--  -->
+ 
 		<view class="list">
 			<view class="item rows ptb20 plr20" v-for="(item, index) in chatList" :key="index"
 				@click="handleChat(item)">
--- a/service/pages/login/login.vue
+++ b/service/pages/login/login.vue
@ -1,88 +1,77 @@
 <script setup>
-	/**
-	 * 手机号登录
-	 */
-	import {
-		ref,
-		reactive,
-	} from 'vue'
+/**
+ * 手机号登录
+ */
+import { ref, reactive } from 'vue'

-	// api
-	import api from '@/api/index'
-	// 工具库
-	import util from '@/common/js/util.js'
-	// 加密
-	import CryptoJS from 'crypto-js';
-	// 显示密码
-	const showPwd = ref(false)
-	// 是否阅读
-	const read = ref(false)
-	// 表单
-	const form = reactive({
-		// 设备imei
-		userImei: '',
-		// 手机号
-		phoneNumber: '',
-		// 密码
-		password: '',
+// api
+import api from '@/api/index'
+// 工具库
+import util from '@/common/js/util.js'
+// 加密
+import CryptoJS from 'crypto-js';
+// 显示密码
+const showPwd = ref(false)
+// 是否阅读
+const read = ref(false)
+// 表单
+const form = reactive({
+	// 手机号
+	serviceAccount: '',
+	// 密码
+	password: '',
+})
+
+// 反选阅读
+function handleRead() {
+	read.value = !read.value
+}
+
+/**
+ * 查看文章
+ * @param {Object} id
+ */
+function article(id) {
+	uni.navigateTo({
+		url: util.setUrl('/pages/index/article', {
+			id,
+		})
 	})
+}

-	// 反选阅读
-	function handleRead() {
-		read.value = !read.value
+// 登录
+function handleLogin() {
+	const data = {
+		...form
 	}
-
-	/**
-	 * 查看文章
-	 * @param {Object} id
-	 */
-	function article(id) {
-		uni.navigateTo({
-			url: util.setUrl('/pages/index/article', {
-				id,
-			})
-		})
-	}
-
-	// 登录
-	function handleLogin() {
-		const data = {
-			...form
-		}
-		// 校验
-		if (!data.phoneNumber) {
-			util.alert('请输入手机号')
-			return
-		}
-		if (!data.password) {
-			util.alert('请输入密码')
-			return
-		}
-		data.password = CryptoJS.MD5(data.password).toString()
-		// 如果imei为空
-		if (!data.userImei) {
-			const info = uni.getSystemInfoSync()
-			data.userImei = info.deviceId
-		}
-
-		console.log('data', data)
+	// 校验
+	if (!data.serviceAccount) {
+		util.alert('请输入手机号')
 		return
-
-		// 
-		api.login.userLoginByPassword({
-			data: data,
-		}).then(rs => {
-			if (rs.code == 200) {
-				// 
-				util.finalLogin(rs)
-				return
-			}
-			util.alert({
-				content: rs.msg,
-				showCancel: false,
-			})
-		})
 	}
+	if (!data.password) {
+		util.alert('请输入密码')
+		return
+	}
+	if (!read.value) {
+		util.alert('请阅读并勾选服务协议》和《隐私政策》')
+		return
+	}
+	data.password = CryptoJS.MD5(data.password).toString()
+
+	api.login.userLoginByPassword({
+		query: data,
+	}).then(rs => {
+		if (rs.code == 200) {
+			util.finalLogin(rs)
+			return
+		}
+		util.alert({
+			content: rs.msg,
+			showCancel: false,
+		})
+	})
+}
 </script>

 <template>
@ -96,7 +85,7 @@
 				<view class="title mtb30">九亿客服登录</view>

 				<view class="inputBox mtb20 ptb10 plr30">
-					<input type="text" v-model="form.phoneNumber" placeholder="请输入手机号" />
+					<input type="text" v-model="form.serviceAccount" placeholder="请输入手机号" />
 				</view>

 				<view class="inputBox rows mtb20 ptb10 plr30">
@ -116,7 +105,7 @@
 		</view>

 		<view class="footer">
-			<view class="notice tac c999 f20">
+			<view class="notice fmid tac c999 f20">
 				<view class="button" @click="handleRead">
 					<uni-icons type="checkbox-filled" size="40rpx" color="#000" v-if="read" />
 					<uni-icons type="circle" size="40rpx" color="#99" v-else />
@ -131,19 +120,20 @@
 </template>

 <style lang="scss">
-	.image {
-		width: 100%;
-		height: 100%;
-	}
+.image {
+	width: 100%;
+	height: 100%;
+}

-	// 
-	.container {
-		margin-top: 15vh;
+// 
+.container {
+	margin-top: 15vh;

-		// 标志
-		.logo {
-			width: 200rpx;
-			height: 200rpx;
-		}
+	// 标志
+	.logo {
+		width: 200rpx;
+		height: 200rpx;
 	}
+}
+
 </style>
--- a/service/unpackage/dist/cache/.vite/deps/@tencentcloud_chat.js
+++ b/service/unpackage/dist/cache/.vite/deps/@tencentcloud_chat.js
@ -2,9 +2,9 @@ import {
  __commonJS
 } from "./chunk-TDUMLE5V.js";

-// ../../../../document/九亿商城/service/node_modules/@tencentcloud/chat/index.js
+// ../../../../document/九亿商城/jy/service/node_modules/@tencentcloud/chat/index.js
 var require_chat = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/@tencentcloud/chat/index.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/@tencentcloud/chat/index.js"(exports, module) {
    !function(e, t) {
      "object" == typeof exports && "undefined" != typeof module ? module.exports = t() : "function" == typeof define && define.amd ? define(t) : (e = "undefined" != typeof globalThis ? globalThis : e || self).TencentCloudChat = t();
    }(exports, function() {
--- a/service/unpackage/dist/cache/.vite/deps/@tencentcloud_chat_indexesjs.js
+++ b/service/unpackage/dist/cache/.vite/deps/@tencentcloud_chat_indexesjs.js
--- a/service/unpackage/dist/cache/.vite/deps/@tencentcloud_chat_indexesjs.js.map
+++ b/service/unpackage/dist/cache/.vite/deps/@tencentcloud_chat_indexesjs.js.map
--- a/service/unpackage/dist/cache/.vite/deps/_metadata.json
+++ b/service/unpackage/dist/cache/.vite/deps/_metadata.json
@ -1,25 +1,19 @@
 {
-  "hash": "d7401311",
-  "configHash": "b4a96d31",
+  "hash": "a409d935",
+  "configHash": "da5c2bdf",
  "lockfileHash": "7b6ef450",
-  "browserHash": "b758873c",
+  "browserHash": "8066c8cc",
  "optimized": {
-    "crypto-js": {
-      "src": "../../../../../node_modules/crypto-js/index.js",
-      "file": "crypto-js.js",
-      "fileHash": "63888f73",
-      "needsInterop": true
-    },
-    "@tencentcloud/chat/index.es.js": {
-      "src": "../../../../../node_modules/@tencentcloud/chat/index.es.js",
-      "file": "@tencentcloud_chat_index__es__js.js",
-      "fileHash": "1c16a284",
-      "needsInterop": false
-    },
    "@tencentcloud/chat": {
      "src": "../../../../../node_modules/@tencentcloud/chat/index.js",
      "file": "@tencentcloud_chat.js",
-      "fileHash": "b4c7d0e4",
+      "fileHash": "0e28df2d",
+      "needsInterop": true
+    },
+    "crypto-js": {
+      "src": "../../../../../node_modules/crypto-js/index.js",
+      "file": "crypto-js.js",
+      "fileHash": "d3e1eda0",
      "needsInterop": true
    }
  },
--- a/service/unpackage/dist/cache/.vite/deps/crypto-js.js
+++ b/service/unpackage/dist/cache/.vite/deps/crypto-js.js
@ -16,9 +16,9 @@ var require_crypto = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/core.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/core.js
 var require_core = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/core.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/core.js"(exports, module) {
    (function(root, factory) {
      if (typeof exports === "object") {
        module.exports = exports = factory();
@ -624,9 +624,9 @@ var require_core = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/x64-core.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/x64-core.js
 var require_x64_core = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/x64-core.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/x64-core.js"(exports, module) {
    (function(root, factory) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core());
@ -881,9 +881,9 @@ var require_x64_core = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/lib-typedarrays.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/lib-typedarrays.js
 var require_lib_typedarrays = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/lib-typedarrays.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/lib-typedarrays.js"(exports, module) {
    (function(root, factory) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core());
@ -926,9 +926,9 @@ var require_lib_typedarrays = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/enc-utf16.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/enc-utf16.js
 var require_enc_utf16 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/enc-utf16.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/enc-utf16.js"(exports, module) {
    (function(root, factory) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core());
@ -1044,9 +1044,9 @@ var require_enc_utf16 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/enc-base64.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/enc-base64.js
 var require_enc_base64 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/enc-base64.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/enc-base64.js"(exports, module) {
    (function(root, factory) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core());
@ -1152,9 +1152,9 @@ var require_enc_base64 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/enc-base64url.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/enc-base64url.js
 var require_enc_base64url = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/enc-base64url.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/enc-base64url.js"(exports, module) {
    (function(root, factory) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core());
@ -1271,9 +1271,9 @@ var require_enc_base64url = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/md5.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/md5.js
 var require_md5 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/md5.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/md5.js"(exports, module) {
    (function(root, factory) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core());
@ -1450,9 +1450,9 @@ var require_md5 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/sha1.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha1.js
 var require_sha1 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/sha1.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha1.js"(exports, module) {
    (function(root, factory) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core());
@ -1541,9 +1541,9 @@ var require_sha1 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/sha256.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha256.js
 var require_sha256 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/sha256.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha256.js"(exports, module) {
    (function(root, factory) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core());
@ -1662,9 +1662,9 @@ var require_sha256 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/sha224.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha224.js
 var require_sha224 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/sha224.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha224.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_sha256());
@ -1707,9 +1707,9 @@ var require_sha224 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/sha512.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha512.js
 var require_sha512 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/sha512.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha512.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_x64_core());
@ -1989,9 +1989,9 @@ var require_sha512 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/sha384.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha384.js
 var require_sha384 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/sha384.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha384.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_x64_core(), require_sha512());
@ -2035,9 +2035,9 @@ var require_sha384 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/sha3.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha3.js
 var require_sha3 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/sha3.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/sha3.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_x64_core());
@ -2237,9 +2237,9 @@ var require_sha3 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/ripemd160.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/ripemd160.js
 var require_ripemd160 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/ripemd160.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/ripemd160.js"(exports, module) {
    (function(root, factory) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core());
@ -2708,9 +2708,9 @@ var require_ripemd160 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/hmac.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/hmac.js
 var require_hmac = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/hmac.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/hmac.js"(exports, module) {
    (function(root, factory) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core());
@ -2815,9 +2815,9 @@ var require_hmac = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/pbkdf2.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/pbkdf2.js
 var require_pbkdf2 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/pbkdf2.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/pbkdf2.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_sha256(), require_hmac());
@ -2913,9 +2913,9 @@ var require_pbkdf2 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/evpkdf.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/evpkdf.js
 var require_evpkdf = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/evpkdf.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/evpkdf.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_sha1(), require_hmac());
@ -3004,9 +3004,9 @@ var require_evpkdf = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/cipher-core.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/cipher-core.js
 var require_cipher_core = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/cipher-core.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/cipher-core.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_evpkdf());
@ -3648,9 +3648,9 @@ var require_cipher_core = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/mode-cfb.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-cfb.js
 var require_mode_cfb = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/mode-cfb.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-cfb.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_cipher_core());
@ -3700,9 +3700,9 @@ var require_mode_cfb = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/mode-ctr.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ctr.js
 var require_mode_ctr = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/mode-ctr.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ctr.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_cipher_core());
@ -3740,9 +3740,9 @@ var require_mode_ctr = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/mode-ctr-gladman.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ctr-gladman.js
 var require_mode_ctr_gladman = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/mode-ctr-gladman.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ctr-gladman.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_cipher_core());
@ -3815,9 +3815,9 @@ var require_mode_ctr_gladman = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/mode-ofb.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ofb.js
 var require_mode_ofb = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/mode-ofb.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ofb.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_cipher_core());
@ -3853,9 +3853,9 @@ var require_mode_ofb = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/mode-ecb.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ecb.js
 var require_mode_ecb = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/mode-ecb.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/mode-ecb.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_cipher_core());
@ -3884,9 +3884,9 @@ var require_mode_ecb = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/pad-ansix923.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-ansix923.js
 var require_pad_ansix923 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/pad-ansix923.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-ansix923.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_cipher_core());
@ -3916,9 +3916,9 @@ var require_pad_ansix923 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/pad-iso10126.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-iso10126.js
 var require_pad_iso10126 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/pad-iso10126.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-iso10126.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_cipher_core());
@ -3944,9 +3944,9 @@ var require_pad_iso10126 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/pad-iso97971.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-iso97971.js
 var require_pad_iso97971 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/pad-iso97971.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-iso97971.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_cipher_core());
@ -3971,9 +3971,9 @@ var require_pad_iso97971 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/pad-zeropadding.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-zeropadding.js
 var require_pad_zeropadding = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/pad-zeropadding.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-zeropadding.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_cipher_core());
@ -4005,9 +4005,9 @@ var require_pad_zeropadding = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/pad-nopadding.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-nopadding.js
 var require_pad_nopadding = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/pad-nopadding.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/pad-nopadding.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_cipher_core());
@ -4028,9 +4028,9 @@ var require_pad_nopadding = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/format-hex.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/format-hex.js
 var require_format_hex = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/format-hex.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/format-hex.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_cipher_core());
@ -4088,9 +4088,9 @@ var require_format_hex = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/aes.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/aes.js
 var require_aes = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/aes.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/aes.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@ -4242,9 +4242,9 @@ var require_aes = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/tripledes.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/tripledes.js
 var require_tripledes = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/tripledes.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/tripledes.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@ -5023,9 +5023,9 @@ var require_tripledes = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/rc4.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/rc4.js
 var require_rc4 = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/rc4.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/rc4.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@ -5106,9 +5106,9 @@ var require_rc4 = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/rabbit.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/rabbit.js
 var require_rabbit = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/rabbit.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/rabbit.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@ -5235,9 +5235,9 @@ var require_rabbit = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/rabbit-legacy.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/rabbit-legacy.js
 var require_rabbit_legacy = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/rabbit-legacy.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/rabbit-legacy.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@ -5361,9 +5361,9 @@ var require_rabbit_legacy = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/blowfish.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/blowfish.js
 var require_blowfish = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/blowfish.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/blowfish.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@ -6550,9 +6550,9 @@ var require_blowfish = __commonJS({
  }
 });

-// ../../../../document/九亿商城/service/node_modules/crypto-js/index.js
+// ../../../../document/九亿商城/jy/service/node_modules/crypto-js/index.js
 var require_crypto_js = __commonJS({
-  "../../../../document/九亿商城/service/node_modules/crypto-js/index.js"(exports, module) {
+  "../../../../document/九亿商城/jy/service/node_modules/crypto-js/index.js"(exports, module) {
    (function(root, factory, undef) {
      if (typeof exports === "object") {
        module.exports = exports = factory(require_core(), require_x64_core(), require_lib_typedarrays(), require_enc_utf16(), require_enc_base64(), require_enc_base64url(), require_md5(), require_sha1(), require_sha256(), require_sha224(), require_sha512(), require_sha384(), require_sha3(), require_ripemd160(), require_hmac(), require_pbkdf2(), require_evpkdf(), require_cipher_core(), require_mode_cfb(), require_mode_ctr(), require_mode_ctr_gladman(), require_mode_ofb(), require_mode_ecb(), require_pad_ansix923(), require_pad_iso10126(), require_pad_iso97971(), require_pad_zeropadding(), require_pad_nopadding(), require_format_hex(), require_aes(), require_tripledes(), require_rc4(), require_rabbit(), require_rabbit_legacy(), require_blowfish());
--- a/service/vite.config.js
+++ b/service/vite.config.js
@ -0,0 +1,41 @@
+import {
+	defineConfig
+} from 'vite';
+import uni from '@dcloudio/vite-plugin-uni';
+
+// let target = 'http://91f.xyz:8080'
+let target = 'http://1a4b9ed1.r24.cpolar.top'
+
+export default defineConfig({
+	plugins: [uni()],
+	server: {
+		host: "0.0.0.0",
+		port: 5173,
+		proxy: {
+			"/system": {
+				target,
+				changeOrigin: true,
+			},
+			"/shopify": {
+				target,
+				changeOrigin: true,
+			},
+			"/user": {
+				target,
+				changeOrigin: true,
+			},
+			"/coreplay": {
+				target,
+				changeOrigin: true,
+			},
+			"/file": {
+				target,
+				changeOrigin: true,
+			},
+			"/video": {
+				target,
+				changeOrigin: true,
+			},
+		}
+	}
+})