Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into cmx

优惠券弹窗不关闭
2020-08-11 14:20:12 +08:00 · 2020-08-11 10:45:10 +08:00
57 changed files with 547 additions and 1330 deletions
--- a/common/api/shop.js
+++ b/common/api/shop.js
@@ -202,10 +202,9 @@ export default {
 				return vm.$u.post('Spike/recommendedSpike');
 			},
 			// 秒杀详情
-			getSpikeInfo({ groupbuy_id, goods_id }) {
+			getSpikeInfo({ groupbuy_id }) {
 				return vm.$u.post('Spike/spikeInfo', {
-					groupbuy_id: groupbuy_id,
-					goods_id: goods_id,
+					groupbuy_id: groupbuy_id
 				});
 			},
 			// 秒杀列表
@@ -222,23 +221,13 @@ export default {
 				});
 			},
 			// 拼团商品详情
-			getPinTuanDetails({ pintuan_id, goods_id }) {
-				return vm.$u.post('Specialci/pintuanInfo', { 
-					pintuan_id: pintuan_id,
-					goods_id: goods_id,
-				});
+			getPinTuanDetails({ pintuan_id }) {
+				return vm.$u.post('Specialci/pintuanInfo', { pintuan_id: pintuan_id });
 			},
 			// 推荐拼团
 			getPinTuanPush() {
 				return vm.$u.post('Specialci/pintuanPush');
 			},
-			// 拼团验证
-			pintuanVerify({ pintuan_id, pintuangroup_headid }) {
-				return vm.$u.post('Specialci/pintuanVerify', {
-					pintuan_id: pintuan_id,
-					pintuangroup_headid: pintuangroup_headid,
-				});
-			},
 			// 开团/参团
 			withImmediate({ pintuan_id, pintuangroup_headid, pintuangroup_id}) {
 				return vm.$u.post('Specialci/withImmediate', {
@@ -276,8 +265,8 @@ export default {
 				});
 			},
 			// 获取直播列表
-			tabLiveList({page}){
-				return vm.$u.post('Specialci/tabLiveList',{page})
+			tabLiveList(){
+				return vm.$u.post('Specialci/tabLiveList')
 			},
 			// 商城-活动广告
 			getStoreActivity() {
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -304,8 +304,8 @@ export default {
 				return vm.$u.post('Message/informationList', { });
 			},
 			// 关注列表
-			snsfriendList({page}) {
-				return vm.$u.post('message/snsfriendList', {page});
+			snsfriendList({ }) {
+				return vm.$u.post('message/snsfriendList', { });
 			},
 			// 关注达人
 			attentionMember({ member_id }) {
@@ -408,8 +408,8 @@ export default {
 				return vm.$u.post('article/articleCollectList');
 			},
 			// 关注用户列表
-			attentionMemberList({ page = 1 } = {}) {
-				return vm.$u.post('member/attentionMemberList', { page: page });
+			attentionMemberList() {
+				return vm.$u.post('member/attentionMemberList');
 			},
        }
    }
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -47,30 +47,24 @@ const install = (Vue, vm) => {
            // 假设201为token失效，这里跳转登录
            // vm.$u.toast('您还没有登录哦，请先去登录！');
            if (res.data.data.action != "memberinfo") {
-                setTimeout(() => {
-                    // 此为uView的方法，详见路由相关文档
-                    uni.navigateTo({
-                        url: "/pageA/login/login",
-                    })
-                }, 1000)
-                // uni.showModal({
-                //     title: "温馨提示",
-                //     content: "您还未登录，请立即登录",
-                //     cancelText: "以后再说",
-                //     confirmText: "立即登录",
-                //     confirmColor: "#FF780F",
-                //     success(res) {
-                //         // console.log(res);
-                //         if (res.confirm) {
-                //             setTimeout(() => {
-                //                 // 此为uView的方法，详见路由相关文档
-                //                 vm.$u.route('/pageA/login/login')
-                //             }, 500)
-                //         }
-                //         if (res.cancel) {
-                //         }
-                //     }
-                // })
+                uni.showModal({
+                    title: "温馨提示",
+                    content: "您还未登录，请立即登录",
+                    cancelText: "以后再说",
+                    confirmText: "立即登录",
+                    confirmColor: "#FF780F",
+                    success(res) {
+                        // console.log(res);
+                        if (res.confirm) {
+                            setTimeout(() => {
+                                // 此为uView的方法，详见路由相关文档
+                                vm.$u.route('/pageA/login/login')
+                            }, 500)
+                        }
+                        if (res.cancel) {
+                        }
+                    }
+                })
            }
            return false;
        } else if (res.errCode == 1) {
--- 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.member_nickname }}</text>
+			<text class="name">{{ content.geval_frommembername }}</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">
--- a/components/index/zhibo-item/index.vue
+++ b/components/index/zhibo-item/index.vue
@@ -3,12 +3,12 @@
        <image class="head" :src="image"></image>
        <view class="user">
            <view class="name">
-                <image :src="item.member_avatar"></image>
+                <image></image>
                <text class="u-line-1" style="width:130rpx">{{name}}</text>
            </view>
-            <view class="pingbi" @click.stop="articleAddShield">
-                <image src="/static/image/common/7.png"></image>
-                <text>屏蔽用户</text>
+            <view class="pingbi">
+                <image></image>
+                <text>1屏蔽用户</text>
            </view>
        </view>
    </view>    
@@ -81,20 +81,8 @@ export default {
                   rid:this.rid
               } 
            })
-        },
-        articleAddShield() {
-            console.log(this.item)
-			this.$u.api.articleAddShield({
-				member_id: this.item.user_id,
-			}).then(res => {
-				// console.log(res)
-				if(res.errCode == 0) {
-                    this.$u.toast(res.message);
-					this.$emit("updateList");
-				}
-			})
-		},
+        }
    },
-    props:['name','image','url','zid','rid','item']
+    props:['name','image','url','zid','rid']
 }
 </script>
--- a/components/mine/address-active/index.vue
+++ b/components/mine/address-active/index.vue
@@ -80,6 +80,7 @@ export default {
 		//　判断是不是编辑页面 调用接口
 		confirmBtn() {
 			if(!this.debounce) return;
+			this.debounce = false;
 			this.info ? this.editAddress() : this.addAddress();
 		},
 		// chooseArea() {
@@ -118,7 +119,6 @@ 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,7 +144,6 @@ 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,
--- a/components/mine/order-item/index.vue
+++ b/components/mine/order-item/index.vue
@@ -15,7 +15,7 @@
 					<view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40 && goods.goods_spec">
 						<text v-for="(spec, index) in goods.goods_spec" :key="index">{{ spec + ';' }}</text>
 					</view>
-					<!-- <view class="goods-time u-line-1" v-if="order.view_type == 1">结束时间：{{ order.end_time | date('yyyy-mm-dd hh:MM') }}</view> -->
+					<view class="goods-time u-line-1" v-if="order.view_type == 1">结束时间：{{ order.end_time | date('yyyy-mm-dd hh:MM') }}</view>
 					<view class="goods-price u-line-1" v-if="order.order_state == 20 || order.order_state == 40">总价：￥{{ goods.goods_price }}，实付款￥{{ goods.goods_pay_price }}</view>
 					<view class="goods-date" v-if="order.order_state == 20 || order.order_state == 40">
 						<image src="@/pageE/static/mine/26.png"></image>
@@ -24,16 +24,14 @@
 				</view>
 			</view>
 		</view>
-		<view class="order-btn" v-if="[1, 2, 3, 4, 8].indexOf(order.view_type) >= 0">
-			 <!-- || order.view_type == 2 -->
-			<view class="cancel" v-if="(order.view_type == 3) && order.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
+		<view class="order-btn" v-if="[1, 2, 3, 4, 8, 9].indexOf(order.view_type) >= 0">
+			<view class="cancel" v-if="(order.view_type == 3 || order.view_type == 2) && order.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
 			<view class="cancel" v-if="order.view_type == 3" @click="toOtherPage('Logistics')">查看物流</view>
 			<view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view>
 			<view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>
 			<view class="cancel" v-if="order.view_type == 1" @click="cancelOrder">取消支付</view>
-			<!-- <view class="cancel" v-if="order.view_type == 9" @click="cancelOrder">取消订单</view> -->
-			 <!-- || order.view_type == 9 -->
-			<view class="payment" v-if="order.view_type == 1" @click="payNow(order.pay_sn, order.order_amount,order.order_id)">立即支付</view>
+			<view class="cancel" v-if="order.view_type == 9" @click="cancelOrder">取消订单</view>
+			<view class="payment" v-if="order.view_type == 1 || order.view_type == 9" @click="payNow(order.pay_sn, order.order_amount,order.order_id)">立即支付</view>
 			<view class="service" v-if="order.view_type == 8">联系官方客服</view>
 			<view class="submit" v-if="order.view_type == 8">提交官方审核</view>
 		</view>
@@ -81,9 +79,6 @@ export default {
 				case 9:
 					state = '拼团中';
 					break;
-				case 10:
-					state = '已取消';
-					break;
 				default:
 					break;
 			}
--- a/components/shop/list/index.vue
+++ b/components/shop/list/index.vue
@@ -14,7 +14,7 @@
 			</swiper-item>
 		</swiper>
 		<!-- 加载更多 -->
-		<u-loadmore class="load-size" :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" @loadmore="loadMore"></u-loadmore>
+		<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" @loadmore="loadMore"></u-loadmore>
    </view>
 </template>
 <script>
--- 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,
 				}
 			})
 		}
--- a/components/shop/special-shop/index.vue
+++ b/components/shop/special-shop/index.vue
@@ -5,8 +5,8 @@
 			<view class="right">
 				<view class="name u-line-1" @click="spikeGoods">{{ item.goods_name }}</view>
 				<view class="price">
-					<view class="groupbuy-price">￥{{ item.groupbuy_price }}</view>
-					<view class="goods-price">￥{{ item.goods_price }}</view>
+					<view class="groupbuy-price">{{ item.groupbuy_price }}</view>
+					<view class="goods-price">{{ item.goods_price }}</view>
 				</view>
 				<view class="buy">
 					<view class="num">剩余{{ item.inventory }}件</view>
@@ -19,7 +19,7 @@
 			<view class="right">
 				<view class="name u-line-1" @click="toDetailsPage">{{ item.pintuan_goods_name }}</view>
 				<view class="price group">
-					<view class="groupbuy-price">￥{{ item.pintuan_goods_price }}</view>
+					<view class="groupbuy-price">{{ item.pintuan_goods_price }}</view>
 					<view class="btn" @click="toDetailsPage">立即拼团</view>
 				</view>
 			</view>
--- a/pageB/components/sdetails/guige.vue
+++ b/pageB/components/sdetails/guige.vue
@@ -57,7 +57,7 @@ export default {
    props:['item','title'],
    watch:{
        select(){
-            // console.log(this.select)
+            console.log(this.select)
            this.$emit("sel", this.select);
        }
    }
--- a/pageB/components/userinfo/index.vue
+++ b/pageB/components/userinfo/index.vue
@@ -1,9 +1,8 @@
 <template>
-    <view class="userinfo" @click="stopClick()">
+    <view class="userinfo">
        <view class="userhead">
            <image class="avatar" :src="item.member_avatar"></image>
-            <!-- <text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text> -->
-            <image class="follow" :src=" !is_follow ? '../../static/image/userinfo/follow.png' : '../../static/image/userinfo/followed.png' " mode="" @click="following(item.member_id)"></image>
+            <text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text>
        </view>
        <!-- 点赞 -->
        <view class="operat zan">
@@ -63,10 +62,16 @@
    .follow {
        z-index: 100;
        position: absolute;
-        top: 80rpx;
-        left: 30rpx;
-        width: 50rpx;
-        height: 50rpx;
+        top: 90rpx;
+        left: 40rpx;
+        width: 36rpx;
+        height: 36rpx;
+        text-align: center;
+        line-height: 36rpx;
+        font-size: 34rpx;
+        border-radius: 50%;
+        color: #fff;
+        background-color: #FF780F;
    }

    .operat {
@@ -75,7 +80,6 @@
        /* #endif */
        align-items: center;
        flex-direction: column;
-        padding: 0 30rpx;
    }

    .operat-span {
@@ -106,7 +110,7 @@
        },
        watch: {
            list(newValue, old) {
-                // console.log(newValue);
+                console.log(newValue);
                this.item = newValue || {};
                this.is_follow = this.list.is_attention || false;
                this.is_like = this.list.is_like || false;
@@ -148,11 +152,6 @@
                                title: res.data.message,
                                icon: "none"
                            })
-                        } else if (res.data.errCode == 401) {
-                            uni.showToast({
-                                title: "您还没有登录，请先登录！",
-                                icon: "none"
-                            })
                        }
                    }
                })
@@ -175,11 +174,6 @@
                            // console.log(res);
                            this.is_like = !this.is_like;
                            this.list.like_num = res.data.data.num;
-                        } else if (res.data.errCode == 401) {
-                            uni.showToast({
-                                title: "您还没有登录，请先登录！",
-                                icon: "none"
-                            })
                        } else {
                            uni.showToast({
                                title: res.data.message,
@@ -206,11 +200,6 @@
                            console.log(res.data.num);
                            this.is_collect = !this.is_collect;
                            this.list.collect_num = res.data.data.num;
-                        } else if (res.data.errCode == 401) {
-                            uni.showToast({
-                                title: "您还没有登录，请先登录！",
-                                icon: "none"
-                            })
                        } else {
                            uni.showToast({
                                title: res.data.message,
@@ -238,9 +227,6 @@
                    cart: this.is_cart
                });
            },
-            // 冒泡
-            stopClick() {
-            }
        }
    }
 </script>
