diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 6ca6879..f1a4095 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -46,7 +46,7 @@ const install = (Vue, vm) => {
         } else if(res.data.errCode == 401) {
             // 假设201为token失效，这里跳转登录
             // vm.$u.toast('您还没有登录哦，请先去登录！');
-            if (res.data.action != "memberinfo") {
+            if (res.data.data.action != "memberinfo") {
                 uni.showModal({
                     title: "温馨提示",
                     content: "您还未登录，请立即登录",
diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index a51ec25..a9cfe18 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -241,7 +241,7 @@ export default {
 				// console.log(res)
 				if(res.errCode == 0) {
                     this.$u.toast(res.message);
-					this.$emit("getArticlelist");
+					this.$emit("updateList");
 				}
 			})
 		},
diff --git a/components/informations/notice/notice.vue b/components/informations/notice/notice.vue
index b212e45..712914a 100644
--- a/components/informations/notice/notice.vue
+++ b/components/informations/notice/notice.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="notice">
-		<view v-for="(item,index) in notice" :key="index">
+		<view v-for="(item,index) in notice" :key="index"  @click="gotoInfo(index)">
 			<view class="time_notice">{{ item.addtime }}</view>
 			<view class="notice_view">
 				<image :src="item.picture" mode="aspectFill" ></image>
 				<view class="text_view u-line-2">{{ item.content }}</view>
-				<view class="notice_list" @click="gotoInfo(index)">
+				<view class="notice_list">
 					<text>查看详情</text>
 					<u-icon name="arrow-right" color="#666"></u-icon>
 				</view>
diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue
index c0dd56b..96664c5 100644
--- a/components/remaining/remaining.vue
+++ b/components/remaining/remaining.vue
@@ -205,7 +205,7 @@
         z-index: 1000;
         position: absolute;
         bottom: 100rpx;
-        right: 30%;
+        right: 230rpx;
         width: 300rpx;
         height: 80rpx;
         line-height: 80rpx;
diff --git a/pageA/register/register.vue b/pageA/register/register.vue
index 2b567ab..d77a45b 100644
--- a/pageA/register/register.vue
+++ b/pageA/register/register.vue
@@ -152,16 +152,9 @@
 						// 	type: 'success',
 						// 	url: '/pageA/topick/topick'
 						// })
-					} else if(res.errCode == 2){
-						this.$refs.uToast.show({
-							title: res.message,
-							type: 'primary',
-							url: '/pageA/login/login'
-						})
 					} else {
                         this.$refs.uToast.show({
                         	title: res.message,
-                        	type: 'primary'
                         })
                     }
 				})
diff --git a/pageB/follow/index.vue b/pageB/follow/index.vue
index 32aa774..2147b98 100644
--- a/pageB/follow/index.vue
+++ b/pageB/follow/index.vue
@@ -4,8 +4,8 @@
             <image src="/static/image/common/10.png"></image>
             <text>输入达人名称</text>
         </view>
-        <view class="list">
-            <darenItem style="margin-top:20rpx;" v-for="item in recommendList" :key="item.id" :info="item"  v-on:pChangeType="changeType"></darenItem>
+        <view class="list" style="margin-left:-20rpx">
+            <darenItem style="margin-top:20rpx;margin-left:20rpx;" v-for="item in recommendList" :key="item.id" :info="item"  v-on:pChangeType="changeType"></darenItem>
         </view>
     </view>
 </template>
@@ -76,7 +76,7 @@ export default {
 		},
 		searchValue() {
 			uni.navigateTo({
-				url: '/pageB/search/index?type=1'
+				url: '/pageB/search/index?type=2'
 			})
 		},
 	},
diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue
index 0980a0c..894737e 100644
--- a/pageB/photo/index.vue
+++ b/pageB/photo/index.vue
@@ -27,7 +27,7 @@
 		<u-popup v-model="is_comment" class="pl" mode="bottom" border-radius="10" height="700rpx">
 			<view class="top">
 				<text>评论</text>
-				<u-icon name="arrow-down" color="#333" size="28" @click="is_comment=false"></u-icon>
+				<u-icon name="close" color="#333" size="28" @click="is_comment=false"></u-icon>
 			</view>
 			<scroll-view class="scroll-box" scroll-y="true" lower-threshold="50" @scrolltolower="scrollBottom">
 				<block v-for="(item,index) in commentList" :key="index">
@@ -66,7 +66,7 @@
 		<!-- 评论box -->
 		<u-popup v-model="is_edit" mode="bottom" border-radius="10" height="100rpx">
 			<view class="edit-box">
-				<input type="text" :focus="is_focus" :placeholder="edit_text_other" @focus="focus" v-model="send_value">
+				<input type="text" focus :placeholder="edit_text_other" @focus="focus" v-model="send_value">
 				<text @click="sendComment">发送</text>
 			</view>
 		</u-popup>
