冲突

commont/http.interceptor.js

@@ -3,6 +3,7 @@ module.exports = (vm) => {
   // 初始化请求配置
   uni.$u.http.setConfig((config) => {
     /* config 为默认全局配置*/
+    // config.baseURL = "https://cbec.hdlkeji.com"; /* 根域名 */
     config.baseURL = "https://api.qbhcn.com"; /* 根域名 */
     // config.baseURL = "https://cbec-test.hdlkeji.com"; /* 根域名，测试地址 */
     return config;

components/kj-flow/kj-flow.vue

@@ -57,7 +57,8 @@ color: #666666;">{{item.name_ita}}</view>
 			</scroll-view>
 		</view>
 		<view class="" v-else style="height: 300rpx;text-align: center;line-height: 300rpx;font-size: 24rpx;">
-			{{i18n.nodata}}</view>
+			{{i18n.nodata}}
+		</view>
 		<view class="bottom">
 			<view class="btn" @click="enter">{{i18n.enter}}</view>
 		</view>
@@ -187,9 +188,24 @@ color: #666666;">{{item.name_ita}}</view>
 						this.leftchange = this.leftchangea
 						this.rightchange = this.rightchangea
 						this.container(this.typeida)
-						this.typeid = this.transportList[0].id
+						this.typeid = this.transportList[0].id  
 					} else {
+						this.leftchange = index
+						this.typeid = res[0].id
 						this.container(res[0].id)
+						if (this.language == 'en-US') {
+							this.leftname = item.name_en
+						}
+						if (this.language == 'es-ES') {
+							this.leftname = item.name_es                                                                               
+						}
+						if (this.language == 'it-IT') {
+							this.leftname = item.name_ita
+						}
+
+						if (this.language == 'zh-CN') {
+							this.leftname = item.name_cn
+						}
 					}
 				}).catch(() => {
 
@@ -202,7 +218,7 @@ color: #666666;">{{item.name_ita}}</view>
 				this.typeid = item.id
 				this.container(item.id)
 				this.rightname = '',
-					this.dateid = ''
+				this.dateid = ''
 				if (this.language == 'en-US') {
 					this.leftname = item.name_en
 				}

pageA/chat/news.vue

@@ -105,10 +105,11 @@
 	import {
 		conn,
 	} from '@/utils/WebIM';
+	import WebIM from '@/newSDK/Easemob-chat-4.1.7.js'
 	export default {
 		data() {
 			return {
-				cursor:'',
+				cursor: '',
 				type: "error",
 				value: 1,
 				list: [],
@@ -137,9 +138,9 @@
 			}
 		},
 		methods: {
-			toserve(){
+			toserve() {
 				uni.navigateTo({
-					url:'/pageA/chat/search'
+					url: '/pageA/chat/search'
 				})
 			},
 			dele() {
@@ -167,10 +168,10 @@
 				}).then((res) => {
 					console.log(res);
 					// this.list.concat(res.data.conversations)
-					if(this.cursor==''){
+					if (this.cursor == '') {
 						this.list = res.data.conversations
 					}
-					if(this.cursor){
+					if (this.cursor) {
 						this.list.concat(res.data.conversations)
 					}
 					this.cursor = res.data.cursor
@@ -182,6 +183,20 @@
 				})
 			},
 			chat(item) {
+				let option = {
+					chatType: "singleChat", // 会话类型，设置为单聊。
+					type: "channel", // 消息类型。固定参数固定值，不要动它
+					to: item.conversationId, // 接收消息对象（用户 ID)。
+				};
+				let msg = new WebIM.message.create(option);
+				conn.send(msg)
+					.then((res) => {
+						console.log("%c>>>>>>>>会话已读回执发送成功", "color:#6ad1c7", res);
+					})
+					.catch((e) => {
+						console.log("%c>>>>>>>>>会话已读回执发送失败", "color:#ef8784", e);
+					});
+
 				if (item.lastMessage.ext.user.easemob_username == this.user_no) {
 					uni.navigateTo({
 						url: '/pageA/chat/chat?user_other_no=' + item.conversationId + '&user_other=' +

unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.wxss

@@ -1 +1 @@
-.iitem.data-v-c6484868{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.price.data-v-c6484868{font-family:SFPro;font-weight:500;font-size:24rpx;color:#f83224;line-height:28rpx;text-align:left;font-style:normal}.right.data-v-c6484868{flex:1;width:474rpx;height:642rpx}.bottom.data-v-c6484868{width:750rpx;background:#fff;padding:20rpx 24rpx 0;box-sizing:border-box}.btn.data-v-c6484868{width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.title.data-v-c6484868{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:36rpx;color:#333;line-height:50rpx;text-align:left;font-style:normal}.left.data-v-c6484868{width:212rpx;height:642rpx}.ititle.data-v-c6484868{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.itime.data-v-c6484868{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#333;line-height:28rpx;text-align:center;font-style:normal}
+.iitem.data-v-ef0f51e0{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.price.data-v-ef0f51e0{font-family:SFPro;font-weight:500;font-size:24rpx;color:#f83224;line-height:28rpx;text-align:left;font-style:normal}.right.data-v-ef0f51e0{flex:1;width:474rpx;height:642rpx}.bottom.data-v-ef0f51e0{width:750rpx;background:#fff;padding:20rpx 24rpx 0;box-sizing:border-box}.btn.data-v-ef0f51e0{width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.title.data-v-ef0f51e0{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:36rpx;color:#333;line-height:50rpx;text-align:left;font-style:normal}.left.data-v-ef0f51e0{width:212rpx;height:642rpx}.ititle.data-v-ef0f51e0{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.itime.data-v-ef0f51e0{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#333;line-height:28rpx;text-align:center;font-style:normal}

unpackage/dist/build/mp-weixin/pages/mine/component/mallOrderForm.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }