diff --git a/App.vue b/App.vue
index e15be00..4ad52c3 100644
--- a/App.vue
+++ b/App.vue
@@ -41,7 +41,6 @@
 	@import "/static/css/normalize";
     /* 顶部自定义导航留白 */
     .status_bar {
-        z-index: 1000;
     	width: 100%;
     	height: var(--status-bar-height);
     }
diff --git a/common/api/user.js b/common/api/user.js
index 899a148..5fc0775 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -408,8 +408,8 @@ export default {
 				return vm.$u.post('article/articleCollectList');
 			},
 			// 关注用户列表
-			attentionMemberList() {
-				return vm.$u.post('member/attentionMemberList');
+			attentionMemberList({ page = 1 } = {}) {
+				return vm.$u.post('member/attentionMemberList', { page: page });
 			},
         }
     }
diff --git a/components/comment/index.vue b/components/comment/index.vue
index 3795916..f93bb87 100644
--- a/components/comment/index.vue
+++ b/components/comment/index.vue
@@ -2,7 +2,7 @@
 	<view class="comment-item">
 		<view class="user">
 			<u-avatar :src="content.member_avatar" class="avatar" size="60"></u-avatar>
-			<text class="name">{{ content.geval_frommembername }}</text>
+			<text class="name">{{ content.member_nickname }}</text>
 			<u-rate v-if="reply" :disabled='true' :count="count" v-model="rate" size="23" active-color="#FF780F" inactive-color="#F0EDF1" gutter="10"></u-rate>
 		</view>
 		<view class="content">
