From a871e050f64a9f0408a204c93266242d1481e814 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Wed, 12 Aug 2020 15:24:13 +0800
Subject: [PATCH 1/5] update goods price 8.12

---
 pageB/sdetails/index.vue | 5 ++++-
 pageC/groupBuy/index.vue | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index 3e9a71b..fb20226 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>
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,

From 22812469a89f89b9a1347e3a0b09a323576c5da3 Mon Sep 17 00:00:00 2001
From: Gdpao <1341331954@qq.com>
Date: Wed, 12 Aug 2020 15:35:47 +0800
Subject: [PATCH 2/5] GDPAO

---
 App.vue                |   1 -
 pageB/photo/index.vue  |   4 +-
 pageB/video/video.nvue | 161 ++++++++++++++++++++++++++++++++---------
 pages/index/index.vue  |  20 ++---
 4 files changed, 136 insertions(+), 50 deletions(-)

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/pageB/photo/index.vue b/pageB/photo/index.vue
index fd55862..bff54e2 100644
--- a/pageB/photo/index.vue
+++ b/pageB/photo/index.vue
@@ -531,9 +531,11 @@ export default {
                     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) {
                         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);
                     }
diff --git a/pageB/video/video.nvue b/pageB/video/video.nvue
index aa0ae33..dd229cb 100644
--- a/pageB/video/video.nvue
+++ b/pageB/video/video.nvue
@@ -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" 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,12 @@
                     </loading>
                 </scroller>
             </cover-view>
+            <!-- 评论框 -->
+            <cover-view class="edit-box" v-if="is_edit">
+                <input class="edit-input" type="text" value="" :focus="is_focus" :placeholder="edit_text" placeholder-class="placeholder-class"
+                    v-model="send_value" />
+                <text class="btn-send" @click="sendComment">发送</text>
+            </cover-view>
             <!-- 购物车 -->
             <cover-view class="cart-box" v-if="cart_type">
                 <view class="cart-title">
@@ -89,7 +96,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>
@@ -119,10 +126,19 @@
                 fixTop: 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 +186,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 +234,21 @@
                         pid: this.pid,
                         reply_id: this.reply_id,
                     },
+                    header: {
+                        Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+                    },
                     success: (res) => {
                         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 {
                             uni.showToast({
                                 title: res.data.message,
@@ -288,6 +315,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 +326,33 @@
                     // this.is_play = true;
                 }
             },
+            // 打开评论输入
+            openKeyInput(data,index) {
+            	console.log(this.is_focus);
+            	this.is_edit = true;
+                setTimeout(() => {
+                    this.is_focus = true;
+                }, 200)
+                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;
+                console.log(111);
+            },
             // 关闭评论
             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 +370,7 @@
             // 跳转
             goGoodInfo(id) {
                 uni.navigateTo({
-                	url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
+                    url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
                 })
             },
             // stop
@@ -376,44 +430,47 @@
         border-radius: 10rpx;
         background-color: rgba(255, 255, 255, .6);
     }
-    
+
     .good-one {
-        position: absolute;
-        bottom: 300rpx;
-        right: 100rpx;
-        width: 450rpx;
+        position: fixed;
+        bottom: 260rpx;
+        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 +488,7 @@
         left: 0;
         width: 750rpx;
         height: 700rpx;
+        padding-bottom: 50rpx;
         margin-bottom: 88rpx;
         background-color: #fff;
     }
@@ -529,6 +587,30 @@
         color: #333;
     }
 
+    .edit-box {
+        /* #ifdef H5 */
+        display: flex;
+        /* #endif */
+        z-index: 10000;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        width: 750rpx;
+        height: 88rpx;
+        padding: 0 20rpx;
+        background-color: #fff;
+    }
+
+    .edit-input {
+        width: 600rpx;
+        height: 88rpx;
+        font-size: 24rpx;
+        color: #333;
+    }
+
     .cart-box {
         z-index: 99;
         position: fixed;
@@ -549,33 +631,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 +708,6 @@
     }
 
     .label {
-        lines: 3;
         width: 100rpx;
         height: 40rpx;
         padding: 4rpx 10rpx;
@@ -632,6 +715,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 +739,9 @@
         height: 30rpx;
         color: #999;
     }
+
+    .placeholder-class {
+        font-size: 13px;
+        color: #666;
+    }
 </style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 257bdca..075019f 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>
@@ -98,11 +98,7 @@
 		width: 750rpx;
 		display: flex;
 		flex-direction: column;