--- a/pageB/coupon/details.vue
+++ b/pageB/coupon/details.vue
@@ -56,8 +56,17 @@ export default {
 	},
 	onLoad(option) {
 		this.price = option.price;
+		// this.isNewmembervoucher();
 	},
 	methods: {
+		// 是否显示新人优惠券
+		isNewmembervoucher() {
+			this.$u.api.isNewmembervoucher().then(res => {
+				if(res.errCode == 0) {
+					this.price = res.data.price;
+				}
+			})
+		},
 		exchangeCoupon() {
 			this.$u.api.getCoupon({ id: 1 }).then(res => {
 				this.$u.toast(res.message);
--- a/pageB/coupon/index.vue
+++ b/pageB/coupon/index.vue
@@ -1,89 +0,0 @@
-<template>
-	<u-popup v-model="showCoupon" mode="center" class="u-coupon-popup">
-		<view class="coupon">
-			<view class="price">{{ newMemberCoupon.price }}</view>
-			<image src="/static/image/common/30.png" class="coupon-image" @click="viewCoupon"></image>
-			<image src="/static/image/common/24.png" class="close-image" @click="showCoupon=false"></image>
-		</view>
-	</u-popup>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				showCoupon: true,
-				newMemberCoupon: {},
-			}
-		},
-		watch: {
-			showCoupon(value) {
-				if(!value) {
-					uni.navigateBack();
-				}
-			}
-		},
-		onShow() {
-			this.isNewmembervoucher();
-		},
-		methods: {
-			viewCoupon() {
-				this.$u.route('/pageB/coupon/details', {
-					price: this.newMemberCoupon.price
-				});
-			},
-			// 是否显示新人优惠券
-			isNewmembervoucher() {
-				this.$u.api.isNewmembervoucher().then(res => {
-					if(res.errCode == 0) {
-						this.newMemberCoupon = res.data;
-					} else {
-						this.showCoupon = false;
-					}
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: rgba(0,0,0,0);
-	}
-	.u-coupon-popup {
-		/deep/ .u-mode-center-box {
-			background-color: transparent;
-		}
-		.coupon {
-			width: 750rpx;
-			height: 583rpx;
-			position: relative;
-			.price {
-				z-index: 3;
-				color: #EBB36E;
-				position: absolute;
-				font-size: 92rpx;
-				font-weight: bold;
-				top: 200rpx;
-				left: 50%;
-				font-family: PingFang SC;
-				transform: translate(-68%, 0);
-			}
-			.coupon-image {
-				width: 568rpx;
-				height: 583rpx;
-				position: absolute;
-				top: 0;
-				left: 50%;
-				transform: translate(-60%, 0);
-			}
-			.close-image {
-				position: absolute;
-				top: 0; 
-				right: 155rpx;
-				width: 60rpx;
-				height: 60rpx;
-			}
-		}
-	}
-</style>
--- a/pageB/details/index.vue
+++ b/pageB/details/index.vue
@@ -19,7 +19,7 @@
            <view class="box">
            	<videoItem v-for="item in listInfo" :key="item.article_id" :item="item"
            	 @getArticlelist="getArticlelist"></videoItem>
-                 <view class="no-data" v-show="!listInfo && page">暂无数据</view>
+                 <view class="no-data" v-show="!listInfo && !page">暂无数据</view>
            </view>
        </scroll-view>
    </view>
@@ -74,7 +74,7 @@ export default {
            userInfo: {}, // 用户信息
            listInfo: [], // 列表详情
            member_id: 0,
-            page: 1,
+            page: 0,
        }
    },
    onLoad(option) {
--- a/pageB/follow/index.vue
+++ b/pageB/follow/index.vue
@@ -76,7 +76,7 @@ export default {
 		},
 		searchValue() {
 			uni.navigateTo({
-				url: '/pageB/search/index?type=2&curent=1'
+				url: '/pageB/search/index?type=2'
 			})
 		},
 	},
--- a/pageB/photo/index.vue
+++ b/pageB/photo/index.vue
@@ -47,12 +47,12 @@
                            <view class="info">
                                <image :src="child.member_avatar" mode=""></image>
                                <text>{{ child.member_nickname }}</text>
-                                <u-icon class="icon" name="play-right-fill" color="#666" size="10rpx" v-if="0"></u-icon>
-                                <text v-if="0">{{ child.reply_member_nickname }}</text>
+                                <u-icon v-if="!child.is_nickanme" class="icon" name="play-right-fill" color="#666" size="10rpx"></u-icon>
+                                <text v-if="!child.is_nickanme">{{ child.reply_member_nickname }}</text>
                            </view>
                            <view class="child_content">{{ child.content }}</view>
                        </view>
-                        <view class="more-reply" v-if="item.reply_count && is_more" @click="getReplyList(item.id)">展开更多回复<u-icon name="arrow-down"></u-icon></view>
+                        <view class="more-reply" v-if="item.reply_count" @click="getReplyList(item.id)">展开更多回复<u-icon name="arrow-down"></u-icon></view>
                    </view>
 				</block>
                <view class="no-data" v-if="!commentList.length">还没有评论，快来评论吧！</view>
@@ -66,7 +66,7 @@
 		<!-- 评论box -->
 		<u-popup v-model="is_edit" mode="bottom" border-radius="10" height="100rpx">
 			<view class="edit-box">
-				<input type="text" :focus="is_focus" :placeholder="edit_text_other" @focus="focus" v-model="send_value">
+				<input type="text" focus :placeholder="edit_text_other" @focus="focus" v-model="send_value">
 				<text @click="sendComment">发送</text>
 			</view>
 		</u-popup>
@@ -81,6 +81,7 @@
 					<image :src="item.goods_image" mode="aspectFill"></image>
 					<view>
 						<text class="title">{{ item.goods_advword }}</text>
+						<text class="name">{{ item.goods_name }}</text>
 						<text class="price">{{ item.goods_promotion_price }}</text>
 					</view>
 				</view>
@@ -329,7 +330,7 @@
 				& > view {
 					display: flex;
 					flex-direction: column;
-					justify-content: space-around;
+					justify-content: space-between;
 					color: #333;
 					font-size: 28rpx;
 					.title {
@@ -406,7 +407,7 @@ export default {
            list:{},
 			swiper_id: "",
            page: 0, // 主评论
-            page_: {}, // 子评论
+            page_: [], // 子评论
 			cart_type: false, // 显示购物车
 			is_comment: false, // 显示评论
 			is_focus: false, // 聚焦
@@ -416,11 +417,10 @@ export default {
 			cart_len: 0,
 			photo_len: 0,
            comment_num: 0,
-            is_more: true,
 			edit_text: "有爱评论，说点好听的 ~",
 			edit_text_other: "有爱评论，说点好听的 ~",
 			commentList: [], // 评论
-            allList: {}, // 全部子评论
+            allList: [], // 全部子评论
            status: 'loadmore',
            iconType: 'circle',
            loadText: {
@@ -434,7 +434,6 @@ export default {
 	onLoad(option){
 	    this.article_id = option.id;
 	    this.articleInfo(this.article_id);
-        this.allList = {};
 	},
    // 监听返回按钮
    onBackPress() {
@@ -493,31 +492,18 @@ export default {
                        this.commentList = this.commentList.concat(res.data);
                    }
                    this.page++;
-                    let list = this.commentList;
-                    list.forEach((item,index) => {
-                        // console.log(item);
-                        item.page = 0;
-                        item.commentList = [];
-                    })
-                    this.commentList = list;
                }
 			})
 		},
 		// 打开评论输入
 		openKeyInput(data,index) {
-            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.content) {
+            if (data.id) {
                this.edit_text_other = "回复@" + data.member_nickname;
                this.pid = data.id;
                this.reply_id = data.member_id;
@@ -540,25 +526,15 @@ export default {
 				pid: this.pid,
 				reply_id: this.reply_id,
 			}).then(res => {
-				// console.log(res.data);
+				// console.log(res.data.data);
 				if (res.errCode == 0) {
                    this.send_value = "";
                    this.comment_num = res.data.num;
                    // console.log(this.comment_num);
 					this.is_edit = false;
-                    // console.log(res.data.data.reply_id);
-                    let p_id = res.data.data.pid;
-                    // console.log(p_id);
                    if (res.data.data.pid) {
                        this.commentList[this.comment_id].reply_count = true;
-                        console.log(this.allList[p_id]);
-                        if (this.allList[p_id]) {
-                            this.allList[p_id].push(res.data.data);
-                        } else {
-                            this.allList[p_id] = [];
-                            this.allList[p_id].push(res.data.data);
-                        }
-                        console.log(this.allList);
+                        this.allList[this.comment_id].unshift(res.data.data);
                    } else {
                        this.commentList.unshift(res.data.data);
                    }
@@ -569,25 +545,15 @@ export default {
 		},
        // 发现回复列表
        getReplyList(id) {
-            uni.showLoading({
-                title: "loading..."
-            })
+            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 => {
-                uni.hideLoading();
+                console.log(this.page_);
                if (res.errCode == 0) {
-                    if (res.data.length < 10) {
-                        this.is_more = false;
-                    }
                    this.page_[id]++;
-                    console.log(this.page_[id]);
-                    this.$nextTick(() => {
-                        this.allList[id] = res.data;
-                    })
-                    console.log(this.allList);
-                    
+                    this.allList[id] = res.data;
                }
            })
        },
@@ -618,7 +584,7 @@ export default {
 				delta: 1
 			})
 		},
-		focus(e) {
+		focus() {
 			setTimeout(function(){
 				uni.showSoftKeybord;
 			}, 200)
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -23,17 +23,14 @@
 				<text class="goods-name">{{ goodsInfo.goods_name }}</text>
            </view>
            <view class="price-collect">
-				<view class="pic" v-if="type == 2">
+				<view class="pic" v-if="type != 3">
 					<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>
+				<view class="collect" @click="switchCollect(goodsInfo.goods_collect)">
+					<u-icon name="star" color="#474747" size="28" v-if="!goodsInfo.goods_collect"></u-icon>
 					<u-icon name="star-fill" color="#FF7807" size="28" v-else></u-icon>
-					<text>{{ !goodsInfo.is_collect == 1 ? '收藏' : '已收藏' }}</text>
+					<text>{{ !goodsInfo.goods_collect ? '收藏' : '已收藏' }}</text>
 				</view>
 			</view>
        </view>
@@ -103,7 +100,7 @@
 		</u-popup>
 		<u-popup v-model="showInvolvementUser" mode="center" z-index="10078">
 			<view class="involvement-container" v-if="involvemenGroupInfo.length">
-				<view class="title">参与<text class="user-name u-line-1">{{ involvemenGroupInfo[0].member_nickname }}</text>的拼团</view>
+				<view class="title u-line-1">参与{{ involvemenGroupInfo[0].member_nickname }}的拼团</view>
 				<view class="involvement-view">
 					<view class="item" v-for="(user, i) in involvemenGroupInfo" :key="i">
 						<image class="avatar" :src="user.member_avatar"></image>
@@ -142,6 +139,7 @@
 					</view>
 					<view style="height:100rpx"></view>
 				</view>
+				<u-toast ref="uToast" />
 			</scroll-view>
        </u-popup>
 		<!-- 普通商品 tool -->
@@ -182,7 +180,7 @@
 			<view class="btn" v-else @click="spikeGoods">立即秒杀</view>
 		</view>
        <!-- <tloos @buy="buy" @xuanze="xuanze" :id="id" :info="goodsInfo" :type="type"></tloos> -->
-        <u-toast ref="uToast" :z-index='200000' />
+        <u-toast ref="uToast" />
    </view>
 </template>
 <script>
@@ -198,7 +196,7 @@ export default {
 			goodsInfo: {}, // 商品信息
 			storeInfo: {}, // 店铺信息
            glist: [], // 规格列表
-			id: 0, // 商品id
+			id: 0, // 商品id/秒杀id/拼团 id
 			type: '', // 商品类型 商品详情 1普通 2拼团 3秒杀 4优惠券
 			groupUser: [], // 拼团用户
 			user_suc: [], // 拼团成功用户
@@ -217,9 +215,7 @@ export default {
 			sel: "", // 拼接的规格
 			quanxuan: false, // 规格是否选择
 			debounce: true, // 防止多次提交订单
-			storeid:0, // 店铺 id
-			pintuan_id: '', // 拼团 id
-			groupbuy_id: '', // 秒杀 id
+			storeid:0 // 店铺id
        }
 	},
    components: {
@@ -387,10 +383,10 @@ export default {
 					this.ordinaryDetails(id);
 					break;
 				case 2:
-					this.pinTuanDetails();
+					this.pinTuanDetails(id);
 					break;
 				case 3:
-					this.spikeGoodsDetails();
+					this.spikeGoodsDetails(id);
 					break;
 				default:
 					break;
@@ -398,40 +394,38 @@ export default {
 		},
 		// 普通商品详情
 		ordinaryDetails(id) {
-			this.$u.api.getGoodsDetails({ id: id }).then(res => {
+			this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
+				// console.log(res)
 				if (res.errCode == 0) {
 					this.evaluate = res.data.goods_evaluate_info;
 					this.goodsInfo = res.data.goods;
 					this.storeInfo = res.data.store;
 					this.setSwiperList(res.data.goods_image);
 					this.glist = res.data.spec_list;
-					this.storeid = res.data.store.store_id;
+					this.storeid = res.data.store.store_id
+					// console.log(this.goodsInfo.mobile_body);
 					this.type = res.data.view_type;
 					this.setTitle();
 					if(this.type == 1) {
 						this.id = res.data.goods.goods_id;
 					} else if(this.type == 2) {
-						this.id = res.data.goods.goods_id;
-						this.pintuan_id = res.data.goods.pintuan_id;
-						this.getGoodsDetails();
+						this.id = res.data.goods.pintuan_id;
+						this.getGoodsDetails(this.id);
 					} else if(this.type == 3) {
-						this.id = res.data.goods.goods_id;
-						this.groupbuy_id = res.data.groupbuy_id;
-						this.getGoodsDetails();
+						this.id = res.data.groupbuy_id;
+						this.getGoodsDetails(this.id);
 					}
 				}
 			})
 		},
 		// 拼团详情
-		pinTuanDetails() {
+		pinTuanDetails(id) {
 			this.$u.api.getPinTuanDetails({
-				pintuan_id: this.pintuan_id,
-				goods_id: this.id,
+				pintuan_id: id
 			}).then(res => {
 				if(res.errCode == 0) {
 					this.evaluate = res.data.data.goods_evaluate_info;
 					this.goodsInfo = res.data.data.goods;
-					this.pintuan_id = res.data.data.pintuan_id;
 					this.setSwiperList(res.data.data.goods_image);
 					this.glist = res.data.data.spec_list;
 					this.user_suc = res.data.data.user_suc;
@@ -441,14 +435,13 @@ export default {
 			})
 		},
 		// 秒杀详情
-		spikeGoodsDetails() {
+		spikeGoodsDetails(id) {
 			this.$u.api.getSpikeInfo({
-				groupbuy_id: this.groupbuy_id,
-				goods_id: this.id,
+				groupbuy_id: id
 			}).then(res => {
 				if(res.errCode == 0) {
+					// this.id = res.data.groupbuy_id;
 					this.groupbuyInfo = res.data.groupbuyInfo;
-					this.groupbuy_id = res.data.groupbuyInfo.groupbuy_id;
 					this.evaluate = res.data.goodsInfo.goods_evaluate_info;
 					this.goodsInfo = res.data.goodsInfo.goods;
 					this.setSwiperList(res.data.goodsInfo.goods_image);
@@ -469,26 +462,13 @@ export default {
 				}
 			})
 		},
-		// 验证能否拼团
-		async pintuanVerify({ pintuan_id, pintuangroup_headid }) {
-			const res = await this.$u.api.pintuanVerify({
-				pintuan_id: pintuan_id,
-				pintuangroup_headid: pintuangroup_headid,
-			})
-			if(res.errCode != 0) {
-				this.$refs.uToast.show({ 
-					title: res.message,
-				});
-			}
-			return res.errCode;
-		},
 		/*
 		* @description 下单 订单步骤1：展示结算数据
 		* @params {Number} type involvement 拼团或者 默认开团
 		* @params {Number} num 数量
 		* @params {Number} ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
 		**/
-		async settlementOrder({type, num = this.goodsNumber, ifcart = 0} = {}) {
+		settlementOrder({type, num = this.goodsNumber, ifcart = 0} = {}) {
 			if(type != 'involvement') {
 				if(!this.showSpec) {
 					this.showSpec = true;
@@ -510,33 +490,26 @@ export default {
 				}
 			}
 			if(!this.debounce) return;
+			this.debounce = false;
 			let params = {
 				ifcart: ifcart, 
 				cart_id: [this.goodsInfo.goods_id + '|' + num],
 			}
 			if(this.type == 2) {
 				if(type == 'involvement') {
-					// 验证能否拼团
-					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;
-					})
-					if(whether) return false;
+					// const userId = uni.getStorageSync('user_info').member.member_id;
 					this.$store.commit('setGroupHeadId', this.involvemenGroupInfo[0].user_id);
+					// console.log(this.$store.state.pintuangroup_headid);
 					Object.assign(params, {
-						pintuan_id: this.pintuan_id, 
+						pintuan_id: this.id, 
 						pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id,
 					})
 				} else {
 					Object.assign(params, {
-						pintuan_id: this.pintuan_id,
+						pintuan_id: this.id,
 					})
 				}
 			}
-			this.debounce = false;
 			this.$u.api.settlementOrder(params).then(res => {
 				if(res.errCode == 0) {
 					// console.log('type' + this.type);
@@ -546,10 +519,8 @@ export default {
 						url: '/pageC/cart/ConfirmOrder'
 					})
 				} else {
-					this.$refs.uToast.show({ 
-						title: res.message,
-					});
 					this.debounce = true;
+                    this.$u.toast(res.message);
 				}
 			})
 		},
@@ -585,9 +556,8 @@ export default {
 			// console.log(id)
 			// 选择完规格后设商品type = 1
 			// this.type = 1;
-			// 改变 goods_id
+            this.getGoodsDetails(this.glist[id])
 			this.id = this.glist[id];
-            this.getGoodsDetails();
 		},
 		// 设置页面标题
 		setTitle() {
@@ -633,7 +603,7 @@ export default {
            })
 		},
 		switchCollect(status) {
-			if(status == 1) {
+			if(status) {
 				this.removeFavorite();
 			} else {
 				this.addFavoriteGoods();
@@ -989,13 +959,6 @@ export default {
 			font-size: 32rpx;
 			color: rgba(51,51,51,1);
 			position: relative;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			.user-name {
-				display: inline-block;
-				max-width: 200rpx;
-			}
 			&::after {
 				content: '';
 				position: absolute;
--- a/pageB/search/index.vue
+++ b/pageB/search/index.vue
@@ -18,13 +18,10 @@ export default {
 			searchwordlist: [],
        }
 	},
-	// type: 1 商品 2: 其他
+	// type: 2 商品 1: 其他
 	onLoad(option) {
 		this.type = option.type;
-        this.curent = option.curent || 0
 		this.getWordList();
-		if(option.type == 1) this.setNavSearchInput('搜索您需要的商品');
-		else if(option.type == 2) this.setNavSearchInput('请输入搜索内容');
 	},
 	// 点击搜索按钮
 	onNavigationBarButtonTap(e) {
@@ -39,18 +36,6 @@ export default {
 		this.search(this.keyword);
 	},
    methods:{
-		setNavSearchInput(placeholder) {
-			// #ifdef APP-PLUS
-			// 修改 placeholder
-			webview.setStyle({
-				'titleNView': {
-					"searchInput": { //修改当前窗口search样式  
-						"placeholder": placeholder,  
-					}
-				}
-			})
-			// #endif
-		},
 		getWordList() {
 			this.$u.api.searchwordlist({type:this.type}).then(res => {
                console.log(res)
@@ -66,8 +51,7 @@ export default {
 			}
 			let params = {
 				value: value,
-                type: this.type,
-                curent:this.curent
+				type: this.type,
 			}
 			if(this.type == 2) {
                this.$u.route({
--- a/pageB/search/out.vue
+++ b/pageB/search/out.vue
@@ -7,7 +7,7 @@
 			</view>
 			<view class="evaluation" :class="{ 'current' : current == 2 }" @click="switchCurrent(2)">社区</view>
 		</view>
-		<scroll-view scroll-y class="goods-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore" v-show="current == 0"  :scroll-top="scrollTop" @scroll="scroll">
+		<scroll-view scroll-y class="goods-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore" v-show="current == 0">
 			<view v-for="goods in goodsList" :key="goods.store_id" class="goods-item" @click="toDetailsPage(goods.store_id)">
 				<image :src="goods.store_avatar"></image>
 				<view class="right">
@@ -18,7 +18,7 @@
 			<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
 			<u-empty mode="list" v-if="!goodsList.length"></u-empty>
 		</scroll-view>
-		<scroll-view style="width:100%;" :style="{ height: scrollHeight }" scroll-y="true" @scrolltolower="loadMore" v-if=" current == 2 "  :scroll-top="scrollTop" @scroll="scroll">
+		<scroll-view style="width:100%;" :style="{ height: scrollHeight }" scroll-y="true" @scrolltolower="loadMore" v-if=" current == 2 ">
 			<view class="box" style="padding: 0 30rpx;">
 				<view style="display:flex">
 					<view>
@@ -34,7 +34,7 @@
 			<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
 			<u-empty mode="list" v-if="!goodsList.length"></u-empty>
 		</scroll-view>
-		<scroll-view style="width:100%;padding: 0rpx 30rpx;margin-right:23rpx;" :style="{ height: scrollHeight }" scroll-y="true" @scrolltolower="loadMore" v-if=" current == 1 "  :scroll-top="scrollTop" @scroll="scroll">
+		<scroll-view style="width:100%;padding: 20rpx 30rpx;margin-right:23rpx;" :style="{ height: scrollHeight }" scroll-y="true" @scrolltolower="loadMore" v-if=" current == 1 ">
 			<view class="list" >
 				<darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0px 3rpx 7rpx 0px rgba(153, 153, 153, 0.35);" v-for="item in goodsList" :key="item.id" :info="item"  v-on:pChangeType="changeType"></darenItem>
 			</view>
@@ -59,11 +59,7 @@ export default {
 			scrollHeight: '',
 			loadStatus: 'loadmore',
 			timer: true, // 防止上拉加载短时间内多次调用,
-			value:"",
-			scrollTop: 0,
-            old: {
-                scrollTop: 0
-            }
+			value:""
 		}
 	},
 	components:{
@@ -82,22 +78,16 @@ export default {
 	},
 	onLoad(option) {
 		this.value = option.value;
-		this.current = option.curent
 		this.setViewHeight();
 		this.ShopSearch()
 		this.setNavSearchInput(this.value);
-
 	},
 	onNavigationBarSearchInputConfirmed(value) {
 		this.value = value.text
-		this.page = 1
 		// console.log(this.value)
 		this.ShopSearch()
 	},
 	methods: {
-		scroll: function(e) {
-            this.old.scrollTop = e.detail.scrollTop; // 必要
-        },
 		// 动态设置导航栏搜索框内容
 		setNavSearchInput(keyword) {
 			// #ifdef APP-PLUS
@@ -213,14 +203,13 @@ export default {
 		},
 		switchCurrent(current) {
 			// if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
-			this.page = 1;
 			this.current = current;
 			this.goodsList = []
 			this.ShopSearch()
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.scrollHeight = res.windowHeight - res.windowWidth / 750 * 92  + 'px';
+			this.scrollHeight = res.windowHeight - res.windowWidth / 750 * 90  + 'px';
 		},
 		toDetailsPage(id) {
 			this.$u.route('/pageC/merchant/index', {
@@ -242,11 +231,10 @@ export default {
 		box-sizing: border-box;
 		padding: 30rpx 40rpx;
 		display: flex;
-		// margin-bottom: 30rpx;
-		height: 92rpx;
+		margin-bottom: 30rpx;
 		> view {
 			height: 30rpx;
-			line-height: 1;
+			line-height: 30rpx;
 			flex: 1;
 			font-size: 32rpx;
 			color: rgba(51,51,51,1);
--- a/pageB/search/searchGoods.vue
+++ b/pageB/search/searchGoods.vue
@@ -11,13 +11,12 @@
 			</view>
 			<view class="evaluation" :class="{ 'current' : current == 2 }" @click="switchCurrent(2)">好评</view>
 		</view>
-		<scroll-view scroll-y class="goods-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore" :scroll-top="scrollTop" @scroll="scroll">
+		<scroll-view scroll-y class="goods-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore">
 			<view v-for="goods in goodsList" :key="goods.goods_id" class="goods-item" @click="toDetailsPage(goods.goods_id)">
 				<image :src="goods.goods_image"></image>
 				<view class="right">
 					<view class="name u-line-1">{{ goods.goods_name }}</view>
-					<view class="briefing u-line-1">{{ goods.goods_advword }}</view>
-					<view class="price">￥{{ goods.goods_price }}</view>
+					<view class="briefing u-line-2">{{ goods.goods_advword }}</view>
 				</view>
 			</view>
 			<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
@@ -38,11 +37,7 @@ export default {
 			scrollHeight: '',
 			loadStatus: 'loadmore',
 			timer: true, // 防止上拉加载短时间内多次调用,
-			value:"",
-			scrollTop: 0,
-            old: {
-                scrollTop: 0
-            }
+			value:""
 		}
 	},
 	watch: {
@@ -59,18 +54,12 @@ export default {
 		this.value = option.value
 		this.setViewHeight();
 		this.ShopSearch()
-		this.setNavSearchInput(this.value);
-
 	},
 	onNavigationBarSearchInputConfirmed(value) {
 		this.value = value.text
-		this.page = 1
 		this.ShopSearch()
 	},
 	methods: {
-		scroll: function(e) {
-            this.old.scrollTop = e.detail.scrollTop; // 必要
-        },
 		setNavSearchInput(keyword) {
 			console.log(keyword);
 			// #ifdef APP-PLUS
@@ -106,6 +95,7 @@ export default {
 		// 排序方式 goods_salenum：销量　evaluation_count：评价　goods_price_asc：价格从低到高　goods_price_desc：价格从高到低
 		async ShopSearch({ load = 'reload' } = {}) {
 			console.log(this.value);
+			this.setNavSearchInput(this.value);
 			const sort = this.setOrderSort();
 			const res = await this.$u.api.ShopSearch({ 
 				keyword: this.value, 
@@ -137,18 +127,13 @@ export default {
 			})
 		},
 		switchCurrent(current) {
-			this.page = 1
-			if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
-			this.scrollTop = this.old.scrollTop
-            this.$nextTick(function() {
-                this.scrollTop = 0
-            });
 			this.ShopSearch()
+			if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
 			this.current = current;
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.scrollHeight = res.windowHeight - res.windowWidth / 750 * 92  + 'px';
+			this.scrollHeight = res.windowHeight - res.windowWidth / 750 * 90  + 'px';
 		},
 		toDetailsPage(id) {
 			this.$u.route('/pageB/sdetails/index', {
@@ -164,11 +149,10 @@ export default {
 		box-sizing: border-box;
 		padding: 30rpx 40rpx;
 		display: flex;
-		// margin-bottom: 30rpx;
-		height: 92rpx;
+		margin-bottom: 30rpx;
 		> view {
 			height: 30rpx;
-			line-height: 1;
+			line-height: 30rpx;
 			flex: 1;
 			font-size: 32rpx;
 			color: rgba(51,51,51,1);
@@ -213,21 +197,15 @@ export default {
 			}
 			.right {
 				width: 418rpx;
-				height: 200rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-around;
 				.name {
 					font-size: 30rpx;
 					color: rgba(51,51,51,1);
+					margin-bottom: 20rpx;
 				}
 				.briefing {
 					font-size: 28rpx;
 					color: rgba(102,102,102,1);
-				}
-				.price {
-					font-size: 26rpx;
-					color: rgba(255,49,49,1);
+					line-height: 42rpx;
 				}
 			}
 		}
--- a/pageB/video/video.nvue
+++ b/pageB/video/video.nvue
@@ -1,17 +1,18 @@
 <template>
-    <view class="container">
+    <view>
        <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>
+            @timeupdate="timeupdate" :show-play-btn="false" controls="false" @click="stoping" :enable-progress-gesture="false"></video>
+        <cover-image class="close" @click="goBack" src="../../static/close.png">
+        </cover-image>
+        <cover-image class="pause" @click="stoping" src="../../static/videoPlay.png" v-if="!is_play">
+        </cover-image>
        <!-- 用户操作 -->
-        <userinfo class="user-info" :style="{ top: fixTop }" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num"
-            @openCart="openPopup"></userinfo>
-        <!-- 视频信息 -->
-        <cover-view class="info-box" @click="stopClick">
+        <userinfo class="user-info" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo>
+        <cover-view class="info-box" @click="stopClick">>
            <view class="video-info-box">
                <image class="image-play" src="../../static/videoIcon.png" mode=""></image>
                <text class="video-slip">视频</text>
-                <text class="time">{{ time_count }}s</text>
+                <text class="time">{{ time_count == 1 ? 0 : time_count }}s</text>
            </view>
            <view>
                <text class="name">@{{ list.member_nickname }}</text>
@@ -28,104 +29,40 @@
                </block>
            </view>
        </cover-view>
-        <!-- 单个商品 -->
-        <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">
-                    <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>
+        <cover-view class="content-box" v-if="is_comment">
+            <view class="content-title">
+                <text class="tips">评论</text>
+                <text class="close-down" @click="closeComment">×</text>
            </view>
+            <scroller class="comment-list">
+                <view class="" v-for="(item,index) in commentList" :key="index">
+                    <view class="comment-list-box">
+                        <view class="comment-list-header">
+                            <image class="avatar" :src="item.member_avatar" mode=""></image>
+                            <view>
+                                <text class="comment-title">{{ item.member_nickname }}</text>
+                                <text class="comment-time">{{ item.create_time }}</text>
+                            </view>
+                        </view>
+                        <text class="reply">回复</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="" />
+                    <text class="btn-send">发送</text>
+                </view>
+                <loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
+                    <loading-indicator class="indicator"></loading-indicator>
+                    <text class="indicator-text">努力加载中</text>
+                </loading>
+            </scroller>
        </cover-view>
-        <!-- 遮罩层 -->
-        <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">
-                    <text class="tips">评论</text>
-                    <text class="close-down" @click="closeComment">×</text>
-                </view>
-                <scroller class="comment-list">
-                    <view class="" v-for="(item,index) in commentList" :key="index">
-                        <view class="comment-list-box">
-                            <view class="comment-list-header">
-                                <image class="avatar" :src="item.member_avatar" mode=""></image>
-                                <view>
-                                    <text class="comment-title">{{ item.member_nickname }}</text>
-                                    <text class="comment-time">{{ item.create_time }}</text>
-                                </view>
-                            </view>
-                            <text class="reply" @click="openKeyInput(item,index)">回复</text>
-                        </view>
-                        <view class="content-main">
-                            <text class="content-style">{{ item.content }}</text>
-                        </view>
-                        <view class="more-content-box">
-                            <!-- <view class="child-box" v-for="(child,cid) in allList[item.id]" :key="cid">
-                                <view class="info">
-                                    <image :src="child.member_avatar" mode=""></image>
-                                    <text>{{ child.member_nickname }}</text>
-                                    <text v-if="0">{{ child.reply_member_nickname }}</text>
-                                </view>
-                                <view class="child_content">{{ child.content }}</view>
-                            </view> -->
-                            <view class="more-comment" v-if="item.reply_count">
-                                展开更多回复
-                            </view>
-                        </view>
-                    </view>
-                    <view class="send-box">
-                        <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'">
-                        <loading-indicator class="indicator"></loading-indicator>
-                        <text class="indicator-text">努力加载中</text>
-                    </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">
-                    <text class="tips">全部商品</text>
-                    <text class="close-down" @click="cart_type = false">×</text>
-                </view>
-                <scroller class="cart-list">
-                    <view class="" v-for="(item,index) in list.goods" :key="index">
-                        <view class="cart-list-header" @click="goGoodInfo(item.goods_id)">
-                            <image class="goods-img" :src="item.goods_image" mode=""></image>
-                            <view class="goods-info">
-                                <text class="good-title">{{ item.goods_advword }}</text>
-                                <text class="good-price">{{ item.goods_promotion_price }}</text>
-                            </view>
-                        </view>
-                    </view>
-                    <loading v-if="0" class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
-                        <loading-indicator class="indicator"></loading-indicator>
-                        <text class="indicator-text">努力加载中</text>
-                    </loading>
-                </scroller>
-            </cover-view>
-        </cover-view>
-        <!-- 返回按钮 -->
-        <cover-image class="close" @click="goBack" src="../../static/close.png">
-        </cover-image>
-        <!-- 暂停按钮 -->
-        <cover-image class="pause" :style="{ top: fixTop + 100 }" @click="stoping" src="../../static/videoPlay.png"
-            v-if="!is_play">
-        </cover-image>
+        <list class="cart-box">
+            <cell></cell>
+        </list>
    </view>
 </template>

@@ -139,23 +76,12 @@
        data() {
            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,
@@ -172,22 +98,7 @@
        onReady() {
            this.videoBox = uni.createVideoContext("videoId", this);
        },
-        onBackPress() {
-            if (this.cart_type) {
-                this.cart_type = !this.cart_type;
-            } else if (this.is_edit) {
-                this.is_edit = !this.is_edit;
-            } else if (this.is_comment) {
-                this.is_comment = !this.is_comment;
-            } else {
-                return false;
-            }
-            return true;
-        },
        methods: {
-            moveHandle() {
-                return false;
-            },
            // 获取信息
            getVideoInfo(article_id) {
                uni.request({
@@ -202,8 +113,6 @@
                    success: (res) => {
                        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 => {
@@ -230,7 +139,7 @@
                    },
                    success: (res) => {
                        if (res.data.errCode == 0) {
-                            // console.log(res.data);
+                            console.log(res.data);
                            this.commentList = res.data.data;
                        }
                    }
@@ -251,40 +160,11 @@
                        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;	
-                            let p_id = res.data.data.data.pid;
-                            console.log(this.pid,this.reply_id,this.comment_id);
-                            if (res.data.data.data.pid) {
-                                this.commentList[this.comment_id].reply_count = true;
-                                console.log(this.allList[p_id]);
-                                if (this.allList[p_id]) {
-                                    this.allList[p_id].push(res.data.data);
-                                } else {
-                                    this.allList[p_id] = [];
-                                    this.allList[p_id].push(res.data.data);
-                                }
-                                console.log(this.allList);
-                            } else {
-                                this.commentList.unshift(res.data.data.data);
-                            }
-                            // console.log(this.commentList);
-                        } else if (res.data.errCode == 401) {
-                            uni.showToast({
-                                title: "您还没有登录，请先登录！",
-                                icon: "none",
-                                // success: () => {
-                                //     setTimeout(function() {
-                                //         this.$u.route("/pageA/login/login")
-                                //     }, 2000)
-                                // }
-                            })
+                            console.log(res.data);	
                        } else {	
                            uni.showToast({	
                                title: res.data.message,	
@@ -300,13 +180,8 @@
                    success: (res) => {
                        this.videoSize = {
                            width: "750rpx",
-                            height: res.screenHeight + "px",
+                            height: res.screenHeight + "px"
                        }
-                        this.fixTop = "400rpx";
-                        this.fixTop = res.screenHeight / 3;
-                        // #ifdef H5
-                        this.fixTop = 400 + 'rpx'
-                        // #endif
                    }
                })
            },
@@ -315,19 +190,6 @@
                // console.log(e);
                if (e.type == "play") {}
            },
-            pausing(e) {
-                if (e.type == "pause") {
-                    this.is_play = false;
-                }
-            },
-            // 结束
-            videoEnd(e) {
-                // console.log(e);
-                if (e.type == "ended") {
-                    this.is_play = false;
-                    this.time_count = 0;
-                }
-            },
            // 暂停
            stoping() {
                this.is_play = !this.is_play;
@@ -340,9 +202,8 @@
            // 监听视频
            timeupdate(e) {
                this.time_count = parseInt(e.detail.duration) - parseInt(e.detail.currentTime);
-                // console.log(e.detail.currentTime,e.detail.duration);
                if (e.detail.duration == e.detail.currentTime) {
-                    // this.is_play = false;
+                    this.is_play = false;
                }
                // let num = parseInt((e.detail.currentTime/e.detail.duration)*100);
                // this.linear = num + "%";
@@ -350,59 +211,17 @@
            },
            // 打开弹窗
            openPopup(data) {
-                // console.log(data);
-                if (this.cart_len >= 2) {
-
-                }
+                console.log(data);
                this.cart_type = data.cart;
                this.is_comment = data.comment;
                if (this.is_comment) {
                    this.page = 0;
                    this.getComment();
-                    // this.is_play = true;
                }
            },
-            // 打开评论输入
-            openKeyInput(data, index) {
-                console.log(data);
-                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);
-                //     this.is_play = false;
-                // }
            },
            // 下拉加载
            onloading(e) {
@@ -412,12 +231,6 @@
                    this.loadinging = false;
                }, 2000)
            },
-            // 跳转
-            goGoodInfo(id) {
-                uni.navigateTo({
-                    url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
-                })
-            },
            // stop
            stopClick(event) {
                event.stopPropagation();
@@ -432,23 +245,19 @@
 </script>

 <style>
-    .container {
-        position: relative;
-    }
-
    /* 关闭 */
    .close {
        position: fixed;
-        top: 100rpx;
-        right: 70rpx;
+        top: 80rpx;
+        right: 60rpx;
        width: 30rpx;
        height: 30rpx;
    }

    /* 暂停 */
    .pause {
-        z-index: 99;
        position: fixed;
+        top: 600rpx;
        left: 330rpx;
        width: 100rpx;
        height: 100rpx;
@@ -457,6 +266,7 @@
    /* 用户操作 */
    .user-info {
        position: fixed;
+        top: 360rpx;
        right: 30rpx;
    }

@@ -480,55 +290,6 @@
        background-color: rgba(255, 255, 255, .6);
    }

-    .good-one {
-        position: fixed;
-        right: 160rpx;
-        width: 420rpx;
-        padding: 20rpx;
-        border-radius: 10rpx;
-        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-around;
-        color: #333;
-    }
-
-    .title-one {
-        width: 200rpx;
-        font-size: 28rpx;
-        color: #fff;
-        lines: 1;
-        text-overflow: ellipsis;
-    }
-
-    .content-one {
-        width: 200rpx;
-        font-size: 24rpx;
-        color: #fff;
-        lines: 2;
-        text-overflow: ellipsis;
-    }
-
-    .mask {
-        z-index: 999999;
-        position: fixed;
-        top: 0;
-        left: 0;
-        background-color: rgba(0, 0, 0, 0.5);
-    }
-
    .content-box {
        z-index: 99;
        position: fixed;
@@ -536,7 +297,6 @@
        left: 0;
        width: 750rpx;
        height: 700rpx;
-        padding-bottom: 50rpx;
        margin-bottom: 88rpx;
        background-color: #fff;
    }
@@ -555,7 +315,7 @@
    }

    .comment-list-box {
-        padding: 20rpx 30rpx;
+        padding: 30rpx;
        flex-direction: row;
        align-items: center;
        justify-content: space-between;
@@ -566,7 +326,6 @@
        padding-left: 100rpx;
    }
    
-
    .content-style {
        width: 600rpx;
        font-size: 26rpx;
@@ -574,16 +333,6 @@
        lines: 2;
    }
    
-    .more-content-box {
-        margin-left: 100rpx;
-    }
-    
-    .more-comment {
-        margin: 10rpx 0;
-        font-size: 22rpx;
-        color: #999;
-    }
-
    .comment-list-header {
        flex-direction: row;
    }
@@ -611,7 +360,6 @@
        font-weight: 500;
        color: #333;
    }
-
    .send-box {
        z-index: 10000;
        position: fixed;
@@ -635,103 +383,16 @@
    }
    
    .btn-send {
-        font-size: 28rpx;
-        color: #666;
+        font-size: 30rpx;
+        color: #303133;
    }
    
    .close-down {
-        padding: 10rpx;
        font-size: 50rpx;
        text-align: center;
        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;
-        bottom: 0;
-        left: 0;
-        width: 750rpx;
-        height: 700rpx;
-        background-color: #fff;
-    }
-
-    .cart-title {
-        flex-direction: row;
-        align-items: center;
-        justify-content: space-between;
-        height: 88rpx;
-        padding: 0 20rpx;
-        border-color: #f2f2f2;
-        border-bottom-width: 1rpx;
-        background-color: #fff;
-    }
-
-    .cart-list {}
-
-    .cart-list-header {
-        padding: 20rpx;
-        flex-direction: row;
-        border-bottom-width: 1rpx;
-        border-bottom-color: #ececec;
-    }
-
-    .goods-img {
-        width: 160rpx;
-        height: 160rpx;
-        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;
-    }
-
    .image-play {
        width: 22rpx;
        height: 20rpx;
@@ -775,6 +436,7 @@
    }

    .label {
+        lines: 3;
        width: 100rpx;
        height: 40rpx;
        padding: 4rpx 10rpx;
@@ -782,7 +444,6 @@
        margin-bottom: 10rpx;
        font-size: 26rpx;
        text-align: center;
-        line-height: 38rpx;
        color: #666666;
        border-radius: 10rpx;
        background-color: rgba(255, 255, 255, .6);
@@ -806,9 +467,4 @@
        height: 30rpx;
        color: #999;
    }
-
-    .placeholder-class {
-        font-size: 13px;
-        color: #666;
-    }
 </style>
--- a/pageC/cart/ConfirmOrder.vue
+++ b/pageC/cart/ConfirmOrder.vue
@@ -148,7 +148,7 @@ export default {
 	onLoad(option) {
 		this.orderType = this.$store.state.orderType;
 		this.orderInfo = this.$store.state.orderInfo;
-		// console.log('orderType' + this.orderType);
+		console.log('orderType' + this.orderType);
 		// console.log(this.orderInfo);
 		this.getGoodsClass();
 		this.setTotalPrice();
--- a/pageC/cart/index.vue
+++ b/pageC/cart/index.vue
@@ -3,7 +3,7 @@
 		<u-checkbox-group class="cart-main" @change="storeChange">
 			<view v-for="(store, s_index) in list" :key="s_index" class="cart-item">
 				<view class="store">
-					<u-checkbox v-model="store.checked" shape="circle" active-color="#FF780F" icon-size="26" :name="s_index" @change="storeaAloneChange"></u-checkbox>
+					<u-checkbox v-model="store.checked" shape="circle" active-color="#FF780F" icon-size="35" :name="s_index" @change="storeaAloneChange"></u-checkbox>
 					<view class="name" @click="viewStoreDetails(store.store_id)">
 						<image :src="store.store_avatar"></image>
 						<view>{{ store.store_name }}</view>
@@ -12,7 +12,7 @@
 				<view class="goods">
 					<u-checkbox-group @change="goodsChange($event, s_index)">
 						<view v-for="(goods, g_index) in store.goods" :key="g_index" class="goods-item">
-							<u-checkbox v-model="goods.checked" shape="circle" active-color="#FF780F" icon-size="26" :name="g_index"></u-checkbox>
+							<u-checkbox v-model="goods.checked" shape="circle" active-color="#FF780F" icon-size="35" :name="g_index"></u-checkbox>
 							<image :src="goods.goods_image" @click="viewGoodsDetails(goods.goods_id)"></image>
 							<view class="info">
 								<view class="name u-line-2" @click="viewGoodsDetails(goods.goods_id)">{{ goods.goods_name }}</view>
@@ -31,7 +31,7 @@
 		</view>
 		<view class="balance">
 			<u-checkbox-group>
-				<u-checkbox v-model="checkedAll" shape="circle" active-color="#FF780F" icon-size="26" label-size="30" @change="totalChange">
+				<u-checkbox v-model="checkedAll" shape="circle" active-color="#FF780F" icon-size="35" label-size="30" @change="totalChange">
 					全选
 				</u-checkbox>
 			</u-checkbox-group>
@@ -326,13 +326,10 @@ export default {
 									font-weight: 500;
 									color: rgba(255,49,49,1);
 								}
-								/deep/ .u-numberbox {
+								.u-numberbox {
 									border: 1rpx solid rgba(217,215,215,1);
 									border-radius:4px;
-									.u-icon-minus, .u-icon-plus {
-										width: 38rpx;
-									}
-									.u-number-input {
+									/deep/ .u-number-input {
 										margin: 0;
 										color: #333 !important;
 										border: 1rpx #D9D7D7 solid {
@@ -341,6 +338,31 @@ export default {
 										}
 									}
 								}
+								// .num {
+								// 	display: flex;
+								// 	width: 118rpx;
+								// 	height: 39rpx;
+								// 	border: 1rpx solid rgba(217,215,215,1);
+								// 	border-radius:4px;
+								// 	.reduce, .increase {
+								// 		flex: 1;
+								// 		font-size: 11rpx;
+								// 		color: #FF780F;
+								// 		line-height: 39rpx;
+								// 		text-align: center;
+								// 	}
+								// 	.value {
+								// 		flex: 1;
+								// 		font-size: 22rpx;
+								// 		color:rgba(51,51,51,1);
+								// 		line-height: 39rpx;
+								// 		text-align: center;
+								// 		border: 1rpx #D9D7D7 solid {
+								// 			top: 0px;
+								// 			bottom: 0px;
+								// 		}
+								// 	}
+								// }
 							}
 						}
 					}
--- a/pageC/classify/goods.vue
+++ b/pageC/classify/goods.vue
@@ -16,8 +16,7 @@
 				<image :src="goods.goods_image"></image>
 				<view class="right">
 					<view class="name u-line-1">{{ goods.goods_name }}</view>
-					<view class="briefing u-line-1">{{ goods.goods_advword }}</view>
-					<view class="price">￥{{ goods.goods_price }}</view>
+					<view class="briefing u-line-2">{{ goods.goods_advword }}</view>
 				</view>
 			</view>
 			<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
@@ -177,21 +176,15 @@ export default {
 			}
 			.right {
 				width: 418rpx;
-				height: 200rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-around;
 				.name {
 					font-size: 30rpx;
 					color: rgba(51,51,51,1);
+					margin-bottom: 20rpx;
 				}
 				.briefing {
 					font-size: 28rpx;
 					color: rgba(102,102,102,1);
-				}
-				.price {
-					font-size: 26rpx;
-					color: rgba(255,49,49,1);
+					line-height: 42rpx;
 				}
 			}
 		}
--- a/pageC/components/merchant/list-item.vue
+++ b/pageC/components/merchant/list-item.vue
@@ -1,10 +1,6 @@
 <template>
    <view class="listItem">
-        <!-- <video  :src="url" :show-fullscreen-btn="true"></video> -->
-		<view v-if="type == '2'" class="video-container">
-			<image :src="url" mode="aspectFill" class="video"></image>
-			<image src="/static/videoPlay.png" mode="aspectFill" class="play-video"></image>
-		</view>
+        <video v-if="type == '2'" :src="url" :show-fullscreen-btn="true"></video>
        <image v-else :src="url" mode="aspectFill"></image>
    </view>
 </template>
@@ -13,30 +9,11 @@
    width: 365rpx;
    height: 500rpx;
 	overflow: hidden;
-    > image {
+    >image,video{
        width: 100%;
        height: 100%;
 		margin-bottom: 20rpx;
    }
-	.video-container {
-		width: 100%;
-        height: 100%;
-		margin-bottom: 20rpx;
-		position: relative;
-		.video {
-			width: 100%;
-        	height: 100%;
-		}
-		.play-video {
-			position: absolute;
-			width: 100rpx;
-			height: 100rpx;
-			z-index: 19;
-			top: 50%;
-			left: 50%;
-			transform: translate(-50%, -50%);
-		}
-	}
 }
 </style>
 <script>
--- a/pageC/components/merchant/video-top.vue
+++ b/pageC/components/merchant/video-top.vue
@@ -1,7 +1,6 @@
 <template>
-    <view class="videoTop" @click="toDetailsPage">
-		  <image :src="url" mode="aspectFill" class="video"></image>
-		  <image src="/static/videoPlay.png" mode="aspectFill" class="play-video"></image>
+    <view class="videoTop">
+          <video :src="url" :show-fullscreen-btn="true"></video>
    </view>
 </template>
 <style lang="scss" scoped>
@@ -9,22 +8,10 @@
    width: 100%;
    height: 284rpx;
    margin-bottom: 20rpx;
-	position: relative;
-    .video{
-		position: absolute;
+    >video{
        width: 100%;
        height: 100%;
-		z-index: 9;
    }
-	.play-video {
-		position: absolute;
-		width: 100rpx;
-		height: 100rpx;
-		z-index: 19;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-	}
 }
 </style>
 <script>
@@ -34,13 +21,6 @@ export default {
        return {
        }
    },
-	props:['url'],
-	methods: {
-		toDetailsPage(id) {
-			this.$u.route('pageB/video/video', {
-				id: id
-			});
-		},
-	}
+    props:['url']
 }
 </script>
--- 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-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>
+					<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>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
@@ -22,7 +22,7 @@ import SpecialGoods from "../../components/shop/special-shop/index";
 export default {
 	data() {
 		return {
-			pageSize: 6,
+			pageSize: 12,
 			tabList: [],
 			current: -1,
 			swiperCurrent: 0,
--- a/pageC/merchant/goods.vue
+++ b/pageC/merchant/goods.vue
@@ -14,7 +14,7 @@
 		</view>
 		<scroll-view scroll-y class="scroll-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore">
 			<view class="goods-container">
-				<view v-for="(goods, index) in goodsList" :key="index" class="goods-view">
+				<view v-for="(goods, index) in goodsList" :key="index" class="goods-view" @click="toDetailsPage(goods.goods_id)">
 					<goodsItem :info="goods"></goodsItem>
 				</view>
 			</view>
@@ -28,7 +28,7 @@ import goodsItem from "@/components/shop/list/item"
 export default {
 	data() {
 		return {
-			pageSize: 5,
+			pageSize: 15,
 			cid: '',
 			page: 1,
 			current: 0,
@@ -83,7 +83,7 @@ export default {
 				page: this.page,
 				order: sort,
 			})
-			// this.timer = true;
+			this.timer = true;
 			if(res.errCode == 0) {
 				this.pageSize = res.data.per_page;
 				if(load == 'reload') this.goodsList = res.data.data;
@@ -92,8 +92,8 @@ export default {
 			return res.data.data.length;
 		},
 		loadMore() {
-			// if(this.goodsList.length < this.pageSize) return false;
-			// if(!this.timer) return false;
+			if(this.goodsList.length < this.pageSize) return false;
+			if(!this.timer) return false;
 			this.loadStatus = "loading";
 			this.page++;
 			this.getStoreGoodsList({  load: 'loadmore' }).then(length => {
@@ -118,6 +118,12 @@ export default {
 			this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * otherHeight + 'px';
 			// console.log(this.scrollHeight);
 		},
+		toDetailsPage(id) {
+			this.$u.route('/pageB/sdetails/index', {
+				id: id,
+				type: 1 // 商品详情 商品类型 1普通 2拼团 3秒杀 4优惠券
+			});
+		}
 	}
 };
 </script>
--- a/pageC/merchant/index.vue
+++ b/pageC/merchant/index.vue
@@ -14,18 +14,15 @@
 				<view>我的</view>
 			</view>
 		</view> -->
-		<view class="top" :style="{'background':'url(' + info.store_banner + ') 100% 100% no-repeat' }">
-			<view class="mantle"></view>
-			<view class="main-container">
-				<image :src="info.store_avatar"></image>
-				<view class="info">
-					<view class="name u-line-1">{{info.store_name}}</view>
-					<view class="num">粉丝数：{{info.store_collect}}</view>
-				</view>
-				<view class="btn" @click="attentionMember">
-					<image :src="info.is_attention == 0 ? '/static/image/shop/14.png' : '/static/image/shop/8.png'"></image>
-					<view>{{ info.is_attention == 0 ? "关注" : "已关注" }}</view>
-				</view>
+		<view class="top" :style="{'background-image':'url(' + info.store_banner + ')'}">
+			<image :src="info.store_avatar"></image>
+			<view class="info">
+				<view class="name u-line-1">{{info.store_name}}</view>
+				<view class="num">粉丝数：{{info.store_collect}}</view>
+			</view>
+			<view class="btn" @click="attentionMember">
+				<image src="/static/image/shop/8.png"></image>
+				<view>{{ info.is_attention == 0 ? "关注" : "已关注" }}</view>
 			</view>
 		</view>
 		<view class="follow" v-if="info.attention_member && info.attention_member.length">
@@ -42,11 +39,11 @@
 		<view class="main">
 			<scroll-view class="video-image" scroll-y v-if="cur==0 && indextop.length" :style="{ height: scrollHeiht }">
 				<view v-for="item in indextop" :key="item.id" class="container-top">
-					<videoTop :url="item.article_pic" v-if="item.type == 2" @click.native="toDetailsPage({ id: item.article_id, type: item.type })"></videoTop>
-					<imageTop v-else :url="item.article_pic" @click.native="toDetailsPage({ id: item.article_id, type: item.type })"></imageTop>
+					<videoTop :url="item.article_pic" v-if="item.type == 2" @click.native="toDetailsPage(item.article_id)"></videoTop>
+					<imageTop v-else :url="item.article_pic" @click.native="toDetailsPage(item.article_id)"></imageTop>
 				</view>
 				<view v-if="indexlist.length" class="container-bottom">
-					<listitem v-for="item in indexlist" :key="item.id" :type="item.type" :url="item.article_pic" class="bottom-item" @click.native="toDetailsPage({ id: item.article_id, type: item.type })"></listitem>
+					<listitem v-for="item in indexlist" :key="item.id" :type="item.type" :url="item.article_pic" class="bottom-item" @click.native="toDetailsPage(item.article_id)"></listitem>
 				</view>
 			</scroll-view>
 			<view class="item" v-if="cur==1">
@@ -91,7 +88,7 @@ export default {
 			indexlist: [],
 			indextop: [],
 			info: {},
-			page: 1,
+			page: 0,
 			scrollHeiht: '',
 		}
 	},
@@ -107,8 +104,8 @@ export default {
 		// this.getStoreImgVideoList();
 	},
 	onNavigationBarButtonTap(e) {
-		console.log(e.index);
-		if(e.index == 0) this.$u.route('/pageC/cart/index');
+		// console.log(e.index);
+		if(e.index == 1) this.$u.route('/pageC/cart/index');
 		// if(e.index == 0) this.show = true;
 	},
 	methods: {
@@ -130,7 +127,7 @@ export default {
 					this.time = time;
 					this.date = date
 				}
-				// console.log(123)
+				console.log(123)
 				this.$u.api.getAtwillUserInfo({
 					id:this.sid
 				}).then((res)=>{
@@ -149,10 +146,11 @@ export default {
 			}
 			
 		},
-		toDetailsPage({ id, type }) {
+		toDetailsPage(id) {
 			// console.log(11);
-			let src = type == 1 ? 'pageB/photo/index' : 'pageB/video/video';
-			this.$u.route(src, {　id: id　});
+			this.$u.route('pageB/photo/index', {
+				id: id
+			});
 		},
 		switchCurrent(current) {
 			this.cur = current;
@@ -193,17 +191,15 @@ export default {
 			}).then(res => {
 				uni.stopPullDownRefresh();
 				if (res.errCode == 0) {
-					let articleList = res.data.list;
-					// articleList.unshift({}, {}, {}, {});
-					// articleList.push({}, {});
+					// this.articleList = res.data.list;
 					if(JSON.stringify(res.data) != '[]') {
-						if(articleList.length > 0) {
-							this.indextop = [articleList[0]]
+						if(res.data.list.length > 0) {
+							this.indextop = [res.data.list[0]]
 							// this.indextop = [res.data.list[0], res.data.list[1]];
 						}
-						if(articleList.length > 1) {
-							this.indextop.push(articleList[1]);
-							this.indexlist.push(...articleList.slice(2,));
+						if(res.data.list.length > 1) {
+							this.indextop.push(res.data.list[1]);
+							this.indexlist.push(...res.data.list.slice(2,));
 						}
 					}
 				}
@@ -236,66 +232,48 @@ export default {
 		z-index: 9;
 		width: 750rpx;
 		height: 350rpx;
-		// background-color: #999999;
-		.mantle {
-			width: 750rpx;
-			height: 350rpx;
-			position: absolute;
-			top: 0;
-			left: 0;
-			z-index: 10;
-			background-color: #999999;
-			opacity: 0.7;
+		background-color: #999999;
+		display: flex;
+		align-items: center;
+		padding: 168rpx 60rpx 0 30rpx;
+		> image {
+			margin-right: 40rpx;
+			width: 140rpx;
+			height: 140rpx;
+			border-radius: 50%;
+			background-color: aqua;
 		}
-		.main-container {
+		.info {
+			width: 220rpx;
+			color: rgba(255,255,255,1);
+			.name {
+				margin-bottom: 30rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+			}
+			.num {
+				font-size: 24rpx;
+			}
+		}
+		.btn {
+			margin-left: auto;
+			width: 162rpx;
+			height: 60rpx;
+			border: 2rpx solid rgba(255,255,255,1);
+			border-radius: 30rpx;
 			display: flex;
 			align-items: center;
-			padding: 54rpx 60rpx 0 30rpx;
-			position: absolute;
-			top: 0;
-			left: 0;
-			z-index: 19;
-			width: 750rpx;
-			height: 350rpx;
+			justify-content: center;
 			> image {
-				margin-right: 40rpx;
-				width: 140rpx;
-				height: 140rpx;
-				border-radius: 50%;
-				// background-color: aqua;
+				width: 28rpx;
+				height: 28rpx;
+				flex-shrink: 0;
+				margin-right: 14rpx;
 			}
-			.info {
-				width: 220rpx;
+			> view {
+				white-space: nowrap;
+				font-size: 26rpx;
 				color: rgba(255,255,255,1);
-				.name {
-					margin-bottom: 30rpx;
-					font-size: 28rpx;
-					font-weight: 500;
-				}
-				.num {
-					font-size: 24rpx;
-				}
-			}
-			.btn {
-				margin-left: auto;
-				width: 162rpx;
-				height: 60rpx;
-				border: 2rpx solid rgba(255,255,255,1);
-				border-radius: 30rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				> image {
-					width: 28rpx;
-					height: 28rpx;
-					flex-shrink: 0;
-					margin-right: 14rpx;
-				}
-				> view {
-					white-space: nowrap;
-					font-size: 26rpx;
-					color: rgba(255,255,255,1);
-				}
 			}
 		}
 	}
@@ -334,7 +312,7 @@ export default {
 						margin-right: 35rpx;
 					}
 					text-align: center;
-					width: 96rpx;
+					width: 90rpx;
 					> image {
 						width: 60rpx;
 						height: 60rpx;
--- a/pageD/attention/attention.vue
+++ b/pageD/attention/attention.vue
@@ -1,18 +1,15 @@
 <template>
 	<view class="attention">
 		<view class="attention_box" v-for="(item,index) in attention" :key="index" @click="navto(item.friend_tomid)">
-			<view style="position:relative">
+			<view>
 				<image :src="item.friend_tomavatar" mode="aspectFill"></image>
-				<view class="tishi" v-if="item.unread_message"></view>
 			</view>
 			<view>{{item.friend_tomname}}</view>
 			<view>{{item.live_status ? '正在直播' : '未直播'}}</view>
-			<view  class="cur_two"  @click="tapClick(index)">已关注</view>
-			<!-- <view class="cur"   @click="tapClick(index)" v-else = "item.about == 2">未关注</view> -->
+			<view  class="cur_two"  @click="tapClick(index)" v-if = "item.about == 1">已关注</view>
+			<view class="cur"   @click="tapClick(index)" v-else = "item.about == 2">未关注</view>
 		</view>
-		<u-loadmore :status="status" icon-type="iconType"/>
 	</view>
-	
 </template>

 <script>
@@ -22,27 +19,12 @@
 			return {
 				rSelect:[],
 				type : '未关注',
-				attention: [],
-				page:1,
-				status:'loadmore'
+				attention: []
 			};
 		},
-		onReachBottom(){
-			if(this.status == 'loading' || this.status == 'nomore'){
-				return ;
-			}else{
-				this.status = "loading"
-				this.page++
-				this.snsfriendList()
-			}
-		},
 		onLoad(){
 			this.snsfriendList()
 		},
-		onShow(){
-			this.page = 1;
-			this.snsfriendList();
-		},
 		methods: {
 			// 点击切换颜色
 			tapClick(index) {
@@ -55,17 +37,8 @@
 				}
 			},
 			snsfriendList(){
-				this.$u.api.snsfriendList({page:this.page}).then((res)=>{
-					console.log(res)
-					if(this.page > 1){
-						this.attention.push(...res.data.data)
-					}else{
-						this.attention = res.data.data;
-					}
-					this.status = "loadmore"
-					if(res.data.data.length < 15){
-						this.status = "nomore"
-					}
+				this.$u.api.snsfriendList({}).then((res)=>{
+					this.attention = res.data;
 				})
 			},
 			navto(id){
@@ -85,15 +58,6 @@
 </script>

 <style lang="scss" scoped>
-	.tishi{
-		position: absolute;
-		top: 5rpx;
-		left: 80rpx;
-		background-color: #ff5d00;
-		width: 12rpx;
-		height: 12rpx;
-		border-radius: 50%;
-	}
 	.attention {
 		 display: flex;
 		flex-wrap: wrap;
--- a/pageD/components/GoEasyAudioPlayer/GoEasyAudioPlayer.vue
+++ b/pageD/components/GoEasyAudioPlayer/GoEasyAudioPlayer.vue
@@ -40,12 +40,11 @@
        padding: 6rpx 10rpx;
        height: 72rpx;
        line-height: 72rpx;
-        background: #FF780F;
+        background: #D02129;
        font-size: 24rpx;
        border-radius: 14rpx;
        color: #ffffff;
        display: flex;
-        flex-direction: row-reverse;
    }
    .audio-facade-bg{
        background: url("./images/voice.png") no-repeat center;
--- a/pageD/components/GoEasyAudioPlayer/images/play.gif
+++ b/pageD/components/GoEasyAudioPlayer/images/play.gif
--- a/pageD/images/file.png
+++ b/pageD/images/file.png
--- a/pageD/images/jianpan.png
+++ b/pageD/images/jianpan.png
--- a/pageD/images/record-appearance-icon.png
+++ b/pageD/images/record-appearance-icon.png
--- a/pageD/images/vedio.png
+++ b/pageD/images/vedio.png
--- a/pageD/privateChat/privateChat.vue
+++ b/pageD/privateChat/privateChat.vue
@@ -68,7 +68,6 @@
 		</div>
 		<div class="record-loading" v-if="audio.recording"></div>
 		<video style="width:100%;height: 100%" :src="video.url" v-if="video.visible" id="videoPlayer" autoplay="true" @fullscreenchange="onVideoFullScreenChange"  @play="onVideoPlayStart"></video>
-		<u-toast ref="uToast" />
 	</div>
 </template>

@@ -192,13 +191,6 @@
 				})
 			},
 			sendMessage() {//发送消息
-				if(!this.imService.status){
-					this.$refs.uToast.show({
-						title: '连接聊天中，请稍候',
-						type: 'warning'
-					})
-					return
-				}
 				if (this.content.trim() != '') {
 					this.imService.sendPrivateTextMessage(this.friend.uuid, this.content);
 					let that = this
@@ -217,13 +209,6 @@
 				this.imService.loadPrivateHistoryMessage(this.friend.uuid, lastMessageTimeStamp);
 			},
 			onRecordStart () {
-				if(!this.imService.status){
-					this.$refs.uToast.show({
-						title: '连接聊天中，请稍候',
-						type: 'warning'
-					})
-					return
-				}
 				try{
 					recorderManager.start();
 				}catch(e){
@@ -246,13 +231,6 @@
 				}
 			},
 			sendVideo () {//发送文件
-				if(!this.imService.status){
-					this.$refs.uToast.show({
-						title: '连接聊天中，请稍候',
-						type: 'warning'
-					})
-					return
-				}
 				uni.chooseVideo({
 					success : (res) => {
 						console.log(res)
@@ -261,13 +239,6 @@
 				})
 			},
 			sendImage() {
-				if(!this.imService.status){
-					this.$refs.uToast.show({
-						title: '连接聊天中，请稍候',
-						type: 'warning'
-					})
-					return
-				}
 				uni.chooseImage({
 					count :1,
 					success :(res) => {
@@ -277,7 +248,6 @@
 				})
 			},
 			showImageFullScreen (e) {
-				
 				var imagesUrl = [e.currentTarget.dataset.url];
 				uni.previewImage({
 					urls: imagesUrl
@@ -342,7 +312,7 @@
 		box-sizing: border-box;
 	}
 	.chatInterface .top{
-		font-size: 20rpx;
+		font-size: 24rpx;
 		height: 90rpx;
 		display: flex;
 		flex-direction: column;
@@ -352,7 +322,7 @@
 		color: blue;
 	}
 	.chatInterface .top .description{
-		/* text-decoration: underline; */
+		text-decoration: underline;
 	}

 	.chatInterface .message-item{
--- a/pageE/mine/ImageTextCollection.vue
+++ b/pageE/mine/ImageTextCollection.vue
@@ -3,7 +3,7 @@
 		<view class="container">
 			<view class="item-box" v-for="(item, index) in articleList" :key="index" @click="toDetailsPage(item.article_id)">
 				<view class="video-item" v-if="item">
-					<image class="head" :src="item.article_pic" mode="aspectFill" v-if="item.type == 1"></image>
+					<image class="head" :src="item.article_pic" mode="scaleToFill" v-if="item.type == 1"></image>
 					<view class="header_fist" v-else>
 						<view class="backes"></view>
 						<image class="head" :src="item.article_pic"></image>
@@ -219,7 +219,7 @@ export default {
 					.backes{
 						position: absolute;
 						top: 0;
-						// background: rgba(0,0,0,0.6);
+						background: rgba(0,0,0,0.6);
 						width: 100%;
 						height: 100%;
 						color: #fff;
--- 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({ id: info.friend_tomid, type: info.role })"></image>
-					<text class="name" @click="viewDetails({ id: info.friend_tomid, type: info.role })">{{ info.friend_tomname || '' }}</text>
+					<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>
 					<view class="guanzhu" @click="changeType(info.friend_tomid)" v-if="info.friend_followstate == 1">取消关注</view>
 				</view>
 			</view>
@@ -31,15 +31,14 @@ export default {
 			this.$u.api.attentionMemberList().then(res => {
 				uni.stopPullDownRefresh();
 				if(res.errCode == 0) {
-					this.list = res.data.data;
+					this.list = res.data;
 				} else {
 					this.list = [];
 				}
 			})
 		},
-		viewDetails({ id, type }) {
-			let src = type == 3 ? 'pageB/details/index' : 'pageC/merchant/index';
-			this.$u.route(src, {
+		viewDetails(id) {
+			this.$u.route('pageB/details/index', {
 				id: id
 			});
 		},
--- a/pageE/order/Comment.vue
+++ b/pageE/order/Comment.vue
@@ -8,15 +8,14 @@
 		<view class="order-rate">
 			<view class="rate">
 				<view class="title">物流评分</view>
-				<u-rate :count="5" min-count="1" active-color="#FF780F" inactive-color="#CCCCCC" v-model="logistics" gutter="20" size="32"></u-rate>
+				<u-rate :count="5" active-color="#FF780F" inactive-color="#CCCCCC" v-model="logistics" gutter="20" size="32"></u-rate>
 			</view>
 			<view class="rate">
 				<view class="title">服务态度</view>
-				<u-rate :count="5" min-count="1" v-model="service" active-color="#FF780F" inactive-color="#CCCCCC" gutter="20" size="32"></u-rate>
+				<u-rate :count="5" v-model="service" active-color="#FF780F" inactive-color="#CCCCCC" gutter="20" size="32"></u-rate>
 			</view>
 		</view>
 		<view class="write-btn" @click="submitComment">发表意见</view>
-		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
@@ -27,14 +26,13 @@ export default {
 		return {
 			orderId: '',
 			count: 3, // 最大图片数量
-			logistics: 1, // 物流服务
-			service: 1, // 服务态度
+			logistics: 0, // 物流服务
+			service: 0, // 服务态度
 			describe: [],
 			content: [],
 			imageList: [], // 本地图片路径
 			goodsList: [],
 			uploadImageList: [], // 线上图片名字
-			debounce: true, // 防止多次提交
 		}
 	},
 	components: {
@@ -78,7 +76,7 @@ export default {
 		setModelKey(data) {
 			data.forEach(() => {
 				this.content.push('');
-				this.describe.push(1);
+				this.describe.push(0);
 				this.imageList.push([]);
 			})
 		},
@@ -125,28 +123,29 @@ export default {
 			})
 		},
 		verifyParams() {
-			let status = true;
 			this.goodsList.forEach((_, index) => {
 				if(this.$u.test.isEmpty(this.content[index])) {
 					this.$u.toast('内容不可为空');
-					status = false;
+					return false;
 				}
 			})
-			return status;
+			return true;
 		},
 		submitComment() {
 			// console.log(this.content);
 			// console.log(this.describe);
 			// console.log(this.imageList);
 			this.uploadImage();
+			// this.goodsList.forEach((_, index) => {
+				
+			// })
 		},
 		addOrderEvaluate() {
 			if(!this.verifyParams()) return false;
-			if(!this.debounce) return false;
 			let files = [];
 			// console.log(this.uploadImageList);
 			this.uploadImageList.forEach((item, index) => {
-				// files[index] = '';
+				files[index] = '';
 				// console.log(item);
 				item.forEach((img, idx) => {
 					if(idx < item.length-1) {
@@ -162,21 +161,11 @@ export default {
 				scores_one: this.logistics,
 				scores_two: this.service,
 				scores_three: this.describe,
+				file: files,
 			};
-			if(files.length) {
-				Object.assign(params, { file: files })
-			}
-			// console.log(params);
+			console.log(params);
 			this.$u.api.updateOrderEvaluate(params).then(res => {
-				if(res.errCode == 0) {
-					this.$refs.uToast.show({
-						title: res.message,
-						back: true,
-					})
-				} else {
-					this.$u.toast(res.message);
-					this.debounce = true;
-				}
+				this.$u.toast(res.message);
 			})
 		},
 	},
--- a/pageE/order/Details.vue
+++ b/pageE/order/Details.vue
@@ -20,12 +20,12 @@
 			</view>
 			<view class="info-goods">
 				<view class="goods-store">
-					<view class="stoer-title" @click="viewStoreDetails(orderInfo.extend_store.store_id)">
+					<view class="stoer-title">
 						<image :src="orderInfo.extend_store.store_avatar" class="store-image"></image>
 						<view class="store-name">{{ orderInfo.extend_store.store_name }}</view>
 						<image src="../static/mine/21.png" class="right-icon"></image>
 					</view>
-					<view v-for="goods in orderInfo.extend_order_goods" :key="goods.goods_id" @click="viewGoodsDetails(goods.goods_id)">
+					<view v-for="goods in orderInfo.extend_order_goods" :key="goods.goods_id">
 						<view class="store-goods">
 							<image :src="goods.goods_image"></image>
 							<view class="goods-info">
@@ -67,17 +67,14 @@
 				<view>创建时间：{{ orderInfo.add_time | date}}</view>
 			</view>
 		</view>
-		 <!-- '4', '8' -->
-		<view class="btn" v-if="['1', '2', '6'].indexOf(orderstate) >= 0">
-			<!-- orderstate == '4' ||  -->
-			<view class="cancel" v-if="(orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</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>
 			<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>
 			<view class="cancel" v-if="orderstate == '6'" @click="cancelOrder">取消支付</view>
-			<!-- <view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view> -->
-			 <!-- || orderstate == '8' -->
-			<view class="payment" v-if="orderstate == '6'" @click="payNow">立即支付</view>
+			<view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view>
+			<view class="payment" v-if="orderstate == '6' || orderstate == '8'" @click="payNow">立即支付</view>
 			<view class="service" v-if="orderstate == '7'">联系官方客服</view>
 			<view class="submit" v-if="orderstate == '7'">提交官方审核</view>
 		</view>
@@ -121,15 +118,11 @@ export default {
 					text: '拼团中',
 					image: '../static/mine/37.png',
 				},
-				'9': {
-					text: '已取消',
-					image: '../static/mine/33.png',
-				},
 			},
 			orderInfo: {},
 			oid: '',
 			timer: '',
-			countdown: '00:00:00', // 倒计时
+			countdown: '', // 倒计时
 			isSpike: false, // 倒计时是否结束
 		}
 	},
@@ -173,27 +166,11 @@ export default {
 				case 9:
 					state = '8';
 					break;
-				case 10:
-					state = '9';
-					break;
 				default:
 					break;
 			}
 			this.orderstate = state;
 		},
-		viewStoreDetails(id) {
-			this.$u.route('pageC/merchant/index', {
-				id: id
-			});
-		},
-		viewGoodsDetails(id) {
-			this.$u.route({
-				url: 'pageB/sdetails/index',
-				params: {
-					id: id,
-				}
-			})
-		},
 		setSpikeTime(time) {
 			// console.log(time);
 			this.timer = setInterval(() => {
--- a/pageE/order/Index.vue
+++ b/pageE/order/Index.vue
@@ -38,15 +38,15 @@ export default {
 				name: '试穿试送'
 			},{
 				name: '拼团中'
-			}, {
-				name: '待评价'
 			}, {
 				name: '售后'
+			}, {
+				name: '待评价'
 			}],
 			orderList: [],
 			loadStatus: ['loadmore','loadmore','loadmore','loadmore','loadmore','loadmore','loadmore','loadmore'],
 			page: 0,
-			current: 0,
+			current: Number,
 			swiperCurrent: 0,
 			swiperHeight: '',
 			timer: true,
@@ -101,10 +101,10 @@ export default {
 					type = 9; // 拼团中
 					break;
 				case 6:
-					type = 4; // 待评价
+					type = 8; // 售后
 					break;
 				case 7:
-					type = 8; // 售后
+					type = 4; // 待评价
 					break;
 				default:
 					type = -1;
--- a/pageE/order/Logistics.vue
+++ b/pageE/order/Logistics.vue
@@ -43,12 +43,12 @@ export default {
 	methods: {
 		getOrderLogistics(id) {
 			this.$u.api.orderLogistics({ id: id }).then(res => {
+				this.$u.toast(res.message);
 				if(res.errCode == 0) {
 					this.expressInfo = res.data.express_info;
 					this.list = res.data.express_list;
 				} else {
 					this.list = [];
-					this.$u.toast(res.message);
 				}
 			})
 		}
--- a/pageE/order/RefundOrder.vue
+++ b/pageE/order/RefundOrder.vue
@@ -75,7 +75,6 @@ export default {
 			})
 			// console.log(goodsList);
 			this.goods = goodsList[0];
-			this.num = this.goods.goods_num;
 			console.log(this.goods);
 		},
 		getOrderInfo(id) {
--- a/pageE/order/commentItem.vue
+++ b/pageE/order/commentItem.vue
@@ -10,7 +10,7 @@
 			</view>
 			<view class="rate">
 				<view class="title">描述相符</view>
-				<u-rate :count="5" min-count="1" v-model="describe" active-color="#FF780F" inactive-color="#CCCCCC" gutter="20" size="32"></u-rate>
+				<u-rate :count="5" v-model="describe" active-color="#FF780F" inactive-color="#CCCCCC" gutter="20" size="32"></u-rate>
 			</view>
 			<u-input v-model="content" type="textarea" height="100" :auto-height="true" placeholder="发表你的评价吧，收货时心情如何？" />
 			<u-upload 
@@ -45,7 +45,7 @@ export default {
 				name: 'common', // 其他图片
 			},
 			content: '',
-			describe: 1,
+			describe: '',
 			imageList: [],
 		}
 	},
@@ -68,7 +68,7 @@ export default {
 			lists.forEach(item => {
 				this.imageList.push(item.url);
 			})
-			// console.log(this.imageList);
+			console.log(this.imageList);
 			this.$emit('setLocalImage', { list: this.imageList, index: this.index });
 		}
 	}
--- a/pageE/tool/MineHistory.vue
+++ b/pageE/tool/MineHistory.vue
@@ -6,16 +6,12 @@
 				<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-1">{{ item.store_name }}</view>
+						<view class="u-line-2">{{ 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>
@@ -56,7 +52,7 @@ export default {
 		},
 		async getBrowseList () {
 			const res = await this.$u.api.getBrowseList({ page: this.page });
-			this.timer = true;
+			this.timer = false;
 			if(res.errCode == 0) {
 				this.historyList.push(...res.data.storeInfo);
 			}
@@ -64,15 +60,14 @@ export default {
 		},
 		reachBottom() {
 			if(!this.timer) return false;
-			this.timer = false;
 			this.loadStatus = "loading";
 			this.page++;
-			this.getBrowseList().then(length => {
+			this.getBrowseList({page: this.page}).then(length => {
 				if(length == 0) {
 					this.page--;
-					this.loadStatus = 'nomore';
+					this.status = 'nomore';
 				} else {
-					this.loadStatus = 'loading';
+					this.status = 'loading';
 				}
 			}).catch(() => {
 				this.loadStatus = "nomore";
@@ -130,10 +125,10 @@ export default {
 						font-size: 22rpx;
 						color: rgba(51,51,51,1);
 					}
-					// > image {
-					// 	width: 37rpx;
-					// 	height: 8rpx;
-					// }
+					> image {
+						width: 37rpx;
+						height: 8rpx;
+					}
 				}
 			}
 		}
--- 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="type == 1 ? item.goods_image : item.images[0]"></image>
+							<image :src="item.goods_image"></image>
 							<view v-if="item.deliver_goods_type == 2 && item.order_status == 20">
 								<view>骑手名字：{{ item.takeawayer_name || '' }}</view>
 								<view>联系方式：{{ item.takeawayer_mobile || '' }}</view>
@@ -40,9 +40,13 @@
 								<view>商家在正路途中，请耐心等待</view>
 							</view>
 						</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 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>
 					</view>
 				</scroll-view>
@@ -83,7 +87,6 @@ export default {
 			timer: true,
 			commentList: [],
 			swiperHeight: '',
-			type: 1, // 1 平台 2 实体店
 		}
 	},
 	components: {
@@ -136,9 +139,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: this.type,
+				type: type,
 				page: this.page,
 			})
 			uni.stopPullDownRefresh();
@@ -211,10 +214,8 @@ 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();
@@ -321,21 +322,17 @@ export default {
 					display: flex;
 					justify-content: flex-end;
 					margin-top: 30rpx;
-					.btn {
-						box-sizing: border-box;
+					.btn{
 						width: 154rpx;
-						// height: 54rpx;
+						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;
-						// display: flex;
-						// align-items: center;
-						// justify-content: center;
+						margin-right: -80rpx;
 					}
 				}
 			}
--- a/pages.json
+++ b/pages.json
@@ -57,7 +57,8 @@
 						"navigationBarTitleText": "",
 						"navigationStyle": "custom",
 						"app-plus": {
-							"titleNView": false
+							"titleNView": false,
+							"animationType": "slide-in-bottom"
 						}
 					}
 				},
@@ -104,10 +105,7 @@
                {
                    "path" : "video/video",
                    "style" : {
-                        "navigationStyle":"custom",
-                        "app-plus": {
-                        	"softinputMode": "adjustResize"
-                        }
+                        "navigationStyle":"custom"
                    }
                },
 				{
@@ -180,7 +178,7 @@
 								"searchInput": {
 									"align": "left",
 									"borderRadius": "15px",
-									"placeholder": "请输入搜索内容",
+									"placeholder": "搜索您需要的商品",
 									"backgroundColor": "rgb(236,236,236)",
 									"placeholderColor": "#999999",
 									"disabled": false,
@@ -200,7 +198,7 @@
 								"searchInput": {
 									"align": "left",
 									"borderRadius": "15px",
-									"placeholder": "请输入搜索内容",
+									"placeholder": "搜索您需要的商品",
 									"backgroundColor": "rgb(236,236,236)",
 									"placeholderColor": "#999999",
 									"disabled": false,
@@ -240,18 +238,6 @@
 						}
 					}
 				},
-				{
-					"path": "coupon/index",
-					"style": {
-						"navigationStyle": "custom",
-						"app-plus": {
-							"animationType": "fade-in",
-							"background": "transparent",
-							"backgroundColor": "rgba(0,0,0.5)",
-							"popGesture": "none"
-						}
-					}
-				},
 				{
 					"path": "coupon/details",
 					"style": {
@@ -349,8 +335,8 @@
 						"app-plus": {
 							"titleSize": "36px",
 							"titleNView": {
-                                "type": "transparent",
 								"titleColor": "#333333",
+								"backgroundColor": "rgba(255,255,255,0)",
 								"buttons": [
 									// {  
 									// 	"type":"none",
@@ -367,7 +353,6 @@
 										"fontSize":"22",
 										"fontSrc": "/static/fonts/cart.ttf",
 										"color": "#FFFFFF"
-                                        
 									}
 								],
 								"searchInput": {
@@ -851,7 +836,6 @@
 					"style": {
 						"navigationBarTitleText": "勋章介绍",
 						"app-plus": {
-							"type": "transparent",
 							"titleSize": "36px",
 							"titleNView": {
 								"backgroundColor": "rgba(255,255,255,0)",
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -18,9 +18,9 @@
 				</view>
 				<view class="sosuo"></view>
 			</view>
-			<swiper class="card" @change="dianji" :current="num" @touchmove.stop.prevent="moveHandle">
+			<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">
+					<scroll-view style="width:100%;height:100%" scroll-y="true" lower-threshold="200" @scrolltolower="swiperBottom">
 						<view class="box">
 							<!-- <indexad style="width:690rpx"></indexad> -->
 							<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper>
@@ -39,20 +39,19 @@
 					</scroll-view>
 				</swiper-item>
 				<swiper-item>
-					<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="swiperBottom">
+					<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"  :item="item" @updateList="updateList"></zhiboItem>
+									 :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"  :item="item" @updateList="updateList"></zhiboItem>
+									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
 								</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>
@@ -80,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" :load-text="loadText" />
+                                     <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>
@@ -88,23 +87,28 @@
 				</swiper-item>
 			</swiper>
 		</view>
+		<u-popup v-model="showCoupon" mode="center" class="u-coupon-popup">
+			<view class="coupon">
+				<view class="price">{{ newMemberCoupon.price }}</view>
+				<image src="/static/image/common/30.png" class="coupon-image" @click="viewCoupon"></image>
+				<image src="/static/image/common/24.png" class="close-image" @click="showCoupon=false"></image>
+			</view>
+		</u-popup>
 	</view>

 </template>
 <style lang="scss" scoped>
-    page {
-        background-color: #fff;
-    }
 	.index {
 		width: 750rpx;
 		display: flex;
 		flex-direction: column;
+		height: 100vh;
+        /* #ifdef APP-PLUS */
+        padding-bottom: 100rpx;
+        /* #endif */
+        overflow: hidden;

 		.top {
-            z-index: 10000;
-            position: fixed;
-            top: var(--status-bar-height);
-            left: 0;
 			display: flex;
 			flex-shrink: 0;
 			align-items: center;
@@ -112,7 +116,6 @@
 			width: 100%;
 			height: 88rpx;
 			padding: 0 30rpx;
-            background-color: #fff;

 			.sosuo {
 				width: 32rpx;
@@ -130,32 +133,27 @@
 		}

 		.card {
+			height: 100%;
 			width: 100%;
-			height: calc(100vh - 150rpx);
-            margin-top: 100rpx;
-            // padding-top: 100rpx;
+            // pointer-events: none;

 			.box {
 				width: 100%;
                height: 100%;
-				padding: 0 30rpx 0;
-                // margin-top: 30rpx;
+				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;
+			padding: 30rpx;

 			.title {
 				width: 100%;
@@ -213,6 +211,41 @@
        margin: 200rpx auto 0;
        text-align: center;
    }
+	.u-coupon-popup {
+		/deep/ .u-mode-center-box {
+			background-color: transparent;
+		}
+		.coupon {
+			width: 750rpx;
+			height: 583rpx;
+			position: relative;
+			.price {
+				z-index: 3;
+				color: #EBB36E;
+				position: absolute;
+				font-size: 108rpx;
+				font-weight: bold;
+				top: 200rpx;
+				left: 50%;
+				transform: translate(-68%, 0);
+			}
+			.coupon-image {
+				width: 568rpx;
+				height: 583rpx;
+				position: absolute;
+				top: 0;
+				left: 50%;
+				transform: translate(-60%, 0);
+			}
+			.close-image {
+				position: absolute;
+				top: 0; 
+				right: 155rpx;
+				width: 60rpx;
+				height: 60rpx;
+			}
+		}
+	}
 	
    
 </style>
@@ -238,7 +271,7 @@
 					name: '关注'
 				}],
 				num: 0,
-				page: 1, // 0即第一页
+				page: 0, // 0即第一页
                follow_page: 0, //
 				articleList: [],
 				recommendList: [], // 推荐达人
@@ -254,6 +287,9 @@
                    loading: '努力加载中',
                    nomore: '实在没有了'
 				},
+				showCoupon: false,
+				newMemberCoupon: {},
+				exchangestate:false
 			}
 		},
 		components: {
@@ -263,71 +299,43 @@
 			darenItem
 		},
 		onShow() {
-            this.page = 1;
-            if (this.page != 1) {
-                this.articleList = [];
-            }
-            this.getArticlelist();
-            // if (this.hasLogin) {
-            //     this.isNewmembervoucher();
-            // }
+			// 页面返回,页面登陆的情况下检查是否显示领取优惠卷优惠券弹窗
+			if(this.exchangestate==true){
+				this.isNewmembervoucher()
+			}
+            this.articleList = [];
+            this.page = 0;
+			this.getArticlelist();
+			this.getSwiper();
 		},
 		onLoad(){
-            this.getSwiper();
-            // 优惠券
 			if(this.$store.state.hasLogin){
-				this.isNewmembervoucher();
+				this.exchangestate = true
 				const user = uni.getStorageSync('user_info');
-				// console.log(user)
+				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")
+					console.log("guanbi")
 				},1000)
 				setTimeout(function(){
-					// console.log("lianjie")
+					console.log("lianjie")
 					that.imService.connectIM()
 				},2000)
 			}
 		},
 		onPullDownRefresh() {
-            this.page = 1;
            this.getArticlelist();
 			// this.getManicureList({ load: 'reload' });
 		},
 		methods: {
-            moveHandle() {
-                return;
-            },
            // 直播列表
 			tabLiveList() {
-				uni.showLoading({
-                    title: "loading..."
-                })
-				this.$u.api.tabLiveList({page:this.page}).then((res) => {
-					 // uni.stopPullDownRefresh();
-                    this.status = "loading";
-                    if (res.errCode == 0) {
-                        uni.hideLoading();
-                        if (this.page == 1) {
-                        	this.tabLiveLists = res.data.data;
-                            this.status = "loadmore";
-                        } else if (res.data.data.length == 0 && this.page > 1) {
-                            this.status = "nomore";
-                        } else {
-							this.tabLiveLists  = this.tabLiveLists.concat(res.data.data);
-							console.log(this.tabLiveLists)
-                        }
-                        if (res.data.data.length == 0 && this.page > 1) {
-                        } else {
-                            this.page++;
-                        }
-                    } else {
-                        this.status = "nomore"
-					}
-					
+				this.$u.api.tabLiveList().then((res) => {
+					console.log(res)
+					this.tabLiveLists = res.data;
 				})
 			},
            // 轮播图
@@ -340,7 +348,7 @@
 			},
            // 关注
 			changeType(member_id) {
-				// console.log(member_id);
+				console.log(member_id);
 				// this.$emit("pChangeType");
 				this.$u.api.attentionMember({
 					member_id: member_id
@@ -369,13 +377,11 @@
                // 状态请求
                if (a.type == "change") { // 强制请求一次
                    if (this.num == 0) {
-                        this.page = 1;
-                        this.articleList = [];
+                        this.page = 0;
                        this.status = "loadmore";
                        this.getArticlelist();
                        this.getSwiper();
                    } else if (this.num == 1) {
-                        this.page = 1;
                        this.getZhiBoSwiper(); // 直播轮播
                        this.tabLiveList();
                    } else if (this.num == 2) {
@@ -390,29 +396,23 @@
 			},
            // 发现别表
 			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) {
+                        // uni.stopPullDownRefresh();
+                        // console.log('37647744ghj', res)
+                        if (this.page == 0) {
                        	this.articleList = res.data.list;
                            this.status = "loadmore";
-                        } else if (res.data.length == 0 && this.page > 1) {
+                        } else if (res.data.length == 0 && this.page > 0) {
                            this.status = "nomore";
                        } else {
                            this.articleList = this.articleList.concat(res.data.list);
                        }
-                        if (res.data.length == 0 && this.page > 1) {
-                        } else {
-                            this.page++;
-                        }
+                        this.page++;
                    } else {
                        this.status = "nomore"
                    }
@@ -420,25 +420,15 @@
 			},
            // 屏蔽更新列表
            updateList() {
-                this.page = 1;
-				this.getArticlelist();
-				this.tabLiveList()
+                console.log(111);
+                this.page = 0;
+                this.getArticlelist();
            },
            // 发现下拉加载
            swiperBottom(e) {
-				if(this.num == 0 ){
-	                this.getArticlelist();
-
-				}else if(this.num == 1){
-					console.log(123)
-					this.tabLiveList()
-				}
+                this.getArticlelist();
                // console.log(e);
            },
-            swiperTop() {
-                // uni.startPullDownRefresh();
-            },
-            // 关注下拉
            followBotton(e) {
                this.getFollowList();
              // console.log(e);
@@ -522,17 +512,24 @@
            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');
+						this.newMemberCoupon = res.data;
+						this.showCoupon = true;
+					} else {
+						this.showCoupon = false;
 					}
 				})
 			},
+			viewCoupon() {
+				this.$u.route('/pageB/coupon/details', {
+					price: this.newMemberCoupon.price
+				});
+			}
 		},
 	}
 </script>
--- 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>
-						<u-icon name="arrow-right" color="#999" size="22"></u-icon>
+						<image src="/static/image/mine/21.png"></image>
 					</view>
 				</view>
 				<view class="content">
@@ -71,11 +71,11 @@
 						<image src="/static/image/mine/37.png"></image>
 						<view>拼团中</view>
 					</view>
-					<view @click="toOtherPage('/order/Index?current=6')">
+					<view @click="toOtherPage('/order/Index?current=7')">
 						<image src="/static/image/mine/3.png"></image>
 						<view>待评价</view>
 					</view>
-                    <view @click="toOtherPage('/order/Index?current=7')">
+                    <view @click="toOtherPage('/order/Index?current=6')">
                    	<image src="/static/image/mine/9.png"></image>
                    	<view>售后</view>
                    </view>
@@ -180,7 +180,7 @@ export default {
    .mine-top {
 		// width: 100%;
 		height: 272rpx;
-		background-color: #FF7807;
+		background: #FF780F;
 		.top {
 			padding: 40rpx 0 0 30rpx;
 			display: flex;
@@ -242,11 +242,13 @@ export default {
 			}
 		}
 		.bottom {
-			display: flex;
-			justify-content: space-around;
-            padding: 0 10rpx;
 			box-sizing: border-box;
+			padding: 0 30rpx;
+			display: flex;
+			// justify-content: space-between;
+			justify-content: flex-start;
 			> view {
+				margin-right: 80rpx;
 				text-align: center;
 				font-size: 26rpx;
                font-weight: 500;
@@ -266,35 +268,35 @@ export default {
 		}
 		@mixin common-mine($content-padding-top, $content-padding-bottom, $image-width, $image-height) {
 			box-sizing: border-box;
-			width: 750rpx;
+			width: 690rpx;
 			background: rgba(255,255,255,1);
-			// border-radius: 10rpx;
-			margin: 20rpx auto 0;
+			border-radius: 10rpx;
+			margin: 30rpx auto 0;
+			padding: 0 20rpx;
 			.title {
-				display: flex;
-				align-items: center;
 				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);
-				// }
+				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);
+				}
 			}
            .title-text-more {	
                font-size: 24rpx;
                color: #999;
            }
 			.content {
-				padding: $content-padding-top 20rpx $content-padding-bottom;
+				padding: $content-padding-top 0 $content-padding-bottom;
 				display: flex;
 				> view {
 					text-align: center;
--- a/pages/zhibo/index.nvue
+++ b/pages/zhibo/index.nvue
@@ -26,7 +26,7 @@
      <image src="../../static/danmu.png" class="danmubianji"></image>
      <text style="font-size:26rpx;color:#fff;margin-left:20rpx">{{ $store.state.hasLogin ? '想说点什么' : '请先登录'}}</text>
    </view>
-    <!-- <image class="liketap" src="../../static/like.png" @click=""> -->
+    <image class="liketap" src="../../static/like.png" @click="">

    <view class="danmuinputbox" v-if="danmu">
      <input type="text" focus="true" style="width:600rpx;margin-left:30rpx;font-size:26rpx" maxlength="20" @blur="danmu=false" v-model="danmutext">
@@ -86,7 +86,7 @@
 .shopimg{
    width: 160rpx;
    height: 160rpx;
-    // background-color: #0f0;
+    background-color: #0f0;
    

 }
@@ -158,9 +158,7 @@
  height: 46rpx;
  position: fixed;
  bottom: 36rpx;
-  // right: 154rpx;
-  right: 54rpx;
-
+  right: 154rpx;
 }
 .hottext{
  font-size: 20rpx;
@@ -277,7 +275,7 @@
  left: 0;
  width: 308rpx;
  height: 58rpx;
-  background-color: #000;
+  background-color: #0f0;
  opacity: 0.4;
  border-radius: 29rpx;
 }
@@ -393,7 +391,7 @@ export default {
          that.$forceUpdate();
          console.log(that.room)

-    },10 * 1000)
+    },60 * 1000)
    uni.request({
      url:"https://dmmall.sdbairui.com/api/Specialci/livingUserInfo",
      data:{
@@ -454,13 +452,6 @@ export default {
 		},
  methods:{
    sendMessage (messageType, content) {//发送消息
-    if(!this.chatRoomService.status){
-      uni.showToast({
-          title: '连接聊天室中，请稍等',
-          duration: 2000
-      });
-      return
-    }
    console.log(this.room,this.room.id,messageType, content)
 				if(content == "" && messageType == 0) return;
 				var message = {
@@ -469,8 +460,7 @@ export default {
 					content : content
 				}
 				this.chatRoomService.sendMessages(this.room.id, message);
-        this.danmutext = ""
-        this.danmu = false
+				this.danmutext = ""
 			},
    whenNewMessage (message) {//新消息监听
      // if(message.type == this.room.MessageType.PROP){
@@ -517,11 +507,7 @@ export default {
            },
            success(res){
              console.log(res)
-              that.info = res.data.data;
-              uni.showToast({
-                  title: res.data.message,
-                  icon: "none"
-              })
+              that.info = res.data.data
              // that.list= res.data.data
            }
          })
--- a/static/image/shop/14.png
+++ b/static/image/shop/14.png
--- a/static/image/tabbar/mine2.png
+++ b/static/image/tabbar/mine2.png
--- a/static/image/userinfo/follow.png
+++ b/static/image/userinfo/follow.png
--- a/static/image/userinfo/followed.png
+++ b/static/image/userinfo/followed.png
--- a/static/imservice.js
+++ b/static/imservice.js
@@ -37,7 +37,6 @@ function IMService() {
        host:'hangzhou.goeasy.io',//qos=1
        appkey:'BC-453aa755c4ea48148abefc55a86df283'
    });
-    this.status = false
    //当前“我”
    this.currentUser = null;
    //我的好友
@@ -237,12 +236,10 @@ IMService.prototype.connectIM = function () {
 IMService.prototype.initialIMListeners = function () {
    this.im.on(GoEasyIM.EVENT.CONNECTED, () => {
        console.log('连接成功.')
-        this.status = true
    });

    this.im.on(GoEasyIM.EVENT.DISCONNECTED, () => {
        console.log('连接断开.')
-        this.status = false
    });

    //监听好友上下线
Author	SHA1	Message	Date
cmxdd	5e0162e3ea	Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into cmx	2020-08-11 14:20:12 +08:00
cmxdd	282502a8d6	优惠券弹窗不关闭	2020-08-11 10:45:10 +08:00