diff --git a/src/components/loading.vue b/src/components/loading.vue
deleted file mode 100644
index c6a9ea8..0000000
--- a/src/components/loading.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-	<view>
-		<view class="div">
-			<view v-if="loadingFinish" class="image">没有更多内容了</view>
-			<view v-else class="loading">
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-			
-			};
-		},
-		props: {
-		  loadingFinish: {
-		    type: Boolean,
-		    default: false
-		  }
-		}
-	}
-</script>
-
-<style>
-	.div{
-		width: 100%;
-		height: 50px;
-		flex-direction: row;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-	.image{
-		font-size: 13px;
-		color: #ccc;
-	}
-	.loading {
-		width: 18px;
-		height: 18px;
-		border: 2px solid #ccc;
-		border-bottom: #cccccc00 2px solid;
-		border-radius: 50%;
-		-webkit-animation: load 1.1s infinite linear;
-	}
-
-	@-webkit-keyframes load {
-		from {
-			transform: rotate(0deg);
-		}
-
-		to {
-			transform: rotate(360deg);
-		}
-	}
-</style>
diff --git a/src/components/msgList2/msgList2.vue b/src/components/msgList2/msgList2.vue
deleted file mode 100644
index 9c5a7cf..0000000
--- a/src/components/msgList2/msgList2.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-	<view>
-		<uni-swipe-action>
-			<uni-swipe-action-item @click="swLlick($event,item)" :options="options" v-for="(item,index) in list" :key='index'>
-				<view class="item" @tap.stop="toTalk(item)" v-if="item.userChat.chatType == 1">
-					<view class="msgnum" v-if="item.userChat.unreadCount">
-						{{item.userChat.unreadCount}}
-					</view>
-					<image v-if="item.userChat.chatType == 1" class="header" :src="item.headImgUrl" mode="aspectFill"></image>
-					<view class="right">
-						<view class="name" v-if="item.userChat.chatType == 1">
-							{{item.toUserAsName}}
-						</view>
-						<view class="name" v-else>
-							{{item.userChat.chatType | getOname}}
-						</view>
-						<view v-if="item.userChat.chatType == 1">
-							<view class="centerdes" v-if="item.userChat.lastMsg.type == 0">
-								{{item.userChat.lastMsg.msg}}
-							</view>
-							<view class="centerdes" v-else>
-								{{item.userChat.lastMsg.type | getType}}
-							</view>
-						</view>
-						<view class="lasttime">
-							{{item.userChat.lastTime | getTextTimex}}
-						</view>
-					</view>
-				</view>
-			</uni-swipe-action-item>
-		</uni-swipe-action>
-	</view>
-</template>
-
-<script>
-	import uniSwipeAction from '@/components/uni-swipe-action/uni-swipe-action.vue'
-	import uniSwipeActionItem from '@/components/uni-swipe-action-item/uni-swipe-action-item.vue'
-	export default {
-		components: {
-			uniSwipeAction,
-			uniSwipeActionItem
-		},
-		data() {
-			return {
-				options: [{
-					text: '删除',
-					style: {
-						backgroundColor: '#E22B34'
-					}
-				}]
-			};
-		},
-		filters: {
-			getType(type) {
-				switch (type) {
-					case 1:
-						return "[图片]"
-						break;
-					case 2:
-						return "[语音]"
-						break;
-					case 3:
-						return "[视频]"
-						break;
-					case 4:
-						return "[位置]"
-						break;
-					case 5:
-						return "[消息]"
-						break;
-					case 6:
-						return "[文件]"
-						break;
-					case 7:
-						return "[商品]"
-						break;
-					default:
-						break;
-				}
-			},
-			getOname(type) {
-				switch (type) {
-					case 2:
-						return "系统消息"
-						break;
-					case 3:
-						return "订单消息"
-						break;
-					case 4:
-						return "求购消息"
-						break;
-					default:
-						break;
-				}
-			}
-		},
-		props: {
-			list: {
-				type: Array,
-				default: () => {
-					return []
-				}
-			}
-		},
-		methods: {
-			swLlick(e, item) {
-				console.log(item.userChat.id)
-				this.$emit("swLlick", item.userChat.id)
-			},
-			//去聊天
-			toTalk(item) {
-				if (this.utils.checkLocToken()) {
-					if (item.userChat.chatType == 1) {
-						uni.navigateTo({
-							url: "/pages/im/talkPage/talkPage?toId=" + item.userChat.fromId + "&chatId=" + item.userChat.chatId
-						})
-						// // #ifdef APP-PLUS
-						// uni.navigateTo({
-						// 	url: "/pages/im/talkPageNvue/talkPageNvue?toId=" + item.userChat.fromId + "&id=" + item.userChat.id
-						// })
-						// // #endif
-						// // #ifdef MP-WEIXIN
-						// uni.navigateTo({
-						// 	url: "/pages/im/talkPage/talkPage?toId=" + item.userChat.fromId + "&id=" + item.userChat.id
-						// })
-						// // #endif
-					}
-					//订单消息
-					if (item.userChat.chatType == 3) {
-						uni.navigateTo({
-							url: "/pages/im/orderInfo/orderInfo?type=1"
-						})
-					}
-					//求购消息
-					if (item.userChat.chatType == 4) {
-						uni.navigateTo({
-							url: "/pages/im/orderInfo/orderInfo?type=3"
-						})
-					}
-					//系统消息
-					if (item.userChat.chatType == 2) {
-						uni.navigateTo({
-							url: "/pages/im/orderInfo/orderInfo?type=2"
-						})
-					}
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.item {
-		background-color: #fff;
-		border-bottom: 1upx solid #efefef;
-		display: flex;
-		align-items: flex-start;
-		padding: 12px;
-		width: 100%;
-		position: relative;
-
-		.msgnum {
-			position: absolute;
-			right: 12px;
-			top: 14px;
-			padding-left: 10px;
-			padding-right: 10px;
-			height: 19px;
-			line-height: 19px;
-			background: linear-gradient(90deg, rgba(224, 32, 32, 1) 0%, rgba(245, 105, 1, 1) 100%);
-			border-radius: 10px;
-			font-size: 16px;
-			color: #fff;
-		}
-
-		.header {
-			width: 44px;
-			height: 44px;
-			border-radius: 50%;
-		}
-
-		.right {
-			flex: 1;
-			margin-left: 10px;
-			display: flex;
-			flex-direction: column;
-
-			.name {
-				height: 26px;
-				font-size: 16px;
-				font-weight: 800;
-				color: rgba(51, 51, 51, 1);
-				line-height: 26px;
-			}
-
-			.centerdes {
-				height: 34px;
-				font-size: 16px;
-				color: rgba(153, 153, 153, 1);
-				line-height: 34px;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: -webkit-box; //作为弹性伸缩盒子模型显示。
-				-webkit-box-orient: vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列
-				-webkit-line-clamp: 1; //显示的行
-				flex-shrink: 0;
-			}
-
-			.lasttime {
-				height: 20px;
-				font-size: 14px;
-				color: rgba(153, 153, 153, 1);
-				line-height: 20px;
-			}
-		}
-	}
-</style>
diff --git a/src/components/nothing/nothing.vue b/src/components/nothing/nothing.vue
deleted file mode 100644
index 9eb2785..0000000
--- a/src/components/nothing/nothing.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-	<view>
-		<view class="notihs">
-			<image src="../../static/nogoods.png" ></image>
-			暂无数据
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
-</script>
-
-<style lang="less">
-.notihs{
-	width: 100%;
-	margin-top: 20vh;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: column;
-	font-size: 15px;
-	color: #999;
-	image{
-		width: 80px;
-		margin-bottom: 10px;
-		height: 80px;
-	}
-}
-</style>
diff --git a/src/components/pageLoading.vue b/src/components/pageLoading.vue
deleted file mode 100644
index 622ca79..0000000
--- a/src/components/pageLoading.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-	<view>
-		<view v-if="show" class="bgPage" :class="hideClass" @touchmove.stop.prevent>
-			<!-- <image src="../static/logo.png" class="logoimage" ></image> -->
-			<topLoading width="50"></topLoading>
-		</view>
-	</view>
-</template>
-
-<script>
-	import topLoading from '@/components/topLoading.vue'
-	export default {
-		data() {
-			return {
-				show:true,
-				hideClass:""
-			};
-		},
-		props: {
-		  loadingFinish: {
-		    type: Boolean,
-		    default: false
-		  }
-		},
-		watch:{
-			loadingFinish(val){
-				if(val){
-					this.hideClass = "hidePage"
-					setTimeout(()=>{
-						this.show = false
-					},450)
-				}
-			}
-		},
-		components: {
-			topLoading
-		},
-	}
-</script>
-
-<style lang="less">
-	.bgPage{
-		width: 100vw;
-		height: 100vh;
-		position: fixed;
-		top: 0px;
-		bottom: 0px;
-		right: 0px;
-		left: 0px;
-		z-index: 9999;
-		background: #fff;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		
-	}
-	.hidePage{
-		animation:mymovePage .5s forwards;
-		-webkit-animation:mymovePage .5s forwards; /*Safari and Chrome*/
-	}
-	
-	@keyframes mymovePage
-	{
-		from {opacity:1;}
-		to {opacity:0;}
-	}
-	
-	@-webkit-keyframes mymovePage /*Safari and Chrome*/
-	{
-		from {opacity:1;}
-		to {opacity:0;}
-	}
-	.logoimage{
-			width: 50px;
-			height: 50px;
-			 -webkit-animation:rotateImg 1s linear infinite;
-		}
-	
-	@keyframes rotateImg {
-	  0% {transform : rotate(0deg);}
-	  100% {transform : rotate(360deg);}
-	}
-	
-	@-webkit-keyframes rotateImg {
-	    0%{-webkit-transform : rotate(0deg);}
-	  100%{-webkit-transform : rotate(360deg);}
-	}
-	
-</style>
diff --git a/src/components/topLoading.vue b/src/components/topLoading.vue
deleted file mode 100644
index 7b2016c..0000000
--- a/src/components/topLoading.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-	<view>
-		<view class="goods" v-bind:style="{  paddingBottom: getMer() + 'px' }">
-			<image class="imagexxxxx" v-bind:style="{  height: width + 'px',width: width + 'px' }"  src="../static/icon10.png" />
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-			};
-		},
-		methods:{
-			getMer(){
-				return parseFloat(this.mart)
-			}
-		},
-		props: {
-		  mart: {
-		    type: [String,Number],
-		    default: 0
-		  },
-		  width: {
-		    type: [String,Number],
-		    default: 30
-		  }
-		},
-	}
-</script>
-
-<style>
-	* {
-		margin: 0;
-		padding: 0;
-	}
-
-	.imagexxxxx {
-		display: inline-block;
-		width: 30px;
-		height: 30px;
-		border-radius: 50%;
-	}
-
-	.goods {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 100%;
-	}
-
-	.goods image {
-		animation: myfirst .8s infinite;
-	}
-
-	@keyframes myfirst {
-		0% {
-			transform: translate(0px, 0px);
-		}
-
-		50% {
-			transform: translate(0px, 10px);
-		}
-
-		100% {
-			transform: translate(0px, 0px);
-		}
-	}
-</style>
diff --git a/src/manifest.json b/src/manifest.json
index 2d32c21..7d2837f 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "艺象心",
-    "appid" : "__UNI__ED9DD86",
+    "appid" : "__UNI__77CA6BC",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
diff --git a/src/pages.json b/src/pages.json
index 3a6c5c5..a609cc2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -548,16 +548,14 @@
 		{
 			"root": "pagesA/",
 			"pages": [{
-					"path": "msgTalk/msgTalk",
+					"path": "msg/msg",
 					"style": {
-						"navigationBarTitleText": "我的消息"
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "消息列表"
 					}
 				},
 				{
-					"path": "talkPage/talkPage",
-					"style": {
-						"navigationBarTitleText": "消息"
-					}
+					"path": "msg/chat/chat"
 				},
 				{
 					"path": "addArtActivity/addArtActivity",
diff --git a/src/pages/PolicyExpress/PolicyExpress.vue b/src/pages/PolicyExpress/PolicyExpress.vue
index 499bbdf..9c1a870 100644
--- a/src/pages/PolicyExpress/PolicyExpress.vue
+++ b/src/pages/PolicyExpress/PolicyExpress.vue
@@ -12,6 +12,7 @@
 					{{v.username}} {{v.fbsj}}
 				</view>
 			</view>
+			<u-empty v-if="list2.length == 0" mode="data" icon="../../static/orderE.png" marginTop="120"></u-empty>
 		</view>
 	</view>
 </template>
diff --git a/src/pages/activity/activity.vue b/src/pages/activity/activity.vue
index b472523..1784f05 100644
--- a/src/pages/activity/activity.vue
+++ b/src/pages/activity/activity.vue
@@ -25,6 +25,7 @@
 			</view>
 		</view>
 
+		<u-empty v-if="list2.length == 0" mode="data" icon="../../static/orderE.png" marginTop="120"></u-empty>
 		<tabbar tabbarId='2'></tabbar>
 	</view>
 </template>
diff --git a/src/pages/my/My.vue b/src/pages/my/My.vue
index 466c765..8ebf497 100644
--- a/src/pages/my/My.vue
+++ b/src/pages/my/My.vue
@@ -116,8 +116,8 @@
 					</view>
 					
 					
-					<view class="content_bott_itm">
-					    <view class="content_bott_wods" @click="myNews()">
+					<view class="content_bott_itm" @click="myNews()">
+					    <view class="content_bott_wods">
 					        消息
 					    </view>
 					    <view class="content_bott_arrow">
@@ -296,9 +296,9 @@
 			// 消息
 			myNews(){
 				
-				// uni.navigateTo({
-				//     url: "/pagesA/msgTalk/msgTalk"
-				// })
+				uni.navigateTo({
+				    url: "/pagesA/msg/msg"
+				})
 			}
         }
     }
diff --git a/src/pagesA/msg/chat/chat.vue b/src/pagesA/msg/chat/chat.vue
new file mode 100644
index 0000000..8cfb5b5
--- /dev/null
+++ b/src/pagesA/msg/chat/chat.vue
@@ -0,0 +1,782 @@
+<template>
+	<view>
+		<view class="content" @touchstart="hideEmoji">
+			<scroll-view class="msg-list" scroll-y="true" :scroll-with-animation="scrollAnimation" :scroll-top="scrollTop" :scroll-into-view="scrollToView">
+				<view class="row" v-for="(row,index) in msgList" :key="index" :id="'msg'+row.id">
+					<!-- 自己发出的消息 -->
+					<view class="my" v-if="row.uid==myuid">
+						<view class="left">
+							<view v-if="row.type=='text'" class="bubble">
+								<rich-text :nodes="row.msg.content"></rich-text>
+							</view>
+							<view v-if="row.type=='voice'" class="bubble voice" @tap="playVoice(row)" :class="playMsgid == row.id?'play':''">
+								<view class="length">{{row.msg.length}}</view>
+								<view class="icon my-voice"></view>
+							</view>
+							<view v-if="row.type=='img'" class="bubble img" @tap="showPic(row)">
+								<image :src="row.msg.url" :style="{'width': row.msg.w+'px','height': row.msg.h+'px'}"></image>
+							</view>
+						</view>
+						<view class="right">
+							<image :src="row.face"></image>
+						</view>
+					</view>
+					<!-- 别人发出的消息 -->
+					<view class="other" v-if="row.uid!=myuid">
+						<view class="left">
+							<image :src="row.face"></image>
+						</view>
+						<view class="right">
+							<view class="username">
+								<view class="name">{{row.username}}</view> <view class="time">{{row.time}}</view>
+							</view>
+							<view v-if="row.type=='text'" class="bubble">
+								<rich-text :nodes="row.msg.content"></rich-text>
+							</view>
+							<view v-if="row.type=='voice'" class="bubble voice" @tap="playVoice(row)" :class="playMsgid == row.id?'play':''">
+								<view class="icon other-voice"></view>
+								<view class="length">{{row.msg.length}}</view>
+							</view>
+							<view v-if="row.type=='img'" class="bubble img" @tap="showPic(row)">
+								<image :src="row.msg.url" :style="{'width': row.msg.w+'px','height': row.msg.h+'px'}"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<!-- 表情栏 -->
+		<view class="emoji-box" :class="showEmji" @touchmove.stop.prevent="discard">
+			<swiper class="swiper" indicator-dots="true" duration="150">
+				<swiper-item v-for="(page,pid) in emojiList" :key="pid">
+					<view v-for="(em,eid) in page" :key="eid" @tap="addEmoji(em)">
+						<image mode="widthFix" :src="'/static/img/emoji/'+em.url"></image>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<!-- 底部输入栏 -->
+		<view class="input-box" :class="showEmji" @touchmove.stop.prevent="discard">
+			<!-- H5下不能录音，输入栏布局改动一下 -->
+			<!-- #ifndef H5 -->
+			<view class="voice">
+				<view class="icon" :class="isVoice?'jianpan':'yuyin'" @tap="switchVoice"></view>
+			</view>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="more" @tap="chooseImage">
+				<view class="icon tupian"></view>
+			</view>
+			<!-- #endif -->
+			<view class="textbox">
+				<view class="voice-mode" :class="[isVoice?'':'hidden',recording?'recording':'']" @touchstart="voiceBegin" @touchmove.stop.prevent="voiceIng" @touchend="voiceEnd" @touchcancel="voiceCancel">{{voiceTis}}</view>
+				<view class="text-mode"  :class="isVoice?'hidden':''">
+					<view class="box">
+						<textarea auto-height="true" v-model="textMsg" id="textMsg" />
+					</view>
+					<view class="em" @tap="chooseEmoji">
+						<view class="icon biaoqing"></view>
+					</view>
+				</view>
+			</view>
+			<!-- #ifndef H5 -->
+			<view class="more" @tap="chooseImage">
+				<view class="icon tupian"></view>
+			</view>
+			<!-- #endif -->
+			<label for="textMsg">
+			<view class="send" :class="isVoice?'hidden':''" @tap="sendText">
+				<view class="btn">
+					发送
+				</view>
+			</view>
+			</label>
+		</view>
+		<!-- 录音效果(上滑取消) -->
+		<view class="record" :class="recording?'':'hidden'">
+			<view class="ing" :class="willStop?'hidden':''"><view class="icon luyin2" ></view></view>
+			<view class="cancel" :class="willStop?'':'hidden'"><view class="icon chehui" ></view></view>
+			<view class="tis" :class="willStop?'change':''">{{recordTis}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				//文字消息
+				
+				textMsg:'',
+				//消息列表
+				scrollAnimation:false,
+				scrollTop:0,
+				scrollToView:'',
+				msgList:[],
+				msgImgList:[],
+				myuid:0,
+				//录音相关参数
+				// #ifndef H5
+				//H5不能录音
+				RECORDER:uni.getRecorderManager(),
+				// #endif
+				isVoice:false,
+				voiceTis:'按住 说话',
+				recordTis:"手指上滑 取消发送",
+				recording:false,
+				willStop:false,
+				initPoint:{identifier:0,Y:0},
+				recordTimer:null,
+				recordLength:0,
+				//播放语音相关参数
+				AUDIO:uni.createInnerAudioContext(),
+				playMsgid:null,
+				VoiceTimer:null,
+				//表情定义
+				showEmji:'',
+				emojiList:[
+					[{"url":"100.gif",alt:"[微笑]"},{"url":"101.gif",alt:"[伤心]"},{"url":"102.gif",alt:"[美女]"},{"url":"103.gif",alt:"[发呆]"},{"url":"104.gif",alt:"[墨镜]"},{"url":"105.gif",alt:"[哭]"},{"url":"106.gif",alt:"[羞]"},{"url":"107.gif",alt:"[哑]"},{"url":"108.gif",alt:"[睡]"},{"url":"109.gif",alt:"[哭]"},{"url":"110.gif",alt:"[囧]"},{"url":"111.gif",alt:"[怒]"},{"url":"112.gif",alt:"[调皮]"},{"url":"113.gif",alt:"[笑]"},{"url":"114.gif",alt:"[惊讶]"},{"url":"115.gif",alt:"[难过]"},{"url":"116.gif",alt:"[酷]"},{"url":"117.gif",alt:"[汗]"},{"url":"118.gif",alt:"[抓狂]"},{"url":"119.gif",alt:"[吐]"},{"url":"120.gif",alt:"[笑]"},{"url":"121.gif",alt:"[快乐]"},{"url":"122.gif",alt:"[奇]"},{"url":"123.gif",alt:"[傲]"}],
+					[{"url":"124.gif",alt:"[饿]"},{"url":"125.gif",alt:"[累]"},{"url":"126.gif",alt:"[吓]"},{"url":"127.gif",alt:"[汗]"},{"url":"128.gif",alt:"[高兴]"},{"url":"129.gif",alt:"[闲]"},{"url":"130.gif",alt:"[努力]"},{"url":"131.gif",alt:"[骂]"},{"url":"132.gif",alt:"[疑问]"},{"url":"133.gif",alt:"[秘密]"},{"url":"134.gif",alt:"[乱]"},{"url":"135.gif",alt:"[疯]"},{"url":"136.gif",alt:"[哀]"},{"url":"137.gif",alt:"[鬼]"},{"url":"138.gif",alt:"[打击]"},{"url":"139.gif",alt:"[bye]"},{"url":"140.gif",alt:"[汗]"},{"url":"141.gif",alt:"[抠]"},{"url":"142.gif",alt:"[鼓掌]"},{"url":"143.gif",alt:"[糟糕]"},{"url":"144.gif",alt:"[恶搞]"},{"url":"145.gif",alt:"[什么]"},{"url":"146.gif",alt:"[什么]"},{"url":"147.gif",alt:"[累]"}],
+					[{"url":"148.gif",alt:"[看]"},{"url":"149.gif",alt:"[难过]"},{"url":"150.gif",alt:"[难过]"},{"url":"151.gif",alt:"[坏]"},{"url":"152.gif",alt:"[亲]"},{"url":"153.gif",alt:"[吓]"},{"url":"154.gif",alt:"[可怜]"},{"url":"155.gif",alt:"[刀]"},{"url":"156.gif",alt:"[水果]"},{"url":"157.gif",alt:"[酒]"},{"url":"158.gif",alt:"[篮球]"},{"url":"159.gif",alt:"[乒乓]"},{"url":"160.gif",alt:"[咖啡]"},{"url":"161.gif",alt:"[美食]"},{"url":"162.gif",alt:"[动物]"},{"url":"163.gif",alt:"[鲜花]"},{"url":"164.gif",alt:"[枯]"},{"url":"165.gif",alt:"[唇]"},{"url":"166.gif",alt:"[爱]"},{"url":"167.gif",alt:"[分手]"},{"url":"168.gif",alt:"[生日]"},{"url":"169.gif",alt:"[电]"},{"url":"170.gif",alt:"[炸弹]"},{"url":"171.gif",alt:"[刀子]"}],
+					[{"url":"172.gif",alt:"[足球]"},{"url":"173.gif",alt:"[瓢虫]"},{"url":"174.gif",alt:"[翔]"},{"url":"175.gif",alt:"[月亮]"},{"url":"176.gif",alt:"[太阳]"},{"url":"177.gif",alt:"[礼物]"},{"url":"178.gif",alt:"[抱抱]"},{"url":"179.gif",alt:"[拇指]"},{"url":"180.gif",alt:"[贬低]"},{"url":"181.gif",alt:"[握手]"},{"url":"182.gif",alt:"[剪刀手]"},{"url":"183.gif",alt:"[抱拳]"},{"url":"184.gif",alt:"[勾引]"},{"url":"185.gif",alt:"[拳头]"},{"url":"186.gif",alt:"[小拇指]"},{"url":"187.gif",alt:"[拇指八]"},{"url":"188.gif",alt:"[食指]"},{"url":"189.gif",alt:"[ok]"},{"url":"190.gif",alt:"[情侣]"},{"url":"191.gif",alt:"[爱心]"},{"url":"192.gif",alt:"[蹦哒]"},{"url":"193.gif",alt:"[颤抖]"},{"url":"194.gif",alt:"[怄气]"},{"url":"195.gif",alt:"[跳舞]"}],
+					[{"url":"196.gif",alt:"[发呆]"},{"url":"197.gif",alt:"[背着]"},{"url":"198.gif",alt:"[伸手]"},{"url":"199.gif",alt:"[耍帅]"},{"url":"200.png",alt:"[微笑]"},{"url":"201.png",alt:"[生病]"},{"url":"202.png",alt:"[哭泣]"},{"url":"203.png",alt:"[吐舌]"},{"url":"204.png",alt:"[迷糊]"},{"url":"205.png",alt:"[瞪眼]"},{"url":"206.png",alt:"[恐怖]"},{"url":"207.png",alt:"[忧愁]"},{"url":"208.png",alt:"[眨眉]"},{"url":"209.png",alt:"[闭眼]"},{"url":"210.png",alt:"[鄙视]"},{"url":"211.png",alt:"[阴暗]"},{"url":"212.png",alt:"[小鬼]"},{"url":"213.png",alt:"[礼物]"},{"url":"214.png",alt:"[拜佛]"},{"url":"215.png",alt:"[力量]"},{"url":"216.png",alt:"[金钱]"},{"url":"217.png",alt:"[蛋糕]"},{"url":"218.png",alt:"[彩带]"},{"url":"219.png",alt:"[礼物]"},]				
+				],
+				//表情图片图床名称
+				onlineEmoji:{"100.gif":"AbNQgA.gif","101.gif":"AbN3ut.gif","102.gif":"AbNM3d.gif","103.gif":"AbN8DP.gif","104.gif":"AbNljI.gif","105.gif":"AbNtUS.gif","106.gif":"AbNGHf.gif","107.gif":"AbNYE8.gif","108.gif":"AbNaCQ.gif","109.gif":"AbNN4g.gif","110.gif":"AbN0vn.gif","111.gif":"AbNd3j.gif","112.gif":"AbNsbV.gif","113.gif":"AbNwgs.gif","114.gif":"AbNrD0.gif","115.gif":"AbNDuq.gif","116.gif":"AbNg5F.gif","117.gif":"AbN6ET.gif","118.gif":"AbNcUU.gif","119.gif":"AbNRC4.gif","120.gif":"AbNhvR.gif","121.gif":"AbNf29.gif","122.gif":"AbNW8J.gif","123.gif":"AbNob6.gif","124.gif":"AbN5K1.gif","125.gif":"AbNHUO.gif","126.gif":"AbNIDx.gif","127.gif":"AbN7VK.gif","128.gif":"AbNb5D.gif","129.gif":"AbNX2d.gif","130.gif":"AbNLPe.gif","131.gif":"AbNjxA.gif","132.gif":"AbNO8H.gif","133.gif":"AbNxKI.gif","134.gif":"AbNzrt.gif","135.gif":"AbU9Vf.gif","136.gif":"AbUSqP.gif","137.gif":"AbUCa8.gif","138.gif":"AbUkGQ.gif","139.gif":"AbUFPg.gif","140.gif":"AbUPIS.gif","141.gif":"AbUZMn.gif","142.gif":"AbUExs.gif","143.gif":"AbUA2j.gif","144.gif":"AbUMIU.gif","145.gif":"AbUerq.gif","146.gif":"AbUKaT.gif","147.gif":"AbUmq0.gif","148.gif":"AbUuZV.gif","149.gif":"AbUliF.gif","150.gif":"AbU1G4.gif","151.gif":"AbU8z9.gif","152.gif":"AbU3RJ.gif","153.gif":"AbUYs1.gif","154.gif":"AbUJMR.gif","155.gif":"AbUadK.gif","156.gif":"AbUtqx.gif","157.gif":"AbUUZ6.gif","158.gif":"AbUBJe.gif","159.gif":"AbUdIO.gif","160.gif":"AbU0iD.gif","161.gif":"AbUrzd.gif","162.gif":"AbUDRH.gif","163.gif":"AbUyQA.gif","164.gif":"AbUWo8.gif","165.gif":"AbU6sI.gif","166.gif":"AbU2eP.gif","167.gif":"AbUcLt.gif","168.gif":"AbU4Jg.gif","169.gif":"AbURdf.gif","170.gif":"AbUhFS.gif","171.gif":"AbU5WQ.gif","172.gif":"AbULwV.gif","173.gif":"AbUIzj.gif","174.gif":"AbUTQs.gif","175.gif":"AbU7yn.gif","176.gif":"AbUqe0.gif","177.gif":"AbUHLq.gif","178.gif":"AbUOoT.gif","179.gif":"AbUvYF.gif","180.gif":"AbUjFU.gif","181.gif":"AbaSSJ.gif","182.gif":"AbUxW4.gif","183.gif":"AbaCO1.gif","184.gif":"Abapl9.gif","185.gif":"Aba9yR.gif","186.gif":"AbaFw6.gif","187.gif":"Abaiex.gif","188.gif":"AbakTK.gif","189.gif":"AbaZfe.png","190.gif":"AbaEFO.gif","191.gif":"AbaVYD.gif","192.gif":"AbamSH.gif","193.gif":"AbaKOI.gif","194.gif":"Abanld.gif","195.gif":"Abau6A.gif","196.gif":"AbaQmt.gif","197.gif":"Abal0P.gif","198.gif":"AbatpQ.gif","199.gif":"Aba1Tf.gif","200.png":"Aba8k8.png","201.png":"AbaGtS.png","202.png":"AbaJfg.png","203.png":"AbaNlj.png","204.png":"Abawmq.png","205.png":"AbaU6s.png","206.png":"AbaaXn.png","207.png":"Aba000.png","208.png":"AbarkT.png","209.png":"AbastU.png","210.png":"AbaB7V.png","211.png":"Abafn1.png","212.png":"Abacp4.png","213.png":"AbayhF.png","214.png":"Abag1J.png","215.png":"Aba2c9.png","216.png":"AbaRXR.png","217.png":"Aba476.png","218.png":"Abah0x.png","219.png":"Abdg58.png"}
+			};
+		},
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.name
+			});
+			this.getMsgList();
+			//语音自然播放结束
+			this.AUDIO.onEnded((res)=>{
+				this.playMsgid=null;
+			});
+			// #ifndef H5
+			//录音开始事件
+			this.RECORDER.onStart((e)=>{
+				this.recordBegin(e);
+			})
+			//录音结束事件
+			this.RECORDER.onStop((e)=>{
+				this.recordEnd(e);
+			})
+			// #endif
+		},
+		methods:{
+			getMsgList(){
+				// 消息列表
+				let list = [
+					{id:0,uid:0,username:"大黑哥",face:"/static/img/face.jpg",time:"12:56",type:"text",msg:{content:"为什么温度会相差那么大？"}},
+					{id:1,uid:1,username:"售后客服008",face:"/static/img/im/face/face_2.jpg",time:"12:57",type:"text",msg:{content:"这个是有偏差的，两个温度相差十几二十度是很正常的，如果相差五十度，那即是质量问题了。"}},
+					{id:2,uid:1,username:"售后客服008",face:"/static/img/im/face/face_2.jpg",time:"12:59",type:"voice",msg:{url:"/static/voice/3.aac",length:"00:06"}},
+					{id:3,uid:0,username:"大黑哥",face:"/static/img/face.jpg",time:"13:05",type:"voice",msg:{url:"/static/voice/2.mp3",length:"00:06"}},
+					{id:4,uid:0,username:"大黑哥",face:"/static/img/face.jpg",time:"13:05",type:"img",msg:{url:"/static/img/goods/p10.jpg",w:200,h:200}},
+					{id:5,uid:1,username:"售后客服008",face:"/static/img/im/face/face_2.jpg",time:"12:59",type:"img",msg:{url:"/static/img/q.jpg",w:1920,h:1080}}
+				]
+				// 获取消息中的图片,并处理显示尺寸
+				for(let i=0;i<list.length;i++){
+					if(list[i].type=='img'){
+						list[i] = this.setPicSize(list[i]);
+						console.log("list[i]: " + JSON.stringify(list[i]));
+						this.msgImgList.push(list[i].msg.url);
+					}
+				}
+				this.msgList = list;
+				// 滚动到底部
+				this.$nextTick(function() {
+					this.scrollTop = 9999;
+					this.scrollAnimation = true;
+				});
+			},
+			//处理图片尺寸，如果不处理宽高，新进入页面加载图片时候会闪
+			setPicSize(row){
+				let maxW = uni.upx2px(350);
+				let maxH = uni.upx2px(350);
+				if(row.msg.w>maxW||row.msg.h>maxH){
+					let scale = row.msg.w/row.msg.h;
+					if(row.msg.w>row.msg.h){
+						row.msg.w = maxW;
+						row.msg.h = row.msg.w/scale
+					}else{
+						row.msg.h = maxH;
+						row.msg.w = row.msg.h*scale;
+					}
+				}
+				return row;
+			},
+			// 接受消息(筛选处理)
+			screenMsg(msg){
+				//从长连接处转发给这个方法，进行筛选处理
+				if(msg.uid!=this.myuid){
+					uni.vibrateLong();
+				}
+				switch (msg.type){
+					case 'text':
+						this.addTextMsg(msg);
+						break;
+					case 'voice':
+						this.addVoiceMsg(msg);
+						break;
+					case 'img':
+						this.addImgMsg(msg);
+						break;
+				}
+				this.$nextTick(function() {
+					this.scrollToView = 'msg'+msg.id
+				});
+			},
+			// 选择表情
+			chooseEmoji(){
+				this.showEmji = this.showEmji=='showEmoji'?'hideEmoji':'showEmoji';
+			},
+			// 隐藏表情
+			hideEmoji(){
+				this.showEmji = this.showEmji=='showEmoji'?'hideEmoji':'';
+			},
+			//添加表情
+			addEmoji(em){
+				this.textMsg+=em.alt;
+			},
+			// 发送文字消息
+			sendText(){
+				this.hideEmoji();
+				if(!this.textMsg){
+					return;
+				}
+				let content = this.replaceEmoji(this.textMsg);
+				let msg = {content:content}
+				this.sendMsg(msg,'text');
+				this.textMsg = '';
+			},
+			//替换表情符号为图片
+			replaceEmoji(str){
+				let replacedStr = str.replace(/\[([^(\]|\[)]*)\]/g,(item, index)=>{
+					console.log("item: " + item);
+					for(let i=0;i<this.emojiList.length;i++){
+						let row = this.emojiList[i];
+						for(let j=0;j<row.length;j++){
+							let EM = row[j];
+							if(EM.alt==item){
+								//在线表情路径，图文混排必须使用网络路径
+								let onlinePath = 'https://s2.ax1x.com/2019/04/12/'
+								let imgstr = '<img src="'+onlinePath+this.onlineEmoji[EM.url]+'">';
+								console.log("imgstr: " + imgstr);
+								return imgstr;
+							}
+						}
+					}
+				});
+				return '<div style="display: flex;align-items: center;">'+replacedStr+'</div>';
+			},
+			// 选择图片发送
+			chooseImage(){
+				this.hideEmoji();
+				uni.chooseImage({
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					success: (res)=>{
+						for(let i=0;i<res.tempFilePaths.length;i++){
+							uni.getImageInfo({
+								src: res.tempFilePaths[i],
+								success: (image)=>{
+									console.log(image.width);
+									console.log(image.height);
+									let msg = {url:res.tempFilePaths[i],w:image.width,h:image.height};
+									this.sendMsg(msg,'img');
+								}
+							});
+						}
+					}
+				});
+			},
+			// 发送消息
+			sendMsg(content,type){
+				//实际应用中，此处应该提交长连接，模板仅做本地处理。
+				var nowDate = new Date();
+				let lastid = this.msgList[this.msgList.length-1].id;
+				lastid++;
+				let msg = {id:lastid,uid:0,username:"大黑哥",face:"/static/img/face.jpg",time:nowDate.getHours()+":"+nowDate.getMinutes(),type:type,msg:content};
+				this.screenMsg(msg);
+				// 定时器模拟对方回复,三秒
+				setTimeout(()=>{
+					lastid = this.msgList[this.msgList.length-1].id;
+					lastid++;
+					msg = {id:lastid,uid:1,username:"售后客服008",face:"/static/img/im/face/face_2.jpg",time:nowDate.getHours()+":"+nowDate.getMinutes(),type:type,msg:content};
+					this.screenMsg(msg);
+				},3000)
+			},
+			
+			// 处理文字消息
+			addTextMsg(msg){
+				this.msgList.push(msg);
+			},
+			// 处理语音消息
+			addVoiceMsg(msg){
+				this.msgList.push(msg);
+			},
+			// 处理图片消息
+			addImgMsg(msg){
+				msg = this.setPicSize(msg);
+				this.msgImgList.push(msg.msg.url);
+				this.msgList.push(msg);
+			},
+			// 预览图片
+			showPic(row){
+				uni.previewImage({
+					indicator:"none",
+					current:row.msg.url,
+					urls: this.msgImgList
+				});
+			},
+			// 播放语音
+			playVoice(msg){
+				this.playMsgid=msg.id;
+				this.AUDIO.src = msg.msg.url;
+				console.log("msg.msg.url: " + msg.msg.url);
+                this.AUDIO.play();
+			},
+			// 录音开始
+			voiceBegin(e){
+				if(e.touches.length>1){
+					return ;
+				}
+				this.initPoint.Y = e.touches[0].clientY;
+				this.initPoint.identifier = e.touches[0].identifier;
+				this.RECORDER.start({format:"aac"});//录音开始,
+			},
+			//录音开始UI效果
+			recordBegin(e){
+				this.recording = true;
+				this.voiceTis='松开 结束';
+				this.recordLength = 0;
+				this.recordTimer = setInterval(()=>{
+					this.recordLength++;
+				},1000)
+			},
+			// 录音被打断
+			voiceCancel(){
+				this.recording = false;
+				this.voiceTis='按住 说话';
+				this.recordTis = '手指上滑 取消发送'
+				this.willStop = true;//不发送录音
+				this.RECORDER.stop();//录音结束
+			},
+			// 录音中(判断是否触发上滑取消发送)
+			voiceIng(e){
+				if(!this.recording){
+					return;
+				}
+				let touche = e.touches[0];
+				//上滑一个导航栏的高度触发上滑取消发送
+				if(this.initPoint.Y - touche.clientY>=uni.upx2px(100)){
+					this.willStop = true;
+					this.recordTis = '松开手指 取消发送'
+				}else{
+					this.willStop = false;
+					this.recordTis = '手指上滑 取消发送'
+				}
+			},
+			// 结束录音
+			voiceEnd(e){
+				if(!this.recording){
+					return;
+				}
+				this.recording = false;
+				this.voiceTis='按住 说话';
+				this.recordTis = '手指上滑 取消发送'
+				this.RECORDER.stop();//录音结束
+			},
+			
+			//录音结束(回调文件)
+			recordEnd(e){
+				clearInterval(this.recordTimer);
+				if(!this.willStop){
+					plus.io.resolveLocalFileSystemURL( e.tempFilePath, function( entry ) {
+						// 可通过entry对象操作test.html文件 
+						entry.file( function(file){
+							console.log(file.size + '--' + file.name);
+						} );
+					}, function ( e ) {
+						alert( "Resolve file URL failed: " + e.message );
+					} );
+					console.log("e: " + JSON.stringify(e));
+					let msg = {
+						length:0,
+						url:e.tempFilePath
+					}
+					let min = parseInt(this.recordLength/60);
+					let sec = this.recordLength%60;
+					min = min<10?'0'+min:min;
+					sec = sec<10?'0'+sec:sec;
+					msg.length = min+':'+sec;
+					this.sendMsg(msg,'voice');
+				}else{
+					console.log('取消发送录音');
+				}
+				this.willStop = false;
+			},
+			// 切换语音/文字输入
+			switchVoice(){
+				this.hideEmoji();
+				this.isVoice = this.isVoice?false:true;
+			},
+			discard(){
+				return;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+page{
+	background-color: #e5e5e5;
+}
+
+	.icon {
+		font-size:56upx;
+		color: #333;
+	}
+.hidden{
+	display: none !important;
+}
+@keyframes showEM {
+	0% {transform: translateY(0);}
+	100% {transform: translateY(-42vw);}
+}
+@keyframes hideEM {
+	0% {transform: translateY(-42vw);}
+	100% {transform: translateY(0);}
+}
+.emoji-box{
+	&.hideEmoji{animation: hideEM .15s linear both;}
+	&.showEmoji{animation: showEM .15s linear both;}
+	width: 96%;
+	height: 42vw;
+	padding: 20upx 2%;
+	background-color: #f3f3f3;
+	border-top: solid 1upx #ddd;
+	position: fixed;
+	z-index: 20;
+	top: 100%;
+	.swiper{
+		swiper-item{
+			display: flex;
+			flex-wrap: wrap;
+			view{
+				width: 12vw;
+				height: 12vw;
+				display: flex;
+				justify-content: center;
+				image{
+					width: 60%;
+				}
+			}
+		}
+	}
+}
+.input-box{
+	&.hideEmoji{animation: hideEM .15s linear both;}
+	&.showEmoji{animation: showEM .15s linear both;}
+	width: 98%;
+	min-height: 100upx;
+	padding: 0 1%;
+	background-color: #f2f2f2;
+	display: flex;
+	position: fixed;
+	z-index: 20;
+	bottom: 0;
+	.voice,.more{
+		flex-shrink: 0;
+		width: 90upx;
+		height: 100upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.send{
+		//H5发送按钮左边距
+		/* #ifdef H5 */
+		margin-left: 20upx;
+		/* #endif */
+		flex-shrink: 0;
+		width: 100upx;
+		height: 100upx;
+		display: flex;
+		align-items: center;
+		.btn{
+			width: 90upx;
+			height: 56upx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			background:linear-gradient(to right,#f09b37,#eb632c);
+			color: #fff;
+			border-radius: 6upx;
+			font-size: 24upx;
+		}
+	}
+	.textbox{
+		width: 100%;
+		min-height: 70upx;
+		margin-top: 15upx;
+		.voice-mode{
+			width: calc(100% - 2upx);
+			height: 68upx;
+			border-radius: 70upx;
+			border:solid 1upx #cdcdcd;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 28upx;
+			background-color: #fff;
+			color: #555;
+			&.recording{
+				background-color: #e5e5e5;
+			}
+		}
+		.text-mode{
+			width: 100%;
+			min-height: 70upx;
+			display: flex;
+			background-color: #fff;
+			border-radius: 40upx;
+			.box{
+				width: 100%;
+				padding-left: 30upx;
+				min-height: 70upx;
+				display: flex;
+				align-items: center;
+				textarea{
+					width: 100%;
+				}
+			}
+			.em{
+				flex-shrink: 0;
+				width: 80upx;
+				height: 70upx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
+}
+.record{
+	width: 40vw;
+	height: 40vw;
+	position: fixed;
+	top: 55%;
+	left: 30%;
+	background-color: rgba(0,0,0,.6);
+	border-radius: 20upx;
+	.ing{
+		width: 100%;
+		height: 30vw;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		@keyframes volatility {
+			0% {background-position: 0% 130%;}
+			20% {background-position: 0% 150%;}
+			30% {background-position: 0% 155%;}
+			40% {background-position: 0% 150%;}
+			50% {background-position: 0% 145%;}
+			70% {background-position: 0% 150%;}
+			80% {background-position: 0% 155%;}
+			90% {background-position: 0% 140%;}
+			100% {background-position: 0% 135%;}
+		}
+		.icon{
+			background-image:linear-gradient(to bottom,#f09b37,#fff 50%); 
+			background-size:100% 200%;
+			animation: volatility 1.5s ease-in-out -1.5s infinite alternate;
+			-webkit-background-clip:text; 
+			-webkit-text-fill-color:transparent; 
+			font-size: 150upx;
+			color: #f09b37;
+		}
+	}
+	.cancel{
+		width: 100%;
+		height: 30vw;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		.icon{
+			color: #fff;
+			font-size: 150upx;
+		}
+	}
+	.tis{
+		width: 100%;
+		height: 10vw;
+		display: flex;
+		justify-content: center;
+		font-size: 28upx;
+		color: #fff;
+		&.change{
+			color: #f09b37;
+		}
+	}
+}
+.content{
+	width: 100%;
+	.msg-list{
+		width: 96%;
+		padding: 0 2%;
+		position: absolute;
+		top: 0;
+		bottom: 100upx;
+		.row{
+			&:first-child{
+				margin-top: 20upx;
+			}
+			padding: 20upx 0;
+			.my .left,.other .right{
+				width: 100%;
+				display: flex;
+				.bubble{
+					max-width: 70%;
+					min-height: 50upx;
+					border-radius: 10upx;
+					padding: 15upx 20upx;
+					display: flex;
+					align-items: center;
+					font-size: 32upx;
+					word-break: break-word;
+					&.img{
+						background-color: transparent;
+						padding:0;
+						overflow: hidden;
+						image{
+							max-width: 350upx;
+							max-height: 350upx;
+						}
+					}
+					&.voice{
+						.icon{
+							font-size: 40upx;
+							display: flex;
+							align-items: center;
+						}
+						.icon:after
+						{
+							content:" ";
+							width: 53upx;
+							height: 53upx;
+							border-radius: 100%;
+							position: absolute;
+							box-sizing: border-box;
+						}
+						.length{
+							font-size: 28upx;
+						}
+					}
+				}
+			}
+			.my .right,.other .left{
+				flex-shrink: 0;
+				width: 80upx;
+				height: 80upx;
+				image{
+					width: 80upx;
+					height: 80upx;
+					border-radius: 10upx;
+				}
+			}
+			.my{
+				width: 100%;
+				display: flex;
+				justify-content: flex-end;
+				.left{
+					min-height: 80upx;
+					
+					align-items: center;
+					justify-content: flex-end;
+					.bubble{
+						background-color: #f06c7a;
+						color: #fff;
+						&.voice{
+							.icon{
+								color: #fff;
+							}
+							.length{
+								margin-right: 20upx;
+							}
+						}
+						&.play{
+							@keyframes my-play {
+								0% {
+									transform: translateX(80%);
+								}
+								100% {
+									transform: translateX(0%);
+								}
+							}
+							.icon:after
+							{
+								border-left: solid 10upx rgba(240,108,122,.5);
+								animation: my-play 1s linear infinite;
+							}
+						}
+					}
+				}
+				.right{
+					margin-left: 15upx;
+				}
+			}
+			.other{
+				width: 100%;
+				display: flex;
+				.left{
+					margin-right: 15upx;
+				}
+				.right{
+					flex-wrap: wrap;
+					.username{
+						width: 100%;
+						height: 45upx;
+						font-size: 24upx;
+						color: #999;
+						display: flex;
+						.name{
+							margin-right: 50upx;
+						}
+					}
+					.bubble{
+						background-color: #fff;
+						color: #333;
+						&.voice{
+							.icon{
+								color: #333;
+								
+							}
+							.length{
+								margin-left: 20upx;
+							}
+						}
+						&.play{
+							@keyframes other-play {
+								0% {
+									transform: translateX(-80%);
+								}
+								100% {
+									transform: translateX(0%);
+								}
+							}
+							.icon:after
+							{
+								border-right: solid 10upx rgba(255,255,255,.8);
+								
+								animation: other-play 1s linear infinite;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/src/pagesA/msg/msg.vue b/src/pagesA/msg/msg.vue
new file mode 100644
index 0000000..21ee4aa
--- /dev/null
+++ b/src/pagesA/msg/msg.vue
@@ -0,0 +1,241 @@
+<template>
+	<view>
+        <view class="chat-list">
+			<view class="chat" v-for="(chat,index) in chatList" :key="index">
+				<view class="row" @tap="toChat(chat)">
+					<view class="left">
+						<image :src="chat.face"></image>
+					</view>
+					<view class="right">
+						<view class="top">
+							<view class="username">{{chat.username}}</view>
+							<view class="time">{{chat.time}}</view>
+						</view>
+						<view class="bottom">
+							<view class="msg">{{chat.msg}}</view>
+							<view class="tis" v-if="chat.tisNum>0">{{chat.tisNum}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				chatList:[
+					{
+						uid:1,
+						username:"鲜果蔬专营店",
+						face:"/static/img/im/face/face_1.jpg",
+						time:"13:08",
+						msg:"亲，20点前下单都是当天送达的",
+						tisNum:1
+					},
+					{
+						uid:2,
+						username:"官店大欺客旗舰店",
+						face:"/static/img/im/face/face_2.jpg",
+						time:"13:05",
+						msg:"问那么多干什么？不想买就滚~",
+						tisNum:0
+					},
+					{
+						uid:3,
+						username:"妙不可言",
+						face:"/static/img/im/face/face_3.jpg",
+						time:"12:15",
+						msg:"推荐一个商品呗？",
+						tisNum:0
+					},
+					{
+						uid:4,
+						username:"茶叶专卖",
+						face:"/static/img/im/face/face_4.jpg",
+						time:"12:11",
+						msg:"现在卖的都是未过青的茶哦",
+						tisNum:0
+					},
+					{
+						uid:5,
+						username:"likeKiss客服",
+						face:"/static/img/im/face/face_5.jpg",
+						time:"12:10",
+						msg:"你好，发福建快递多久送到的？",
+						tisNum:0
+					},
+					{
+						uid:6,
+						username:"白开水",
+						face:"/static/img/im/face/face_6.jpg",
+						time:"12:10",
+						msg:"在吗？",
+						tisNum:0
+					},
+					{
+						uid:7,
+						username:"衣帽间的叹息",
+						face:"/static/img/im/face/face_7.jpg",
+						time:"11:56",
+						msg:"新品上市，欢迎选购",
+						tisNum:0
+					},
+					{
+						uid:8,
+						username:"景萧疏",
+						face:"/static/img/im/face/face_8.jpg",
+						time:"11:56",
+						msg:"商品七天无理由退换的",
+						tisNum:0
+					},
+					{
+						uid:9,
+						username:"文宁先生",
+						face:"/static/img/im/face/face_9.jpg",
+						time:"12:15",
+						msg:"星期天再发货的",
+						tisNum:0
+					},
+					{
+						uid:10,
+						username:"高端Chieh",
+						face:"/static/img/im/face/face_10.jpg",
+						time:"12:36",
+						msg:"建议你直接先测量好尺码在选购的。",
+						tisNum:0
+					},
+					{
+						uid:11,
+						username:"mode旗舰店",
+						face:"/static/img/im/face/face_11.jpg",
+						time:"12:40",
+						msg:"新品5折，还有大量优惠券。",
+						tisNum:0
+					},
+					{
+						uid:12,
+						username:"敏萘客服",
+						face:"/static/img/im/face/face_12.jpg",
+						time:"12:36",
+						msg:"还没有用，等我明天早上试一下",
+						tisNum:0
+					},
+					{
+						uid:13,
+						username:"春天里的花",
+						face:"/static/img/im/face/face_13.jpg",
+						time:"12:36",
+						msg:"适用于成年人的，小孩不适用的",
+						tisNum:0
+					},
+					{
+						uid:14,
+						username:"电脑外设专业户",
+						face:"/static/img/im/face/face_13.jpg",
+						time:"12:36",
+						msg:"把上面的螺丝拆下来，把铁片撬开就能看见了",
+						tisNum:0
+					},
+					{
+						uid:15,
+						username:"至善汽车用品",
+						face:"/static/img/im/face/face_15.jpg",
+						time:"12:36",
+						msg:"这个产品是原车配件，完美装上的",
+						tisNum:0
+					}
+
+				]
+			}
+		},
+		//下拉刷新，需要自己在page.json文件中配置开启页面下拉刷新 "enablePullDownRefresh": true
+		onPullDownRefresh() {
+		    setTimeout(function () {
+		        uni.stopPullDownRefresh();
+		    }, 1000);
+		},
+		onLoad() {
+
+		},
+		methods: {
+			toChat(chat){
+				uni.navigateTo({
+					url:"chat/chat?name="+chat.username
+				})
+			}
+		}
+	}
+</script>
+
+<style  lang="scss">
+	page{
+		background-color: rgba(0,0,0,0);
+	}
+	.chat-list{
+		width: 94%;
+		padding: 0 3%;
+		.chat{
+			width: 100%;
+			height: 100upx;
+			padding: 20upx 0;
+			border-bottom: solid 1upx #eaeaea;
+			.row{
+				display: flex;
+				justify-content: flex-start;
+				.left{
+					flex-shrink:0;
+					width: 100upx;
+					height: 100upx;
+					image{
+						width: 100upx;
+						height: 100upx;
+						border-radius: 20upx;
+					}
+				}
+				.right{
+					flex-shrink:1;
+					width: 98%;
+					padding-left: 2%;
+					.top{
+						width: 100%;
+						display: flex;
+						justify-content: space-between;
+						align-items: flex-end;
+						.usernam{
+							font-size: 26upx;
+						}
+						.time{
+							font-size: 22upx;
+							color: #bebebe;
+						}
+					}
+					.bottom{
+						width: 100%;
+						height: 40upx;
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						.msg{
+							font-size: 25upx;
+							color: #777;
+						}
+						.tis{
+							width: 35upx;
+							height: 35upx;
+							font-size: 22upx;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							background-color: #eb4d3d;
+							color: #fff;
+							border-radius: 100%;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/src/pagesA/msgTalk/msgTalk.vue b/src/pagesA/msgTalk/msgTalk.vue
deleted file mode 100644
index 0d0eb6d..0000000
--- a/src/pagesA/msgTalk/msgTalk.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-	<view>
-		<pageLoading :loadingFinish="pageLoadingFinish"></pageLoading>
-		<msgList @swLlick="delectChat" :list="chatList"></msgList>
-		<nothing v-if="chatList.length==0"></nothing>
-	</view>
-</template>
-
-<script>
-	import nothing from '@/components/nothing/nothing.vue'
-	import pageLoading from '@/components/pageLoading.vue'
-	import msgList from "@/components/msgList2/msgList2.vue"
-	export default {
-		components:{
-			msgList,
-			pageLoading,
-			nothing
-		},
-		data() {
-			return {
-				pageLoadingFinish:false,
-				chatList:[],
-				object:{
-					DemandCount: 0,
-					OrderCount: 0,
-					SysCount: 0
-				}
-			};
-		},
-		onShow() {
-			this.utils.checkLocToken()
-			if(uni.getStorageSync("token")){
-				this.getUserChatLsit()
-			}else{
-				setTimeout(()=>{
-					this.pageLoadingFinish = true
-				},300)
-			}
-		},
-		onPullDownRefresh() {
-			if(uni.getStorageSync("token")){
-				this.getUserChatLsit()
-			}else{
-				setTimeout(()=>{
-					this.pageLoadingFinish = true
-					uni.stopPullDownRefresh()
-				},300)
-			}
-		},
-		methods:{
-			getUserChatLsit(){
-				this.http.request('/n/IM/getUserChatLsit', {
-					page: 1,
-					limit: 10000,
-					type:0
-				}, "get").then(res => {
-					this.chatList = res.data
-					this.object = res.object
-					this.chatList.map(e=>{
-						e.userChat.lastMsg = JSON.parse(e.userChat.lastMsg)
-					})
-					this.pageLoadingFinish = true
-					try{
-						uni.stopPullDownRefresh()
-					}catch(e){
-						//TODO handle the exception
-					}
-				}).catch(e=>{
-					this.pageLoadingFinish = true
-					try{
-						uni.stopPullDownRefresh()
-					}catch(e){
-						//TODO handle the exception
-					}
-				})
-			},
-			delectChat(id){
-				// console.log(1111111)
-				this.http.request('/n/IM/delectChat', {
-					id
-				}, "DELETE",false,true).then(res => {
-					if(res.code==0){
-						this.getUserChatLsit()
-					}
-					
-				})
-			},
-			toList(chatType) {
-				if (this.utils.checkLocToken()) {
-					uni.navigateTo({
-						url: "/pages/im/orderInfo/orderInfo?type="+chatType
-					})
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.top{
-		width: 100%;
-		height: 68px;
-		// background:$main-color;
-		position: relative;
-		.center{
-			position: absolute;
-			height:93px;
-			left: 12px;
-			right: 12px;
-			top: 10px;
-			background:rgba(255,255,255,1);
-			border-radius:8px;
-			display: flex;
-			align-items: center;
-			.item{
-				flex: 1;
-				height: 100%;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-				font-size:14px;
-				color:rgba(51,51,51,1);
-				line-height:21px;
-				position: relative;
-				image{
-					width: 45px;
-					height: 45px;
-					margin-bottom: 5px;
-				}
-				.xiaodian{
-					position: absolute;
-					right: 50%;
-					margin-right: -24px;
-					top: 12px;
-					z-index: 5;
-					background-color: #E22B34;
-					border-radius: 50%;
-					width: 10px;
-					height: 10px;
-				}
-			}
-		}
-	}
-</style>
diff --git a/src/request/interface.js b/src/request/interface.js
index 39151d0..59753d1 100644
--- a/src/request/interface.js
+++ b/src/request/interface.js
@@ -6,9 +6,9 @@
 export default {
 	config: {
 		// baseUrl: "http://192.168.0.57:8080/h5/api",  //王锡
-		// baseUrl: "/pre",  //俞燕红-跨域
+		baseUrl: "/pre",  //俞燕红-跨域
 		// baseUrl: "http://10.0.0.36:8080/h5/api", //俞燕红
-		baseUrl: "https://yxx.ydool.net/h5/api", //线上
+		// baseUrl: "https://yxx.ydool.net/h5/api", //线上
 		header: {
 			'Content-Type': 'application/json;charset=UTF-8',
 			// 'Content-Type':'application/x-www-form-urlencoded'