-		height: 100vh;
-        /* #ifdef APP-PLUS */
-        padding-bottom: 88rpx;
-        /* #endif */
-        overflow: hidden;
+        height: 100vh;
 
 		.top {
             z-index: 10000;
@@ -135,9 +131,8 @@
 
 		.card {
 			width: 100%;
-			height: 100%;
-            margin-top: 88rpx;
-            // pointer-events: none;
+			height: calc(100vh + 500rpx);
+            padding-top: 88rpx;
 
 			.box {
 				width: 100%;
@@ -147,17 +142,18 @@
 
 			.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%;

From 3b5515d317f8a4646e9756b2c23def1293ab802b Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Wed, 12 Aug 2020 16:01:43 +0800
Subject: [PATCH 3/5] fixing bug add address 8.12

---
 components/mine/address-active/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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,

From c03fff99e07168172124f669459e0c09929d9637 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Wed, 12 Aug 2020 18:38:14 +0800
Subject: [PATCH 4/5] fixing bug 8.12

---
 common/api/user.js            |  4 ++--
 components/comment/index.vue  |  2 +-
 components/shop/list/item.vue |  2 +-
 pageB/sdetails/index.vue      |  8 ++++----
 pageE/mine/MineConcerns.vue   | 11 ++++++-----
 pageE/order/Details.vue       |  6 ++++--
 pageE/order/RefundOrder.vue   |  1 +
 pageE/tool/MineHistory.vue    | 14 +++++++++-----
 pageE/tool/SendWash.vue       | 33 ++++++++++++++++++---------------
 9 files changed, 46 insertions(+), 35 deletions(-)

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/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/sdetails/index.vue b/pageB/sdetails/index.vue
index fb20226..aa62571 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -488,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;
@@ -517,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/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;
 					}
 				}
 			}

From 6d4d8c567518e8521e6236cfebfcb97915520905 Mon Sep 17 00:00:00 2001
From: Gdpao <1341331954@qq.com>
Date: Wed, 12 Aug 2020 22:00:01 +0800
Subject: [PATCH 5/5] gdpaoup

---
 pageB/photo/index.vue  |   33 +-
 pageB/video/video.nvue |   71 ++-
 pages/index/index.vue  | 1014 ++++++++++++++++++++--------------------
 pages/mine/index.vue   |   50 +-
 pages/zhibo/index.nvue |    6 +-
 5 files changed, 609 insertions(+), 565 deletions(-)

diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue
index bff54e2..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,7 +536,7 @@ 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;
@@ -533,9 +544,11 @@ export default {
 					this.is_edit = false;
                     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);
-                        console.log(this.allList,111);
+                        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);
                     }
@@ -546,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;
                 }
             })
@@ -585,7 +598,7 @@ export default {
 				delta: 1
 			})
 		},