diff --git a/components/mine/address-active/index.vue b/components/mine/address-active/index.vue
index 8f08166..933ee42 100644
--- a/components/mine/address-active/index.vue
+++ b/components/mine/address-active/index.vue
@@ -80,7 +80,6 @@ export default {
 		//　判断是不是编辑页面 调用接口
 		confirmBtn() {
 			if(!this.debounce) return;
-			this.debounce = false;
 			this.info ? this.editAddress() : this.addAddress();
 		},
 		// chooseArea() {
@@ -119,6 +118,7 @@ export default {
 		},
 		addAddress() {
 			if(!this.validateValue()) return false;
+			this.debounce = false;
 			this.$u.api.addressAdd({
 				area_id: this.area_id,
 				city_id: this.city_id,
@@ -144,6 +144,7 @@ export default {
 		},
 		editAddress() {
 			if(!this.validateValue()) return false;
+			this.debounce = false;
 			this.$u.api.addressEdit({
 				address_id: this.info.address_id,
 				area_id: this.area_id,
diff --git a/components/shop/list/item.vue b/components/shop/list/item.vue
index 2a4e499..315d431 100644
--- a/components/shop/list/item.vue
+++ b/components/shop/list/item.vue
@@ -34,7 +34,7 @@ export default {
 				url: 'pageB/sdetails/index',
 				params: {
 					id: this.info.goods_id,
-					type: 1,
+					// type: 1,
 				}
 			})
 		}
diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue
index fd55862..911248d 100644
--- a/pageB/photo/index.vue
+++ b/pageB/photo/index.vue
@@ -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 :placeholder="edit_text_other" @focus="focus" v-model="send_value">
+				<input type="text" :focus="is_focus" :placeholder="edit_text_other" @focus="focus" v-model="send_value">
 				<text @click="sendComment">发送</text>
 			</view>
 		</u-popup>
@@ -419,7 +419,7 @@ export default {
 			edit_text: "有爱评论，说点好听的 ~",
 			edit_text_other: "有爱评论，说点好听的 ~",
 			commentList: [], // 评论
-            allList: [], // 全部子评论
+            allList: {}, // 全部子评论
             status: 'loadmore',
             iconType: 'circle',
             loadText: {
@@ -433,6 +433,7 @@ export default {
 	onLoad(option){
 	    this.article_id = option.id;
 	    this.articleInfo(this.article_id);
+        this.allList = {};
 	},
     // 监听返回按钮
     onBackPress() {
@@ -491,18 +492,28 @@ export default {
                         this.commentList = this.commentList.concat(res.data);
                     }
                     this.page++;
+                    let list = this.commentList;
+                    // list.forEach((item,index) => {
+                    //     console.log(item);
+                    // })
                 }
 			})
 		},
 		// 打开评论输入
 		openKeyInput(data,index) {
-			// console.log(data);
+            let me = this;
+			console.log(data);
 			this.is_edit = true;
             setTimeout(() => {
                 this.is_focus = true;
             }, 200)
+            uni.onKeyboardHeightChange(function(res){
+                if (res.height == 0) {
+                    me.is_focus = false;
+                }
+            })
             this.comment_id = index;
-            if (data.id) {
+            if (data.content) {
                 this.edit_text_other = "回复@" + data.member_nickname;
                 this.pid = data.id;
                 this.reply_id = data.member_id;
@@ -525,15 +536,19 @@ export default {
 				pid: this.pid,
 				reply_id: this.reply_id,
 			}).then(res => {
-				// console.log(res.data.data);
+				// console.log(res.data);
 				if (res.errCode == 0) {
                     this.send_value = "";
                     this.comment_num = res.data.num;
                     // console.log(this.comment_num);
 					this.is_edit = false;
-                    if (res.data.data.pid) {
+                    console.log(res.data.data.reply_id);
+                    if (res.data.data.reply_id) {
+                        console.log(this.allList);
                         this.commentList[this.comment_id].reply_count = true;
-                        this.allList[this.comment_id].unshift(res.data.data);
+                        this.allList[this.comment_id] = [];
+                        this.allList[this.comment_id].push(res.data.data);
+                        console.log(this.allList);
                     } else {
                         this.commentList.unshift(res.data.data);
                     }
@@ -544,14 +559,14 @@ export default {
 		},
         // 发现回复列表
         getReplyList(id) {
-            this.page_[id] = 0;            
             if (!this.page_[id] === 0) {
             }
             console.log(this.page_[id]);
             this.$u.post("article/articleReplyList", {id: id, page: this.page_[id]}).then(res => {
-                console.log(this.page_);
+                console.log(res);
                 if (res.errCode == 0) {
                     this.page_[id]++;
+                    console.log(this.page_[id]);
                     this.allList[id] = res.data;
                 }
             })
@@ -583,7 +598,7 @@ export default {
 				delta: 1
 			})
 		},
-		focus() {
+		focus(e) {
 			setTimeout(function(){
 				uni.showSoftKeybord;
 			}, 200)
diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index 3e9a71b..aa62571 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -23,10 +23,13 @@
 				<text class="goods-name">{{ goodsInfo.goods_name }}</text>
             </view>
             <view class="price-collect">
-				<view class="pic" v-if="type != 3">
+				<view class="pic" v-if="type == 2">
 					<text>￥{{ goodsInfo.pintuan_price || '0.00' }}</text>
 					<s>￥{{ goodsInfo.goods_price || '0.00' }}</s>
 				</view>
+				<view class="pic" v-else-if="type == 1">
+					<text>￥{{ goodsInfo.goods_price || '0.00' }}</text>
+				</view>
 				<view class="collect" @click="switchCollect(goodsInfo.is_collect)">
 					<u-icon name="star" color="#474747" size="28" v-if="goodsInfo.is_collect == 0"></u-icon>
 					<u-icon name="star-fill" color="#FF7807" size="28" v-else></u-icon>
@@ -485,7 +488,7 @@ export default {
 		* @params {Number} num 数量
 		* @params {Number} ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
 		**/
-		settlementOrder({type, num = this.goodsNumber, ifcart = 0} = {}) {
+		async settlementOrder({type, num = this.goodsNumber, ifcart = 0} = {}) {
 			if(type != 'involvement') {
 				if(!this.showSpec) {
 					this.showSpec = true;
@@ -514,14 +517,14 @@ export default {
 			if(this.type == 2) {
 				if(type == 'involvement') {
 					// 验证能否拼团
-					let status = this.pintuanVerify({
+					const whether = await this.pintuanVerify({
 						pintuan_id: this.pintuan_id,
 						pintuangroup_headid: this.involvemenGroupInfo[0].user_id
 					}).then(status => {
 						if(status != 0) return true;
+						else return false;
 					})
-					// console.log(status);
-					if(status) return false;
+					if(whether) return false;
 					this.$store.commit('setGroupHeadId', this.involvemenGroupInfo[0].user_id);
 					Object.assign(params, {
 						pintuan_id: this.pintuan_id, 
diff --git a/pageB/video/video.nvue b/pageB/video/video.nvue
index aa0ae33..57afe10 100644
--- a/pageB/video/video.nvue
+++ b/pageB/video/video.nvue
@@ -1,5 +1,5 @@
 <template>
-    <view>
+    <view class="container">
         <video id="videoId" :style="videoSize" :src="src" autoplay="true" :show-fullscreen-btn="false" @play="playing"
             @pause="pausing" @ended="videoEnd" @timeupdate="timeupdate" :show-play-btn="false" controls="false" @click="stoping"
             :enable-progress-gesture="false" :show-center-play-btn="false"></video>
@@ -29,18 +29,18 @@
             </view>
         </cover-view>
         <!-- 单个商品 -->
-        <cover-view class="good-one" v-if="cart_len == 1">
-            <view class="one-list" v-for="(item,index) in list.goods" :key="index">
+        <cover-view class="good-one" :style="{ bottom: fixTop - 100 }" v-if="cart_len == 1 && cart_type">
+            <view class="one-list" v-for="(item,index) in list.goods" :key="index" @click="goGoodInfo(item.goods_id)">
                 <image class="one-image" :src="item.goods_image" mode=""></image>
                 <view class="one-box">
-                    <view class="title-one">{{ item.goods_advword }}</view>
-                    <view class="content-one">{{ item.goods_name }}</view>
-                    <view class="good-price">￥{{ item.goods_promotion_price }}</view>
+                    <text class="title-one">{{ item.goods_advword }}</text>
+                    <text class="content-one">{{ item.goods_name }}</text>
+                    <text class="good-price">￥{{ item.goods_promotion_price }}</text>
                 </view>
             </view>
         </cover-view>
         <!-- 遮罩层 -->
-        <cover-view class="mask" @click.stop="stopClick" :style="videoSize" v-if="is_comment || cart_type">
+        <cover-view class="mask" @click.stop="stopClick" :style="videoSize" v-if="is_edit || is_comment || cart_type && cart_len >= 2">
             <!-- 评论 -->
             <cover-view class="content-box" v-if="is_comment" ref="contentBox">
                 <view class="content-title">
@@ -57,14 +57,15 @@
                                     <text class="comment-time">{{ item.create_time }}</text>
                                 </view>
                             </view>
-                            <text class="reply">回复</text>
+                            <text class="reply" @click="openKeyInput(item,index)">回复</text>
                         </view>
                         <view class="content-main">
                             <text class="content-style">{{ item.content }}</text>
                         </view>
                     </view>
                     <view class="send-box">
-                        <input class="send-val" type="text" value="" />
+                        <input class="send-val" type="text" :placeholder="edit_text" placeholder-class="placeholder-class"
+                            disabled="true" @blur="blue" @click="openKeyInput" value="" />
                         <text class="btn-send">发送</text>
                     </view>
                     <loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
@@ -73,6 +74,15 @@
                     </loading>
                 </scroller>
             </cover-view>
+            <!-- 评论框 -->
+            <cover-view class="edit-box" :style="videoSize" v-if="is_edit">
+                <view class="input-main" :style="{ bottom: editTop }">
+                    <input class="edit-input" type="text" value="" :focus="is_focus" :placeholder=" edit_text_other ? edit_text_other : edit_text"
+                        placeholder-class="placeholder-class" v-model="send_value" />
+                    <text class="btn-send" @click="sendComment">发送</text>
+                </view>
+                <view></view>
+            </cover-view>
             <!-- 购物车 -->
             <cover-view class="cart-box" v-if="cart_type">
                 <view class="cart-title">
@@ -89,7 +99,7 @@
                             </view>
                         </view>
                     </view>
-                    <loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
+                    <loading v-if="0" class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
                         <loading-indicator class="indicator"></loading-indicator>
                         <text class="indicator-text">努力加载中</text>
                     </loading>
@@ -117,12 +127,22 @@
             return {
                 videoSize: {},
                 fixTop: 0,
+                editTop: 0,
                 list: {},
                 labelLen: [],
+                cart_len: 0, // 购物车个数
                 cart_type: false, // 显示购物车
                 is_comment: false, // 显示评论
+                is_edit: false, // 显示输入
+                is_focus: false, // 
                 comment_num: 0, // 评论数
+                edit_text: "有爱评论，说点好听的 ~",
+                edit_text_other: "有爱评论，说点好听的 ~",
+                pid: 0, // 主键
+                reply_id: 0, // 回复id
                 page: 0,
+                comment_id: 0,
+                send_value: "", // 评论
                 commentList: [], // 评论列表
                 src: "",
                 is_play: true,
@@ -170,6 +190,7 @@
                         this.list = res.data.data.info;
                         this.src = res.data.data.info.video_path;
                         this.cart_len = res.data.data.info.goods.length;
+                        console.log(this.cart_len);
                         let item = res.data.data.info.label;
                         let arr = [];
                         item.forEach(data => {
@@ -217,11 +238,27 @@
                         pid: this.pid,
                         reply_id: this.reply_id,
                     },
+                    header: {
+                        Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+                    },
                     success: (res) => {
+                        this.is_edit = false;
                         if (res.data.errCode == 0) {
                             this.send_value = "";
                             this.comment_num = res.data.num;
-                            console.log(res.data);
+                            if (res.data.data.data.reply_id) {
+                                // this.commentList[this.comment_id].reply_count = true;
+                                // this.allList[this.comment_id].unshift(res.data.data);
+                                // console.log(this.allList, 111);
+                            } else {
+                                this.commentList.unshift(res.data.data.data);
+                            }
+                            console.log(this.commentList);
+                        } else if (res.data.errCode == 401) {
+                            uni.showToast({
+                                title: "您还没有登录，请先登录！",
+                                icon: "none"
+                            })
                         } else {
                             uni.showToast({
                                 title: res.data.message,
@@ -288,6 +325,9 @@
             // 打开弹窗
             openPopup(data) {
                 // console.log(data);
+                if (this.cart_len >= 2) {
+
+                }
                 this.cart_type = data.cart;
                 this.is_comment = data.comment;
                 if (this.is_comment) {
@@ -296,9 +336,41 @@
                     // this.is_play = true;
                 }
             },
+            // 打开评论输入
+            openKeyInput(data, index) {
+                let me = this;
+                this.is_focus = true;
+                setTimeout(() => {
+                    this.is_edit = true;
+                }, 500)
+                uni.onKeyboardHeightChange(function(res) {
+                    console.log(res);
+                    if (res.height == 0) {
+                        me.is_focus = false;
+                        me.is_edit = false;
+                    } else {
+                        me.editTop = res.height;
+                    }
+                })
+                this.comment_id = index;
+                if (data.id) {
+                    this.edit_text_other = "回复@" + data.member_nickname;
+                    this.pid = data.id;
+                    this.reply_id = data.member_id;
+                } else {
+                    this.edit_text_other = "有爱评论，说点好听的 ~";
+                    this.pid = "";
+                    this.reply_id = "";
+                }
+                // console.log(this.pid, this.edit_text_other);
+            },
+            blue() {
+                this.is_focus = false;
+            },
             // 关闭评论
             closeComment() {
                 this.is_comment = false;
+                this.is_edit = false;
                 // console.log(this.is_comment,this.is_play);
                 // if (!this.is_comment && this.is_play) {
                 //     console.log(1);
@@ -316,7 +388,7 @@
             // 跳转
             goGoodInfo(id) {
                 uni.navigateTo({
-                	url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
+                    url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
                 })
             },
             // stop
@@ -333,6 +405,10 @@
 </script>
 
 <style>
+    .container {
+        position: relative;
+    }
+
     /* 关闭 */
     .close {
         position: fixed;
@@ -376,44 +452,46 @@
         border-radius: 10rpx;
         background-color: rgba(255, 255, 255, .6);
     }
-    
+
     .good-one {
-        position: absolute;
-        bottom: 300rpx;
-        right: 100rpx;
-        width: 450rpx;
+        position: fixed;
+        right: 160rpx;
+        width: 420rpx;
         padding: 20rpx;
         border-radius: 10rpx;
-        background-color: rgba(0,0,0,0.6);
+        background-color: rgba(0, 0, 0, 0.6);
     }
-    
+
     .one-list {
         flex-direction: row;
     }
-    
+
     .one-image {
         width: 160rpx;
         height: 160rpx;
         margin-right: 20rpx;
         border-radius: 4rpx;
     }
-    
+
     .one-box {
-        justify-content: space-between;
+        justify-content: space-around;
+        color: #333;
     }
-    
+
     .title-one {
-        width: 100rpx;
+        width: 200rpx;
         font-size: 28rpx;
         color: #fff;
         lines: 1;
+        text-overflow: ellipsis;
     }
-    
+
     .content-one {
-        width: 100rpx;
+        width: 200rpx;
         font-size: 24rpx;
         color: #fff;
         lines: 2;
+        text-overflow: ellipsis;
     }
 
     .mask {
@@ -431,6 +509,7 @@
         left: 0;
         width: 750rpx;
         height: 700rpx;
+        padding-bottom: 50rpx;
         margin-bottom: 88rpx;
         background-color: #fff;
     }
@@ -518,8 +597,8 @@
     }
 
     .btn-send {
-        font-size: 30rpx;
-        color: #303133;
+        font-size: 28rpx;
+        color: #666;
     }
 
     .close-down {
@@ -529,6 +608,38 @@
         color: #333;
     }
 
+    .edit-box {
+        z-index: 1000;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 750rpx;
+        background-color: rgba(0, 0, 0, 0.8);
+    }
+
+    .input-main {
+        position: fixed;
+        left: 0;
+        /* #ifdef H5 */
+        display: flex;
+        /* #endif */
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        width: 750rpx;
+        padding: 0 20rpx;
+        line-height: 80rpx;
+        background-color: #fff;
+    }
+
+    .edit-input {
+        width: 600rpx;
+        height: 80rpx;
+        padding: 0 10rpx;
+        font-size: 24rpx;
+        color: #333;
+    }
+
     .cart-box {
         z-index: 99;
         position: fixed;
@@ -549,33 +660,35 @@
         border-bottom-width: 1rpx;
         background-color: #fff;
     }
-    
-    .cart-list {
-        
-    }
-    
+
+    .cart-list {}
+
     .cart-list-header {
         padding: 20rpx;
         flex-direction: row;
         border-bottom-width: 1rpx;
         border-bottom-color: #ececec;
     }
-    
+
     .goods-img {
         width: 160rpx;
         height: 160rpx;
-        margin-right: 10rpx;
+        border-radius: 10rpx;
+        margin-right: 20rpx;
     }
-    
+
     .goods-info {
         justify-content: space-around;
     }
-    
+
     .good-title {
+        width: 500rpx;
         color: #333;
         font-size: 30rpx;
+        lines: 2;
+        text-overflow: ellipsis;
     }
-    
+
     .good-price {
         font-size: 28rpx;
         color: #FF3131;
@@ -624,7 +737,6 @@
     }
 
     .label {
-        lines: 3;
         width: 100rpx;
         height: 40rpx;
         padding: 4rpx 10rpx;
@@ -632,6 +744,7 @@
         margin-bottom: 10rpx;
         font-size: 26rpx;
         text-align: center;
+        line-height: 38rpx;
         color: #666666;
         border-radius: 10rpx;
         background-color: rgba(255, 255, 255, .6);
@@ -655,4 +768,9 @@
         height: 30rpx;
         color: #999;
     }
+
+    .placeholder-class {
+        font-size: 13px;
+        color: #666;
+    }
 </style>
diff --git a/pageC/groupBuy/index.vue b/pageC/groupBuy/index.vue
index 9b3ad21..16e4279 100644
--- a/pageC/groupBuy/index.vue
+++ b/pageC/groupBuy/index.vue
@@ -10,8 +10,8 @@
 					<view v-if="pinTuanList[index]">
 						<SpecialGoods v-for="(item, index) in pinTuanList[index]" :key="index" :item="item" type='group'></SpecialGoods>
 					</view>
-					<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="!pinTuanList[index] || pinTuanList[index].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
-					<u-empty text="暂无商品" mode="list" color="#000" v-if="!pinTuanList[index] || !pinTuanList[index].length"></u-empty>
+					<u-empty text="暂无商品" mode="list" color="#000" margin-top="120" v-if="!pinTuanList[index] || !pinTuanList[index].length"></u-empty>
+					<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="pinTuanList[index] && pinTuanList[index].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
@@ -22,7 +22,7 @@ import SpecialGoods from "../../components/shop/special-shop/index";
 export default {
 	data() {
 		return {
-			pageSize: 12,
+			pageSize: 6,
 			tabList: [],
 			current: -1,
 			swiperCurrent: 0,
diff --git a/pageE/mine/MineConcerns.vue b/pageE/mine/MineConcerns.vue
index 362fecd..c3886e5 100644
--- a/pageE/mine/MineConcerns.vue
+++ b/pageE/mine/MineConcerns.vue
@@ -3,8 +3,8 @@
 		<view class="concerns-container">
 			<view v-for="(info, index) in list" :key="index">
 				<view class="daren-item">
-					<image class="head" :src="info.friend_tomavatar" @click="viewDetails(info.friend_tomid)"></image>
-					<text class="name" @click="viewDetails(info.friend_tomid)">{{ info.friend_tomname || '' }}</text>
+					<image class="head" :src="info.friend_tomavatar" @click="viewDetails({ id: info.friend_tomid, type: info.role })"></image>
+					<text class="name" @click="viewDetails({ id: info.friend_tomid, type: info.role })">{{ info.friend_tomname || '' }}</text>
 					<view class="guanzhu" @click="changeType(info.friend_tomid)" v-if="info.friend_followstate == 1">取消关注</view>
 				</view>
 			</view>
@@ -31,14 +31,15 @@ export default {
 			this.$u.api.attentionMemberList().then(res => {
 				uni.stopPullDownRefresh();
 				if(res.errCode == 0) {
-					this.list = res.data;
+					this.list = res.data.data;
 				} else {
 					this.list = [];
 				}
 			})
 		},
-		viewDetails(id) {
-			this.$u.route('pageB/details/index', {
+		viewDetails({ id, type }) {
+			let src = type == 3 ? 'pageB/details/index' : 'pageC/merchant/index';
+			this.$u.route(src, {
 				id: id
 			});
 		},
diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue
index d1155ef..5667811 100644
--- a/pageE/order/Details.vue
+++ b/pageE/order/Details.vue
@@ -67,8 +67,10 @@
 				<view>创建时间：{{ orderInfo.add_time | date}}</view>
 			</view>
 		</view>
-		<view class="btn" v-if="['1', '2', '4', '6', '8'].indexOf(orderstate) >= 0">
-			<view class="cancel" v-if="(orderstate == '4' || orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
+		 <!-- '4', -->
+		<view class="btn" v-if="['1', '2', '6', '8'].indexOf(orderstate) >= 0">
+			<!-- orderstate == '4' ||  -->
+			<view class="cancel" v-if="(orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
 			<view class="cancel" v-if="orderstate == '1'" @click="toOtherPage('Logistics')">查看物流</view>
 			<view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view>
 			<view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view>
diff --git a/pageE/order/RefundOrder.vue b/pageE/order/RefundOrder.vue
index fe9319b..16c239c 100644
--- a/pageE/order/RefundOrder.vue
+++ b/pageE/order/RefundOrder.vue
@@ -75,6 +75,7 @@ export default {
 			})
 			// console.log(goodsList);
 			this.goods = goodsList[0];
+			this.num = this.goods.goods_num;
 			console.log(this.goods);
 		},
 		getOrderInfo(id) {
diff --git a/pageE/tool/MineHistory.vue b/pageE/tool/MineHistory.vue
index cfdf1e6..dfcb728 100644
--- a/pageE/tool/MineHistory.vue
+++ b/pageE/tool/MineHistory.vue
@@ -6,12 +6,16 @@
 				<view v-for="(item, index) in historyList.slice(0, 50)" :key="index" class="history-item">
 					<view class="item-title" @click="viewStoreDetails(item.store_id)">
 						<image :src="item.store_avatar"></image>
-						<view class="u-line-2">{{ item.store_name }}</view>
+						<view class="u-line-1">{{ item.store_name }}</view>
 					</view>
 					<image :src="item.goods_image" class="item-image" @click="viewGoodsDetails(item.goods_id)"></image>
 					<view class="item-info" @click="viewGoodsDetails(item.goods_id)">
 						<view class="info-name u-line-1">{{ item.goods_name }}</view>
+						<u-icon name="trash" color="#666" size="32"></u-icon>
 					</view>
+					<!-- <view @click.stop="delArticle(item.article_id)">
+						
+					</view> -->
 				</view>
 			</view>
 			<u-empty text="暂无足迹" mode="list" color="#000" v-if="!historyList.length"></u-empty>
@@ -126,10 +130,10 @@ export default {
 						font-size: 22rpx;
 						color: rgba(51,51,51,1);
 					}
-					> image {
-						width: 37rpx;
-						height: 8rpx;
-					}
+					// > image {
+					// 	width: 37rpx;
+					// 	height: 8rpx;
+					// }
 				}
 			}
 		}
diff --git a/pageE/tool/SendWash.vue b/pageE/tool/SendWash.vue
index e07c7e8..5e088f1 100644
--- a/pageE/tool/SendWash.vue
+++ b/pageE/tool/SendWash.vue
@@ -21,7 +21,7 @@
 							<view class="order-status">{{ item.order_status | viewStatus }}</view>
 						</view>
 						<view class="order-info">
-							<image :src="item.goods_image"></image>
+							<image :src="type == 1 ? item.goods_image : item.images[0]"></image>
 							<view v-if="item.deliver_goods_type == 2 && item.order_status == 20">
 								<view>骑手名字：{{ item.takeawayer_name || '' }}</view>
 								<view>联系方式：{{ item.takeawayer_mobile || '' }}</view>
@@ -40,13 +40,9 @@
 								<view>商家在正路途中，请耐心等待</view>
 							</view>
 						</view>
-						<view class="send-btn" v-if="item.order_status == 20 || item.order_status == 50">
-							<view class="btn" v-if="item.order_status == 20" @click="sendLaundryOrderConfirm(item.laundry_id)">
-								确认完成
-							</view>
-							<view class="btn" v-if="item.order_status == 50 && !item.comment" @click="toComment(item.laundry_id)">
-								去评价
-							</view>
+						<view class="send-btn" v-if="item.order_status == 20 || (item.order_status == 50&& !item.comment)">
+							<view class="btn" v-if="item.order_status == 20" @click="sendLaundryOrderConfirm(item.laundry_id)">确认完成</view>
+							<view class="btn" v-if="item.order_status == 50 && !item.comment" @click="toComment(item.laundry_id)">去评价</view>
 						</view>
 					</view>
 				</scroll-view>
@@ -87,6 +83,7 @@ export default {
 			timer: true,
 			commentList: [],
 			swiperHeight: '',
+			type: 1, // 1 平台 2 实体店
 		}
 	},
 	components: {
@@ -139,9 +136,9 @@ export default {
 	},
 	methods: {
 		async sendLaundryOrderList({ load = 'reload' } = {}) {
-			let type = this.list[0].name == '平台历史订单' ? 1 : 2;
+			// let type = this.list[0].name == '平台历史订单' ? 1 : 2;
 			const res = await this.$u.api.sendLaundryOrderList({
-				type: type,
+				type: this.type,
 				page: this.page,
 			})
 			uni.stopPullDownRefresh();
@@ -214,8 +211,10 @@ export default {
 		},
 		replaces(e){
 			if(e == 1){
+				this.type = 2;
 				this.$set(this.list,0,{name: '实体店历史订单'} )
 			} else {
+				this.type = 1;
 				this.$set(this.list,0,{name: '平台历史订单'} )
 			}
 			this.sendLaundryOrderList();
@@ -322,17 +321,21 @@ export default {
 					display: flex;
 					justify-content: flex-end;
 					margin-top: 30rpx;
-					.btn{
+					.btn {
+						box-sizing: border-box;
 						width: 154rpx;
 						height: 54rpx;
 						border-radius: 49rpx;
-						transform: translate(-50%, 0);
+						// transform: translate(-50%, 0);
 						font-size: 26rpx;
 						border: 1rpx solid rgba(255,120,15,1);
 						color:rgba(255,120,15,1);
-						text-align: center;
-						line-height: 54rpx;
-						margin-right: -80rpx;
+						// text-align: center;
+						// line-height: 54rpx;
+						// margin-right: -80rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
 					}
 				}
 			}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 21bc378..c9ec856 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="index" @touchmove.stop.prevent="moveHandle">
+		<view class="index">
 			<view class="top">
 				<view class="sosuo" @click="goSearch">
                     <u-icon name="search" color="#555" size="34rpx"></u-icon>
@@ -18,7 +18,7 @@
 				</view>
 				<view class="sosuo"></view>
 			</view>
-			<swiper class="card" @change="dianji" :current="num">
+			<swiper class="card" @change="dianji" :current="num" @touchmove.stop.prevent="moveHandle">
 				<swiper-item>
 					<scroll-view style="width:100%;height:100%" scroll-y="true" lower-threshold="200" upper-threshold="100" @scrolltolower="swiperBottom" @scrolltoupper="swiperTop">
 						<view class="box">
@@ -45,11 +45,11 @@
 							<view class="list">
 								<view>
 									<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :zid="item.live_id" :rid="item.chatroom_id"
-									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url" :item="item" @updateList="updateList"></zhiboItem>
+									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"  :item="item" @updateList="updateList"></zhiboItem>
 								</view>
 								<view style="margin-left:20rpx">
 									<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :zid="item.live_id" :rid="item.chatroom_id"
-									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url" :item="item" @updateList="updateList"></zhiboItem>
+									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"  :item="item" @updateList="updateList"></zhiboItem>
 								</view>
 							</view>
 						</view>
@@ -79,7 +79,7 @@
                                         <videoItem isguanzhu="true" v-for="(item,id) in fansList" :key="id" :item="item"></videoItem>
                                     </view>
                                      <view class="no-data" v-if="!fansList.length">您还没有关注哦，赶紧去点点关注！</view>
-                                     <u-loadmore class="load-size" v-else :status="status_1" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
+                                     <u-loadmore class="load-size" v-else :status="status_1" icon-type="iconType" margin-top="50" :load-text="loadText" />
 								</view>
 							</view>
 						</view>
@@ -98,11 +98,6 @@
 		width: 750rpx;
 		display: flex;
 		flex-direction: column;
-		height: 100vh;
-        /* #ifdef APP-PLUS */
-        padding-bottom: 88rpx;
-        /* #endif */
-        overflow: hidden;
 
 		.top {
             z-index: 10000;
@@ -135,29 +130,31 @@
 
 		.card {
 			width: 100%;
-			height: 100%;
-            margin-top: 88rpx;
-            // pointer-events: none;
+			height: calc(100vh - 150rpx);
+            margin-top: 100rpx;
+            // padding-top: 100rpx;
 
 			.box {
 				width: 100%;
                 height: 100%;
-				padding: 0 30rpx;
+				padding: 0 30rpx 0;
+                // margin-top: 30rpx;
 			}
 
 			.list {
 				display: flex;
-                padding-bottom: 50rpx;
-                margin-bottom: 50rpx;
+                // height: 100vh;
+                // padding-bottom: 100rpx;
+                // margin-bottom: 50rpx;
 			}
 		}
 
 		.tuijian {
 			width: 750rpx;
+			padding: 30rpx;
 			margin-left: -30rpx;
 			height: 400rpx;
 			background-color: #ececec;
-			padding: 30rpx;
 
 			.title {
 				width: 100%;
@@ -389,7 +386,6 @@
                             this.articleList = this.articleList.concat(res.data.list);
                         }
                         if (res.data.length == 0 && this.page > 1) {
-                            console.log(111);
                         } else {
                             this.page++;
                         }
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index e047b68..689adba 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -47,7 +47,7 @@
 					<view class="title-text">我的订单</view>
 					<view class="more" @click="toOtherPage('/order/Index')">
 						<view class="title-text-more">查看全部订单</view>
-						<image src="/static/image/mine/21.png"></image>
+						<u-icon name="arrow-right" color="#999" size="22"></u-icon>
 					</view>
 				</view>
 				<view class="content">
@@ -180,7 +180,7 @@ export default {
     .mine-top {
 		// width: 100%;
 		height: 272rpx;
-		background: #FF780F;
+		background-color: #F0AD4E;
 		.top {
 			padding: 40rpx 0 0 30rpx;
 			display: flex;
@@ -242,13 +242,11 @@ export default {
 			}
 		}
 		.bottom {
-			box-sizing: border-box;
-			padding: 0 30rpx;
 			display: flex;
-			// justify-content: space-between;
-			justify-content: flex-start;
+			justify-content: space-around;
+            padding: 0 10rpx;
+			box-sizing: border-box;
 			> view {
-				margin-right: 80rpx;
 				text-align: center;
 				font-size: 26rpx;
                 font-weight: 500;
@@ -268,35 +266,35 @@ export default {
 		}
 		@mixin common-mine($content-padding-top, $content-padding-bottom, $image-width, $image-height) {
 			box-sizing: border-box;
-			width: 690rpx;
+			width: 750rpx;
 			background: rgba(255,255,255,1);
-			border-radius: 10rpx;
-			margin: 30rpx auto 0;
-			padding: 0 20rpx;
+			// border-radius: 10rpx;
+			margin: 20rpx auto 0;
 			.title {
-				height: 76rpx;
-				font-size: 28rpx;
-				color: #666;
-				position: relative;
 				display: flex;
 				align-items: center;
-				&::after {
-					content: "";
-					position: absolute;
-					width: 650rpx;
-					height: 1rpx;
-					background: rgba(234,234,234,1);
-					bottom: 0;
-					left: 50%;
-    				transform: translate(-50%,0);
-				}
+				height: 76rpx;
+                padding: 0 20rpx;
+				font-size: 28rpx;
+				color: #666;
+                border-bottom: 1px solid #ececec;
+				// &::after {
+				// 	content: "";
+				// 	position: absolute;
+				// 	width: 650rpx;
+				// 	height: 1rpx;
+				// 	background: rgba(234,234,234,1);
+				// 	bottom: 0;
+				// 	left: 50%;
+    // 				transform: translate(-50%,0);
+				// }
 			}
             .title-text-more {	
                 font-size: 24rpx;
                 color: #999;
             }
 			.content {
-				padding: $content-padding-top 0 $content-padding-bottom;
+				padding: $content-padding-top 20rpx $content-padding-bottom;
 				display: flex;
 				> view {
 					text-align: center;
diff --git a/pages/zhibo/index.nvue b/pages/zhibo/index.nvue
index f02e236..031496c 100644
--- a/pages/zhibo/index.nvue
+++ b/pages/zhibo/index.nvue
@@ -510,7 +510,11 @@ export default {
             },
             success(res){
               console.log(res)
-              that.info = res.data.data
+              that.info = res.data.data;
+              uni.showToast({
+                  title: res.data.message,
+                  icon: "none"
+              })
               // that.list= res.data.data
             }
           })