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

jiuyi2/common/js/config.js

@@ -7,6 +7,7 @@ const config = {
 	// #endif
 	// #ifndef H5
 	host: 'http://91f.xyz:8080',
+	host: 'https://b433d23.r24.cpolar.top/',
 	// #endif
 	// 支付方式配置
 	payType: {

jiuyi2/components/news/msgList.vue

@@ -317,13 +317,6 @@ function handleDate(timestamp) {
 						@click="handleMenu($event, item)">
 						<view class="item rows ptb20 plr30" @click.stop="handleChat(item)">
 							<view class="image wh90 pr">
-								<!-- <template v-if="item.groupId == null">
-									<image class="cir wh90" :src="item.callbackJson.from_url" mode="aspectFill" />
-								</template>
-<template v-else>
-									<image class="cir wh90" :src="item.groupChatDTO.groupFaceUrl" mode="aspectFill" />
-								</template> -->
-
 								<image class="cir wh90" :src="item.avatar" mode="aspectFill" />
 								<view class="mark pa t0 r0 cfff f22 cir" v-if="item.unreadCount">{{ item.unreadCount }}
 								</view>
@@ -331,12 +324,6 @@ function handleDate(timestamp) {
 							<view class="col f1 ml20">
 								<view class="rows">
 									<view class="name f1 thd c333 f32">{{ item.name }}</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.MsgTime) }}</view>
 								</view>

jiuyi2/pages/news/chat/chat.vue

@@ -212,7 +212,10 @@ function sendMsg(param) {
 		data: param.data,
 	}).then((rs) => {
 		if (rs.code == 200) {
-			getHistory()
+			getHistory({
+				msgId: '',
+				limit: 1,
+			})
 			param.success ? param.success() : ''
 			return
 		}

jiuyi2/vite.config.js

@@ -3,7 +3,8 @@ import {
 } from 'vite';
 import uni from '@dcloudio/vite-plugin-uni';
 
-let target = 'http://91f.xyz:8080'
+// let target = 'http://91f.xyz:8080'
+let target = 'https://b433d23.r24.cpolar.top/'
 
 export default defineConfig({
 	plugins: [uni()],