-		focus() {
+		focus(e) {
 			setTimeout(function(){
 				uni.showSoftKeybord;
 			}, 200)
diff --git a/pageB/video/video.nvue b/pageB/video/video.nvue
index dd229cb..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,7 +29,7 @@
             </view>
         </cover-view>
         <!-- 单个商品 -->
-        <cover-view class="good-one" v-if="cart_len == 1 && cart_type">
+        <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">
@@ -75,10 +75,13 @@
                 </scroller>
             </cover-view>
             <!-- 评论框 -->
-            <cover-view class="edit-box" v-if="is_edit">
-                <input class="edit-input" type="text" value="" :focus="is_focus" :placeholder="edit_text" placeholder-class="placeholder-class"
-                    v-model="send_value" />
-                <text class="btn-send" @click="sendComment">发送</text>
+            <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">
@@ -124,6 +127,7 @@
             return {
                 videoSize: {},
                 fixTop: 0,
+                editTop: 0,
                 list: {},
                 labelLen: [],
                 cart_len: 0, // 购物车个数
@@ -238,6 +242,7 @@
                         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;
@@ -249,6 +254,11 @@
                                 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,
@@ -327,12 +337,21 @@
                 }
             },
             // 打开评论输入
-            openKeyInput(data,index) {
-            	console.log(this.is_focus);
-            	this.is_edit = true;
+            openKeyInput(data, index) {
+                let me = this;
+                this.is_focus = true;
                 setTimeout(() => {
-                    this.is_focus = true;
-                }, 200)
+                    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;
@@ -347,7 +366,6 @@
             },
             blue() {
                 this.is_focus = false;
-                console.log(111);
             },
             // 关闭评论
             closeComment() {
@@ -387,6 +405,10 @@
 </script>
 
 <style>
+    .container {
+        position: relative;
+    }
+
     /* 关闭 */
     .close {
         position: fixed;
@@ -433,7 +455,6 @@
 
     .good-one {
         position: fixed;
-        bottom: 260rpx;
         right: 160rpx;
         width: 420rpx;
         padding: 20rpx;
@@ -576,8 +597,8 @@
     }
 
     .btn-send {
-        font-size: 30rpx;
-        color: #303133;
+        font-size: 28rpx;
+        color: #666;
     }
 
     .close-down {
@@ -588,25 +609,33 @@
     }
 
     .edit-box {
-        /* #ifdef H5 */
-        display: flex;
-        /* #endif */
-        z-index: 10000;
+        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;
-        height: 88rpx;
         padding: 0 20rpx;
+        line-height: 80rpx;
         background-color: #fff;
     }
 
     .edit-input {
         width: 600rpx;
-        height: 88rpx;
+        height: 80rpx;
+        padding: 0 10rpx;
         font-size: 24rpx;
         color: #333;
     }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 421ce3e..ebe81d0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,507 +1,507 @@
-<template>
-	<view>
-		<view class="status_bar"></view>
-		<view class="index">
-			<view class="top">
-				<view class="sosuo" @click="goSearch">
-                    <u-icon name="search" color="#555" size="34rpx"></u-icon>
-                </view>
-				<view class="tabs">
-					<u-tabs :is-scroll="false" bar-width="70" ref="tabs" :list="list" :current="num" :bar-style="{
-                    'background-color':'#FF780F',
-                    'bottom':'10rpx'
-                }"
-					 inactive-color="#333" :active-item-style="{
-                    'color':'#333'
-                }" :bold="false"
-					 @change="dianji($event)"></u-tabs>
-				</view>
-				<view class="sosuo"></view>
-			</view>
-			<swiper class="card" @change="dianji" :current="num">
-				<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">
-							<!-- <indexad style="width:690rpx"></indexad> -->
-							<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper>
-							<view class="list">
-								<view>
-									<videoItem v-for="(item,id) in articleList.filter((_, index) => !(index&1))" :key="id" :item="item"
-									 @updateList="updateList"></videoItem>
-								</view>
-								<view style="margin-left:20rpx">
-									<videoItem v-for="(item,id) in articleList.filter((_, index) => index&1)" :key="id" :item="item"
-									 @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" />
-						</view>
-					</scroll-view>
-				</swiper-item>
-				<swiper-item>
-					<scroll-view style="width:100%;height:100%" scroll-y="true">
-						<view class="box">
-							<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
-							<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"></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"></zhiboItem>
-								</view>
-							</view>
-						</view>
-					</scroll-view>
-				</swiper-item>
-				<swiper-item>
-					<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="followBotton" lower-threshold="200">
-						<view class="box">
-							<view class="tuijian">
-								<view class="title" @click="toSearchPage">
-									<view class="left">
-										<view></view>
-										<text>推荐达人</text>
-									</view>
-									<u-icon name="arrow-right" color="#666" size="28"></u-icon>
-								</view>
-								<view class="tuijianlist">
-									<!-- <darenItem style="margin-right:23rpx"></darenItem>
-                                <darenItem style="margin-right:23rpx"></darenItem> -->
-									<darenItem v-for="item in recommendList.slice(0,3)" :key="item.id" :info="item" v-on:pChangeType="changeType"></darenItem>
-								</view>
-							</view>
-							<view class="rec-list">
-								<view class="rec-box">
-                                    <!-- {{ fansList }} -->
-                                    <view class="item">
-                                        <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" />
-								</view>
-							</view>
-						</view>
-					</scroll-view>
-				</swiper-item>
-			</swiper>
-		</view>
-	</view>
-
-</template>
-<style lang="scss" scoped>
-    page {
-        background-color: #fff;
-    }
-	.index {
-		width: 750rpx;
-		display: flex;
-		flex-direction: column;
-        height: 100vh;
-
-		.top {
-            z-index: 10000;
-            position: fixed;
-            top: var(--status-bar-height);
-            left: 0;
-			display: flex;
-			flex-shrink: 0;
-			align-items: center;
-			justify-content: space-between;
-			width: 100%;
-			height: 88rpx;
-			padding: 0 30rpx;
-            background-color: #fff;
-
-			.sosuo {
-				width: 32rpx;
-				height: 32rpx;
-			}
-
-			.tabs {
-				width: 334rpx;
-                // pointer-events: none;
-                
-				/deep/ .u-tab-item {
-					font-weight: bold;
-				}
-			}
-		}
-
-		.card {
-			width: 100%;
-			height: calc(100vh + 500rpx);
-            padding-top: 88rpx;
-
-			.box {
-				width: 100%;
-                height: 100%;
-				padding: 0 30rpx;
-			}
-
-			.list {
-				display: flex;
-                // height: 100vh;
-                // padding-bottom: 100rpx;
-                // margin-bottom: 50rpx;
-			}
-		}
-
-		.tuijian {
-			width: 750rpx;
-			padding: 30rpx;
-			margin-left: -30rpx;
-			height: 400rpx;
-			background-color: #ececec;
-
-			.title {
-				width: 100%;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-
-				.left {
-					display: flex;
-					align-items: center;
-
-					>view {
-						width: 6rpx;
-						height: 30rpx;
-						background-color: #FF780F;
-					}
-
-					>text {
-						font-size: 30rpx;
-						color: 30rpx;
-						margin-left: 14rpx;
-					}
-				}
-
-				.right {
-					width: 14rpx;
-					height: 24rpx;
-				}
-			}
-
-			.tuijianlist {
-				width: 100%;
-				height: 282rpx;
-				margin-top: 30rpx;
-				display: flex;
-
-				>view:not(:last-child) {
-					margin-right: 23rpx;
-				}
-			}
-		}
-        .rec-list {
-            width: 100%;
-            .rec-box {
-                width: 100%;
-                .item {
-                    display: flex;
-                    flex-wrap: wrap;
-                    justify-content: space-between;
-                }
-            }
-        }
-	}
-    .no-data {
-        margin: 200rpx auto 0;
-        text-align: center;
-    }
-	
-    
-</style>
-<script>
-    import { mapState } from 'vuex'
-	import videoItem from "@/components/index/video-item/index"
-	import zhiboItem from "@/components/index/zhibo-item/index"
-	import indexad from "@/components/index/ad/index"
-	import darenItem from "@/components/index/daren-item/index"
-
-	export default {
-		name: "index",
-        computed: {
-            ...mapState(["hasLogin"])
-        },
-		data() {
-			return {
-				list: [{
-					name: '发现'
-				}, {
-					name: '直播'
-				}, {
-					name: '关注'
-				}],
-				num: 0,
-				page: 1, // 0即第一页
-                follow_page: 0, //
-				articleList: [],
-				recommendList: [], // 推荐达人
-				indexImageSwiper: [],
-				zhiboImageSwiper: [],
-				tabLiveLists: [],
-                fansList: [], // 关注的发现列表
-                status: 'loadmore',
-                status_1: 'loadmore',
-                iconType: 'circle',
-                loadText: {
-                    loadmore: '轻轻上拉',
-                    loading: '努力加载中',
-                    nomore: '实在没有了'
-				},
-			}
-		},
-		components: {
-			videoItem,
-			zhiboItem,
-			indexad,
-			darenItem
-		},
-		onShow() {
-            this.page = 1;
-            if (this.page != 1) {
-                this.articleList = [];
-            }
-            this.getArticlelist();
-            // if (this.hasLogin) {
-            //     this.isNewmembervoucher();
-            // }
-		},
-		onLoad(){
-            this.getSwiper();
-            // 优惠券
-			if(this.$store.state.hasLogin){
-				this.isNewmembervoucher();
-				const user = uni.getStorageSync('user_info');
-				// console.log(user)
-				this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
-				this.imService.connectIM()
-				let that = this
-				setTimeout(function(){
-					that.imService.disconnect()
-					// console.log("guanbi")
-				},1000)
-				setTimeout(function(){
-					// console.log("lianjie")
-					that.imService.connectIM()
-				},2000)
-			}
-		},
-		onPullDownRefresh() {
-            this.page = 1;
-            this.getArticlelist();
-			// this.getManicureList({ load: 'reload' });
-		},
-		methods: {
-            moveHandle() {
-                return;
-            },
-            // 直播列表
-			tabLiveList() {
-				this.$u.api.tabLiveList().then((res) => {
-					console.log(res)
-					this.tabLiveLists = res.data;
-				})
-			},
-            // 轮播图
-			getSwiper() {
-				this.$u.api.getIndexSwiper().then(res => {
-					if (res.errCode == 0) {
-						this.indexImageSwiper = res.data;
-					}
-				})
-			},
-            // 关注
-			changeType(member_id) {
-				// console.log(member_id);
-				// this.$emit("pChangeType");
-				this.$u.api.attentionMember({
-					member_id: member_id
-				}).then((res) => {
-                    this.follow_page = 0;
-					this.getRecommendList(); // 关注列表
-                    this.getFollowList(); // 刷新发现的列表
-				})
-			},
-			getZhiBoSwiper() {
-				this.$u.api.getZhiBoSwiper().then(res => {
-					if (res.errCode == 0) {
-						this.zhiboImageSwiper = res.data;
-					}
-				})
-			},
-            // 切换导航
-			dianji(a) {
-                // console.log(a);
-                if (a.type == "change") {
-                    this.num = a.detail.current
-                } else {
-                    this.num = a;
-                }
-                // console.log(this.num);
-                // 状态请求
-                if (a.type == "change") { // 强制请求一次
-                    if (this.num == 0) {
-                        this.page = 1;
-                        this.articleList = [];
-                        this.status = "loadmore";
-                        this.getArticlelist();
-                        this.getSwiper();
-                    } else if (this.num == 1) {
-                        this.getZhiBoSwiper(); // 直播轮播
-                        this.tabLiveList();
-                    } else if (this.num == 2) {
-                        this.follow_page = 0;
-                        this.fansList = [];
-                        if (this.hasLogin) {
-                            this.getFollowList(); // 关注列表
-                        }
-                        this.getRecommendList(); // 推荐达人
-                    }
-                }
-			},
-            // 发现别表
-			getArticlelist() {
-                uni.showLoading({
-                    title: "loading..."
-                })
-				this.$u.api.getArticlelist({
-					page: this.page,
-					is_video_img: 0, // 查询视频1 图文2 都查0
-				}).then(res => {
-                    // uni.stopPullDownRefresh();
-                    this.status = "loading";
-                    if (res.errCode == 0) {
-                        uni.hideLoading();
-                        if (this.page == 1) {
-                        	this.articleList = res.data.list;
-                            this.status = "loadmore";
-                        } else if (res.data.length == 0 && this.page > 1) {
-                            this.status = "nomore";
-                        } else {
-                            this.articleList = this.articleList.concat(res.data.list);
-                        }
-                        if (res.data.length == 0 && this.page > 1) {
-                            console.log(111);
-                        } else {
-                            this.page++;
-                        }
-                    } else {
-                        this.status = "nomore"
-                    }
-				})
-			},
-            // 屏蔽更新列表
-            updateList() {
-                this.page = 1;
-                this.getArticlelist();
-            },
-            // 发现下拉加载
-            swiperBottom(e) {
-                this.getArticlelist();
-                // console.log(e);
-            },
-            swiperTop() {
-                // uni.startPullDownRefresh();
-            },
-            // 关注下拉
-            followBotton(e) {
-                this.getFollowList();
-              // console.log(e);
-            },
-            // 达人列表
-			getRecommendList() {
-				this.$u.api.getRecommendList().then(res => {
-					console.log(res);
-					if (res.errCode == 0) {
-						this.recommendList = res.data.list;
-					}
-				})
-			},
-            // 关注发现列表
-            getFollowList() {
-                this.$u.post("article/attentionArticleList",{
-                    page: this.follow_page,
-                }).then(res => {
-                    this.status_1 = "loading";
-                    if (res.errCode == 0) {
-                        if (this.fansList.length < 4) {
-                            this.status_1 = "nomore";
-                        }
-                        // uni.stopPullDownRefresh();
-                        // console.log('37647744ghj', res)
-                        if (this.follow_page == 0) {
-                            this.fansList = res.data.list;
-                            // this.status_1 = "loadmore";
-                        } else if (res.data.list.length == 0 && this.follow_page > 0) {
-                            this.status_1 = "nomore";
-                        } else {
-                            this.fansList = this.fansList.concat(res.data.list);
-                        }
-                        this.follow_page++;
-                    } else {
-                        this.status_1 = "nomore"
-                    }
-                })
-            },
-			toSearchPage() {
-				uni.navigateTo({
-					url: '/pageB/follow/index'
-				});
-			},
-			clickFImage(index) {
-				const item = this.indexImageSwiper[index];
-				console.log(item);
-				this.activityLink({
-					type: item.url_type,
-					id: item.info_id
-				});
-			},
-			clickSImage(index) {
-				const item = this.zhiboImageSwiper[index];
-				console.log(item);
-				this.activityLink({
-					type: item.url_type,
-					id: item.info_id
-				});
-			},
-			activityLink({
-				type,
-				id
-			}) {
-                console.log(type,id);
-				if (type == 0) return false;
-				// type 1 商品详情页, 2 店铺详情页
-				const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';
-				let params = {
-					id: id
-				};
-				// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
-				if (type == 1) Object.assign(params, {
-					type: 1
-				});
-				this.$u.route({
-					url: url,
-					params: params
-				})
-			},
-            goSearch() {
-                this.$u.route("/pageB/search/index", {
-					type: 2,
-					curent:2
-				});
-			},
-			// 是否显示新人优惠券
-			isNewmembervoucher() {
-				this.$u.api.isNewmembervoucher().then(res => {
-					if(res.errCode == 0) {
-						this.$u.route('/pageB/coupon/index');
-					}
-				})
-			},
-		},
-	}
-</script>
+<template>
+	<view>
+		<view class="status_bar"></view>
+		<view class="index">
+			<view class="top">
+				<view class="sosuo" @click="goSearch">
+                    <u-icon name="search" color="#555" size="34rpx"></u-icon>
+                </view>
+				<view class="tabs">
+					<u-tabs :is-scroll="false" bar-width="70" ref="tabs" :list="list" :current="num" :bar-style="{
+                    'background-color':'#FF780F',
+                    'bottom':'10rpx'
+                }"
+					 inactive-color="#333" :active-item-style="{
+                    'color':'#333'
+                }" :bold="false"
+					 @change="dianji($event)"></u-tabs>
+				</view>
+				<view class="sosuo"></view>
+			</view>
+			<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">
+							<!-- <indexad style="width:690rpx"></indexad> -->
+							<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper>
+							<view class="list">
+								<view>
+									<videoItem v-for="(item,id) in articleList.filter((_, index) => !(index&1))" :key="id" :item="item"
+									 @updateList="updateList"></videoItem>
+								</view>
+								<view style="margin-left:20rpx">
+									<videoItem v-for="(item,id) in articleList.filter((_, index) => index&1)" :key="id" :item="item"
+									 @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" />
+						</view>
+					</scroll-view>
+				</swiper-item>
+				<swiper-item>
+					<scroll-view style="width:100%;height:100%" scroll-y="true">
+						<view class="box">
+							<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
+							<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"></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"></zhiboItem>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</swiper-item>
+				<swiper-item>
+					<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="followBotton" lower-threshold="200">
+						<view class="box">
+							<view class="tuijian">
+								<view class="title" @click="toSearchPage">
+									<view class="left">
+										<view></view>
+										<text>推荐达人</text>
+									</view>
+									<u-icon name="arrow-right" color="#666" size="28"></u-icon>
+								</view>
+								<view class="tuijianlist">
+									<!-- <darenItem style="margin-right:23rpx"></darenItem>
+                                <darenItem style="margin-right:23rpx"></darenItem> -->
+									<darenItem v-for="item in recommendList.slice(0,3)" :key="item.id" :info="item" v-on:pChangeType="changeType"></darenItem>
+								</view>
+							</view>
+							<view class="rec-list">
+								<view class="rec-box">
+                                    <!-- {{ fansList }} -->
+                                    <view class="item">
+                                        <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" :load-text="loadText" />
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</swiper-item>
+			</swiper>
+		</view>
+	</view>
+
+</template>
+<style lang="scss" scoped>
+    page {
+        background-color: #fff;
+    }
+	.index {
+		width: 750rpx;
+		display: flex;
+		flex-direction: column;
+
+		.top {
+            z-index: 10000;
+            position: fixed;
+            top: var(--status-bar-height);
+            left: 0;
+			display: flex;
+			flex-shrink: 0;
+			align-items: center;
+			justify-content: space-between;
+			width: 100%;
+			height: 88rpx;
+			padding: 0 30rpx;
+            background-color: #fff;
+
+			.sosuo {
+				width: 32rpx;
+				height: 32rpx;
+			}
+
+			.tabs {
+				width: 334rpx;
+                // pointer-events: none;
+                
+				/deep/ .u-tab-item {
+					font-weight: bold;
+				}
+			}
+		}
+
+		.card {
+			width: 100%;
+			height: calc(100vh - 150rpx);
+            margin-top: 100rpx;
+            // padding-top: 100rpx;
+
+			.box {
+				width: 100%;
+                height: 100%;
+				padding: 0 30rpx 0;
+                // margin-top: 30rpx;
+			}
+
+			.list {
+				display: flex;
+                // height: 100vh;
+                // padding-bottom: 100rpx;
+                // margin-bottom: 50rpx;
+			}
+		}
+
+		.tuijian {
+			width: 750rpx;
+			padding: 30rpx;
+			margin-left: -30rpx;
+			height: 400rpx;
+			background-color: #ececec;
+
+			.title {
+				width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.left {
+					display: flex;
+					align-items: center;
+
+					>view {
+						width: 6rpx;
+						height: 30rpx;
+						background-color: #FF780F;
+					}
+
+					>text {
+						font-size: 30rpx;
+						color: 30rpx;
+						margin-left: 14rpx;
+					}
+				}
+
+				.right {
+					width: 14rpx;
+					height: 24rpx;
+				}
+			}
+
+			.tuijianlist {
+				width: 100%;
+				height: 282rpx;
+				margin-top: 30rpx;
+				display: flex;
+
+				>view:not(:last-child) {
+					margin-right: 23rpx;
+				}
+			}
+		}
+        .rec-list {
+            width: 100%;
+            .rec-box {
+                width: 100%;
+                .item {
+                    display: flex;
+                    flex-wrap: wrap;
+                    justify-content: space-between;
+                }
+            }
+        }
+	}
+    .no-data {
+        margin: 200rpx auto 0;
+        text-align: center;
+    }
+	
+    
+</style>
+<script>
+    import { mapState } from 'vuex'
+	import videoItem from "@/components/index/video-item/index"
+	import zhiboItem from "@/components/index/zhibo-item/index"
+	import indexad from "@/components/index/ad/index"
+	import darenItem from "@/components/index/daren-item/index"
+
+	export default {
+		name: "index",
+        computed: {
+            ...mapState(["hasLogin"])
+        },
+		data() {
+			return {
+				list: [{
+					name: '发现'
+				}, {
+					name: '直播'
+				}, {
+					name: '关注'
+				}],
+				num: 0,
+				page: 1, // 0即第一页
+                follow_page: 0, //
+				articleList: [],
+				recommendList: [], // 推荐达人
+				indexImageSwiper: [],
+				zhiboImageSwiper: [],
+				tabLiveLists: [],
+                fansList: [], // 关注的发现列表
+                status: 'loadmore',
+                status_1: 'loadmore',
+                iconType: 'circle',
+                loadText: {
+                    loadmore: '轻轻上拉',
+                    loading: '努力加载中',
+                    nomore: '实在没有了'
+				},
+			}
+		},
+		components: {
+			videoItem,
+			zhiboItem,
+			indexad,
+			darenItem
+		},
+		onShow() {
+            this.page = 1;
+            if (this.page != 1) {
+                this.articleList = [];
+            }
+            this.getArticlelist();
+            // if (this.hasLogin) {
+            //     this.isNewmembervoucher();
+            // }
+		},
+		onLoad(){
+            this.getSwiper();
+            // 优惠券
+			if(this.$store.state.hasLogin){
+				this.isNewmembervoucher();
+				const user = uni.getStorageSync('user_info');
+				// console.log(user)
+				this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
+				this.imService.connectIM()
+				let that = this
+				setTimeout(function(){
+					that.imService.disconnect()
+					// console.log("guanbi")
+				},1000)
+				setTimeout(function(){
+					// console.log("lianjie")
+					that.imService.connectIM()
+				},2000)
+			}
+		},
+		onPullDownRefresh() {
+            this.page = 1;
+            this.getArticlelist();
+			// this.getManicureList({ load: 'reload' });
+		},
+		methods: {
+            moveHandle() {
+                return;
+            },
+            // 直播列表
+			tabLiveList() {
+				this.$u.api.tabLiveList().then((res) => {
+					console.log(res)
+					this.tabLiveLists = res.data;
+				})
+			},
+            // 轮播图
+			getSwiper() {
+				this.$u.api.getIndexSwiper().then(res => {
+					if (res.errCode == 0) {
+						this.indexImageSwiper = res.data;
+					}
+				})
+			},
+            // 关注
+			changeType(member_id) {
+				// console.log(member_id);
+				// this.$emit("pChangeType");
+				this.$u.api.attentionMember({
+					member_id: member_id
+				}).then((res) => {
+                    this.follow_page = 0;
+					this.getRecommendList(); // 关注列表
+                    this.getFollowList(); // 刷新发现的列表
+				})
+			},
+			getZhiBoSwiper() {
+				this.$u.api.getZhiBoSwiper().then(res => {
+					if (res.errCode == 0) {
+						this.zhiboImageSwiper = res.data;
+					}
+				})
+			},
+            // 切换导航
+			dianji(a) {
+                // console.log(a);
+                if (a.type == "change") {
+                    this.num = a.detail.current
+                } else {
+                    this.num = a;
+                }
+                // console.log(this.num);
+                // 状态请求
+                if (a.type == "change") { // 强制请求一次
+                    if (this.num == 0) {
+                        this.page = 1;
+                        this.articleList = [];
+                        this.status = "loadmore";
+                        this.getArticlelist();
+                        this.getSwiper();
+                    } else if (this.num == 1) {
+                        this.getZhiBoSwiper(); // 直播轮播
+                        this.tabLiveList();
+                    } else if (this.num == 2) {
+                        this.follow_page = 0;
+                        this.fansList = [];
+                        if (this.hasLogin) {
+                            this.getFollowList(); // 关注列表
+                        }
+                        this.getRecommendList(); // 推荐达人
+                    }
+                }
+			},
+            // 发现别表
+			getArticlelist() {
+                uni.showLoading({
+                    title: "loading..."
+                })
+				this.$u.api.getArticlelist({
+					page: this.page,
+					is_video_img: 0, // 查询视频1 图文2 都查0
+				}).then(res => {
+                    // uni.stopPullDownRefresh();
+                    this.status = "loading";
+                    if (res.errCode == 0) {
+                        uni.hideLoading();
+                        if (this.page == 1) {
+                        	this.articleList = res.data.list;
+                            this.status = "loadmore";
+                        } else if (res.data.length == 0 && this.page > 1) {
+                            this.status = "nomore";
+                        } else {
+                            this.articleList = this.articleList.concat(res.data.list);
+                        }
+                        if (res.data.length == 0 && this.page > 1) {
+                        } else {
+                            this.page++;
+                        }
+                    } else {
+                        this.status = "nomore"
+                    }
+				})
+			},
+            // 屏蔽更新列表
+            updateList() {
+                this.page = 1;
+                this.getArticlelist();
+            },
+            // 发现下拉加载
+            swiperBottom(e) {
+                this.getArticlelist();
+                // console.log(e);
+            },
+            swiperTop() {
+                // uni.startPullDownRefresh();
+            },
+            // 关注下拉
+            followBotton(e) {
+                this.getFollowList();
+              // console.log(e);
+            },
+            // 达人列表
+			getRecommendList() {
+				this.$u.api.getRecommendList().then(res => {
+					console.log(res);
+					if (res.errCode == 0) {
+						this.recommendList = res.data.list;
+					}
+				})
+			},
+            // 关注发现列表
+            getFollowList() {
+                this.$u.post("article/attentionArticleList",{
+                    page: this.follow_page,
+                }).then(res => {
+                    this.status_1 = "loading";
+                    if (res.errCode == 0) {
+                        if (this.fansList.length < 4) {
+                            this.status_1 = "nomore";
+                        }
+                        // uni.stopPullDownRefresh();
+                        // console.log('37647744ghj', res)
+                        if (this.follow_page == 0) {
+                            this.fansList = res.data.list;
+                            // this.status_1 = "loadmore";
+                        } else if (res.data.list.length == 0 && this.follow_page > 0) {
+                            this.status_1 = "nomore";
+                        } else {
+                            this.fansList = this.fansList.concat(res.data.list);
+                        }
+                        this.follow_page++;
+                    } else {
+                        this.status_1 = "nomore"
+                    }
+                })
+            },
+			toSearchPage() {
+				uni.navigateTo({
+					url: '/pageB/follow/index'
+				});
+			},
+			clickFImage(index) {
+				const item = this.indexImageSwiper[index];
+				console.log(item);
+				this.activityLink({
+					type: item.url_type,
+					id: item.info_id
+				});
+			},
+			clickSImage(index) {
+				const item = this.zhiboImageSwiper[index];
+				console.log(item);
+				this.activityLink({
+					type: item.url_type,
+					id: item.info_id
+				});
+			},
+			activityLink({
+				type,
+				id
+			}) {
+                console.log(type,id);
+				if (type == 0) return false;
+				// type 1 商品详情页, 2 店铺详情页
+				const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';
+				let params = {
+					id: id
+				};
+				// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
+				if (type == 1) Object.assign(params, {
+					type: 1
+				});
+				this.$u.route({
+					url: url,
+					params: params
+				})
+			},
+            goSearch() {
+                this.$u.route("/pageB/search/index", {
+					type: 2,
+					curent:2
+				});
+			},
+			// 是否显示新人优惠券
+			isNewmembervoucher() {
+				this.$u.api.isNewmembervoucher().then(res => {
+					if(res.errCode == 0) {
+						this.$u.route('/pageB/coupon/index');
+					}
+				})
+			},
+		},
+	}
+</script>
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 f981639..cf05ced 100644
--- a/pages/zhibo/index.nvue
+++ b/pages/zhibo/index.nvue
@@ -507,7 +507,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
             }
           })