@@ -180,13 +180,15 @@
 			z-index: 1000;
 			position: fixed;
 			top: 0;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
 			width: 100%;
 			height: 88rpx;
 			padding: 0 20rpx;
 			line-height: 88rpx;
 			background-color: #ECECEC;
 			& > text {
-				margin-right: 280rpx;
 				color: #333;
 				font-size: 30rpx;
 				font-weight: 500;
@@ -514,6 +516,10 @@ export default {
 		},
 		// 发布评论
 		sendComment() {
+             if (this.send_value.length == 0) {
+                this.$u.toast("内容不能为空！");
+                return;
+            }
 			this.$u.post("article/articleAddComment",{
 				article_id: this.article_id,
 				content: this.send_value,
diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index 15c9d8e..734ff0e 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -135,7 +135,7 @@
 					<guige @sel="self" ref="guige" v-for="(item,index) in goodsInfo.spec_value" :key="index" :title="goodsInfo.spec_name[index]" :item="item"></guige>
 					<view class="num">
 						<text>购买数量</text>
-						<u-number-box v-model="goodsNumber"></u-number-box>
+						<u-number-box v-model="goodsNumber" :min="1"></u-number-box>
 					</view>
 					<view style="height:100rpx"></view>
 				</view>
@@ -524,6 +524,7 @@ export default {
 				} else {
 					this.$u.toast(res.message);
 					this.debounce = true;
+                    this.$u.toast(res.message);
 				}
 			})
 		},
diff --git a/pageB/video/video.nvue b/pageB/video/video.nvue
index 1da0d21..ceba9e7 100644
--- a/pageB/video/video.nvue
+++ b/pageB/video/video.nvue
@@ -8,7 +8,7 @@
         </cover-image>
         <!-- 用户操作 -->
         <userinfo class="user-info" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo>
-        <cover-view class="info-box">
+        <cover-view class="info-box" @click="stopClick">>
             <view class="video-info-box">
                 <image class="image-play" src="../../static/videoIcon.png" mode=""></image>
                 <text class="video-slip">视频</text>
@@ -68,6 +68,7 @@
 
 <script>
     import userinfo from "../components/userinfo/index" // 点赞组件
+    const temp_url = "https://dmmall.sdbairui.com/api/";
     export default {
         components: {
             userinfo
@@ -101,7 +102,7 @@
             // 获取信息
             getVideoInfo(article_id) {
                 uni.request({
-                    url: "https://dmmall.sdbairui.com/api/article/articleInfo",
+                    url: temp_url + "article/articleInfo",
                     method: "POST",
                     data: {
                         article_id: article_id
@@ -130,7 +131,7 @@
             // 获取评论
             getComment() {
                 uni.request({
-                    url: "https://dmmall.sdbairui.com/api/article/articleCommentList",
+                    url: temp_url + "article/articleCommentList",
                     method: "POST",
                     data: {
                         article_id: this.article_id,
@@ -144,6 +145,35 @@
                     }
                 })
             },
+            // 发布评论	
+            sendComment() {	
+                if (this.send_value.length == 0) {	
+                    this.$u.toast("内容不能为空！");	
+                    return;	
+                }	
+                uni.request({	
+                    url: temp_url + "article/articleAddComment",	
+                    method: "POST",	
+                    data: {	
+                        article_id: this.article_id,	
+                        content: this.send_value,	
+                        pid: this.pid,	
+                        reply_id: this.reply_id,	
+                    },	
+                    success: (res) => {	
+                        if (res.data.errCode == 0) {	
+                            this.send_value = "";	
+                            this.comment_num = res.data.num;	
+                            console.log(res.data);	
+                        } else {	
+                            uni.showToast({	
+                                title: res.data.message,	
+                                icon: "none"	
+                            })	
+                        }	
+                    }	
+                })	
+            },
             // 获取手机信息
             getInfo() {
                 uni.getSystemInfo({
@@ -201,6 +231,10 @@
                     this.loadinging = false;
                 }, 2000)
             },
+            // stop
+            stopClick(event) {
+                event.stopPropagation();
+            },
             goBack() {
                 uni.navigateBack({
                     delta: 1
diff --git a/pageC/merchant/index.vue b/pageC/merchant/index.vue
index 83921d5..ccfc7f9 100644
--- a/pageC/merchant/index.vue
+++ b/pageC/merchant/index.vue
@@ -64,7 +64,7 @@
 				<image src="/static/image/shop/11.png"></image>
 				<view>店铺信息</view>
 			</view>
-			<view @click="switchCurrent(3)">
+			<view @click="customers()">
 				<image src="/static/image/shop/12.png"></image>
 				<view>联系客服</view>
 			</view>
@@ -109,6 +109,43 @@ export default {
 		// if(e.index == 0) this.show = true;
 	},
 	methods: {
+		customers(){
+			console.log(this.$store.state.hasLogin)
+			if(!this.$store.state.hasLogin){
+				this.$refs.uToast.show({
+					title: "请先登录",
+					type: 'warning'
+				})
+			}else{
+				function Friend(uuid, name, avatar,time = "", text = "",date = "") {
+					this.uuid = uuid;
+					this.name = name;
+					this.avatar = avatar;
+					this.online = false;
+					this.unReadMessage = 0;
+					this.text = text;
+					this.time = time;
+					this.date = date
+				}
+				console.log(123)
+				this.$u.api.getAtwillUserInfo({
+					id:this.sid
+				}).then((res)=>{
+					console.log(res)
+					let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
+					this.$u.route({
+						url:"/pageD/privateChat/privateChat",
+						params:{
+							id:JSON.stringify(user)
+						}
+						
+					})
+				}).catch((err)=>{
+					console.log(err)
+				})
+			}
+			
+		},
 		toDetailsPage(id) {
 			// console.log(11);
 			this.$u.route('pageB/photo/index', {
diff --git a/pages.json b/pages.json
index e8b773e..02c40a0 100644
--- a/pages.json
+++ b/pages.json
@@ -1041,6 +1041,12 @@
 		}	
 	],
 	"pages": [
+        // {
+        //     "path" : "pageA/start/start",
+        //     "style": {
+        //         "navigationStyle": "custom"
+        //     }
+        // },
 		{
 			"path": "pageA/welcome/welcome",
 			"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e1c0ec6..d35d335 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -27,11 +27,11 @@
 							<view class="list">
 								<view>
 									<videoItem v-for="(item,id) in articleList.filter((_, index) => !(index&1))" :key="id" :item="item"
-									 @getArticlelist="getArticlelist"></videoItem>
+									 @updateList="updateList"></videoItem>
 								</view>
 								<view style="margin-left:20rpx">
 									<videoItem v-for="(item,id) in articleList.filter((_, index) => index&1)" :key="id" :item="item"
-									 @getArticlelist="getArticlelist"></videoItem>
+									 @updateList="updateList"></videoItem>
 								</view>
 							</view>
                             <u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
@@ -96,6 +96,9 @@
 		display: flex;
 		flex-direction: column;
 		height: 100vh;
+        /* #ifdef APP-PLUS */
+        padding-bottom: 100rpx;
+        /* #endif */
         overflow: hidden;
 
 		.top {
@@ -366,6 +369,12 @@
                     }
 				})
 			},
+            // 屏蔽更新列表
+            updateList() {
+                console.log(111);
+                this.page = 0;
+                this.getArticlelist();
+            },
             // 发现下拉加载
             swiperBottom(e) {
                 this.getArticlelist();
diff --git a/pages/information/information.vue b/pages/information/information.vue
index f44ad09..e75d614 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -3,14 +3,14 @@
 		<u-navbar :is-back="false" :title-size="36" title="消息">
 			<view class="slot-wrap">
 				<image src="../../static/pageD/info(3).png" @click="delMessage()"></image>
-				<image src="../../static/pageD/info(2).png"></image>
+				<image src="../../static/pageD/info(2).png" @click="kefu()"></image>
 			</view>
 		</u-navbar>
 		<view class="content">
 			<!-- 正文内容 -->
 		</view>
 		<!-- <view class="sousuo"></view> -->
-		<view class="backes">
+		<view class="backes" style="border-bottom: 1px #ececec solid;">
 			<titles :information="information_dles"></titles>
 		</view>
 		<!-- 消息通知 -->
@@ -105,6 +105,49 @@
 			
 		},
 		methods: {
+			kefu(){
+				if(!this.$store.state.hasLogin){
+					this.$refs.uToast.show({
+						title: "请先登录",
+						type: 'warning'
+					})
+				}else{
+					function Friend(uuid, name, avatar,time = "", text = "",date = "") {
+						this.uuid = uuid;
+						this.name = name;
+						this.avatar = avatar;
+						this.online = false;
+						this.unReadMessage = 0;
+						this.text = text;
+						this.time = time;
+						this.date = date
+					}
+					const token = uni.getStorageSync('token');
+					let that = this
+					uni.request({
+						url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
+						data:{
+							userId: 1
+						},
+						method:"POST",
+						header:{
+							"Authorization" : 'Bearer' + " " + token
+						},
+						success(res){
+							console.log(res)
+							res = res.data
+							let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
+							that.$u.route({
+								url:"/pageD/privateChat/privateChat",
+								params:{
+									id:JSON.stringify(user)
+								}
+							})
+						}
+					})
+				}
+			
+			},
 			gochat(id){
 				this.$u.route({
 					url:"/pageD/privateChat/privateChat",
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index c088e61..e047b68 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -46,7 +46,7 @@
 				<view class="title">
 					<view class="title-text">我的订单</view>
 					<view class="more" @click="toOtherPage('/order/Index')">
-						<view class="title-text">查看全部订单</view>
+						<view class="title-text-more">查看全部订单</view>
 						<image src="/static/image/mine/21.png"></image>
 					</view>
 				</view>
@@ -71,14 +71,14 @@
 						<image src="/static/image/mine/37.png"></image>
 						<view>拼团中</view>
 					</view>
-					<view @click="toOtherPage('/order/Index?current=6')">
-						<image src="/static/image/mine/9.png"></image>
-						<view>售后</view>
-					</view>
 					<view @click="toOtherPage('/order/Index?current=7')">
 						<image src="/static/image/mine/3.png"></image>
 						<view>待评价</view>
 					</view>
+                    <view @click="toOtherPage('/order/Index?current=6')">
+                    	<image src="/static/image/mine/9.png"></image>
+                    	<view>售后</view>
+                    </view>
 				</view>
 			</view>
 			<view class="tool">
@@ -250,8 +250,9 @@ export default {
 			> view {
 				margin-right: 80rpx;
 				text-align: center;
-				font-size: 24rpx;
-				color:rgba(51,51,51,1);
+				font-size: 26rpx;
+                font-weight: 500;
+				color: #333;
 				> view:first-child {
 					margin-bottom: 10rpx;
 				}
@@ -275,7 +276,7 @@ export default {
 			.title {
 				height: 76rpx;
 				font-size: 28rpx;
-				color: rgba(51,51,51,1);
+				color: #666;
 				position: relative;
 				display: flex;
 				align-items: center;
@@ -290,6 +291,10 @@ export default {
     				transform: translate(-50%,0);
 				}
 			}
+            .title-text-more {	
+                font-size: 24rpx;
+                color: #999;
+            }
 			.content {
 				padding: $content-padding-top 0 $content-padding-bottom;
 				display: flex;
@@ -329,6 +334,7 @@ export default {
 				}
 			}
 			.content {
+                align-items: center;
 				justify-content: space-between;
 				> view {
 					display: flex;
@@ -337,22 +343,22 @@ export default {
 					justify-content: space-between;
 				}
 				> view:nth-child(1){
-					@include image-size($image-width: 33rpx, $image-height: 36rpx);
+					@include image-size($image-width: 36rpx, $image-height: 34rpx);
 				}
 				> view:nth-child(2){
-					@include image-size($image-width: 38rpx, $image-height: 32rpx);
+					@include image-size($image-width: 38rpx, $image-height: 36rpx);
 				}
 				> view:nth-child(3){
-					@include image-size($image-width: 41rpx, $image-height: 33rpx);
+					@include image-size($image-width: 40rpx, $image-height: 36rpx);
 				}
 				> view:nth-child(4){
-					@include image-size($image-width: 40rpx, $image-height: 35rpx);
+					@include image-size($image-width: 38rpx, $image-height: 38rpx);
 				}
 				> view:nth-child(5){
-					@include image-size($image-width: 37rpx, $image-height: 37rpx);
+					@include image-size($image-width: 36rpx, $image-height: 40rpx);
 				}
 				> view:nth-child(6){
-					@include image-size($image-width: 33rpx, $image-height: 35rpx);
+					@include image-size($image-width: 36rpx, $image-height: 40rpx);
 				}
 			}
 		} 
diff --git a/static/imservice.js b/static/imservice.js
index f2d1e6f..098524d 100644
--- a/static/imservice.js
+++ b/static/imservice.js
@@ -297,7 +297,8 @@ IMService.prototype.initialIMListeners = function () {
                         friend.text = message.type != "text" ? "其他消息" : message.payload.text
                         let time = new Date(message.timestamp)
                         friend.date = message.timestamp
-                        friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                        friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+                        
                         console.log(that.friends)
                         that.friendsarr = []
                         for(let i in that.friends){
@@ -322,7 +323,7 @@ IMService.prototype.initialIMListeners = function () {
                 friend.text = message.type != "text" ? "其他消息" : message.payload.text
                 let time = new Date(message.timestamp)
                 friend.date = message.timestamp
-                friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
                 console.log(this.friends)  
                 that.friendsarr = []
                 for(let i in this.friends){
@@ -537,7 +538,9 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
                 friend.text = message
                 let time = new Date()
                 friend.date = time.getTime()
-                friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+               
+
                 console.log(that.friends)
                 that.friendsarr = []
                 for(let i in that.friends){
@@ -561,7 +564,9 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
         friend.text = message
         let time = new Date()
         friend.date = time.getTime()
-        friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+        friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+        
+
         console.log(this.friends)  
         that.friendsarr = []
         for(let i in this.friends){