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

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/153

App.vue

@@ -1,10 +1,14 @@
 <script>
 	import { mapMutations, mapState } from 'vuex';
 	export default {
+		globalData: {  
+			im: {}  
+		},  
         computed: {
             ...mapState(["hasLogin"])
         },
 		onLaunch() {
+			getApp().globalData.im = this.imService
 			// 缓存token
 			uni.getStorage({
 				key: "token",
@@ -39,6 +43,12 @@
     .status_bar {
     	width: 100%;
     	height: var(--status-bar-height);
+    }
+    /* 自定义下拉 */
+    .load-size {
+        ::v-deep.u-more-text {
+            font-size: 20rpx !important;
+        }
     }
 	/* #endif */
 </style>

common/api/shop.js

@@ -294,8 +294,8 @@ export default {
 				})
 			},
 			// 搜索发现列表
-			searchwordlist() {
+			searchwordlist({type}) {
-				return vm.$u.post('ShopSearch/searchwordlist')
+				return vm.$u.post('ShopSearch/searchWordList',{type})
 			},
 			// 提交试穿订单
 			saveGoodsTry({ member_name, member_mobile, area_info, address_detail, goods_id, num, store_id, appointment_time }) {
@@ -332,7 +332,18 @@ export default {
 					fav_id: fid,
 					type: type
 				})
-			}
+			},
+			//店铺列表
+			storeList({ page, name_search }) {
+				return vm.$u.post('shop/storeList',{ 
+					page,
+					name_search: name_search
+				})
+			},
+			// 是否弹出新人优惠券
+			isNewmembervoucher() {
+				return vm.$u.post('Coupon/isNewmembervoucher')
+			},
         }
     }
     

common/http.interceptor.js

@@ -46,7 +46,7 @@ const install = (Vue, vm) => {
         } else if(res.data.errCode == 401) {
             // 假设201为token失效，这里跳转登录
             // vm.$u.toast('您还没有登录哦，请先去登录！');
-            if (res.data.action != "memberinfo") {
+            if (res.data.data.action != "memberinfo") {
                 uni.showModal({
                     title: "温馨提示",
                     content: "您还未登录，请立即登录",
@@ -61,17 +61,19 @@ const install = (Vue, vm) => {
                                 vm.$u.route('/pageA/login/login')
                             }, 500)
                         }
+                        if (res.cancel) {
+                        }
                     }
                 })
             }
             return false;
         } else if (res.errCode == 1) {
-			// console.log(res.message);
+            console.log(res.message);
-			return res;
+            return res.data;
         } else {
             // 如果返回false，则会调用Promise的reject回调，
             // 并将进入this.$u.post(url).then().catch(res=>{})的catch回调中，res为服务端的返回值
-            return res;
+            return res.data;
         }
     }
 

components/index/video-item/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <view class="video-item" v-if="item" @click="toDetailsPage(item.article_id)">
+    <view class="video-item" v-if="item" @click="toDetailsPage(item.article_id,item.video_path)">
         <image class="head" :src="item.article_pic" v-if="item.type == 1" ></image>
 		<view class="header_fist"  v-else>
 			<view class="backes"></view>
@@ -174,7 +174,6 @@
 		.backes{
 			position: absolute;
 			top: 0;
-			background: rgba(0,0,0,0.6);
 			width: 100%;
 			height: 100%;
 			color: #fff;
@@ -233,6 +232,7 @@ export default {
 				}
 			})
 		},
+        // 屏蔽
 		articleAddShield() {
 			this.$u.api.articleAddShield({
 				article_id: this.item.article_id,
@@ -241,14 +241,20 @@ export default {
 				// console.log(res)
 				if(res.errCode == 0) {
                     this.$u.toast(res.message);
-					this.$emit("getArticlelist");
+					this.$emit("updateList");
 				}
 			})
 		},
-		toDetailsPage(id) {
+		toDetailsPage(id,type) {
+            if (type) {
+                uni.navigateTo({
+                	url: '/pageB/video/video?id=' + id
+                });
+            } else {
                  uni.navigateTo({
                 	url: '/pageB/photo/index?id=' + id
                 });
+            }
 		},
 	},
 }

components/informations/notice/notice.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="notice">
-		<view v-for="(item,index) in notice" :key="index">
+		<view v-for="(item,index) in notice" :key="index"  @click="gotoInfo(index)">
 			<view class="time_notice">{{ item.addtime }}</view>
 			<view class="notice_view">
 				<image :src="item.picture" mode="aspectFill" ></image>
@@ -87,7 +87,15 @@
             }
         },
         methods: {
-            
+            gotoInfo(index) {
+                console.log(index);
+                this.$u.route({
+                    url: "/pageD/notice/info",
+                    params: {
+                        index: index
+                    },
+                })
+            }
         }
 	}
 </script>

components/logininput/identifying.vue

@@ -44,49 +44,57 @@
 				this.$emit('tochange');
 				let member_mobile = this.member_mobile;
 				// 校验手机号
-				let type_phone = this.$u.test.mobile(member_mobile)
+				let type_phone = this.$u.test.mobile(member_mobile);
-				console.log(member_mobile)
+				// console.log(member_mobile);
-				console.log(this.smslog_type)
+				// console.log(this.smslog_type);
 				// 判断是否有手机号为空
 				if (type_phone == false) {
                     this.$refs.uToast.show({
-						title: '手机号格式不正确',
+                    	title: "手机号格式不正确"
-						type: 'error'
                     })
 				} else {
 					// 验证码倒计时
 					if (this.$refs.uCode.canGetCode) {
-						// 模拟向后端请求验证码
                         uni.showLoading({
                         	title: '正在获取验证码'
                         })
+                        // 请求接口
+                        this.$u.api.sendSmsCode({
+                        	member_mobile: this.member_mobile,
+                        	smslog_type: this.smslog_type
+                        }).then((res) => {
+                            if (res.errCode == 0) {
+                                console.log(res);
+                                this.$refs.uToast.show({
+                                	title: res.message,
+                                })
                                 setTimeout(() => {
                                 	uni.hideLoading();
                                 	// 这里此提示会被this.start()方法中的提示覆盖
-							this.$u.toast('验证码已发送');
+                                	// this.$u.toast('验证码已发送');
                                 	// 通知验证码组件内部开始倒计时
                                 	this.$refs.uCode.start();
-						}, 2000);
+                                }, 100);
+                            } else {
+                                this.$refs.uToast.show({
+                                	title: res.message,
+                                })
+                            }
+                        })
 					} else {
 						// this.$u.toast('倒计时结束后再发送');
-                        console.log("倒计时结束后再发送");
+                        // console.log("倒计时结束后再发送");
 					}
 				}
 
 			},
 			end() {
-				this.$u.toast('倒计时结束');
+				// this.$u.toast('倒计时结束');
 			},
 			start() {
 				// this.$u.toast('倒计时开始');
-				console.log(this.smslog_type)
+				// console.log(this.smslog_type)
 				// 倒计时请求
-				this.$u.api.sendSmsCode({
-					member_mobile: this.member_mobile,
-					smslog_type: this.smslog_type
-				}).then((res) => {
-					console.log(res)
-				})
 			}
 		}
 	}

components/mine/collection-item/index.vue

@@ -9,7 +9,7 @@
 			@click="removeFavorite"
 			@open="open"
 		>
-			<view class="item u-border-bottom">
+			<view class="item u-border-bottom" @click="viewGoodsDetails(item)">
 				<image :src="item.goods_image"></image>
 				<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
 				<view class="title-wrap">
@@ -45,6 +45,18 @@ export default {
 		this.getGoodsFavoritesList();
 	},
 	methods: {
+		viewGoodsDetails(item) {
+			const list = this.list.filter(item => {
+				return item.show;
+			})
+			if(list.length) return false;
+			this.$u.route({
+				url: 'pageB/sdetails/index',
+				params: {
+					id: item.fav_id,
+				}
+			})
+		},
 		getGoodsFavoritesList() {
 			this.$u.api.getFavoritesList().then(res => {
 				if(res.errCode == 0) {
@@ -75,6 +87,7 @@ export default {
 			this.list.map((val, idx) => {
 				if(index != idx) this.list[idx].show = false;
 			})
+			this.$forceUpdate();
 		}
 	},
 };
@@ -92,6 +105,7 @@ export default {
 			flex-shrink: 0;
 		}
 		.title-wrap {
+			flex: 1;
 			.item-top {
 				font-size: 30rpx;
 				color: rgba(51,51,51,1);

components/mine/coupon/index.vue

@@ -10,7 +10,7 @@
 					<view class="price">￥<span>{{ couponInfo.vouchertemplate_price }}</span></view>
 					<view class="condition">满{{ couponInfo.vouchertemplate_limit }}使用</view>
 				</view>
-				<view class="info-store u-line-1">仅限{{ couponInfo.vouchertemplate_storename }}商品使用</view>
+				<view class="info-store u-line-1">仅限{{ couponInfo.type == 2 ? couponInfo.vouchertemplate_storename : '指定商品' }}使用</view>
 				<view class="info-integral">兑换积分：{{ couponInfo.vouchertemplate_points }}积分</view>
 				<view class="info-date">有效期{{ couponInfo.vouchertemplate_startdate }}-{{ couponInfo.vouchertemplate_enddate }}</view>
 			</view>

components/mine/order-item/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="order-item">
+	<view class="order-item" v-if="order.extend_store">
 		<view class="order-title">
 			<view class="store-info">
 				<image :src="order.extend_store.store_avatar"></image>
@@ -24,13 +24,14 @@
 				</view>
 			</view>
 		</view>
-		<view class="order-btn" v-if="[1, 2, 3, 4, 8].indexOf(order.view_type) >= 0">
+		<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="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>

components/remaining/remaining.vue

@@ -205,7 +205,7 @@
         z-index: 1000;
         position: absolute;
         bottom: 100rpx;
-        right: 30%;
+        right: 230rpx;
         width: 300rpx;
         height: 80rpx;
         line-height: 80rpx;
@@ -297,17 +297,18 @@
 				height: 560rpx;
 
 				.protocol_content {
+					display: block;
 					width: 494rpx;
 					height: 528rpx;
+					margin: 10rpx auto 30rpx;
 					font-size: 24rpx;
 					font-weight: 400;
-					color: rgba(51, 51, 51, 1);
-					display: block;
 					text-align: left;
-					margin: 80rpx auto 33rpx;
-					letter-spacing: 1rpx;
-					text-align: justify;
 					line-height: 36rpx;
+					text-align: justify;
+					letter-spacing: 1rpx;
+                    text-indent: 2rem;
+					color: rgba(51, 51, 51, 1);
 
 				}
 			}

components/shop/group/index.vue

@@ -8,13 +8,16 @@
 			</view>
         </view>
         <view class="label">
-            <u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper>
+            <!-- <u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper> -->
+			<u-tabs :list="classifyList" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24"  inactive-color="#333333"></u-tabs>
         </view>
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 340rpx;">
 			<swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
 				<!-- 最多显示3个 -->
-				<sitem :info="info" v-for="(info, index) in groupList.slice(0, 3)" :key="index"></sitem>
+				<view v-if="groupList[i]">
-				<u-empty text="暂无拼团商品" mode="list" color="#000" v-if="!groupList.length" style="margin: 0 auto;"></u-empty>
+					<sitem :info="info" v-for="(info, index) in groupList[i].slice(0, 3)" :key="index"></sitem>
+				</view>
+				<u-empty text="暂无拼团商品" mode="list" color="#000" v-if="!groupList[i] || !groupList[i].length" style="margin: 0 auto;"></u-empty>
 			</swiper-item>
 		</swiper>
     </view>
@@ -58,7 +61,9 @@ export default {
 				page: 0,
 				gc_id: id,
 			}).then(res => {
-				this.groupList = res.data;
+				this.groupList[this.current] = res.data;
+				// console.log(this.groupList);
+				this.$forceUpdate();
 			})
 		},
 		tabsChange(index) {

components/shop/group/item.vue

@@ -34,8 +34,9 @@ export default {
 			this.$u.route({
 				url: 'pageB/sdetails/index',
 				params: {
-					id: this.info.pintuan_id,
+					// id: this.info.pintuan_id,
-					type: 2,
+					id: this.info.pintuan_goods_id,
+					// type: 2,
 				}
 			})
 		}

components/shop/list/index.vue

@@ -2,14 +2,15 @@
     <view class="list">
         <view class="top">商品推荐</view>
 		<view>
-			<u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="26" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper>
+			<!-- <u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="26" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper> -->
+			<u-tabs :list="classifyList" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24"  inactive-color="#333333"></u-tabs>
 		</view>
-		<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
+		<swiper class="swiper-box" :current="swiperCurrent" @animationfinish="animationfinish" :style="{height: swiperHeight}">
 			<swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
-				<view class="goods-item" v-if="goodsList.length">
+				<view class="goods-item">
-					<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
+					<item v-for="item in goodsList[index]" :key="item.goods_id" :info="item"></item>
 				</view>
-				<u-empty text="暂无商品" mode="list" color="#000" margin-top="20" v-else></u-empty>
+				<u-empty text="暂无商品" mode="list" color="#000" margin-top="20" v-if="!goodsList[index] || !goodsList[index].length"></u-empty>
 			</swiper-item>
 		</swiper>
 		<!-- 加载更多 -->
@@ -39,7 +40,7 @@ export default {
 	watch: {
 		current(index) {
 			this.page = 1;
-			this.goodsList = [];
+			// this.goodsList = [];
 			const id = this.classifyList[index].gc_id;
 			this.getGoodsRecommend({gc_id: id});
 		}
@@ -86,34 +87,30 @@ export default {
 			// this.swiperCurrent = this.current;
 			if (res.errCode == 0) {
 				this.timer = true;
-				if(reload) this.goodsList = res.data.goodsList;
+				if(reload) this.goodsList[this.current] = res.data.goodsList;
-				else this.goodsList.push(...res.data.goodsList);
+				else this.goodsList[this.current].push(...res.data.goodsList);
 				// console.log(this.goodsList);
 				this.setSwiperHeight();
 			}
+			this.$forceUpdate();
 			return res.data.goodsList.length;
 		},
 		setSwiperHeight() {
-			// height: 230px, margin-bottom: 13
+			// height: 480rpx, margin-bottom: 26rpx
-			const height = Math.ceil(this.goodsList.length / 2) * (540 + 26);
+			const height = Math.ceil(this.goodsList[this.current].length / 2) * (480 + 26);
 			this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
-			// this.swiperHeight = Math.ceil(this.goodsList.length / 2) * (270 + 13) + 'px';
+			// console.log(this.swiperHeight);
 		},
 		// tabs通知swiper切换
 		tabsChange(index) {
 			this.current = index;
+			this.swiperCurrent = this.current;
 			// this.getGoodsRecommend({ gc_id: this.classifyList[this.current].gc_id });
 		},
-		// swiper-item左右移动，通知tabs的滑块跟随移动
-		transition(e) {
-			let dx = e.detail.dx;
-			this.$refs.uTabs.setDx(dx);
-		},
 		// 由于swiper的内部机制问题，快速切换swiper不会触发dx的连续变化，需要在结束时重置状态
 		// swiper滑动结束，分别设置tabs和swiper的状态
 		animationfinish(e) {
 			let current = e.detail.current;
-			this.$refs.uTabs.setFinishCurrent(current);
 			this.current = current;
 			this.swiperCurrent = current;
 			// this.getGoodsRecommend({ gc_id: this.classifyList[this.current].gc_id });
@@ -136,8 +133,7 @@ export default {
     }
     .swiper-box {
         height: 100%;
-        padding: 20rpx 0;
+        padding-top: 20rpx;
-        margin-bottom: 10rpx;
         .swiper-item {
             // height: 100%;
             .goods-item {

components/shop/list/item.vue

@@ -3,7 +3,7 @@
         <image :src="info.goods_image" mode="aspectFill" class="img"></image>
         <view class="info">
             <text class="title u-line-2">{{ info.goods_name }}</text>
-            <text class="jianjie u-line-1">{{ info.goods_advword }}</text>
+            <!-- <text class="jianjie u-line-1">{{ info.goods_advword }}</text> -->
             <text class="price">￥{{ info.goods_price }}</text>
         </view>
     </view>
@@ -44,7 +44,7 @@ export default {
 <style lang="scss" scoped>
 .item{
     width: 330rpx;
-	height: 520rpx;
+	height: 480rpx;
     margin-bottom: 26rpx;
     background-color: #f8f8f8;
     border-radius: 10rpx 10rpx 0rpx 0rpx;
@@ -62,10 +62,12 @@ export default {
         flex-direction: column;
         justify-content: space-around;
         .title{
-			line-height: 40rpx;
+			margin-bottom: 16rpx;
-            font-size: 30rpx;
+            font-size: 26rpx;
+            font-weight: 600;
+			height: 60rpx;
+			line-height: 30rpx;
             color: #333;
-			margin-bottom: 13rpx;
         }
         .jianjie{
             font-size: 26rpx;

components/shop/recommend/index.vue

@@ -3,11 +3,11 @@
         <view class="top">
             <text>今日秒杀推荐</text>
 			<view class="more" @click="toOthersPage">
-				<text>点击查看更多</text>
+				<text>查看更多</text>
 				<u-icon name="arrow-right" color="#999" size="22"></u-icon>
 			</view>
         </view>
-        <view class="connect">
+        <view class="connect" @click="toOthersPage">
             <view class="time" v-if="type == 'spike'">
                 <image src="/static/image/common/15.png"></image>
                 <text>{{ info.groupbuy_starttime_histime }}</text>
@@ -42,8 +42,8 @@ export default {
 			this.$u.route({
 				url: 'pageB/sdetails/index',
 				params: {
-					id: this.recommendData.groupbuy_id,
+					id: this.recommendData.goods_id,
-					type: 3,
+					// type: 3,
 				}
 			})
 		}
@@ -68,6 +68,7 @@ export default {
 			display: flex;
 			align-items: center;
 			color: #999;
+            font-size: 20rpx;
 		}
     }
     .connect{

components/shop/recommend/pintuan.vue

@@ -3,7 +3,7 @@
         <view class="top">
             <text>今日拼团推荐</text>
 			<view class="more" @click="toDetailsPage">
-				<text>点击查看详情</text>
+				<text>查看详情</text>
 				<u-icon name="arrow-right" color="#999" size="22"></u-icon>
 			</view>
         </view>
@@ -23,7 +23,7 @@
                     <text>￥{{ info.goods_price }}</text>
                 </view>
             </view>
-            <image class="img" :src="info.pintuan_image" @click="toDetailsPage"></image>
+            <image class="img" :src="info.pintuan_image" @click="toDetailsPage" mode="aspectFill"></image>
         </view>
     </view>
 </template>
@@ -60,8 +60,9 @@ export default {
 			this.$u.route({
 				url: 'pageB/sdetails/index',
 				params: {
-					id: this.recommendData.pintuan_id,
+					// id: this.recommendData.pintuan_id,
-					type: 2,
+					id: this.recommendData.groupbuy_id,
+					// type: 2,
 				}
 			})
 		}
@@ -158,10 +159,11 @@ export default {
             }
         }
         .img{
-            width: 213rpx;
-            height: 160rpx;
             flex-shrink: 0;
-            margin-left: 13rpx;
+            width: 210rpx;
+            height: 200rpx;
+            margin-left: 10rpx;
+            border-radius: 4rpx;
 			background-color: antiquewhite;
         }
     }

components/shop/seckill/index.vue

@@ -9,7 +9,7 @@
                     <text class="num">00</text>
                     <text class="mah">:</text>
                     <text class="num">00</text>
-					<text>-</text>
+					<text class="heng">-</text>
 					<text class="num">{{ time.bigHour }}</text>
                     <text class="mah">:</text>
                     <text class="num">00</text>
@@ -47,10 +47,10 @@ export default {
 <style lang="scss" scoped>
 .seckill{
 	background-color: #fff;
-	padding: 30rpx;
+	padding: 0 30rpx 30rpx;
 	margin-bottom: 20rpx;
     .top{
-        height: 60rpx;
+        height: 90rpx;
         display: flex;
         align-items: center;
         justify-content: space-between;
@@ -66,13 +66,23 @@ export default {
                 display: flex;
                 align-items: center;
                 font-size: 20rpx;
+                .heng {
+                    margin: 0 6rpx;
+                }
                 .num{
-					box-sizing: content-box;
                     width: 25rpx;
                     height: 25rpx;
-                    background-color: #bfbfbf;
+					padding: 2rpx 4rpx;
-                    margin: 0 10rpx;
+                    margin: 0 6rpx;
-					padding: 2rpx;
+                    color: #fff;
+                    text-align: center;
+                    line-height: 25rpx;
+                    border-radius: 4rpx;
+					box-sizing: content-box;
+                    background-color: #000;
+                }
+                .mah {
+                    vertical-align: text-top;
                 }
             }
         }
@@ -85,7 +95,7 @@ export default {
     }
     .list{
         display: flex;
-        justify-content: space-between;
+        // justify-content: space-between;
     }
 }
 </style>

components/shop/seckill/item.vue

@@ -1,12 +1,12 @@
 <template>
     <view class="item" @click="spikeGoods">
-        <image class="head" :src="item.groupbuy_image1"></image>
+        <image class="head" :src="item.groupbuy_image1" mode="aspectFill"></image>
         <text class="title u-line-2">{{ item.goods_name }}</text>
         <view class="price">
             <text>￥{{ item.groupbuy_price }}</text>
             <text class="origin">￥{{ item.goods_price }}</text>
         </view>
-        <view class="info">
+        <view class="info" v-if="0">
             <text>剩余{{ item.inventory | formatValue }}件</text>
             <text>立即购买</text>
         </view>
@@ -45,8 +45,9 @@ export default {
 			this.$u.route({
 				url: 'pageB/sdetails/index',
 				params: {
-					id: this.item.groupbuy_id,
+					// id: this.item.groupbuy_id,
-					type: 3,
+					id: this.item.goods_id,
+					// type: 3,
 				}
 			})
 		},
@@ -55,23 +56,28 @@ export default {
 </script>
 <style lang="scss" scoped>
 .item{
-    width: 220rpx;
+    width: 30%;
+    margin-right: 50rpx;
     .head{
-        width: 210rpx;
+        width: 100%;
-        height: 131rpx;
+        height: 210rpx;
         border-radius: 6rpx;
 		background-color: antiquewhite;
     }
     .title{
+        width: 200rpx;
+        height: 30rpx;
+        margin-top: 6rpx;
         font-size: 26rpx;
+        line-height: 30rpx;
         color: #333;
-        margin-top: 16rpx;
+        -webkit-line-clamp: 1 !important;
     }
     .price{
         display: flex;
         align-items: center;
         justify-content: space-between;
-        margin-top: 19rpx;
+        margin-top: 10rpx;
         >text:first-child{
             font-size: 26rpx;
             color: #FF3131;
@@ -88,7 +94,7 @@ export default {
         align-items: center;
         justify-content: space-between;
         font-size: 20rpx;
-        margin-top: 19rpx;
+        margin-top: 10rpx;
         >text:first-child{
             color: #666;
         }

components/shop/special-shop/index.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="special">
 		<view v-if="type == 'spike'">
-			<image :src="item.groupbuy_image1"></image>
+			<image :src="item.groupbuy_image1" @click="spikeGoods"></image>
 			<view class="right">
-				<view class="name u-line-1">{{ item.goods_name }}</view>
+				<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>
@@ -15,9 +15,9 @@
 			</view>
 		</view>
 		<view v-if="type == 'group'">
-			<image :src="item.pintuan_image"></image>
+			<image :src="item.pintuan_image" @click="toDetailsPage"></image>
 			<view class="right">
-				<view class="name u-line-1">{{ item.pintuan_goods_name }}</view>
+				<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="btn" @click="toDetailsPage">立即拼团</view>
@@ -61,8 +61,8 @@ export default {
 			this.$u.route({
 				url: 'pageB/sdetails/index',
 				params: {
-					id: this.item.groupbuy_id,
+					id: this.item.goods_id,
-					type: 3,
+					// type: 3,
 				}
 			})
 		},
@@ -85,8 +85,8 @@ export default {
 			this.$u.route({
 				url: 'pageB/sdetails/index',
 				params: {
-					id: this.item.pintuan_id,
+					id: this.item.pintuan_goods_id,
-					type: 2,
+					// type: 2,
 				}
 			})
 		}

components/shop/youhq/index.vue

@@ -4,15 +4,18 @@
 			<view class="title">全部优惠券</view>
 			<view class="view-more" @click="toCouponPage">查看更多></view>
 		</view>
-		<u-tabs-swiper ref="coupon" :list="couponGroupList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="couponCurrent" font-size="24" :show-bar="false" @change="couponTabsChange" height="60" ></u-tabs-swiper>
+		<!-- <u-tabs-swiper ref="coupon" :list="couponGroupList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="couponCurrent" font-size="24" :show-bar="false" @change="couponTabsChange" height="60" ></u-tabs-swiper> -->
+		<u-tabs :list="couponGroupList" name="gc_name" :is-scroll="true" :current="couponCurrent" @change="couponTabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24"  inactive-color="#333333"></u-tabs>
 		 <!-- :style="{ height: swiperHeight }" -->
-		<swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}">
+		<swiper class="box" :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}">
 			<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
 				<!-- 最多显示四个 -->
-				<view v-for="(coupon, index) in couponList.slice(0, 4)" :key="index" class="coupon-item">
+				<view v-if="couponList[i]">
+					<view v-for="(coupon, index) in couponList[i].slice(0, 4)" :key="index" class="coupon-item">
 						<Coupon :couponInfo="coupon" :status='0' :type="0"></Coupon>
 					</view>
-				<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList.length"></u-empty>
+				</view>
+				<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList[i] || !couponList[i].length"></u-empty>
 			</swiper-item>
 		</swiper>
 	</view>
@@ -56,16 +59,18 @@ export default {
 				gc_id: gc_id, 
 			}).then(res => {
 				if(res.errCode == 0) {
-					this.couponList = res.data;
+					this.couponList[this.couponCurrent] = res.data;
 				} else {
-					this.couponList = [];
+					this.couponList[this.couponCurrent] = [];
 				}
 				// 设置 swiper 高度
 				this.setViewHeight();
+				this.$forceUpdate();
 			})
 		},
 		couponTabsChange(index) {
 			this.couponCurrent = index;
+			this.swiperCouponCurrent = this.couponCurrent;
 		},
 		couponAnimationFinish(e) {
 			const current = e.detail.current;
@@ -75,8 +80,8 @@ export default {
 		setViewHeight() {
 			// 一个优惠券的高度 97px, 下距离 10px
 			let num = 0;
-			num = this.couponList.length 
+			num = this.couponList[this.couponCurrent].length 
-				? this.couponList.length > 4 ? 4 : this.couponList.length
+				? this.couponList[this.couponCurrent].length > 4 ? 4 : this.couponList[this.couponCurrent].length
 				: 1
 			this.swiperHeight = (200 + 20) * num + 'rpx';
 		},
@@ -107,10 +112,12 @@ export default {
 			color: rgba(51,51,51,1);
 		}
 		.view-more {
-			font-size: 18rpx;
+			font-size: 20rpx;
 			color: rgba(153,153,153,1);
 		}
 	}
+    .box {
+        padding-top: 20rpx;
         .swiper-coupon-item {
             padding: 0 30rpx;
             box-sizing: border-box;
@@ -120,5 +127,6 @@ export default {
                 margin-bottom: 20rpx;
             }
         }
+    }
 }
 </style>

pageA/login/login.vue

@@ -101,7 +101,7 @@
 		},
 		onLoad() {
 			// 数据的请求
-			this.apiwelcome();
+			// this.apiwelcome();
 		},
 		onShow() {
 			let pages = getCurrentPages();
@@ -123,7 +123,9 @@
 			...mapMutations(['loginIn']),
 			apiwelcome() {
 				this.$u.api.sendSmsCode({}).then((res) => {
+                    if (res.errCode == 0) {
                         console.log(res)
+                    }
 				})
 			},
 			// 协议跳转
@@ -148,21 +150,18 @@
 				if (this.member_mobile == '') {
 					this.$refs.uToast.show({
 						title: '手机号不能为空',
-						type: 'error'
 					})
 					return false;
 				}
 				if (type_phone == false) {
 					this.$refs.uToast.show({
 						title: '手机号格式不正确',
-						type: 'error'
 					});
 					return false;
 				}
 				if (this.sms_code == '') {
 					this.$refs.uToast.show({
 						title: '验证码不能为空',
-						type: 'error'
 					})
 					return false;
 				}
@@ -176,14 +175,12 @@
 						if (res.data == '') {
 							this.$refs.uToast.show({
 								title: res.message,
-								type: 'error'
 							})
 							return false
 						} else {
 							me.loginIn(res.data.token); //存储一个字符传值
 							// 缓存用户的信息
 							uni.setStorageSync('user_info',res.data);
-							
 							if (res.data.member.has_labels) {
 								uni.switchTab({
 									url: '/pages/index/index'
@@ -205,7 +202,6 @@
 					} else {
 						this.$refs.uToast.show({
 							title: res.message,
-							type: 'error'
 						})
 					}
 				})

pageA/register/register.vue

@@ -71,7 +71,7 @@
 				value: '',
 				login: '注册',
 				show: false,
-                is_check: null,
+                is_check: true,
 				member_mobile: '', //手机号
 				smslog_type : '1',//状态
 				sms_code : '', //验证码
@@ -104,33 +104,30 @@
 			},
 			// 用户注册
 			loginIns(){
+                console.log(this.is_check);
                 let me = this;
-				let type_phone = this.$u.test.mobile( this.member_mobile)
+				let type_phone = this.$u.test.mobile(this.member_mobile)
-				if( this.member_mobile == ''){
+				if(this.member_mobile == ''){
 					this.$refs.uToast.show({
 						title: '手机号不能为空！',
-						type: 'error'
 					})
 					return false;
 				}
 				if (type_phone == false) {
 					this.$refs.uToast.show({
 						title: '手机号格式不正确！',
-						type: 'error'
 					});
 					return false;
 				}
-				if( this.sms_code == ''){
+				if(this.sms_code == ''){
 					this.$refs.uToast.show({
 						title: '验证码不能为空！',
-						type: 'error'
 					})
 					return false;
 				}
-                if (this.is_check) {
+                if (!this.is_check) {
                     this.$refs.uToast.show({
                     	title: '请同意协议！',
-                    	type: 'error'
                     })
                     return false;
                 }
@@ -138,10 +135,6 @@
 					member_mobile: this.member_mobile,
 					sms_code: this.sms_code
 				}).then((res) => {
-					console.log('3333333333',res);
-					// 校验手机号
-					
-					// console.log(res)
 					if(res.errCode == 0){
                         //存储一个字符传值
                         me.loginIn(res.data.token);
@@ -159,18 +152,9 @@
 						// 	type: 'success',
 						// 	url: '/pageA/topick/topick'
 						// })
-					}
+					} else {
-					if(res.errCode == 1){
                         this.$refs.uToast.show({
                         	title: res.message,
-							type: 'error'
-						})
-					}
-					if(res.errCode == 2){
-						this.$refs.uToast.show({
-							title: res.message,
-							type: 'primary',
-							url: '/pageA/login/login'
                         })
                     }
 				})
@@ -196,7 +180,6 @@
 				// console.log("调用父组件的方法")
 				// console.log('2222',this._data.member_mobile)
 				let member_mobile = this._data.member_mobile;
-				
 			}
 		},
 		components: {
@@ -457,10 +440,6 @@
 	.pact {
 		position: relative;
 		padding-left: 40rpx;
-		overflow: hidden;
-		// overflow: hidden; //超出的文本隐藏
-		// text-overflow: ellipsis; //溢出用省略号显示
-		// white-space: nowrap; //溢出不换行
 	}
 	.phones{
 		margin-bottom: 90rpx!important;

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);
         }
     }

pageB/components/userinfo/index.vue

@@ -1,140 +1,211 @@
 <template>
     <view class="userinfo">
         <view class="userhead">
-            <image :src="item.member_avatar"></image>
+            <image class="avatar" :src="item.member_avatar"></image>
-            <text class="follow" v-if="!is_follow" @click="following(item.member_id)">+</text>
+            <text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text>
-			<u-icon v-else name="checkmark" color="#ffffff" :size="28" class="follow"  @click="following(item.member_id)"></u-icon>
         </view>
         <!-- 点赞 -->
         <view class="operat zan">
-            <u-icon name="thumb-up-fill" :color=" is_like ? '#FF7807' : '#ffffff' " :size="50" @click="likeType(item.article_id)"></u-icon>
+            <image class="operat-img" :src=" is_like ? '../../static/image/userinfo/dianzan1.png' : '../../static/image/userinfo/dianzan.png' "
-            <text>{{item.like_num}}</text>
+                mode="" @click="likeType(item.article_id)"></image>
+            <text class="operat-span">{{item.like_num}}</text>
         </view>
         <!-- 收藏 -->
         <view class="operat shoucang">
-            <u-icon name="star-fill" :color=" is_collect ? '#FF7807' : '#ffffff' " :size="50" @click="collecting(item.article_id)"></u-icon>
+            <image class="operat-img" :src=" is_collect ? '../../static/image/userinfo/shoucang1.png' : '../../static/image/userinfo/shoucang.png' "
-            <text>{{item.collect_num}}</text>
+                mode="" @click="collecting(item.article_id)"></image>
+            <text class="operat-span">{{item.collect_num}}</text>
         </view>
         <!-- 评论 -->
         <view class="operat pinglun">
-            <u-icon name="more-circle-fill" :color=" is_content ? '#FF7807' : '#ffffff' " :size="50" @click="editing()"></u-icon>
+            <image class="operat-img" :src=" is_content ? '../../static/image/userinfo/pinglun1.png' : '../../static/image/userinfo/pinglun.png' "
-            <text>{{item.comment_num}}</text>
+                mode="" @click="editing(item.article_id)"></image>
+            <text class="operat-span">{{ comment_num }}</text>
         </view>
         <!-- 购物车 -->
         <view class="operat gouwu">
-           <u-icon name="shopping-cart-fill" :color=" is_cart ? '#FF7807' : '#ffffff' " :size="50" @click="carting()"></u-icon>
+            <image class="operat-img" :src=" is_cart ? '../../static/image/userinfo/gouwuche1.png' : '../../static/image/userinfo/gouwuche.png' "
+                mode="" @click="carting()"></image>
         </view>
     </view>
 </template>
 <style lang="scss" scoped>
-.userinfo{
+    .userinfo {
         width: 110rpx;
         height: 570rpx;
+        /* #ifndef APP-PLUS-NVUE */
         display: flex;
+        /* #endif */
         flex-direction: column;
         justify-content: space-between;
         align-items: center;
-    .userhead{
+    }
+
+    .userhead {
         position: relative;
+        /* #ifndef APP-PLUS-NVUE */
         display: flex;
-        position: relative;
+        /* #endif */
         align-items: center;
-		&>image{
+        padding-bottom: 20rpx;
+    }
+
+    .avatar {
         width: 110rpx;
         height: 110rpx;
         border-radius: 50%;
+        /* #ifndef APP-PLUS-NVUE */
         border: 2rpx solid #fff;
+        /* #endif */
     }
+
     .follow {
+        z-index: 100;
         position: absolute;
         top: 90rpx;
-			left: 35%;
+        left: 40rpx;
         width: 36rpx;
         height: 36rpx;
         text-align: center;
         line-height: 36rpx;
-			font-size: 36rpx;
+        font-size: 34rpx;
         border-radius: 50%;
         color: #fff;
         background-color: #FF780F;
     }
-    }
+
     .operat {
+        /* #ifndef APP-PLUS-NVUE */
         display: flex;
+        /* #endif */
         align-items: center;
         flex-direction: column;
-		& > text {
+    }
+
+    .operat-span {
         margin-top: 10rpx;
         font-size: 28rpx;
         color: #fff;
     }
+
+    .operat-img {
+        width: 50rpx;
+        height: 50rpx;
     }
-}
 </style>
 <script>
-export default {
+    export default {
-    name:'userinfo',
+        name: 'userinfo',
-	props:['list','cart','comment'],
+        props: ['list', 'cart', 'comment', 'num'],
-    data(){
+        data() {
             return {
                 is_follow: this.list.is_attention || false,
                 is_like: this.list.is_like || false,
                 is_collect: this.list.is_collect || false,
                 is_content: false,
                 is_cart: false,
+                comment_num: this.list.comment_num || 0,
                 item: this.list || {}
             }
         },
         watch: {
-		list(newValue,old) {
+            list(newValue, old) {
-			// console.log(newValue,old);
+                console.log(newValue);
                 this.item = newValue || {};
                 this.is_follow = this.list.is_attention || false;
                 this.is_like = this.list.is_like || false;
                 this.is_collect = this.list.is_collect || false;
+                this.comment_num = this.list.comment_num || 0;
             },
-		cart(newValue,old) {
+            cart(newValue, old) {
-			// console.log(newValue,old);
+                // console.log(newValue);
                 this.is_cart = newValue;
             },
-		comment(newValue,old) {
+            comment(newValue, old) {
                 // console.log(newValue,old);
                 this.is_content = newValue;
             },
+            num(newVal, old) {
+                // console.log(newVal);
+                this.comment_num = newVal;
+                // this.item.comment_num = newVal;
+            },
             deep: true
         },
         methods: {
             // 关注
             following(id) {
-			this.$u.api.attentionMember({member_id: id}).then(res => {
+                uni.request({
-				if (res.errCode == 0) {
+                    url: "https://dmmall.sdbairui.com/api/member/attentionMember",
+                    method: "POST",
+                    data: {
+                        member_id: id
+                    },
+                    header: {
+                    	Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+                    },
+                    success: (res) => {
+                        if (res.data.errCode == 0) {
                             this.is_follow = !this.is_follow;
-					this.$u.toast(res.message);
+                            console.log(this.is_follow);
+                            uni.showToast({
+                                title: res.data.message,
+                                icon: "none"
+                            })
+                        }
                     }
                 })
             },
             // 点赞
             likeType(id) {
                 // console.log(id);
-			this.$u.post("article/articleLike",{article_id: id}).then(res => {
+                uni.request({
-				if (res.errCode == 0) {
+                    url: "https://dmmall.sdbairui.com/api/article/articleLike",
+                    method: "POST",
+                    data: {
+                        article_id: id
+                    },
+                    header: {
+                    	Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+                    },
+                    success: (res) => {
+                        console.log(res);
+                        if (res.data.errCode == 0) {
                             // console.log(res);
                             this.is_like = !this.is_like;
-					this.list.like_num = res.data.num;
+                            this.list.like_num = res.data.data.num;
                         } else {
-					this.$u.toast(res.message);
+                            uni.showToast({
+                                title: res.data.message,
+                                icon: "none"
+                            })
+                        }
                     }
                 })
             },
             // 收藏
             collecting(id) {
-			this.$u.post("article/articleCollect",{article_id: id}).then(res => {
+                uni.request({
-				if (res.errCode == 0) {
+                    url: "https://dmmall.sdbairui.com/api/article/articleCollect",
-					// console.log(res);
+                    method: "POST",
+                    data: {
+                        article_id: id
+                    },
+                    header: {
+                    	Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+                    },
+                    success: (res) => {
+                        console.log(res);
+                        if (res.data.errCode == 0) {
+                            console.log(res.data.num);
                             this.is_collect = !this.is_collect;
-					this.list.collect_num = res.data.num;
+                            this.list.collect_num = res.data.data.num;
                         } else {
-					this.$u.toast(res.message);
+                            uni.showToast({
+                                title: res.data.message,
+                                icon: "none"
+                            })
+                        }
                     }
                 })
             },
@@ -142,14 +213,20 @@ export default {
             editing() {
                 this.is_content = !this.is_content;
                 // console.log(this.is_content);
-			this.$emit("openCart",{ comment: this.is_content, cart: this.is_cart});
+                this.$emit("openCart", {
+                    comment: this.is_content,
+                    cart: this.is_cart
+                });
             },
             // 购物车
             carting() {
                 this.is_cart = !this.is_cart;
                 // console.log(this.is_cart);
-			this.$emit("openCart",{ comment: this.is_content, cart: this.is_cart});
+                this.$emit("openCart", {
+                    comment: this.is_content,
+                    cart: this.is_cart
+                });
             },
         }
-}
+    }
 </script>

pageB/coupon/details.vue

@@ -0,0 +1,253 @@
+<template>
+	<view class="coupon-details">
+		<view class="coupon-container">
+			<view class="title">新人专享好礼</view>
+			<view class="coupon-main">
+				<image src="/static/image/common/29.png" class="bg"></image>
+				<view class="left">
+					<view class="price"><text class="sign">￥</text><text class="value">{{ price }}</text></view>
+					<view class="label">专属优惠券</view>
+				</view>
+				<view class="btn" @click="exchangeCoupon">立即领取</view>
+			</view>
+			<view class="tag">
+				<view>
+					<image src="/static/image/common/25.png"></image>
+					<text>全场包邮</text>
+				</view>
+				<view>
+					<image src="/static/image/common/26.png"></image>
+					<text>延误必赔</text>
+				</view>
+				<view>
+					<image src="/static/image/common/27.png"></image>
+					<text>免费上门取件</text>
+				</view>
+				<view>
+					<image src="/static/image/common/28.png"></image>
+					<text>退货免运费</text>
+				</view>
+			</view>
+		</view>
+		<view class="title-container">
+			<image src="/static/image/common/22.png" class="bg"></image>
+			<view class="title">首席搭配师</view>
+		</view>
+		<view class="content-container">
+			<image src="/static/image/common/23.png" class="people"></image>
+			<view class="tag">
+				<view class="">双十一成交破亿</view>
+				<view class="">单场千万级大咖</view>
+				<view class="">品牌特卖TOP1</view>
+			</view>
+			<view class="btn">
+				<view class="bg-view"></view>
+				<view>我们有万能穿搭公式</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			price: 0
+		}
+	},
+	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);
+				if(res.errCode == 0) {}
+			})
+		},
+	}
+};
+</script>
+<style lang="scss" scoped>
+.coupon-details {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #FFDFAC;
+	padding-top: 30rpx;
+	.coupon-container {
+		width: 690rpx;
+		height: 368rpx;
+		background: linear-gradient(-87deg, rgba(247,162,30,1), rgba(255,120,15,1));
+		box-shadow: 0rpx 4rpx 2rpx 0rpx rgba(102,102,102,0.2);
+		border-radius: 20rpx;
+		margin: 0 auto 70rpx;
+		padding: 22rpx {
+			top: 40rpx
+		};
+		.title {
+			font-size: 48rpx;
+			font-weight: bold;
+			color: rgba(255,255,255,1);
+			line-height: 34rpx;
+			text-shadow: 0rpx 4rpx 2rpx rgba(102,102,102,0.2);
+			text-align: center;
+		}
+		.coupon-main {
+			margin: 26rpx auto 20rpx;
+			width: 665rpx;
+			height: 194rpx;
+			position: relative;
+			.bg {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 665rpx;
+				height: 194rpx;
+				z-index: 1;
+			}
+			.left {
+				z-index: 2;
+				position: absolute;
+				top: 40rpx;
+				left: 122rpx;
+				.price {
+					margin-bottom: 16rpx;
+					display: flex;
+					align-items: flex-end;
+					line-height: 80rpx;
+					> text {
+						font-weight: bold;
+						color: rgba(255,120,15,1);
+					}
+					.sign {
+						font-size: 54rpx;
+					}
+					.value {
+						font-size: 102rpx;
+					}
+				}
+				.label {
+					font-size: 32rpx;
+					font-weight: 500;
+					color: rgba(255,120,15,1);
+				}
+			}
+			.btn {
+				z-index: 2;
+				position: absolute;
+				top: 62rpx;
+				right: 60rpx;
+				width: 192rpx;
+				height: 70rpx;
+				background: linear-gradient(-87deg, rgba(247,162,30,1), rgba(255,120,15,1));
+				border-radius: 20rpx;
+				line-height: 70rpx;
+				text-align: center;
+				font-size: 27rpx;
+				font-weight: bold;
+				color: rgba(255,255,255,1);
+			}
+		}
+		.tag {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			font-size: 20rpx;
+			font-weight: 500;
+			color: rgba(255,255,255,1);
+			> view {
+				> image {
+					width: 20rpx;
+					height: 20rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+	}
+	.title-container {
+		position: relative;
+		height: 124rpx;
+		.bg {
+			position: absolute;
+			width: 504rpx;
+			height: 124rpx;
+			z-index: 1;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -75%);
+		}
+		.title {
+			position: absolute;
+			z-index: 2;
+			width: 750rpx;
+			height: 59rpx;
+			background: rgba(255,255,255,0.27);
+			font-size: 60rpx;
+			font-weight: 800;
+			color: rgba(255,122,16,1);
+			text-align: center;
+			top: 0;
+			left: 0;
+		}
+	}
+	.content-container {
+		height: 684rpx;
+		position: relative;
+		.people {
+			width: 348rpx;
+			height: 684rpx;
+			position: absolute;
+			top: 0;
+			left: 50%;
+			transform: translate(-50%, 0%);
+		}
+		.tag {
+			> view {
+				position: absolute;
+				height: 48rpx;
+				background: rgba(229,0,79,0.36);
+				border-radius: 20rpx;
+				font-size: 24rpx;
+				font-weight: bold;
+				color: rgba(255,255,255,1);
+				line-height: 48rpx;
+				padding: 0 24rpx;
+				&:nth-child(1) {
+					top: 104rpx;
+					right: 71rpx;
+				}
+				&:nth-child(2) {
+					top: 271rpx;
+					left: 30rpx;
+				}
+				&:nth-child(3) {
+					top: 373rpx;
+					right: 33rpx;
+				}
+			}
+		}
+		.btn {
+			position: absolute;
+			top: 459rpx;
+			left: 50%;
+			transform: translate(-50%, 0%);
+			width: 581rpx;
+			height: 86rpx;
+			background: linear-gradient(-87deg,rgba(247,162,30,1),rgba(255,120,15,1));
+			border-radius: 20rpx;
+			font-size: 40rpx;
+			font-weight: bold;
+			color: rgba(255,255,255,1);
+			line-height: 86rpx;
+			text-align: center;
+		}
+	}
+}
+</style>

pageB/details/index.vue

@@ -102,7 +102,7 @@ export default {
                 if (res.errCode == 0) {
                     // console.log(res);
                     this.listInfo = res.data.list;
-                    console.log(this.listInfo);
+                    // console.log(this.listInfo);
                 } else {
                     console.log(res.message);
                 }

pageB/follow/index.vue

@@ -4,8 +4,8 @@
             <image src="/static/image/common/10.png"></image>
             <text>输入达人名称</text>
         </view>
-        <view class="list">
+        <view class="list" style="margin-left:-20rpx">
-            <darenItem style="margin-top:20rpx;margin-right:23rpx" v-for="item in recommendList" :key="item.id" :info="item"  v-on:pChangeType="changeType" ></darenItem>
+            <darenItem style="margin-top:20rpx;margin-left:20rpx;" v-for="item in recommendList" :key="item.id" :info="item"  v-on:pChangeType="changeType"></darenItem>
         </view>
     </view>
 </template>
@@ -76,7 +76,7 @@ export default {
 		},
 		searchValue() {
 			uni.navigateTo({
-				url: '/pageB/search/index'
+				url: '/pageB/search/index?type=2'
 			})
 		},
 	},

pageB/photo/index.vue

@@ -22,14 +22,14 @@
 			</view>
         </view>
 		<!-- 用户操作 -->
-        <userinfo class="userinfo" :list="list" :cart="cart_type" :comment="is_comment" @openCart="openPopup"></userinfo>
+        <userinfo class="userinfo" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo>
 		<!-- 评论 -->
 		<u-popup v-model="is_comment" class="pl" mode="bottom" border-radius="10" height="700rpx">
 			<view class="top">
 				<text>评论</text>
-				<u-icon name="arrow-down" color="#333" size="28" @click="is_comment=false"></u-icon>
+				<u-icon name="close" color="#333" size="28" @click="is_comment=false"></u-icon>
 			</view>
-			<scroll-view class="scroll-box" scroll-y="true" @scrolltolower="scrollBottom">
+			<scroll-view class="scroll-box" scroll-y="true" lower-threshold="50" @scrolltolower="scrollBottom">
 				<block v-for="(item,index) in commentList" :key="index">
 					<view class="box">
 						<image :src="item.member_avatar" mode="aspectFill"></image>
@@ -55,9 +55,10 @@
                         <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-else>111</view> -->
+                <view class="no-data" v-if="!commentList.length">还没有评论，快来评论吧！</view>
+				<u-loadmore v-else class="load-size" :status="status" size="20" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
 			</scroll-view>
-			<view class="editing" @click="openKeyInput">
+			<view class="editing" @touchend.prevent="openKeyInput">
 				<input type="text" value="" :placeholder="edit_text" disabled="disabled" />
 				<text>发送</text>
 			</view>
@@ -65,7 +66,7 @@
 		<!-- 评论box -->
 		<u-popup v-model="is_edit" mode="bottom" border-radius="10" height="100rpx">
 			<view class="edit-box">
-				<input type="text" :placeholder="edit_text_other" :focus="is_focus" @focus="focus" v-model="send_value" autofocus>
+				<input type="text" focus :placeholder="edit_text_other" @focus="focus" v-model="send_value">
 				<text @click="sendComment">发送</text>
 			</view>
 		</u-popup>
@@ -179,13 +180,15 @@
 			z-index: 1000;
 			position: fixed;
 			top: 0;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
 			width: 100%;
 			height: 88rpx;
 			padding: 0 20rpx;
 			line-height: 88rpx;
 			background-color: #ECECEC;
 			& > text {
-				margin-right: 280rpx;
 				color: #333;
 				font-size: 30rpx;
 				font-weight: 500;
@@ -258,9 +261,11 @@
             }
 		}
 		.no-data {
-			margin-top: 100rpx;
+			margin-top: 200rpx;
+            text-align: center;
 		}
 		.editing {
+            z-index: 1000;
 			position: fixed;
 			bottom: 0;
 			display: flex;
@@ -389,7 +394,7 @@
 </style>
 <script>
 import userinfo from "../components/userinfo/index" // 点赞组件
-import contentBox from "../components/shpoone/index" // 评论
+// import contentBox from "../components/shpoone/index" // 评论
 // import shoplist from "../components/shoplist/index" // 商品列表
 
 export default {
@@ -411,10 +416,19 @@ export default {
 			cartList: [],
 			cart_len: 0,
 			photo_len: 0,
+            comment_num: 0,
 			edit_text: "有爱评论，说点好听的 ~",
 			edit_text_other: "有爱评论，说点好听的 ~",
 			commentList: [], // 评论
             allList: [], // 全部子评论
+            status: 'loadmore',
+            iconType: 'circle',
+            loadText: {
+                loadmore: '轻轻上拉',
+                loading: '努力加载中',
+                nomore: '暂时没有更多了',
+                no: '评论'
+            }
         }
     },
 	onLoad(option){
@@ -425,10 +439,10 @@ export default {
     onBackPress() {
         if (this.cart_type) {
             this.cart_type = !this.cart_type;
-        } else if (this.is_comment) {
-            this.is_comment = !this.is_comment;
         } 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;
         }
@@ -455,7 +469,7 @@ export default {
 			this.is_comment = data.comment;
 			if (this.is_comment) {
                 this.page = 0;
-				this.getComment(this.article_id,0);
+				this.getComment();
 			}
 		},
 		// 获取评论
@@ -464,21 +478,30 @@ export default {
 				article_id: this.article_id,
 				page: this.page,
 			}).then(res => {
-				console.log(res);
+                this.status = "loading";
-				if (res.errCode == 0 && this.page == 0) {
+				// console.log(res);
+                if (res.errCode == 0) {
+                    if (this.commentList.length < 8) {
+                        this.status = "nomore";
+                    }
+                    if (this.page == 0) {
                     	this.commentList = res.data;
-				} else if (res.errCode == 0 && this.page > 0) {
+                    } else if (res.data.length == 0 && this.page > 0) {
-                    this.commentList = this.commentList.concat(res.data);
+                        this.status = "nomore";
                     } else {
-                    
+                        this.commentList = this.commentList.concat(res.data);
+                    }
+                    this.page++;
                 }
 			})
 		},
 		// 打开评论输入
 		openKeyInput(data,index) {
-			console.log(data);
+			// console.log(data);
 			this.is_edit = true;
+            setTimeout(() => {
                 this.is_focus = true;
+            }, 200)
             this.comment_id = index;
             if (data.id) {
                 this.edit_text_other = "回复@" + data.member_nickname;
@@ -493,6 +516,10 @@ export default {
 		},
 		// 发布评论
 		sendComment() {
+             if (this.send_value.length == 0) {
+                this.$u.toast("内容不能为空！");
+                return;
+            }
 			this.$u.post("article/articleAddComment",{
 				article_id: this.article_id,
 				content: this.send_value,
@@ -501,6 +528,9 @@ export default {
 			}).then(res => {
 				// 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;
                     if (res.data.data.pid) {
                         this.commentList[this.comment_id].reply_count = true;
@@ -540,7 +570,6 @@ export default {
 		},
         // 评论滚动到底部
         scrollBottom(e) {
-            this.page++;
             this.getComment();
         },
 		// 跳转到商品

pageB/sdetails/index.vue

@@ -4,13 +4,13 @@
 		<view class="spike-view" v-if="type == 3">
 			<view class="left">
 				<view class="price">
-					<view class="now-price">￥{{ groupbuyInfo.groupbuy_price }}</view>
+					<view class="now-price">￥{{ groupbuyInfo.groupbuy_price || '0.00' }}</view>
-					<view class="origin-price">￥{{ groupbuyInfo.goods_price }}</view>
+					<view class="origin-price">￥{{ groupbuyInfo.goods_price || '0.00' }}</view>
 				</view>
-				<view class="num">剩余数量{{ groupbuyInfo.inventory - groupbuyInfo.groupbuy_buy_quantity }}件</view>
+				<view class="num">剩余数量{{ groupbuyInfo.inventory - groupbuyInfo.groupbuy_buy_quantity || '0' }}件</view>
 			</view>
-			<view class="right" v-if="!isSpike">
+			<view class="right" v-if="!isSrartSpike || !isEndSpike">
-				<view class="title">秒杀倒计时</view>
+				<view class="title">{{ isSrartSpike ? '结束倒计时' : '秒杀倒计时' }}</view>
 				<view class="time">{{ spikeTime }}</view>
 			</view>
 			<view class="right" v-else>
@@ -24,8 +24,8 @@
             </view>
             <view class="price-collect">
 				<view class="pic" v-if="type != 3">
-					<text>￥{{ goodsInfo.goods_price }}</text>
+					<text>￥{{ goodsInfo.pintuan_price || '0.00' }}</text>
-					<s>￥{{ goodsInfo.goods_marketprice }}</s>
+					<s>￥{{ goodsInfo.goods_price || '0.00' }}</s>
 				</view>
 				<view class="collect" @click="switchCollect(goodsInfo.goods_collect)">
 					<u-icon name="star" color="#474747" size="28" v-if="!goodsInfo.goods_collect"></u-icon>
@@ -98,7 +98,7 @@
 				<image class="close" src="/static/image/common/17.png" @click="showGroupUser=false"></image>
 			</view>
 		</u-popup>
-		<u-popup v-model="showInvolvementUser" mode="center">
+		<u-popup v-model="showInvolvementUser" mode="center" z-index="10078">
 			<view class="involvement-container" v-if="involvemenGroupInfo.length">
 				<view class="title u-line-1">参与{{ involvemenGroupInfo[0].member_nickname }}的拼团</view>
 				<view class="involvement-view">
@@ -127,13 +127,15 @@
 						<image class="image" :src="goodsInfo.goods_image"></image>
 						<view class="info">
 							<text class="u-line-2">{{goodsInfo.goods_name}}</text>
-							<text>￥{{goodsInfo.goods_price}}</text>
+							<text v-if="type == 1">￥{{ goodsInfo.goods_price }}</text>
+							<text v-else-if="type == 2">￥{{ goodsInfo.pintuan_price }}</text>
+							<text v-else-if="type == 3">￥{{ groupbuyInfo.groupbuy_price }}</text>
 						</view>
 					</view>
 					<guige @sel="self" ref="guige" v-for="(item,index) in goodsInfo.spec_value" :key="index" :title="goodsInfo.spec_name[index]" :item="item"></guige>
 					<view class="num">
 						<text>购买数量</text>
-						<u-number-box v-model="goodsNumber" @change="valChange"></u-number-box>
+						<u-number-box v-model="goodsNumber" :min="1"></u-number-box>
 					</view>
 					<view style="height:100rpx"></view>
 				</view>
@@ -171,10 +173,11 @@
 					<text>客服</text>
 				</view>
 			</view>
-			<view class="btn" v-if="groupbuyInfo.groupbuy_state == 20 && groupbuyInfo.inventory > groupbuyInfo.groupbuy_buy_quantity" @click="spikeGoods">立即秒杀</view>
+			<!-- <view class="btn" v-if="isSrartSpike && !isEndSpike && groupbuyInfo.inventory > groupbuyInfo.groupbuy_buy_quantity" @click="spikeGoods">立即秒杀</view> -->
-			<view class="btn" :class="{'cannot': groupbuyInfo.groupbuy_state == 32 || groupbuyInfo.inventory == groupbuyInfo.groupbuy_buy_quantity}" v-else>
+			<view class="btn cannot" v-if="!isSrartSpike">秒杀未开始</view>
-				{{ groupbuyInfo.groupbuy_state == 32 ? '时间已结束' : (groupbuyInfo.inventory > groupbuyInfo.groupbuy_buy_quantity ? '立即秒杀' : '已售空') }}
+			<view class="btn cannot" v-else-if="isEndSpike">时间已结束</view>
-			</view>
+			<view class="btn cannot" v-else-if="groupbuyInfo.inventory == groupbuyInfo.groupbuy_buy_quantity">已售空</view>
+			<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" />
@@ -191,7 +194,7 @@ export default {
         return {
             list: [],　// 轮播图列表
 			goodsInfo: {}, // 商品信息
-			storeInfo: {},
+			storeInfo: {}, // 店铺信息
             glist: [], // 规格列表
 			id: 0, // 商品id/秒杀id/拼团 id
 			type: '', // 商品类型 商品详情 1普通 2拼团 3秒杀 4优惠券
@@ -201,17 +204,18 @@ export default {
 			showInvolvementUser: false, // 参团
 			involvemenGroupInfo: [], // 参团的人
 			groupbuyInfo: {}, // 秒杀详情
-			spikeTime: '',
+			spikeTime: '00:00:00', // 秒杀倒计时(距离开始/距离结束)
-			isSpike: false, // 是否超过秒杀时间
+			isSrartSpike: false, // 是否开始秒杀
+			isEndSpike: false, // 是否超过秒杀时间
 			timer: '', // 秒杀时间定时器
 			spec_id: '', // 规格 id, 下单用的
 			evaluate: {}, // 评价内容
 			showSpec: false, // 是否显示选择规格
-			goodsNumber: 1,
+			goodsNumber: 1, // 购买商品数量
 			sel: "", // 拼接的规格
 			quanxuan: false, // 规格是否选择
-			debounce: true,
+			debounce: true, // 防止多次提交订单
-			storeid:0 //店铺id
+			storeid:0 // 店铺id
         }
 	},
     components: {
@@ -224,6 +228,11 @@ export default {
 		sel(value){
 			this.xuanze(value);
 		},
+		showSpec(value) {
+			if(!value) {
+				this.quanxuan = false;
+			}
+		}
 	},
 	onLoad(option) {
 		// this.init();
@@ -231,7 +240,6 @@ export default {
 		// this.type = Number(option.type);
 		// this.type = 1;
 		this.id = option.id;
-		this.setTitle();
 		// 先请求普通商品详情获取商品类型再渲染页面
 		this.ordinaryDetails(this.id);
 	},
@@ -250,6 +258,13 @@ export default {
 	},
 	methods: {
 		customers(){
+			console.log(this.$store.state.hasLogin)
+			if(!this.$store.state.hasLogin){
+				this.$refs.uToast.show({
+					title: "请先登录",
+					type: 'warning'
+				})
+			}else{
 				function Friend(uuid, name, avatar,time = "", text = "",date = "") {
 					this.uuid = uuid;
 					this.name = name;
@@ -260,7 +275,7 @@ export default {
 					this.time = time;
 					this.date = date
 				}
-			console.log(123)
+				// console.log(123)
 				this.$u.api.getAtwillUserInfo({
 					id:this.storeid
 				}).then((res)=>{
@@ -276,6 +291,8 @@ export default {
 				}).catch((err)=>{
 					console.log(err)
 				})
+			}
+			
 		},
 		setSwiperList(list) {
 			let img = [];
@@ -290,11 +307,26 @@ export default {
 		spikeGoods() {
 			this.settlementOrder()
 		},
-		setSpikeTime(time) {
+		setSpikeTime() {
-			// const time = this.groupbuyInfo.groupbuy_endtime;
+			const startTime = this.groupbuyInfo.groupbuy_starttime;
+			const endTime = this.groupbuyInfo.groupbuy_endtime;
+			let time = startTime;
+
 			this.timer = setInterval(() => {
+				// 秒杀是否开始 秒杀开始后开始结束时间的倒计时
+				if(startTime * 1000 - new Date().getTime() > 0) {
+					this.isSrartSpike = false;
+				}　else {
+					this.isSrartSpike = true;
+					time = endTime;
+				}
+				
+				// 秒杀是否结束
+				if(endTime * 1000 - new Date().getTime() <= 0) {
+					this.isEndSpike = true;
+				}
+
 				let spikeTime = time * 1000 - new Date().getTime();
-				if(spikeTime <= 0) this.isSpike = true;
 				// 计算天数
 				const days = Math.floor(spikeTime/(24*3600*1000));
 				//计算出小时数
@@ -313,13 +345,32 @@ export default {
 			}, 1000)
 		},
 		addCart() {
+			if(!this.showSpec) {
+				this.showSpec = true;
+				return false;
+			}
+			// 如果没有规格设规格已全选
+			if(this.goodsInfo.spec_value == null) {
+				this.quanxuan = true;
+			}
+			if(!this.quanxuan) {
+				this.$refs.uToast.show({
+					title: '请选择规格'
+				})
+				return false;
+			}
 			this.$u.api.addCart({
 				goods_id: this.id,
 				quantity: this.goodsNumber,
 			}).then(res => {
 				this.$refs.uToast.show({
 					title: res.message,
-					type: res.errCode == 0 ? 'success' : 'warning',
+					duration: 1000,
+					callback: () => {
+						if(res.errCode == 0) {
+							this.showSpec = false;
+						}
+					}
 				})
 			})
 		},
@@ -328,9 +379,9 @@ export default {
 		},
 		getGoodsDetails(id) {
 			switch (this.type) {
-				// case 1:
+				case 1:
-				// 	this.ordinaryDetails(id);
+					this.ordinaryDetails(id);
-				// 	break;
+					break;
 				case 2:
 					this.pinTuanDetails(id);
 					break;
@@ -344,7 +395,7 @@ export default {
 		// 普通商品详情
 		ordinaryDetails(id) {
 			this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
-				console.log(res)
+				// console.log(res)
 				if (res.errCode == 0) {
 					this.evaluate = res.data.goods_evaluate_info;
 					this.goodsInfo = res.data.goods;
@@ -354,7 +405,16 @@ export default {
 					this.storeid = res.data.store.store_id
 					// console.log(this.goodsInfo.mobile_body);
 					this.type = res.data.view_type;
-					this.getGoodsDetails(this.type);
+					this.setTitle();
+					if(this.type == 1) {
+						this.id = res.data.goods.goods_id;
+					} else if(this.type == 2) {
+						this.id = res.data.goods.pintuan_id;
+						this.getGoodsDetails(this.id);
+					} else if(this.type == 3) {
+						this.id = res.data.groupbuy_id;
+						this.getGoodsDetails(this.id);
+					}
 				}
 			})
 		},
@@ -370,7 +430,7 @@ export default {
 					this.glist = res.data.data.spec_list;
 					this.user_suc = res.data.data.user_suc;
 					this.groupUser =res.data.data.user;
-					console.log(this.groupUser);
+					// console.log(this.groupUser);
 				}
 			})
 		},
@@ -380,20 +440,25 @@ export default {
 				groupbuy_id: id
 			}).then(res => {
 				if(res.errCode == 0) {
+					// this.id = res.data.groupbuy_id;
 					this.groupbuyInfo = res.data.groupbuyInfo;
 					this.evaluate = res.data.goodsInfo.goods_evaluate_info;
 					this.goodsInfo = res.data.goodsInfo.goods;
 					this.setSwiperList(res.data.goodsInfo.goods_image);
-					this.setSpikeTime(res.data.groupbuyInfo.groupbuy_endtime);
+					this.setSpikeTime();
 				}
 			})
 		},
 		// 试穿
 		tryDress() {
+			if(!this.showSpec) {
+				this.showSpec = true;
+				return false;
+			}
 			this.$u.route({
 				url: '/pageB/triedDress/index',
 				params: {
-					id: this.id,
+					id: this.goodsInfo.goods_id,
 				}
 			})
 		},
@@ -404,6 +469,26 @@ export default {
 		* @params {Number} ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
 		**/
 		settlementOrder({type, num = this.goodsNumber, ifcart = 0} = {}) {
+			if(type != 'involvement') {
+				if(!this.showSpec) {
+					this.showSpec = true;
+					return false;
+				}
+				if(!this.showSpec) {
+					this.showSpec = true;
+					return false;
+				}
+				// 如果没有规格设规格已全选
+				if(this.goodsInfo.spec_value == null) {
+					this.quanxuan = true;
+				}
+				if(!this.quanxuan) {
+					this.$refs.uToast.show({
+						title: '请选择规格'
+					})
+					return false;
+				}
+			}
 			if(!this.debounce) return;
 			this.debounce = false;
 			let params = {
@@ -414,7 +499,7 @@ export default {
 				if(type == 'involvement') {
 					// 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);
+					// console.log(this.$store.state.pintuangroup_headid);
 					Object.assign(params, {
 						pintuan_id: this.id, 
 						pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id,
@@ -427,6 +512,7 @@ export default {
 			}
 			this.$u.api.settlementOrder(params).then(res => {
 				if(res.errCode == 0) {
+					// console.log('type' + this.type);
 					this.$store.commit('setOrderType', this.type);
 					this.$store.commit('updateOrderInfo', res.data)
 					this.$u.route({
@@ -434,6 +520,7 @@ export default {
 					})
 				} else {
 					this.debounce = true;
+                    this.$u.toast(res.message);
 				}
 			})
 		},
@@ -444,9 +531,6 @@ export default {
 			this.showInvolvementUser = true;
 			// console.log(this.involvemenGroupInfo);
 		},
-		valChange(e) {
-            // console.log(this.value)
-        },
         self(){
             // console.log(this.$refs.guige)
             let index = 0;
@@ -460,15 +544,18 @@ export default {
                     arr.push(sel)
                 }
             }
-            // console.log(arr.length)
+            // console.log(arr)
             if(arr.length == index){
                 this.sel = arr.join("|")
-                this.quanxuan = true
+                this.quanxuan = true;
                 // console.log(this.sel)
 			}
+			// console.log(this.quanxuan);
         },
         xuanze(id){
 			// console.log(id)
+			// 选择完规格后设商品type = 1
+			// this.type = 1;
             this.getGoodsDetails(this.glist[id])
 			this.id = this.glist[id];
 		},
@@ -486,6 +573,7 @@ export default {
 					title = '秒杀商品详情';
 					break;
 				default:
+					title = '商品详情';
 					break;
 			}
 			uni.setNavigationBarTitle({
@@ -522,7 +610,7 @@ export default {
 			}
 		},
 		addFavoriteGoods() {
-			this.$u.api.addFavoriteGoods({ fid: this.id }).then(res => {
+			this.$u.api.addFavoriteGoods({ fid: this.goodsInfo.goods_id }).then(res => {
 				if(res.errCode == 0) {
 					this.getGoodsDetails(this.id);
 				} else {
@@ -531,7 +619,7 @@ export default {
 			})
 		},
 		removeFavorite() {
-			this.$u.api.removeFavorite({ fid: this.id, type: 'goods' }).then(res => {
+			this.$u.api.removeFavorite({ fid: this.goodsInfo.goods_id, type: 'goods' }).then(res => {
 				if(res.errCode == 0) {
 					this.getGoodsDetails(this.id);
 				} else {
@@ -549,7 +637,7 @@ export default {
 	background-color: #EEEBEE;
 	.spike-view {
 		position: absolute;
-		top: 396rpx;
+		top: 400rpx;
 		left: 0;
 		width: 100%;
 		height: 104rpx;
@@ -602,8 +690,8 @@ export default {
 			}
 			font-size: 26rpx;
 			font-weight: 500;
-			.title {
+			.time {
-				margin-bottom: 18rpx;
+				margin-top: 18rpx;
 			}
 		}
 	}
@@ -967,13 +1055,13 @@ export default {
 		}
 	}
 	.spike-tool {
+		z-index: 10076;
+		display: flex;
 		position: fixed;
 		bottom: 0;
 		left: 0;
 		width: 100%;
-		height: 98rpx;
+		height: 100rpx;
-		display: flex;
-		z-index: 10076;
 		background-color: #FFFFFF;
 		.left {
 			width: 190rpx;
@@ -996,8 +1084,8 @@ export default {
 		}
 		.btn {
 			flex: 1;
-			height: 98rpx;
+			height: 104rpx;
-			line-height: 98rpx;
+			line-height: 104rpx;
 			text-align: center;
 			font-size: 32rpx;
 			color: rgba(255,255,255,1);

pageB/search/index.vue

@@ -13,11 +13,14 @@ export default {
     name:"search",
     data(){
         return{
+			type: '', // 1 商家达人社区 2 商品
 			keyword: "",
 			searchwordlist: [],
         }
 	},
-	created() {
+	// type: 2 商品 1: 其他
+	onLoad(option) {
+		this.type = option.type;
 		this.getWordList();
 	},
 	// 点击搜索按钮
@@ -34,8 +37,10 @@ export default {
 	},
     methods:{
 		getWordList() {
-			this.$u.api.searchwordlist().then(res => {
+			this.$u.api.searchwordlist({type:this.type}).then(res => {
+                console.log(res)
                 this.searchwordlist = res.data;
+                
 			})
 		},
         search(value){
@@ -44,14 +49,22 @@ export default {
 				this.$u.toast('搜索内容不可为空');
 				return false;
 			}
+			let params = {
+				value: value,
+				type: this.type,
+			}
+			if(this.type == 2) {
                 this.$u.route({
                     url: "/pageB/search/out",
-                params: {
+                    params: params,
-                    value: value,
-					type: "shop",
-					order: 'goods_salenum'
-                }
                 })
+			}else{
+                this.$u.route({
+                    url: "/pageB/search/searchGoods",
+                    params: params,
+                })
+            }
+            
         }
     }
 }

pageB/search/out.vue

@@ -1,193 +1,296 @@
 <template>
-    <view class="out">
+	<view class="classify-goods">
-        <u-tabs-swiper v-if="type == 'dianpu'" @change="tabsChange" :show-bar="false" :bold="false" :font-size="32"
+		<view class="tab-container">
-            active-color="#FF780F" ref="uTabs" :list="list" :is-scroll="false" style="border-bottom: 1px solid #ececec;flex-shrink:0"
+			<view class="salenum" :class="{ 'current' : current == 0 }" @click="switchCurrent(0)">店铺</view>
-            height="88"></u-tabs-swiper>
+			<view class="price" :class="{ 'current' : current == 1 }" @click="switchCurrent(1)">
-        <swiper v-if="type == 'dianpu'" class="swiper" :current="swiperCurrent" @transition="transition"
+				达人
-            @animationfinish="animationfinish">
-            <swiper-item>
-                <scroll-view :scroll-y="true" style="height:100%">
-                    <view style="padding-top:30rpx">
-                        <shop></shop>
 			</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">
+			<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">
+					<view class="name u-line-1">{{ goods.store_name }}</view>
+					<view class="briefing u-line-2">{{ goods.store_description }}</view>
+				</view>
+			</view>
+			<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>
-            </swiper-item>
+		<scroll-view style="width:100%;" :style="{ height: scrollHeight }" scroll-y="true" @scrolltolower="loadMore" v-if=" current == 2 ">
-            <swiper-item>
+			<view class="box" style="padding: 0 30rpx;">
-                <scroll-view :scroll-y="true" style="height:100%">
+				<view style="display:flex">
-                    <view class="list">
+					<view>
-                        <!-- <darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0rpx 3rpx 7rpx 0rpx rgba(153, 153, 153, 0.35);" v-for="item in 50"></darenItem> -->
+						<videoItem v-for="(item,id) in goodsList.filter((_, index) => !(index&1))" :key="id" :item="item"
+							@getArticlelist="getArticlelist"></videoItem>
 					</view>
+					<view style="margin-left:20rpx">
+						<videoItem v-for="(item,id) in goodsList.filter((_, index) => index&1)" :key="id" :item="item"
+							@getArticlelist="getArticlelist"></videoItem>
+					</view>
+				</view>
+			</view>
+			<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>
-            </swiper-item>
+		<scroll-view style="width:100%;padding: 20rpx 30rpx;margin-right:23rpx;" :style="{ height: scrollHeight }" scroll-y="true" @scrolltolower="loadMore" v-if=" current == 1 ">
-        </swiper>
+			<view class="list" >
-        <view v-else style=" display: flex;flex-direction: column;height: calc(100vh - 88rpx);">
+				<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 class="select">
-                <view @click="sx(0)" class="xz" data-type="xl">销量</view>
-                <view class="xz" @click="sx(1)">
-                    <text>价格</text>
-                    <view class="jiage">
-                        <view class="top topxz"></view>
-                        <view class="bottom bottomxz"></view>
-                    </view>
-                </view>
-                <view data-type="hp" @click="sx(2)">好评</view>
-            </view>
-            <view class="swiper" :current="swiperCurrent" @change="huadong">
-                <scroll-view :scroll-y="true" style="height:100%">
-                    <view style="padding-top:30rpx">
-                        <shop v-for="(i,j) in shoplist" :key="j" :name="i.goods_name" :id="i.goods_id" :commonid="i.goods_commonid"
-                            :image="i.goods_image"></shop>
 			</view>
+			<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>
-            </view>
+		
-        </view>
 	</view>
 </template>
-<style lang="scss" scoped>
-    .out {
-        display: flex;
-        flex-direction: column;
-        height: 100vh;
-
-        .sosuo {
-            width: 100%;
-            height: 88rpx;
-            border-bottom: 1rpx solid #ececec;
-            display: flex;
-            align-items: center;
-            padding: 0 30rpx;
-            flex-shrink: 0;
-
-            >image {
-                width: 18rpx;
-                height: 32rpx;
-                margin-right: 24rpx;
-                flex-shrink: 0;
-            }
-
-            align-items: center;
-        }
-
-        .swiper {
-            width: 100%;
-            height: 100%;
-
-            .list {
-                display: flex;
-                flex-wrap: wrap;
-                width: 100%;
-                padding-left: 30rpx;
-            }
-        }
-
-        .select {
-            width: 100%;
-            height: 89rpx;
-            border-bottom: 1rpx solid #ececec;
-            display: flex;
-            align-items: center;
-            padding: 0 40rpx;
-            flex-shrink: 0;
-            justify-content: space-between;
-
-            >view {
-                font-size: 32rpx;
-                color: #333;
-                display: flex;
-                font-weight: 400;
-
-                .jiage {
-                    display: flex;
-                    flex-direction: column;
-
-                    .top {
-                        width: 12rpx;
-                        border-bottom: 12rpx solid #707070;
-                        border-left: 11rpx solid #fff;
-                        border-right: 11rpx solid #fff;
-                        margin-bottom: 2rpx;
-                    }
-
-                    .bottom {
-                        width: 12rpx;
-                        border-top: 12rpx solid #707070;
-                        border-left: 11rpx solid #fff;
-                        border-right: 11rpx solid #fff;
-                    }
-
-                    .topxz {
-                        border-bottom: 12rpx solid #FF780F;
-                    }
-
-                    .bottomxz {
-                        border-top: 12rpx solid #FF780F;
-                    }
-                }
-            }
-
-            .xz {
-                color: #FF780F;
-            }
-
-        }
-    }
-</style>
 <script>
-    import shop from "../components/search/shop"
+	import videoItem from "@/components/index/video-item/index"
 	import darenItem from "@/components/index/daren-item/index" 
-    export default {
+export default {
-        name: "out",
-        components: {
-            shop,
-            darenItem
-        },
 	data() {
 		return {
-                list: [{
+			pageSize: 12,
-                    name: "店铺"
+			cid: '',
-                }, {
+			page: 1,
-                    name: "达人"
-                }],
 			current: 0,
-                swiperCurrent: 0,
+			priceOrderAsc: true,　// 是否升序
-                keyword: "",
+			goodsList: [],
-                type: "",
+			scrollHeight: '',
-                shoplist: []
+			loadStatus: 'loadmore',
+			timer: true, // 防止上拉加载短时间内多次调用,
+			value:""
 		}
 	},
-        onLoad(o) {
+	components:{
-            this.type = o.type
+		videoItem,
-            this.keyword = o.value
+		darenItem
-            this.search()
+	},
+	watch: {
+		current(value) {
+			this.page = 1;
+			this.ShopSearch({ laod: 'reload' });
+		},
+		priceOrderAsc(value) {
+			this.page = 1;
+			this.ShopSearch({ laod: 'reload' });
+		}
+	},
+	onLoad(option) {
+		this.value = option.value;
+		this.setViewHeight();
+		this.ShopSearch()
+		this.setNavSearchInput(this.value);
+	},
+	onNavigationBarSearchInputConfirmed(value) {
+		this.value = value.text
+		// console.log(this.value)
+		this.ShopSearch()
 	},
 	methods: {
-            tabsChange(index) {
+		// 动态设置导航栏搜索框内容
-                this.swiperCurrent = index;
+		setNavSearchInput(keyword) {
+			// #ifdef APP-PLUS
+			let webView = this.$mp.page.$getAppWebview();
+			webView.setTitleNViewSearchInputText(keyword);
+			// #endif
+			// #ifdef H5
+			let inputSearch=document.querySelector('.uni-input-input[type=search]');
+			var evt = new InputEvent('input', {
+				inputType: 'insertText',
+				data: keyword,
+				dataTransfer: null,
+				isComposing: false
+			});
+			if(inputSearch){
+				inputSearch.value = keyword;
+				inputSearch.dispatchEvent(evt);
+			}
+			// #endif
 		},
-            transition(e) {
+		changeType(member_id){
-                let dx = e.detail.dx;
+			console.log(member_id);
-                this.$refs.uTabs.setDx(dx);
+			this.$emit("pChangeType")
+			this.$u.api.attentionMember({
+				member_id: member_id
+			}).then((res)=>{
+				console.log(res)
+				for(let i in this.goodsList){
+				
+					if(this.goodsList[i].member_id == member_id){
+						this.goodsList[i].is_attention = res.message == "已取消关注！" ? 0 : 1
+					}
+				}
+			})
 		},
-            animationfinish(e) {
+		setOrderSort() {
-                let current = e.detail.current;
+			let sort = '';
-                this.$refs.uTabs.setFinishCurrent(current);
+			if(this.current == 0) {
-                this.swiperCurrent = current;
+				sort = 'goods_salenum';
-                this.current = current;
+			} else if (this.current == 1) {
+				if(this.priceOrderAsc) sort = 'goods_price_asc';
+				else sort = 'goods_price_desc';
+			} else if (this.current == 2) {
+				sort = 'evaluation_count';
+			}
+			return sort;
 		},
-            sx(type) {
+		// 排序方式 goods_salenum：销量　evaluation_count：评价　goods_price_asc：价格从低到高　goods_price_desc：价格从高到低
-                console.log(type)
+		async ShopSearch({ load = 'reload' } = {}) {
+			// const res = await this.$u.api.ShopSearch({ 
+			// 	keyword: this.value, 
+			// 	page: this.page,
+			// 	order: sort,
+			// })
+			console.log(this.value)
+			let res = {}
+			if(this.current == 0) {
+				res = await this.$u.api.storeList({ 
+					name_search: this.value, 
+					page: this.page
+				})
+				this.timer = true;
+				if(res.errCode == 0) {
+					if(load == 'reload') this.goodsList = res.data.list.data;
+					else if(load == 'loadmore') this.goodsList.push(...res.data.list.data);
+				}
+				console.log(this.goodsList)
+				return res.data.list.data.length;
+			} else if (this.current == 1) {
+				
+				res = await this.$u.api.getExpertList({ 
+					like_nickname: this.value, 
+					page: this.page
+				})
+				this.timer = true;
+				if(res.errCode == 0) {
+					if(load == 'reload') this.goodsList = res.data.list;
+					else if(load == 'loadmore') this.goodsList.push(...res.data.list);
+				}
+				console.log(this.goodsList)
+				return res.data.list.length;
+			} else if (this.current == 2) {
+				res = await this.$u.api.getArticlelist({ 
+					value: this.value, 
+					page: this.page
+				})
+				this.timer = true;
+				if(res.errCode == 0) {
+					if(load == 'reload') this.goodsList = res.data.list;
+					else if(load == 'loadmore') this.goodsList.push(...res.data.list);
+				}
+				console.log(this.goodsList)
+				return res.data.list.length;
+			}
 			
 		},
-            huadong(e) {
+		loadMore() {
-                console.log(e.detail.current)
+			if(this.goodsList.length < this.pageSize) return false;
-            },
+			if(!this.timer) return false;
-            search() {
+			this.loadStatus = "loading";
-                this.$u.api.ShopSearch({
+			this.page++;
-                    keyword: this.keyword
+			this.ShopSearch({  load: 'loadmore' }).then(length => {
-                }).then((res) => {
+				if(length == 0) {
-                    this.shoplist = res.data.data
+					this.page--;
+					this.loadStatus = 'nomore';
+				} else {
+					this.loadStatus = 'loading';
+				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
 			})
-            }
 		},
+		switchCurrent(current) {
+			// if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
+			this.current = current;
+			this.goodsList = []
+			this.ShopSearch()
+		},
+		setViewHeight() {
+			const res = uni.getSystemInfoSync();
+			this.scrollHeight = res.windowHeight - res.windowWidth / 750 * 90  + 'px';
+		},
+		toDetailsPage(id) {
+			this.$u.route('/pageC/merchant/index', {
+				id: id
+			});
 		}
+	}
+};
 </script>
+<style lang="scss" scoped>
+.list{
+        display: flex;
+        flex-wrap: wrap;
+        width: calc(100% + 23rpx);
+        margin-right: -23rpx;
+    }
+.classify-goods {
+	.tab-container {
+		box-sizing: border-box;
+		padding: 30rpx 40rpx;
+		display: flex;
+		margin-bottom: 30rpx;
+		> view {
+			height: 30rpx;
+			line-height: 30rpx;
+			flex: 1;
+			font-size: 32rpx;
+			color: rgba(51,51,51,1);
+		}
+		.salenum {
+			text-align: left;
+		}
+		.price {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			.text {
+				margin-right: 5rpx;
+			}
+			.icon {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+		.evaluation {
+			text-align: right;
+		}
+		.current {
+			color: rgba(255,120,15,1);
+		}
+	}
+	.goods-container {
+		.goods-item {
+			margin: 0 auto;
+			width: 690rpx;
+			display: flex;
+			background-color: #F5F5F5;
+			margin-bottom: 30rpx;
+			align-items: center;
+			> image {
+				width: 220rpx;
+				height: 200rpx;
+				flex-shrink: 0;
+				margin-right: 30rpx;
+			}
+			.right {
+				width: 418rpx;
+				.name {
+					font-size: 30rpx;
+					color: rgba(51,51,51,1);
+					margin-bottom: 20rpx;
+				}
+				.briefing {
+					font-size: 28rpx;
+					color: rgba(102,102,102,1);
+					line-height: 42rpx;
+				}
+			}
+		}
+	}
+}
+</style>

pageB/search/searchGoods.vue

@@ -0,0 +1,214 @@
+<template>
+	<view class="classify-goods">
+		<view class="tab-container">
+			<view class="salenum" :class="{ 'current' : current == 0 }" @click="switchCurrent(0)">销量</view>
+			<view class="price" :class="{ 'current' : current == 1 }" @click="switchCurrent(1)">
+				<view class="text">价格</view>
+				<view class="icon">
+					<u-icon name="arrow-up-fill" :color="(current == 1 && priceOrderAsc) ? '#FF780F' : '#333333'" size="22"></u-icon>
+					<u-icon name="arrow-down-fill" :color="(current == 1 && !priceOrderAsc) ? '#FF780F' : '#333333'" size="22"></u-icon>
+				</view>
+			</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">
+			<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-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>
+			<u-empty mode="list" v-if="!goodsList.length"></u-empty>
+		</scroll-view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			pageSize: 12,
+			cid: '',
+			page: 1,
+			current: 0,
+			priceOrderAsc: true,　// 是否升序
+			goodsList: [],
+			scrollHeight: '',
+			loadStatus: 'loadmore',
+			timer: true, // 防止上拉加载短时间内多次调用,
+			value:""
+		}
+	},
+	watch: {
+		current(value) {
+			this.page = 1;
+			this.ShopSearch({ laod: 'reload' });
+		},
+		priceOrderAsc(value) {
+			this.page = 1;
+			this.ShopSearch({ laod: 'reload' });
+		}
+	},
+	onLoad(option) {
+		this.value = option.value
+		this.setViewHeight();
+		this.ShopSearch()
+	},
+	onNavigationBarSearchInputConfirmed(value) {
+		this.value = value.text
+		this.ShopSearch()
+	},
+	methods: {
+		setNavSearchInput(keyword) {
+			console.log(keyword);
+			// #ifdef APP-PLUS
+			let webView = this.$mp.page.$getAppWebview();
+			webView.setTitleNViewSearchInputText(keyword);
+			// #endif
+			// #ifdef H5
+			let inputSearch=document.querySelector('.uni-input-input[type=search]');
+			const evt = new InputEvent('input', {
+				inputType: 'insertText',
+				data: keyword,
+				dataTransfer: null,
+				isComposing: false
+			});
+			if(inputSearch){
+				inputSearch.value = keyword;
+				inputSearch.dispatchEvent(evt);
+			}
+			// #endif
+		},
+		setOrderSort() {
+			let sort = '';
+			if(this.current == 0) {
+				sort = 'goods_salenum';
+			} else if (this.current == 1) {
+				if(this.priceOrderAsc) sort = 'goods_price_asc';
+				else sort = 'goods_price_desc';
+			} else if (this.current == 2) {
+				sort = 'evaluation_count';
+			}
+			return sort;
+		},
+		// 排序方式 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, 
+				page: this.page,
+				order: sort,
+			})
+			this.timer = true;
+			if(res.errCode == 0) {
+				if(load == 'reload') this.goodsList = res.data.data;
+				else if(load == 'loadmore') this.goodsList.push(...res.data.data);
+			}
+			return res.data.data.length;
+		},
+		loadMore() {
+			if(this.goodsList.length < this.pageSize) return false;
+			if(!this.timer) return false;
+			this.loadStatus = "loading";
+			this.page++;
+			this.ShopSearch({  load: 'loadmore' }).then(length => {
+				if(length == 0) {
+					this.page--;
+					this.loadStatus = 'nomore';
+				} else {
+					this.loadStatus = 'loading';
+				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
+			})
+		},
+		switchCurrent(current) {
+			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 * 90  + 'px';
+		},
+		toDetailsPage(id) {
+			this.$u.route('/pageB/sdetails/index', {
+				id: id
+			});
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.classify-goods {
+	.tab-container {
+		box-sizing: border-box;
+		padding: 30rpx 40rpx;
+		display: flex;
+		margin-bottom: 30rpx;
+		> view {
+			height: 30rpx;
+			line-height: 30rpx;
+			flex: 1;
+			font-size: 32rpx;
+			color: rgba(51,51,51,1);
+		}
+		.salenum {
+			text-align: left;
+		}
+		.price {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			.text {
+				margin-right: 5rpx;
+			}
+			.icon {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+		.evaluation {
+			text-align: right;
+		}
+		.current {
+			color: rgba(255,120,15,1);
+		}
+	}
+	.goods-container {
+		.goods-item {
+			margin: 0 auto;
+			width: 690rpx;
+			display: flex;
+			background-color: #F5F5F5;
+			margin-bottom: 30rpx;
+			align-items: center;
+			> image {
+				width: 220rpx;
+				height: 200rpx;
+				flex-shrink: 0;
+				margin-right: 30rpx;
+			}
+			.right {
+				width: 418rpx;
+				.name {
+					font-size: 30rpx;
+					color: rgba(51,51,51,1);
+					margin-bottom: 20rpx;
+				}
+				.briefing {
+					font-size: 28rpx;
+					color: rgba(102,102,102,1);
+					line-height: 42rpx;
+				}
+			}
+		}
+	}
+}
+</style>

pageB/video/video.nvue

@@ -0,0 +1,470 @@
+<template>
+    <view>
+        <video id="videoId" :style="videoSize" :src="src" autoplay="true" :show-fullscreen-btn="false" @play="playing"
+            @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" :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 == 1 ? 0 : time_count }}s</text>
+            </view>
+            <view>
+                <text class="name">@{{ list.member_nickname }}</text>
+            </view>
+            <view>
+                <text class="title">{{ list.article_title }}</text>
+            </view>
+            <view>
+                <text class="centent">{{ list.article_content }}</text>
+            </view>
+            <view class="label-box">
+                <block v-for="(item,index) in list.label" :key="index">
+                    <text class="label" :style="{ width: labelLen[index] * 40 + 'rpx' }">{{ item.name }}</text>
+                </block>
+            </view>
+        </cover-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>
+        <list class="cart-box">
+            <cell></cell>
+        </list>
+    </view>
+</template>
+
+<script>
+    import userinfo from "../components/userinfo/index" // 点赞组件
+    const temp_url = "https://dmmall.sdbairui.com/api/";
+    export default {
+        components: {
+            userinfo
+        },
+        data() {
+            return {
+                videoSize: {},
+                list: {},
+                labelLen: [],
+                cart_type: false, // 显示购物车
+                is_comment: false, // 显示评论
+                comment_num: 0, // 评论数
+                page: 0,
+                commentList: [], // 评论列表
+                src: "",
+                is_play: true,
+                time_count: 0,
+                linear: null,
+                loadinging: false,
+            };
+        },
+        onLoad(option) {
+            this.article_id = option.id;
+            this.getVideoInfo(option.id);
+            this.getInfo();
+        },
+        onReady() {
+            this.videoBox = uni.createVideoContext("videoId", this);
+        },
+        methods: {
+            // 获取信息
+            getVideoInfo(article_id) {
+                uni.request({
+                    url: temp_url + "article/articleInfo",
+                    method: "POST",
+                    data: {
+                        article_id: article_id
+                    },
+                    header: {
+                        Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+                    },
+                    success: (res) => {
+                        this.list = res.data.data.info;
+                        this.src = res.data.data.info.video_path;
+                        let item = res.data.data.info.label;
+                        let arr = [];
+                        item.forEach(data => {
+                            let str = escape(data.name);
+                            if (str.indexOf('%u')) {
+                                // console.log(data.name);
+                                arr.push(Math.floor(data.name.length / 2));
+                            } else {
+                                arr.push(data.name.length);
+                            }
+                        })
+                        this.labelLen = arr;
+                    }
+                })
+            },
+            // 获取评论
+            getComment() {
+                uni.request({
+                    url: temp_url + "article/articleCommentList",
+                    method: "POST",
+                    data: {
+                        article_id: this.article_id,
+                        page: this.page,
+                    },
+                    success: (res) => {
+                        if (res.data.errCode == 0) {
+                            console.log(res.data);
+                            this.commentList = res.data.data;
+                        }
+                    }
+                })
+            },
+            // 发布评论	
+            sendComment() {	
+                if (this.send_value.length == 0) {	
+                    this.$u.toast("内容不能为空！");	
+                    return;	
+                }	
+                uni.request({	
+                    url: temp_url + "article/articleAddComment",	
+                    method: "POST",	
+                    data: {	
+                        article_id: this.article_id,	
+                        content: this.send_value,	
+                        pid: this.pid,	
+                        reply_id: this.reply_id,	
+                    },	
+                    success: (res) => {	
+                        if (res.data.errCode == 0) {	
+                            this.send_value = "";	
+                            this.comment_num = res.data.num;	
+                            console.log(res.data);	
+                        } else {	
+                            uni.showToast({	
+                                title: res.data.message,	
+                                icon: "none"	
+                            })	
+                        }	
+                    }	
+                })	
+            },
+            // 获取手机信息
+            getInfo() {
+                uni.getSystemInfo({
+                    success: (res) => {
+                        this.videoSize = {
+                            width: "750rpx",
+                            height: res.screenHeight + "px"
+                        }
+                    }
+                })
+            },
+            // 播放
+            playing(e) {
+                // console.log(e);
+                if (e.type == "play") {}
+            },
+            // 暂停
+            stoping() {
+                this.is_play = !this.is_play;
+                if (this.is_play) {
+                    this.videoBox.play();
+                } else {
+                    this.videoBox.pause();
+                }
+            },
+            // 监听视频
+            timeupdate(e) {
+                this.time_count = parseInt(e.detail.duration) - parseInt(e.detail.currentTime);
+                if (e.detail.duration == e.detail.currentTime) {
+                    this.is_play = false;
+                }
+                // let num = parseInt((e.detail.currentTime/e.detail.duration)*100);
+                // this.linear = num + "%";
+                // console.log(this.time_count);
+            },
+            // 打开弹窗
+            openPopup(data) {
+                console.log(data);
+                this.cart_type = data.cart;
+                this.is_comment = data.comment;
+                if (this.is_comment) {
+                    this.page = 0;
+                    this.getComment();
+                }
+            },
+            // 关闭评论
+            closeComment() {
+                this.is_comment = false;
+            },
+            // 下拉加载
+            onloading(e) {
+                console.log(e);
+                this.loadinging = true;
+                setTimeout(() => {
+                    this.loadinging = false;
+                }, 2000)
+            },
+            // stop
+            stopClick(event) {
+                event.stopPropagation();
+            },
+            goBack() {
+                uni.navigateBack({
+                    delta: 1
+                })
+            }
+        }
+    }
+</script>
+
+<style>
+    /* 关闭 */
+    .close {
+        position: fixed;
+        top: 80rpx;
+        right: 60rpx;
+        width: 30rpx;
+        height: 30rpx;
+    }
+
+    /* 暂停 */
+    .pause {
+        position: fixed;
+        top: 600rpx;
+        left: 330rpx;
+        width: 100rpx;
+        height: 100rpx;
+    }
+
+    /* 用户操作 */
+    .user-info {
+        position: fixed;
+        top: 360rpx;
+        right: 30rpx;
+    }
+
+    /* 底部信息 */
+    .info-box {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        padding: 30rpx;
+    }
+
+    .video-info-box {
+        flex-direction: row;
+        align-items: center;
+        width: 160rpx;
+        height: 40rpx;
+        padding: 4rpx 10rpx;
+        margin-bottom: 20rpx;
+        color: #666666;
+        border-radius: 10rpx;
+        background-color: rgba(255, 255, 255, .6);
+    }
+
+    .content-box {
+        z-index: 99;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 750rpx;
+        height: 700rpx;
+        margin-bottom: 88rpx;
+        background-color: #fff;
+    }
+
+    .content-title {
+        justify-content: space-between;
+        flex-direction: row;
+        align-items: center;
+        height: 88rpx;
+        padding: 0 20rpx;
+        background-color: #ECECEC;
+    }
+
+    .comment-list {
+        margin-bottom: 50rpx;
+    }
+
+    .comment-list-box {
+        padding: 30rpx;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+    }
+    
+    .content-main {
+        flex-direction: row;
+        padding-left: 100rpx;
+    }
+    
+    .content-style {
+        width: 600rpx;
+        font-size: 26rpx;
+        color: #333;
+        lines: 2;
+    }
+    
+    .comment-list-header {
+        flex-direction: row;
+    }
+
+    .avatar {
+        width: 60rpx;
+        height: 60rpx;
+        margin-right: 20rpx;
+        border-radius: 50%;
+    }
+
+    .comment-title {
+        font-size: 26rpx;
+        color: #333;
+    }
+
+    .comment-time,
+    .reply {
+        font-size: 22rpx;
+        color: #999;
+    }
+
+    .tips {
+        font-size: 30rpx;
+        font-weight: 500;
+        color: #333;
+    }
+    .send-box {
+        z-index: 10000;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        width: 750rpx;
+        height: 88rpx;
+        padding: 10rpx 30rpx;
+        border-top-width: 1rpx;
+        border-color: #ececec;
+        background-color: #fff;
+    }
+    
+    .send-val {
+        width: 600rpx;
+        height: 88rpx;
+        font-size: 36rpx;
+    }
+    
+    .btn-send {
+        font-size: 30rpx;
+        color: #303133;
+    }
+    
+    .close-down {
+        font-size: 50rpx;
+        text-align: center;
+        color: #333;
+    }
+
+    .image-play {
+        width: 22rpx;
+        height: 20rpx;
+        margin-right: 10rpx;
+    }
+
+    .video-slip {
+        color: #666;
+        font-size: 24rpx;
+        margin-right: 20rpx;
+    }
+
+    .time {
+        color: #666;
+        font-size: 24rpx;
+    }
+
+    .name {
+        color: #fff;
+        font-size: 36rpx;
+        margin-bottom: 20rpx;
+    }
+
+    .title {
+        color: #fff;
+        font-size: 26rpx;
+        margin-bottom: 20rpx;
+    }
+
+    .centent {
+        width: 500rpx;
+        color: #fff;
+        font-size: 28rpx;
+        margin-bottom: 20rpx;
+        lines: 2;
+        text-overflow: ellipsis;
+    }
+
+    .label-box {
+        flex-direction: row;
+    }
+
+    .label {
+        lines: 3;
+        width: 100rpx;
+        height: 40rpx;
+        padding: 4rpx 10rpx;
+        margin-right: 10rpx;
+        margin-bottom: 10rpx;
+        font-size: 26rpx;
+        text-align: center;
+        color: #666666;
+        border-radius: 10rpx;
+        background-color: rgba(255, 255, 255, .6);
+    }
+
+    .loading {
+        width: 750rpx;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+    }
+
+    .indicator-text {
+        font-size: 20rpx;
+        text-align: center;
+        color: #999;
+    }
+
+    .indicator {
+        width: 30rpx;
+        height: 30rpx;
+        color: #999;
+    }
+</style>

pageC/cart/ConfirmOrder.vue

@@ -26,7 +26,7 @@
 							<view class="info">
 								<view class="name u-line-2">{{ goods.goods_name }}</view>
 								<view class="cart-info">
-									<view class="price">￥{{ goods.goods_price }}</view>
+									<view class="price">￥{{ goods.goods_total }}</view>
 									<view>×{{ goods.goods_num }}</view>
 								</view>
 							</view>
@@ -148,7 +148,7 @@ export default {
 	onLoad(option) {
 		this.orderType = this.$store.state.orderType;
 		this.orderInfo = this.$store.state.orderInfo;
-		// console.log(this.orderType);
+		console.log('orderType' + this.orderType);
 		// console.log(this.orderInfo);
 		this.getGoodsClass();
 		this.setTotalPrice();
@@ -204,6 +204,8 @@ export default {
 				this.withImmediate();
 			} else if(this.orderType == 1) {
 				this.sendOrder(0);
+			}  else if(this.orderType == 3) {
+				this.sendOrder(0);
 			} else {
 				this.sendOrder(1);
 			}
@@ -464,6 +466,8 @@ export default {
 							justify-content: space-between;
 							.name {
 								font-size: 30rpx;
+								height: 88rpx;
+								line-height: 44rpx;
 								color: rgba(51,51,51,1);
 							}
 							.cart-info {

pageC/cart/cashier.vue

@@ -5,7 +5,7 @@
 			<view class="price">￥{{ price }}</view>
 		</view>
 		<view class="pay-view">
-			<u-radio-group v-model="pay_way" @change="radioGroupChange" size="16">
+			<u-radio-group v-model="pay_way" size="16">
 				<view v-for="(item, index) in payLiat" :key="index" class="pay-item">
 					<view class="pay-way">
 						<image :src="item.icon"></image>
@@ -53,12 +53,6 @@ export default {
         this.order_id = option.order_id;
 	},
 	methods: {
-		radioGroupChange(e) {
-			// console.log(e);
-		},
-		// getProvider() {
-		// 	uni.getProvider({service: 'payment'})
-		// },
 		payOrder(provider, orderInfo) {
             let me = this;
 			uni.requestPayment({

pageC/cart/index.vue

@@ -14,8 +14,8 @@
 						<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="35" :name="g_index"></u-checkbox>
 							<image :src="goods.goods_image" @click="viewGoodsDetails(goods.goods_id)"></image>
-							<view class="info" @click="viewGoodsDetails(goods.goods_id)">
+							<view class="info">
-								<view class="name u-line-2">{{ goods.goods_name }}</view>
+								<view class="name u-line-2" @click="viewGoodsDetails(goods.goods_id)">{{ goods.goods_name }}</view>
 								<view class="cart-info">
 									<view class="price">￥{{ goods.goods_price }}</view>
 									<u-number-box :input-width="38" :input-height="39" :size="22" bg-color="#FFFFFF" :disabled-input=true color="#FF780F" :index="goods.cart_id" @minus="reduce" @plus="plus" v-model="goods.goods_num"></u-number-box>
@@ -238,7 +238,7 @@ export default {
 			// #ifdef APP-PLUS
 			let currentWebview = page.$getAppWebview();
 			let titleObj = currentWebview.getStyle().titleNView;
-			console.log(JSON.stringify(titleObj.buttons[0]));
+			// console.log(JSON.stringify(titleObj.buttons[0]));
 			if (!titleObj.buttons) {
 				return;
 			}

pageC/classify/goods.vue

@@ -106,7 +106,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.scrollHeight = res.windowHeight - (90 / 2) + 'px';
+			this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * 90 + 'px';
 		},
 		setTitle(title) {
 			uni.setNavigationBarTitle({

pageC/classify/index.vue

@@ -50,15 +50,18 @@
 			this.getMenuItemTop()
 		},
 		onNavigationBarButtonTap(e) {
-			if(e.index == 0) this.$u.route('/pageB/search/index');
+			if(e.index == 0) this.$u.route('/pageB/search/index',{ type: 2 });
 		},
 		onNavigationBarSearchInputClicked() {
-			this.$u.route('/pageB/search/index');
+			this.$u.route('/pageB/search/index', { type: 2 });
 		},
 		methods: {
 			toSearchPage() {
 				this.$u.route({
-					url: "pageB/search/index"
+					url: "pageB/search/index",
+					prarms: {
+						type: 2
+					}
 				})
 			},
 			// 获取分类列表

pageC/components/merchant/image-top.vue

@@ -1,16 +1,17 @@
 <template>
     <view class="imageTop">
-        <image :src="url" mode="aspectFit"></image>
+        <image :src="url" mode="widthFix"></image>
     </view>
 </template>
 <style lang="scss" scoped>
 .imageTop{
     width: 100%;
     height: 500rpx;
-    margin-bottom: 20rpx;
+	overflow: hidden;
     >image{
         width: 100%;
         height: 100%;
+    	margin-bottom: 20rpx;
     }
 }
 </style>
@@ -21,6 +22,6 @@ export default {
         return {
         }
     },
-    props:['url']
+	props:['url'],
 }
 </script>

pageC/components/merchant/list-item.vue

@@ -1,17 +1,18 @@
 <template>
     <view class="listItem">
         <video v-if="type == '2'" :src="url" :show-fullscreen-btn="true"></video>
-        <image v-else :src="url" mode="aspectFit"></image>
+        <image v-else :src="url" mode="aspectFill"></image>
     </view>
 </template>
 <style lang="scss" scoped>
 .listItem{
     width: 365rpx;
     height: 500rpx;
-    margin-bottom: 20rpx;
+	overflow: hidden;
     >image,video{
         width: 100%;
         height: 100%;
+		margin-bottom: 20rpx;
     }
 }
 </style>

pageC/groupBuy/index.vue

@@ -1,14 +1,17 @@
 <template>
 	<view class="group">
 		<view>
-			<u-tabs-swiper ref="uTabs" :list="tabList" name="gc_name" :current="current" @change="tabsChange" :is-scroll="true" active-color="#FF780F" swiperWidth="750" height="88" :show-bar="false"></u-tabs-swiper>
+			<!-- <u-tabs-swiper ref="uTabs" :list="tabList" name="gc_name" :current="current" @change="tabsChange" :is-scroll="true" active-color="#FF780F" swiperWidth="750" height="88" :show-bar="false"></u-tabs-swiper> -->
+			<u-tabs :list="tabList" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="88" font-size="24"  inactive-color="#333333"></u-tabs>
 		</view>
-		<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
+		<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{height: swiperHeight}">
 			<swiper-item class="swiper-item" v-for="(_, index) in tabList" :key="index">
 				<scroll-view scroll-y style="width: 100%;" @scrolltolower="onreachBottom">
-					<SpecialGoods v-for="(item, index) in pinTuanList" :key="index" :item="item" type='group'></SpecialGoods>
+					<view v-if="pinTuanList[index]">
-					<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="pinTuanList.length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
+						<SpecialGoods v-for="(item, index) in pinTuanList[index]" :key="index" :item="item" type='group'></SpecialGoods>
-					<u-empty text="暂无商品" mode="list" color="#000" v-if="!pinTuanList.length"></u-empty>
+					</view>
+					<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="!pinTuanList[index] || pinTuanList[index].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
+					<u-empty text="暂无商品" mode="list" color="#000" v-if="!pinTuanList[index] || !pinTuanList[index].length"></u-empty>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
@@ -47,8 +50,8 @@ export default {
 		async getGoodsClass() {
 			return await this.$u.api.getGoodsClass().then(res => {
 				if(res.errCode == 0) {
-					this.tabList = res.data;
 					this.current = 0;
+					this.tabList = res.data;
 				}
 			})
 		},
@@ -60,9 +63,10 @@ export default {
 			})
 			this.timer = true;
 			if (res.errCode == 0) {
-				if(load == 'reload') this.pinTuanList = res.data;
+				if(load == 'reload') this.pinTuanList[this.current] = res.data;
-				else if(load == 'loadmore') this.pinTuanList.push(...res.data);
+				else if(load == 'loadmore') this.pinTuanList[this.current].push(...res.data);
 			}
+			this.$forceUpdate();
 			return res.data.length;
 		},
 		// scroll-view到底部加载更多
@@ -88,13 +92,9 @@ export default {
 		},
 		// tabs通知swiper切换
 		tabsChange(index) {
+			this.current = index;
 			this.swiperCurrent = index;
 		},
-		// swiper-item左右移动，通知tabs的滑块跟随移动
-		transition(e) {
-			let dx = e.detail.dx;
-			this.$refs.uTabs.setDx(dx);
-		},
 		// 由于swiper的内部机制问题，快速切换swiper不会触发dx的连续变化，需要在结束时重置状态
 		// swiper滑动结束，分别设置tabs和swiper的状态
 		animationfinish(e) {
@@ -104,7 +104,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
+			this.swiperHeight = res.windowHeight - (res.windowWidth / 750) * 88 + 'px';
 		},
 	}
 };

pageC/merchant/classifyGoods.vue

@@ -125,7 +125,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.scrollHeight = res.windowHeight - 90 / 2 + 'px';
+			this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * 90 + 'px';
 			// console.log(this.scrollHeight);
 		},
 		toDetailsPage(id) {

pageC/merchant/goods.vue

@@ -109,13 +109,13 @@ export default {
 			})
 		},
 		switchCurrent(current) {
-			if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
+			if(current == 3 && this.current == 3) this.priceOrderAsc = !this.priceOrderAsc;
 			this.current = current;
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
 			const otherHeight = 347 + 140 + 20 + 98;
-			this.scrollHeight = res.windowHeight - otherHeight / 2 + 'px';
+			this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * otherHeight + 'px';
 			// console.log(this.scrollHeight);
 		},
 		toDetailsPage(id) {

pageC/merchant/index.vue

@@ -38,12 +38,12 @@
 		</view>
 		<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">
+				<view v-for="item in indextop" :key="item.id" class="container-top">
-					<videoTop :url="item.article_pic" v-if="item.type == 2"></videoTop>
+					<videoTop :url="item.article_pic" v-if="item.type == 2" @click.native="toDetailsPage(item.article_id)"></videoTop>
-					<imageTop v-else :url="item.article_pic"></imageTop>
+					<imageTop v-else :url="item.article_pic" @click.native="toDetailsPage(item.article_id)"></imageTop>
 				</view>
-				<view style="display: flex;flex-wrap: wrap;" v-if="indexlist.length">
+				<view v-if="indexlist.length" class="container-bottom">
-					<listitem :style="{'margin-left': index%2 == 1 ? '20rpx':'0'}" v-for="(item,index) in indexlist" :key="item.id" :type="item.type" :url="item.article_pic"></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">
@@ -64,7 +64,7 @@
 				<image src="/static/image/shop/11.png"></image>
 				<view>店铺信息</view>
 			</view>
-			<view @click="switchCurrent(3)">
+			<view @click="customers()">
 				<image src="/static/image/shop/12.png"></image>
 				<view>联系客服</view>
 			</view>
@@ -109,6 +109,49 @@ export default {
 		// if(e.index == 0) this.show = true;
 	},
 	methods: {
+		customers(){
+			console.log(this.$store.state.hasLogin)
+			if(!this.$store.state.hasLogin){
+				this.$refs.uToast.show({
+					title: "请先登录",
+					type: 'warning'
+				})
+			}else{
+				function Friend(uuid, name, avatar,time = "", text = "",date = "") {
+					this.uuid = uuid;
+					this.name = name;
+					this.avatar = avatar;
+					this.online = false;
+					this.unReadMessage = 0;
+					this.text = text;
+					this.time = time;
+					this.date = date
+				}
+				console.log(123)
+				this.$u.api.getAtwillUserInfo({
+					id:this.sid
+				}).then((res)=>{
+					console.log(res)
+					let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
+					this.$u.route({
+						url:"/pageD/privateChat/privateChat",
+						params:{
+							id:JSON.stringify(user)
+						}
+						
+					})
+				}).catch((err)=>{
+					console.log(err)
+				})
+			}
+			
+		},
+		toDetailsPage(id) {
+			// console.log(11);
+			this.$u.route('pageB/photo/index', {
+				id: id
+			});
+		},
 		switchCurrent(current) {
 			this.cur = current;
 			if(current == 0) {
@@ -123,15 +166,15 @@ export default {
 				uni.stopPullDownRefresh();
 			})
 		},
-		getStoreImgVideoList() {
+		// getStoreImgVideoList() {
-			this.$u.api.getStoreImgVideoList({ id: this.sid }).then((res)=>{
+		// 	this.$u.api.getStoreImgVideoList({ id: this.sid }).then((res)=>{
-				if(res.data.length) {
+		// 		if(res.data.length) {
-					this.indextop = [res.data[0], res.data[1]];
+		// 			this.indextop = [res.data[0], res.data[1]];
-					this.indexlist = res.data.slice(2,);
+		// 			this.indexlist = res.data.slice(2,);
-				}
+		// 		}
-				uni.stopPullDownRefresh();
+		// 		uni.stopPullDownRefresh();
-			})
+		// 	})
-		},
+		// },
 		attentionMember() {
 			this.$u.api.attentionMember({ member_id: this.info.member_id }).then(res => {
 				if(res.errCode == 0) {
@@ -149,15 +192,17 @@ export default {
 				uni.stopPullDownRefresh();
 				if (res.errCode == 0) {
 					// this.articleList = res.data.list;
+					if(JSON.stringify(res.data) != '[]') {
 						if(res.data.list.length > 0) {
 							this.indextop = [res.data.list[0]]
-						this.indextop = [res.data.list[0], res.data.list[1]];
+							// this.indextop = [res.data.list[0], res.data.list[1]];
 						}
 						if(res.data.list.length > 1) {
 							this.indextop.push(res.data.list[1]);
 							this.indexlist.push(...res.data.list.slice(2,));
 						}
 					}
+				}
 			})
 		},
 		setViewHeight() {
@@ -288,10 +333,24 @@ export default {
 		.video-image {
 			padding-bottom: 98rpx;
 		}
+		.container-top {
 			> view {
-			margin-top: 20rpx;
+				margin-bottom: 10rpx;
 			}
 		}
+		.container-bottom {
+			margin-top: 20rpx; 
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			.bottom-item {
+				margin-bottom: 10rpx;
+			}
+		}
+		// > view {
+		// 	margin-top: 20rpx;
+		// }
+	}
 	.tabbar {
 		border-top: 1rpx #DBDADA solid;
 		width: 100%;

pageC/spike/index.vue

@@ -3,13 +3,13 @@
 		<view class="title">
             <view class="name">全部秒杀</view>
 			<view class="time">
-				<text class="num">{{ seckillTime.littleHour }}</text>
+				<text class="num">{{ seckillTime.littleHour || '00' }}</text>
 				<text class="mah">:</text>
 				<text class="num">00</text>
 				<text class="mah">:</text>
 				<text class="num">00</text>
 				<text>-</text>
-				<text class="num">{{ seckillTime.bigHour }}</text>
+				<text class="num">{{ seckillTime.bigHour || '00' }}</text>
 				<text class="mah">:</text>
 				<text class="num">00</text>
 				<text class="mah">:</text>
@@ -18,6 +18,7 @@
 		</view>
 		<view class="spike-list">
 			<SpecialGoods v-for="(item, index) in spikeList" :key="index" :item="item" type='spike'></SpecialGoods>
+			<u-empty mode="list" v-if="!spikeList.length" :margin-top="240"></u-empty>
 		</view>
 	</view>
 </template>

pageD/activity/activity.vue

@@ -48,11 +48,13 @@
 </script>
 
 <style lang="scss" scoped>
+    page {
+        background-color: #ECECEC;
+    }
 	uni-page-body{
 		height: 100%;
 	}
 	#actives{
-			background: #ECECEC;
 			height: 100%;
             .time {
                 padding: 30rpx 0;

pageD/attention/attention.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="attention">
-		<view class="attention_box" v-for="(item,index) in attention" :key="index">
+		<view class="attention_box" v-for="(item,index) in attention" :key="index" @click="navto(item.friend_tomid)">
 			<view>
 				<image :src="item.friend_tomavatar" mode="aspectFill"></image>
 			</view>
@@ -40,6 +40,15 @@
 				this.$u.api.snsfriendList({}).then((res)=>{
 					this.attention = res.data;
 				})
+			},
+			navto(id){
+				// /pageB/details/index
+				this.$u.route({
+					url:"/pageB/details/index",
+					params:{
+						id
+					}
+				})
 			}
 		},
 		components: {

pageD/notice/info.vue

@@ -0,0 +1,70 @@
+<template>
+	<view>
+		<image :src="list.picture" class="picture" mode=""></image>
+        <view class="box">
+            <view class="info">
+                <text class="title u-line-2">{{ list.title }}</text>
+                <u-divider class="time">{{ list.addtime }}</u-divider>
+                <!-- <text class="time"></text> -->
+            </view>
+            <view class="content">{{ list.content }}</view>
+        </view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				index: 0,
+                list: [],
+			};
+		},
+        onLoad(option) {
+            // console.log(option);
+            this.index = option.index;
+            // 获取数据
+            this.informationList();
+        },
+        methods: {
+            informationList(){
+            	this.$u.api.informationList({}).then((res)=>{
+                    if (res.errCode == 0) {
+                        this.list = res.data[this.index];
+                        console.log(this.list);
+                    }
+            	})
+            }
+        }
+	}
+</script>
+
+<style lang="scss">
+page {
+}
+.picture {
+    width: 100%;
+}
+.box {
+    width: 100%;
+    padding: 20rpx;
+    .info {
+        .title {
+            font-size: 38rpx;
+            color: rgba(0,0,0,.84);
+            line-height: 1.2;
+        }
+        .time {
+            padding: 40rpx 0;
+        }
+    }
+    .content {
+        padding: 0 6rpx;
+        font-size: 34rpx;
+        color: rgba(0,0,0,.6);
+        line-height: 1.4;
+        letter-spacing: 1rpx;
+        text-indent: 2rem;
+    }
+}
+</style>

pageD/notice/notice.vue

@@ -21,7 +21,9 @@
 			},
 			informationList(){
 				this.$u.api.informationList({}).then((res)=>{
+                    if (res.errCode == 0) {
                         this.list = res.data;
+                    }
 				})
 			}
 		},

pageE/mine/EditUserInfo.vue

@@ -98,8 +98,37 @@ export default {
 	},
 	onNavigationBarButtonTap(e) {
 		if( e.index == 0 ) uni.navigateBack();
+		// if( e.index == 1 ) this.customers();
 	},
 	methods: {
+		customers(){
+			function Friend(uuid, name, avatar,time = "", text = "",date = "") {
+				this.uuid = uuid;
+				this.name = name;
+				this.avatar = avatar;
+				this.online = false;
+				this.unReadMessage = 0;
+				this.text = text;
+				this.time = time;
+				this.date = date
+			}
+			// console.log(123)
+			this.$u.api.getAtwillUserInfo({
+				id: 1 // 平台店铺 id
+			}).then((res)=>{
+				// console.log(res)
+				let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
+				this.$u.route({
+					url:"/pageD/privateChat/privateChat",
+					params:{
+						id:JSON.stringify(user)
+					}
+					
+				})
+			}).catch((err)=>{
+				console.log(err)
+			})
+		},
 		changeAvatar() {
 			const url = this.$u.http.config.baseUrl + '/Upload/uploadfile';
 			uni.chooseImage({

pageE/mine/Integral.vue

@@ -40,13 +40,13 @@ export default {
 		setIntegralHeight() {
 			const res = uni.getSystemInfoSync();
 			// console.log(res.windowHeight);
-			this.integralHeight = res.windowHeight - 251 / 2 + 'px';
+			this.integralHeight = res.windowHeight - (res.windowWidth / 750) * 251 + 'px';
 		},
 		getMemberPointsStat() {
 			this.$u.api.getMemberPointsStat().then((res)=>{
 				if (res.errCode == 0) {
 					this.memberInfo = res.data;
-					this.nodes = common.unescapeHTML(this.memberInfo.points_rule);
+					this.nodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
 				}
 			})
 		},

pageE/mine/MedalIntroduction.vue

@@ -3,7 +3,7 @@
 		<scroll-view scroll-y class="medal-article">
 			<view class="medal-title">
 				<image src="../static/mine/29.png"></image>
-				<view>了解勋章</view>
+				<view>{{ title }}</view>
 				<image src="../static/mine/30.png"></image>
 			</view>
 			<view class="medal-content">
@@ -18,6 +18,7 @@ export default {
 	data() {
 		return {
 			nodes: '',
+			title: '',
 		}
 	}, 
 	created() {
@@ -27,7 +28,8 @@ export default {
 		getMemberPointsStat() {
 			this.$u.api.getMemberPointsStat().then((res)=>{
 				if (res.errCode == 0) {
-					const nodes = res.data.grade_rule;
+					this.title = res.data.grade_rule.document_title;
+					const nodes = res.data.grade_rule.document_content;
 					this.nodes = common.unescapeHTML(nodes);
 				}
 			})

pageE/mine/MemberServe.vue

@@ -101,9 +101,9 @@ export default {
 		},
 		getMemberPointsStat() {
 			this.$u.api.getMemberPointsStat().then((res)=>{
-				if (res.errCode == 0) {
+				if(res.errCode == 0) {
 					this.memberInfo = res.data;
-					this.nodes = common.unescapeHTML(this.memberInfo.points_rule);
+					this.nodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
 				}
 			})
 		},
@@ -117,9 +117,9 @@ export default {
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
 			// console.log(res.windowHeight);
-			this.richHeight = res.windowHeight - (88 + 250) / 2 + 'px';
+			this.richHeight = res.windowHeight - (88 + 250) * (res.windowWidth / 750) + 'px';
 			// console.log(this.richHeight);
-			this.swiperHeight = res.windowHeight - 88 / 2 + 'px';
+			this.swiperHeight = res.windowHeight - (res.windowWidth / 750) * 88 + 'px';
 		},
 		viewProgress() {
 			this.$u.route({

pageE/mine/MemberServeCoupon.vue

@@ -1,17 +1,27 @@
 <template>
 	<view class="coupon-swiper">
-		<u-tabs-swiper ref="coupon" :list="couponGroupList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="couponCurrent" font-size="24" :show-bar="false" @change="couponTabsChange" height="88" ></u-tabs-swiper>
+		<!-- <scroll-view scroll-x="true" class="classify-coupon">
+			<view v-for="(classify, index) in couponGroupList" :key="index" class="classify-item" :class="{ 'active': couponCurrent == index }" @click="couponTabsChange(index)">{{ classify.gc_name }}</view>
+		</scroll-view> -->
+		<u-tabs :list="couponGroupList" name="gc_name" :is-scroll="true" :current="couponCurrent" @change="couponTabsChange" active-color="#FF780F" :show-bar="false" height="88" font-size="24"  inactive-color="#333333"></u-tabs>
 		<swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{ height: swiperHeight }">
 			<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
-				<scroll-view scroll-y style="height: 100%;" @scrolltolower="onreachBottom">
+				<scroll-view scroll-y style="height: 100%;" @scrolltolower="onreachBottom" class="coupon-scroll">
+					<view v-for="(coupon, index) in couponList[i]" :key="index" class="coupon-item">
+						<Coupon :couponInfo="coupon" :status='0' :type="0" @exchange="exchangeCoupon($event)"></Coupon>
+					</view>
+					<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList[i] || !couponList[i].length"></u-empty>
+					<u-loadmore :status="loadStatus" bgColor="#FFF" margin-bottom="60" v-if="!couponList[i] || couponList[i].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+		<!-- <scroll-view scroll-y style="height: 100%;" @scrolltolower="onreachBottom" class="coupon-scroll" :style="{ height: swiperHeight }">
 			<view v-for="(coupon, index) in couponList" :key="index" class="coupon-item">
 				<Coupon :couponInfo="coupon" :status='0' :type="0" @exchange="exchangeCoupon($event)"></Coupon>
 			</view>
 			<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="couponList.length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
 			<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList.length"></u-empty>
-				</scroll-view>
+		</scroll-view> -->
-			</swiper-item>
-		</swiper>
 	</view>
 </template>
 <script>
@@ -19,7 +29,7 @@ import Coupon from "@/components/mine/coupon/index";
 export default {
 	data() {
 		return {
-			pageSize: 12,
+			pageSize: 5, // 页面显示的条数
 			swiperHeight: '',
 			couponCurrent: 0,
 			swiperCouponCurrent: 0,
@@ -39,9 +49,10 @@ export default {
 	},
 	watch: {
 		couponCurrent(index) {
+			// this.couponList = [];
 			const id = this.couponGroupList[index].gc_id;
 			this.getCouponList({ gc_id: id, load: 'reload' });
-		}
+		},
 	},
 	methods: {
 		onreachBottom() {
@@ -78,9 +89,10 @@ export default {
 			})
 			this.timer = true;
 			if(res.errCode == 0) {
-				if(load == 'reload') this.couponList = res.data;
+				if(load == 'reload') this.couponList[this.couponCurrent] = res.data;
-				else if(load == 'loadmore') this.couponList.push(...res.data);
+				else if(load == 'loadmore') this.couponList[this.couponCurrent].push(...res.data);
 			}
+			this.$forceUpdate();
 			return res.data.length;
 		},
 		exchangeCoupon(id) {
@@ -89,6 +101,7 @@ export default {
 		},
 		couponTabsChange(index) {
 			this.couponCurrent = index;
+			this.swiperCouponCurrent = this.couponCurrent;
 		},
 		couponAnimationFinish(e) {
 			const current = e.detail.current;
@@ -97,22 +110,41 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.swiperHeight = res.windowHeight - ((88 + 10 + 88) / 2) + 'px';
+			this.swiperHeight = res.windowHeight - ((88 + 10 + 88) * (res.windowWidth / 750)) + 'px';
 		},
 	},
 };
 </script>
 <style lang="scss" scoped>
 .coupon-swiper {
-	.swiper-coupon-item {
+	.classify-coupon {
-		box-sizing: border-box;
+		white-space: nowrap;
+		width: 100%;
+		height: 88rpx;
 		background-color: #ffffff;
-		padding: 30rpx {
+		margin-bottom: 2rpx;
-			top: 0;
+		.classify-item {
-		};
+			display: inline-block;
-		.coupon-item {
+			line-height: 88rpx;
-			margin-bottom: 20rpx;
+			text-align: center;
+			font-size: 24rpx;
+			color: #333;
+			padding: 0 30rpx;
 		}
+		.active {
+			color: #FF780F;
+			font-weight: 700;
+		}
+	}
+	// .swiper-coupon-item {
+	// 	box-sizing: border-box;
+	// 	background-color: #ffffff;
+	// 	padding: 30rpx {
+	// 		top: 0;
+	// 	};
+	// 	.coupon-item {
+	// 		margin-bottom: 20rpx;
+	// 	}
 	// 	.coupon-item {
 	// 		padding: 30rpx;
 	// 		background-color: #ffffff;
@@ -162,6 +194,15 @@ export default {
 	// 			text-align: center;
 	// 		}
 	// 	}
+	// }
+	.coupon-scroll {
+		background-color: #ffffff;
+		padding-top: 30rpx;
+		.coupon-item {
+			padding: 30rpx {
+				top: 0;
+			};
+		}
 	}
 }
 </style>

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"></image>
+					<image class="head" :src="info.friend_tomavatar" @click="viewDetails(info.friend_tomid)"></image>
-					<text class="name">{{ info.friend_tomname || '' }}</text>
+					<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>
@@ -37,6 +37,11 @@ export default {
 				}
 			})
 		},
+		viewDetails(id) {
+			this.$u.route('pageB/details/index', {
+				id: id
+			});
+		},
 		changeType(id) {
 				console.log(id);
 				this.$u.api.attentionMember({

pageE/mine/MineProgress.vue

@@ -5,17 +5,17 @@
 				<view class="rank-value">lv{{ memberInfo.member_level }}</view>
 				<view class="line-box">
 					<u-line-progress :percent="percent" :show-percent="false" inactive-color="#FFFFFF" active-color="#F1A36B" height="30" :striped="true" :striped-active="true"></u-line-progress>
-					<text>{{ memberInfo.member_exppoints }}</text>
+					<text>{{ memberInfo.member_exppoints + '/' + memberInfo.next_member_level_exppoints }}</text>
 				</view>
-				<view class="rank-value">lv{{ memberInfo.member_level + 1 }}</view>
+				<view class="rank-value">lv{{ memberInfo.next_member_level }}</view>
 			</view>
 			<view class="exp-value">经验值<span>{{ memberInfo.member_exppoints }}</span></view>
-			<view class="distance">距离下一级还需要{{ memberInfo.next_grade_exppoints_diff }}经验值</view>
+			<view class="distance">距离下一级还需要 {{ memberInfo.next_member_level_exppoints_diff }} 经验值</view>
 		</view>
 		<view class="body">
-			<view class="title">
+			<view class="title" v-if="memberInfo.level_rule">
 				<image src="/static/image/mine/34.png"></image>
-				<text>等级定义</text>
+				<text>{{ memberInfo.level_rule.document_title }}</text>
 			</view>
 			<!-- <view class="rank-list">
 				<view v-for="(rank, index) in rank" :key="index" class="list-item">
@@ -40,10 +40,12 @@ export default {
 		}
 	},
 	filters: {
-		percentExp(value, rank) {
+		percentExp(value, next) {
 			// console.log(rank);
-			let result = '0/0';
+			let result = '0 / 0';
-			if(rank) result = value + '/' + rank.max;
+			result = typeof(next) == 'Number' 
+			? value + ' / ' + (value + next)
+			: value + ' / ' + '0'
 			return result;
 		},
 	},
@@ -55,8 +57,9 @@ export default {
 			this.$u.api.getMemberPointsStat().then((res)=>{
 				if (res.errCode == 0) {
 					this.memberInfo = res.data;
-					this.nodes = common.unescapeHTML(res.data.points_rule);
+					this.nodes = common.unescapeHTML(res.data.level_rule.document_content);
 					// console.log(this.percent);
+					this.percent = (res.data.member_exppoints / res.data.next_member_level_exppoints) * 100;
 				}
 			})
 		},
@@ -118,7 +121,7 @@ export default {
 		}
 	}
 	.body {
-		margin-top: 60rpx;
+		margin-top: 20rpx;
 		.title {
 			height: 88rpx;
 			display: flex;
@@ -128,7 +131,7 @@ export default {
 			font-weight: 500;
 			color: rgba(51,51,51,1);
 			// border-bottom: #ECECEC 1rpx solid;
-			margin-bottom: 30rpx;
+			margin-bottom: 20rpx;
 			> image {
 				width: 29rpx;
 				height: 36rpx;

pageE/order/Details.vue

@@ -67,13 +67,14 @@
 				<view>创建时间：{{ orderInfo.add_time | date}}</view>
 			</view>
 		</view>
-		<view class="btn" v-if="['1', '2', '4', '6'].indexOf(orderstate) >= 0">
+		<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="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>
@@ -83,7 +84,7 @@
 export default {
 	data() {
 		return {
-			orderstate: '', // 1: 待收货 2: 待评价 3: 交易成功 4: 已取消 5: 已退款 6: 待支付 7: 待退款 8: 已退款
+			orderstate: '',
 			s_object: {
 				'1': {
 					text: '待收货',
@@ -153,6 +154,9 @@ export default {
 				case 4:
 					state = '2';
 					break;
+				case 5:
+					state = '3';
+					break;
 				case 6:
 					state = '7';
 					break;

pageE/order/Index.vue

@@ -1,19 +1,20 @@
 <template>
 	<view class="order">
 		<view>
-			<u-tabs-swiper ref="tabs" :list="list" active-color="#FF780F" :current="current" font-size="26" @change="tabsChange" height="88" :gutter="30"></u-tabs-swiper>
+			<!-- <u-tabs-swiper ref="tabs" :list="list" active-color="#FF780F" :current="current" font-size="26" @change="tabsChange" height="88" :gutter="30"></u-tabs-swiper> -->
+			<u-tabs :list="list" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="88" font-size="26" :gutter="20" inactive-color="#333333"></u-tabs>
 		</view>
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ height: swiperHeight }">
 			<swiper-item class="swiper-item" v-for="(item, index) in list" :key="index">
-				<scroll-view scroll-y style="height: 100%;" @scrolltolower="reachBottom">
+				<scroll-view scroll-y style="height: 100%;" @scrolltolower="reachBottom" class="order-scroll">
-					<view>
+					<view v-if="orderList[index]">
-						<view class="item-container" v-for="order in orderList" :key="order.order_id">
+						<view class="item-container" v-for="order in orderList[index]" :key="order.order_id">
 							<OrderItem :order="order" @refreshOrderList="refreshOrderList" v-if="current != 4"></OrderItem>
 							<TryOrderItem :order="order" @refreshOrderList="refreshOrderList" v-else></TryOrderItem>
 						</view>
 					</view>
-					<u-empty text="暂无订单" mode="order" color="#000000" v-if="!orderList.length"></u-empty>
+					<u-empty text="暂无订单" mode="order" color="#000000" v-if="!orderList[index] || !orderList[index].length"></u-empty>
-					<u-loadmore :status="loadStatus[index]" bgColor="#ECECEC" margin-bottom="20"></u-loadmore>
+					<u-loadmore :status="loadStatus[index]" bgColor="#ECECEC" margin-bottom="20" v-if="current != 4 && (!orderList[index] || orderList[index].length>3)" class="order-loadmore"></u-loadmore>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
@@ -57,9 +58,7 @@ export default {
 	},
 	watch: {
 		current(value, origin) {
-			if((origin == 4 && value != 4) || (value == 4 && origin != 4)) {
+			// this.orderList = [];
-				this.orderList = [];
-			}
 			this.page = 0;
 			// reload 重新请求列表 loadmore 往列表里添加
 			if(value == 4) {
@@ -69,6 +68,9 @@ export default {
 			}
 		},
 	},
+	onShow() {
+		this.refreshOrderList();
+	},
 	onLoad(option) {
 		const current = option.current ? Number(option.current) : 0;
 		this.current = current;
@@ -131,23 +133,25 @@ export default {
 			this.timer = true;
 			uni.stopPullDownRefresh(); // 结束刷新
 			if(res.errCode == 0) {
-				if(load == 'reload') this.orderList = res.data;
+				if(load == 'reload') this.orderList[this.current] = res.data;
-				else if(load == 'loadmore') this.orderList.push(...res.data);
+				else if(load == 'loadmore') this.orderList[this.current].push(...res.data);
-			}
-			return res.data.length;
-		},
-		// 售后
-		async getAfterSaleList({ load = 'loadmore' } = {}) {
-			const res = await this.$u.api.getAfterSaleList({
-				page: this.page,
-			})
-			this.timer = true;
-			if(res.errCode == 0) {
-				if(load == 'reload') this.orderList = res.data;
-				else if(load == 'loadmore') this.orderList.push(...res.data);
 			}
+			this.$forceUpdate();
+			// console.log(this.orderList);
 			return res.data.length;
 		},
+		// 售后 废弃
+		// async getAfterSaleList({ load = 'loadmore' } = {}) {
+		// 	const res = await this.$u.api.getAfterSaleList({
+		// 		page: this.page,
+		// 	})
+		// 	this.timer = true;
+		// 	if(res.errCode == 0) {
+		// 		if(load == 'reload') this.orderList[this.current] = res.data;
+		// 		else if(load == 'loadmore') this.orderList[this.current].push(...res.data);
+		// 	}
+		// 	return res.data.length;
+		// },
 		// 试穿
 		async goodsTryOrderList({ load = 'loadmore' } = {}) {
 			const res = await this.$u.api.goodsTryOrderList({
@@ -156,14 +160,14 @@ export default {
 			uni.stopPullDownRefresh(); // 结束刷新
 			this.timer = true;
 			if(res.errCode == 0) {
-				if(load == 'reload') this.orderList = res.data.list;
+				if(load == 'reload') this.orderList[this.current] = res.data.list;
-				else if(load == 'loadmore') this.orderList.push(...res.data.list);
+				else if(load == 'loadmore') this.orderList[this.current].push(...res.data.list);
 			}
+			this.$forceUpdate();
 			return res.data.list.length;
 		},
 		reachBottom() {
-			// 大于15条才会加载更多
+			if(this.current == 4) return;
-			if(this.orderList.length < 15) return false;
 			if(!this.timer) return false;
 			this.timer = false;
 			this.loadStatus.splice(this.current, 1, "loading");
@@ -171,8 +175,8 @@ export default {
 			let promise;
 			// if(this.current == 6) promise = this.getAfterSaleList();
 			// else 
-			if(this.current == 4) promise = this.goodsTryOrderList();
+			// if(this.current == 4) promise = this.goodsTryOrderList();
-			else promise = this.getOrderList();
+			promise = this.getOrderList();
 			promise.then(length => {
 				this.loadStatus.splice(this.current, 1, "nomore");
 				if(length == 0) this.page--;
@@ -204,9 +208,11 @@ export default {
 	display: flex;
 	flex-direction: column;
 	.swiper-item {
+		.order-scroll {
 			.item-container {
 				padding: 20rpx 30rpx;
 			}
 		}
+	}
 }
 </style>

pageE/setting/Index.vue

@@ -33,11 +33,12 @@
 					fontSize: 24
 				},
 				sheetStatus: false,
-				list: [{
+				list: [
-						text: '换个账号登录',
+                    // {
-						color: '#FF780F',
+					// 	text: '换个账号登录',
-						fontSize: 28
+					// 	color: '#FF780F',
-					},
+					// 	fontSize: 28
+					// },
 					{
 						text: '退出登录',
 						color: '#FF780F',
@@ -78,7 +79,7 @@
 			// 退出登录选择 0：切换账号 | 1：退出登录
 			choiceOption(index) {
 				console.log(index);
-				if (index == 1) {
+				if (index == 0) {
 					this.show = true;
 				}
 			},

pageE/tool/Manicure.vue

@@ -90,7 +90,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
+			this.swiperHeight = res.windowHeight - (88 * (res.windowWidth / 750)) + 'px';
 		},
 		tabsChange(index) {
 			this.swiperCurrent = index;

pageE/tool/MineCoupon.vue

@@ -4,10 +4,12 @@
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ height: swiperHeight }">
 			<swiper-item class="swiper-item" v-for="(_, index) in list" :key="index">
 				<scroll-view scroll-y class="scroll-coupon">
-					<view class="coupon-item" v-for="(coupon, c_index) in couponList" :key="c_index">
+					<view v-if="couponList[index]">
-						<Coupon :couponInfo="coupon" :status='index' :type="1" @use="useCoupon($event)" :goodsClass="goodsClass"></Coupon>
+						<view class="coupon-item" v-for="(coupon, c_index) in couponList[index]" :key="c_index">
+							<Coupon :couponInfo="coupon" :status='index' @use="useCoupon($event)" :goodsClass="goodsClass"></Coupon>
 						</view>
-					<u-empty text="暂无优惠券" mode="coupon" v-if="!couponList.length"></u-empty>
+					</view>
+					<u-empty text="暂无优惠券" mode="coupon" v-if="!couponList[index] || !couponList[index].length"></u-empty>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
@@ -59,18 +61,29 @@ export default {
 				status: current
 			}).then(res => {
 				if(res.errCode == 0) {
-					this.couponList = res.data;
+					this.couponList[this.current] = res.data;
 				} else {
-					this.couponList = [];
+					this.couponList[this.current] = [];
 				}
+				this.$forceUpdate();
 			})
 		},
-		useCoupon(id) {
+		useCoupon(coupon) {
-			console.log(id);
+			// console.log(coupon);
+			if(coupon.type == 1) {
+				this.$u.route({
+					type: 'switchTab',
+					url: 'pages/shop/index',
+				})
+			} else if(coupon.type == 2) {
+				this.$u.route('pageC/merchant/index', {
+					id: coupon.voucher_store_id,
+				});
+			}
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.swiperHeight = res.windowHeight - (88 / 2 + 11 / 2) + 'px';
+			this.swiperHeight = res.windowHeight - (100 * (res.windowWidth / 750)) + 'px';
 		},
 		tabsChange(index) {
 			this.swiperCurrent = index;

pageE/tool/MineHistory.vue

@@ -4,12 +4,12 @@
 			<view class="item-box">
 				<!-- 需求：只显示最近五十条数据　后台未作限制 -->
 				<view v-for="(item, index) in historyList.slice(0, 50)" :key="index" class="history-item">
-					<view class="item-title">
+					<view class="item-title" @click="viewStoreDetails(item.store_id)">
 						<image :src="item.store_avatar"></image>
-						<view>{{ item.store_name }}</view>
+						<view class="u-line-2">{{ item.store_name }}</view>
 					</view>
-					<image :src="item.goods_image" class="item-image"></image>
+					<image :src="item.goods_image" class="item-image" @click="viewGoodsDetails(item.goods_id)"></image>
-					<view class="item-info">
+					<view class="item-info" @click="viewGoodsDetails(item.goods_id)">
 						<view class="info-name u-line-1">{{ item.goods_name }}</view>
 					</view>
 				</view>
@@ -34,6 +34,22 @@ export default {
 		this.getBrowseList();
 	},
     methods: {
+		viewStoreDetails(sid) {
+			this.$u.route({
+				url: 'pageC/merchant/index',
+				params: {
+					id: sid,
+				}
+			})
+		},
+		viewGoodsDetails(id) {
+			this.$u.route({
+				url: 'pageB/sdetails/index',
+				params: {
+					id: id,
+				}
+			})
+		},
 		async getBrowseList () {
 			const res = await this.$u.api.getBrowseList({ page: this.page });
 			this.timer = false;

pageE/tool/SendWash.vue

@@ -44,7 +44,7 @@
 							<view class="btn" v-if="item.order_status == 20" @click="sendLaundryOrderConfirm(item.laundry_id)">
 								确认完成
 							</view>
-							<view class="btn" v-if="item.order_status == 50" @click="toComment(item.laundry_id)">
+							<view class="btn" v-if="item.order_status == 50 && !item.comment" @click="toComment(item.laundry_id)">
 								去评价
 							</view>
 						</view>
@@ -192,7 +192,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
+			this.swiperHeight = res.windowHeight - (88 * (res.windowWidth / 750)) + 'px';
 		},
 		toComment(id) {
 			this.$u.route('/pageE/tool/washComment', {

pageE/tool/WashOrder.vue

@@ -3,7 +3,7 @@
 		<view>
 			<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88"></u-tabs-swiper>
 		</view>
-		<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ minHeight: swiperHeight }">
+		<swiper :current="swiperCurrent" @animationfinish="animationfinish" class="aaa" :style="{ minHeight: swiperHeight }">
 			<swiper-item class="swiper-item">
 				<scroll-view scroll-y="true" style="height: 100%;">
 					<view class="order-info">
@@ -12,7 +12,7 @@
 								<text>选择订单:</text>
 								<image src="../../static/image/shop/2.png" mode=""></image>
 							</view>
-							<u-icon name="arrow-dwon" color="#2979ff" size="28"></u-icon>
+							<!-- <u-icon name="arrow-dwon" color="#2979ff" size="28"></u-icon> -->
 						</view>
 						<view class="choose-info" v-if="choose">
 							<view class="store">
@@ -175,7 +175,7 @@
 							<view class="checkd">
 								<label class="radio-view" v-for="(item, index) in items.extend_order_goods" :key="index">
 									<view class="radio">
-										<u-radio color="#F0AD4E" :name="items.order_id + ' ' + item.goods_id" active-color="#FF780F" icon-size="34" shape="circle"></u-radio>
+										<u-radio color="#F0AD4E" :name="items.order_id + ' ' + item.goods_id" active-color="#FF780F" icon-size="24" shape="circle"></u-radio>
 									</view>
 									<view class="store_info">
 										<view class="info_img">
@@ -259,6 +259,16 @@ export default {
 		this.getAreaData();
 		this.getClothesTypeList();
 	},
+	watch: {
+		swiperCurrent() {
+			this.goodsStatus = '';
+			this.type = {};
+			this.name = '';
+			this.phone = '';
+			this.area = '';
+			this.address = '';
+		}
+	},
 	methods: {
 		getClothesTypeList() {
 			this.$u.api.getClothesTypeList().then(res => {
@@ -267,7 +277,7 @@ export default {
 				} else {
 					this.typeList = [];
 				}
-				console.log(this.typeList);
+				// console.log(this.typeList);
 			})
 		},
 		confirmType(e) {
@@ -388,7 +398,7 @@ export default {
 		},
 		radioChange(e){
 			const ids = e.split(" ");
-			console.log(ids)
+			// console.log(ids)
 			let checkedGoods = {};
 			this.orderList.forEach(order => {
 				if(order.order_id == ids[0]) {
@@ -424,12 +434,6 @@ export default {
 			})
 		},
 		animationfinish(e) {
-			this.goodsStatus = '';
-			this.type = {};
-			this.name = '';
-			this.phone = '';
-			this.area = '';
-			this.address = '';
 			// 可重新提交订单
 			this.debounce = true;
 			let current = e.detail.current;
@@ -438,8 +442,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			// this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
+			this.swiperHeight = res.windowHeight - (res.windowWidth / 750) * 88 + 'px';
-			this.swiperHeight = res.windowHeight + 'px';
 		},
 		confirm(e){
 			this.showPopup = false;
@@ -467,6 +470,9 @@ export default {
 		flex: 1;
 		// height: 95vh;
 	}
+    .aaa {
+        overflow-y: scroll;
+    }
 	.order-info {
 		.choose-info{
 			display: flex;flex-wrap: wrap;

pages.json

@@ -80,7 +80,6 @@
 		{
 			"root": "pageB",
 			"pages": [
-				
 				{
 					"path": "follow/index",
 					"style": {
@@ -103,6 +102,12 @@
 						}
 					}
 				},
+                {
+                    "path" : "video/video",
+                    "style" : {
+                        "navigationStyle":"custom"
+                    }
+                },
 				{
 					"path": "sdetails/index",
 					"style": {
@@ -176,7 +181,8 @@
 									"placeholder": "搜索您需要的商品",
 									"backgroundColor": "rgb(236,236,236)",
 									"placeholderColor": "#999999",
-									"disabled": false
+									"disabled": false,
+									"fontSize": "24"
 								}
 							}
 						}
@@ -189,22 +195,34 @@
 							"titleNView": {
 								"titleColor": "#333333",
 								"backgroundColor": "#FFFFFF",
-								"buttons": [
-									{  
-										"type":"none",
-										"text":"搜索",
-										"float":"right",
-										"fontSize":"16",
-										"color": "#FF780F"
-									}
-								],
 								"searchInput": {
 									"align": "left",
 									"borderRadius": "15px",
 									"placeholder": "搜索您需要的商品",
 									"backgroundColor": "rgb(236,236,236)",
 									"placeholderColor": "#999999",
-									"disabled": false
+									"disabled": false,
+									"fontSize": "24"
+								}
+							}
+						}
+					}
+				},
+				{
+					"path": "search/searchGoods",
+					"style": {
+						"app-plus": {
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF",
+								"searchInput": {
+									"align": "left",
+									"borderRadius": "15px",
+									"placeholder": "搜索您需要的商品",
+									"backgroundColor": "rgb(236,236,236)",
+									"placeholderColor": "#999999",
+									"disabled": false,
+									"fontSize": "24"
 								}
 							}
 						}
@@ -219,6 +237,18 @@
 							"softinputMode": "adjustResize"
 						}
 					}
+				},
+				{
+					"path": "coupon/details",
+					"style": {
+						"navigationBarTitleText": "优惠券介绍",
+						"app-plus": {
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
 				}
 			]
 		},
@@ -481,6 +511,15 @@
 							}
 						}
 					}
+				},
+                {
+                    "path" : "notice/info",
+                    "style" : {
+                        "navigationBarTitleText":"公告详情",
+                        "titleNView": {
+                        	"backgroundColor": "#FFFFFF"
+                        }
+                    }
                 }
 			]
 		},
@@ -842,14 +881,14 @@
 										"text":"取消",
 										"float":"left",
 										"fontSize":"14"
-									},
-									{
-										"type":"none",
-										"text":"\ue62d",
-										"float":"right",
-										"fontSrc": "/static/fonts/customer.ttf",
-										"fontSize":"20"
 									}
+									// {
+									// 	"type":"none",
+									// 	"text":"\ue62d",
+									// 	"float":"right",
+									// 	"fontSrc": "/static/fonts/customer.ttf",
+									// 	"fontSize":"20"
+									// }
 								]
 							}
 						}
@@ -990,6 +1029,12 @@
 		}	
 	],
 	"pages": [
+        // {
+        //     "path" : "pageA/start/start",
+        //     "style": {
+        //         "navigationStyle": "custom"
+        //     }
+        // },
 		{
 			"path": "pageA/welcome/welcome",
 			"style": {

pages/index/index.vue

@@ -14,26 +14,27 @@
 					 inactive-color="#333" :active-item-style="{
                     'color':'#333'
                 }" :bold="false"
-					 @change="dianji"></u-tabs>
+					 @change="dianji($event)"></u-tabs>
 				</view>
 				<view class="sosuo"></view>
 			</view>
 			<swiper class="card" @change="dianji" :current="num">
 				<swiper-item>
-					<scroll-view style="width:100%;height:100%" scroll-y="true">
+					<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>
 							<view class="list">
 								<view>
-									<videoItem v-for="item in articleList.filter((_, index) => !(index&1))" :key="item.article_id" :item="item"
+									<videoItem v-for="(item,id) in articleList.filter((_, index) => !(index&1))" :key="id" :item="item"
-									 @getArticlelist="getArticlelist"></videoItem>
+									 @updateList="updateList"></videoItem>
 								</view>
 								<view style="margin-left:20rpx">
-									<videoItem v-for="item in articleList.filter((_, index) => index&1)" :key="item.article_id" :item="item"
+									<videoItem v-for="(item,id) in articleList.filter((_, index) => index&1)" :key="id" :item="item"
-									 @getArticlelist="getArticlelist"></videoItem>
+									 @updateList="updateList"></videoItem>
 								</view>
 							</view>
+                            <u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
 						</view>
 					</scroll-view>
 				</swiper-item>
@@ -55,7 +56,7 @@
 					</scroll-view>
 				</swiper-item>
 				<swiper-item>
-					<scroll-view style="width:100%;height:100%" scroll-y="true">
+					<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="followBotton" lower-threshold="200">
 						<view class="box">
 							<view class="tuijian">
 								<view class="title" @click="toSearchPage">
@@ -74,9 +75,11 @@
 							<view class="rec-list">
 								<view class="rec-box">
                                     <!-- {{ fansList }} -->
-									<videoItem isguanzhu="true" v-for="item in fansList" :key="item.article_id"
+                                    <view class="item">
-									 :item="item"></videoItem>
+                                        <videoItem isguanzhu="true" v-for="(item,id) in fansList" :key="id" :item="item"></videoItem>
-                                     <view class="no-data" v-show="!fansList.length">您还没有关注哦，赶紧去点点关注！</view>
+                                    </view>
+                                     <view class="no-data" v-if="!fansList.length">您还没有关注哦，赶紧去点点关注！</view>
+                                     <u-loadmore class="load-size" v-else :status="status_1" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
 								</view>
 							</view>
 						</view>
@@ -84,6 +87,13 @@
 				</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>
@@ -93,6 +103,10 @@
 		display: flex;
 		flex-direction: column;
 		height: 100vh;
+        /* #ifdef APP-PLUS */
+        padding-bottom: 100rpx;
+        /* #endif */
+        overflow: hidden;
 
 		.top {
 			display: flex;
@@ -110,6 +124,7 @@
 
 			.tabs {
 				width: 334rpx;
+                // pointer-events: none;
                 
 				/deep/ .u-tab-item {
 					font-weight: bold;
@@ -120,6 +135,7 @@
 		.card {
 			height: 100%;
 			width: 100%;
+            // pointer-events: none;
 
 			.box {
 				width: 100%;
@@ -182,15 +198,56 @@
         .rec-list {
             width: 100%;
             .rec-box {
+                width: 100%;
+                .item {
                     display: flex;
                     flex-wrap: wrap;
                     justify-content: space-between;
+                }
+            }
+        }
+	}
     .no-data {
         margin: 200rpx auto 0;
+        text-align: center;
+    }
+	.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>
 <script>
     import { mapState } from 'vuex'
@@ -215,12 +272,24 @@
 				}],
 				num: 0,
 				page: 0, // 0即第一页
+                follow_page: 0, //
 				articleList: [],
 				recommendList: [], // 推荐达人
 				indexImageSwiper: [],
 				zhiboImageSwiper: [],
 				tabLiveLists: [],
                 fansList: [], // 关注的发现列表
+                status: 'loadmore',
+                status_1: 'loadmore',
+                iconType: 'circle',
+                loadText: {
+                    loadmore: '轻轻上拉',
+                    loading: '努力加载中',
+                    nomore: '实在没有了'
+				},
+				showCoupon: false,
+				newMemberCoupon: {},
+				exchangestate:false
 			}
 		},
 		components: {
@@ -230,11 +299,18 @@
 			darenItem
 		},
 		onShow() {
+			// 页面返回,页面登陆的情况下检查是否显示领取优惠卷优惠券弹窗
+			if(this.exchangestate==true){
+				this.isNewmembervoucher()
+			}
+            this.articleList = [];
+            this.page = 0;
 			this.getArticlelist();
 			this.getSwiper();
 		},
 		onLoad(){
 			if(this.$store.state.hasLogin){
+				this.exchangestate = true
 				const user = uni.getStorageSync('user_info');
 				console.log(user)
 				this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
@@ -277,8 +353,8 @@
 				this.$u.api.attentionMember({
 					member_id: member_id
 				}).then((res) => {
-					console.log(res)
+                    this.follow_page = 0;
-					this.getRecommendList();
+					this.getRecommendList(); // 关注列表
                     this.getFollowList(); // 刷新发现的列表
 				})
 			},
@@ -292,23 +368,30 @@
             // 切换导航
 			dianji(a) {
                 // console.log(a);
-				if (typeof a == "object") {
+                if (a.type == "change") {
                     this.num = a.detail.current
                 } else {
-					this.num = a
+                    this.num = a;
                 }
+                // console.log(this.num);
                 // 状态请求
+                if (a.type == "change") { // 强制请求一次
                     if (this.num == 0) {
+                        this.page = 0;
+                        this.status = "loadmore";
                         this.getArticlelist();
                         this.getSwiper();
                     } else if (this.num == 1) {
                         this.getZhiBoSwiper(); // 直播轮播
                         this.tabLiveList();
                     } else if (this.num == 2) {
+                        this.follow_page = 0;
+                        this.fansList = [];
                         if (this.hasLogin) {
                             this.getFollowList(); // 关注列表
                         }
                         this.getRecommendList(); // 推荐达人
+                    }
                 }
 			},
             // 发现别表
@@ -317,13 +400,39 @@
 					page: this.page,
 					is_video_img: 0, // 查询视频1 图文2 都查0
 				}).then(res => {
+                    this.status = "loading";
+                    if (res.errCode == 0) {
                         // uni.stopPullDownRefresh();
                         // console.log('37647744ghj', res)
-					if (res.errCode == 0) {
+                        if (this.page == 0) {
                         	this.articleList = res.data.list;
+                            this.status = "loadmore";
+                        } else if (res.data.length == 0 && this.page > 0) {
+                            this.status = "nomore";
+                        } else {
+                            this.articleList = this.articleList.concat(res.data.list);
+                        }
+                        this.page++;
+                    } else {
+                        this.status = "nomore"
                     }
 				})
 			},
+            // 屏蔽更新列表
+            updateList() {
+                console.log(111);
+                this.page = 0;
+                this.getArticlelist();
+            },
+            // 发现下拉加载
+            swiperBottom(e) {
+                this.getArticlelist();
+                // console.log(e);
+            },
+            followBotton(e) {
+                this.getFollowList();
+              // console.log(e);
+            },
             // 达人列表
 			getRecommendList() {
 				this.$u.api.getRecommendList().then(res => {
@@ -336,12 +445,27 @@
             // 关注发现列表
             getFollowList() {
                 this.$u.post("article/attentionArticleList",{
-                    page: 0,
+                    page: this.follow_page,
                 }).then(res => {
+                    this.status_1 = "loading";
                     if (res.errCode == 0) {
-                        this.fansList = res.data.list;
+                        if (this.fansList.length < 4) {
+                            this.status_1 = "nomore";
+                        }
+                        // uni.stopPullDownRefresh();
+                        // console.log('37647744ghj', res)
+                        if (this.follow_page == 0) {
+                            this.fansList = res.data.list;
+                            // this.status_1 = "loadmore";
+                        } else if (res.data.list.length == 0 && this.follow_page > 0) {
+                            this.status_1 = "nomore";
+                        } else {
+                            this.fansList = this.fansList.concat(res.data.list);
+                        }
+                        this.follow_page++;
+                    } else {
+                        this.status_1 = "nomore"
                     }
-                    // console.log(res);
                 })
             },
 			toSearchPage() {
@@ -386,7 +510,25 @@
 				})
 			},
             goSearch() {
-                this.$u.route("/pageB/search/index");
+                this.$u.route("/pageB/search/index", {
+					type: 2,
+				});
+			},
+			// 是否显示新人优惠券
+			isNewmembervoucher() {
+				this.$u.api.isNewmembervoucher().then(res => {
+					if(res.errCode == 0) {
+						this.newMemberCoupon = res.data;
+						this.showCoupon = true;
+					} else {
+						this.showCoupon = false;
+					}
+				})
+			},
+			viewCoupon() {
+				this.$u.route('/pageB/coupon/details', {
+					price: this.newMemberCoupon.price
+				});
 			}
 		},
 	}

pages/information/information.vue

@@ -3,14 +3,14 @@
 		<u-navbar :is-back="false" :title-size="36" title="消息">
 			<view class="slot-wrap">
 				<image src="../../static/pageD/info(3).png" @click="delMessage()"></image>
-				<image src="../../static/pageD/info(2).png"></image>
+				<image src="../../static/pageD/info(2).png" @click="kefu()"></image>
 			</view>
 		</u-navbar>
 		<view class="content">
 			<!-- 正文内容 -->
 		</view>
 		<!-- <view class="sousuo"></view> -->
-		<view class="backes">
+		<view class="backes" style="border-bottom: 1px #ececec solid;">
 			<titles :information="information_dles"></titles>
 		</view>
 		<!-- 消息通知 -->
@@ -105,6 +105,49 @@
 			
 		},
 		methods: {
+			kefu(){
+				if(!this.$store.state.hasLogin){
+					this.$refs.uToast.show({
+						title: "请先登录",
+						type: 'warning'
+					})
+				}else{
+					function Friend(uuid, name, avatar,time = "", text = "",date = "") {
+						this.uuid = uuid;
+						this.name = name;
+						this.avatar = avatar;
+						this.online = false;
+						this.unReadMessage = 0;
+						this.text = text;
+						this.time = time;
+						this.date = date
+					}
+					const token = uni.getStorageSync('token');
+					let that = this
+					uni.request({
+						url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
+						data:{
+							userId: 1
+						},
+						method:"POST",
+						header:{
+							"Authorization" : 'Bearer' + " " + token
+						},
+						success(res){
+							console.log(res)
+							res = res.data
+							let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
+							that.$u.route({
+								url:"/pageD/privateChat/privateChat",
+								params:{
+									id:JSON.stringify(user)
+								}
+							})
+						}
+					})
+				}
+			
+			},
 			gochat(id){
 				this.$u.route({
 					url:"/pageD/privateChat/privateChat",

pages/mine/index.vue

@@ -5,7 +5,7 @@
 				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="110"></u-avatar>
 				<view class="user-info">
 					<view class="info-left">
-						<view class="user-nickname">{{ userInfo.member_nickname }}</view>
+						<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
 						<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
 							<image src="/static/image/mine/13.png"></image>
 							<view class="rank-title">{{ userInfo.member_grade_name }}</view>
@@ -46,7 +46,7 @@
 				<view class="title">
 					<view class="title-text">我的订单</view>
 					<view class="more" @click="toOtherPage('/order/Index')">
-						<view class="title-text">查看全部订单</view>
+						<view class="title-text-more">查看全部订单</view>
 						<image src="/static/image/mine/21.png"></image>
 					</view>
 				</view>
@@ -71,14 +71,14 @@
 						<image src="/static/image/mine/37.png"></image>
 						<view>拼团中</view>
 					</view>
-					<view @click="toOtherPage('/order/Index?current=6')">
-						<image src="/static/image/mine/9.png"></image>
-						<view>售后</view>
-					</view>
 					<view @click="toOtherPage('/order/Index?current=7')">
 						<image src="/static/image/mine/3.png"></image>
 						<view>待评价</view>
 					</view>
+                    <view @click="toOtherPage('/order/Index?current=6')">
+                    	<image src="/static/image/mine/9.png"></image>
+                    	<view>售后</view>
+                    </view>
 				</view>
 			</view>
 			<view class="tool">
@@ -110,7 +110,7 @@
 						<view>收货地址</view>
 					</view>
 					<view @click="toOtherPage('/more/AfterSalesHelp')">
-						<image src="/static/image/mine/9.png"></image>
+						<image src="/static/image/mine/38.png"></image>
 						<view>售后政策</view>
 					</view>
 					<view @click="toOtherPage('/more/MineHelp')">
@@ -192,13 +192,14 @@ export default {
 				.info-left {
 					margin-right: 15rpx;
 					.user-nickname {
+						width: 100rpx;
 						font-size: 30rpx;
 						color: rgba(51,51,51,1);
 						margin-bottom: 19rpx;
 					}
 					.user-medal {
 						display: flex;
-						width: 110rpx;
+						// width: 110rpx;
 						// height: 25rpx;
 						background: linear-gradient(269deg,rgba(175,175,175,1) 0%,rgba(224,224,224,1) 100%);
 						border-radius: 13rpx;
@@ -249,8 +250,9 @@ export default {
 			> view {
 				margin-right: 80rpx;
 				text-align: center;
-				font-size: 24rpx;
+				font-size: 26rpx;
-				color:rgba(51,51,51,1);
+                font-weight: 500;
+				color: #333;
 				> view:first-child {
 					margin-bottom: 10rpx;
 				}
@@ -274,7 +276,7 @@ export default {
 			.title {
 				height: 76rpx;
 				font-size: 28rpx;
-				color: rgba(51,51,51,1);
+				color: #666;
 				position: relative;
 				display: flex;
 				align-items: center;
@@ -289,6 +291,10 @@ export default {
     				transform: translate(-50%,0);
 				}
 			}
+            .title-text-more {	
+                font-size: 24rpx;
+                color: #999;
+            }
 			.content {
 				padding: $content-padding-top 0 $content-padding-bottom;
 				display: flex;
@@ -328,6 +334,7 @@ export default {
 				}
 			}
 			.content {
+                align-items: center;
 				justify-content: space-between;
 				> view {
 					display: flex;
@@ -336,22 +343,22 @@ export default {
 					justify-content: space-between;
 				}
 				> view:nth-child(1){
-					@include image-size($image-width: 33rpx, $image-height: 36rpx);
+					@include image-size($image-width: 36rpx, $image-height: 34rpx);
 				}
 				> view:nth-child(2){
-					@include image-size($image-width: 38rpx, $image-height: 32rpx);
+					@include image-size($image-width: 38rpx, $image-height: 36rpx);
 				}
 				> view:nth-child(3){
-					@include image-size($image-width: 41rpx, $image-height: 33rpx);
+					@include image-size($image-width: 40rpx, $image-height: 36rpx);
 				}
 				> view:nth-child(4){
-					@include image-size($image-width: 40rpx, $image-height: 35rpx);
+					@include image-size($image-width: 38rpx, $image-height: 38rpx);
 				}
 				> view:nth-child(5){
-					@include image-size($image-width: 37rpx, $image-height: 37rpx);
+					@include image-size($image-width: 36rpx, $image-height: 40rpx);
 				}
 				> view:nth-child(6){
-					@include image-size($image-width: 33rpx, $image-height: 35rpx);
+					@include image-size($image-width: 36rpx, $image-height: 40rpx);
 				}
 			}
 		} 

pages/shop/index.vue

@@ -112,7 +112,10 @@
 			sousuo() {
 				// console.log(123)
 				this.$u.route({
-					url: "pageB/search/index"
+					url: "pageB/search/index",
+					params: {
+						type: 1,
+					}
 				})
 			},
 			// 获取定位
@@ -145,6 +148,8 @@
 								image: item.adv_code,
 								adv_link: item.adv_link,
 								adv_id: item.adv_id,
+                                info_id: item.info_id,
+                                url_type: item.url_type,
 							})
 						})
 						this.list = temp;
@@ -181,8 +186,32 @@
 				})
 			},
 			clickImage(index) {
-				console.log(index);
+				// console.log(this.list[index]);
-				console.log(this.list[index]);
+                let item = this.list[index];
+                this.activityLink({
+                	type: item.url_type,
+                	id: item.info_id,
+                });
+			},
+            activityLink({
+            	type,
+            	id
+            }) {
+                console.log(type,id);
+            	if (type == 0) return false;
+            	// type 1 商品详情页, 2 店铺详情页
+            	const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';
+            	let params = {
+            		id: id
+            	};
+            	// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
+            	if (type == 1) Object.assign(params, {
+            		type: 1
+            	});
+            	this.$u.route({
+            		url: url,
+            		params: params
+            	})
             },
 			// 下拉加载更多推荐商品
 			onreachBottom() {
@@ -226,9 +255,10 @@
 </script>
 <style lang="scss" scoped>
 	.shop {
-		height: calc(100vh - var(--window-top));
+		height: calc(100% - var(--window-top));
 		box-sizing: border-box;
 		background-color: #F0EDF1;
+        overflow-y: scroll;
 
 		.top {
 			padding: 0 30rpx;

pages/zhibo/index.nvue

@@ -21,10 +21,10 @@
     <image class="cart" src="../../static/cart.png" @click="show = true">
 
     </image>
-    <view class="danmufasongbox" @click="danmu = true">
+    <view class="danmufasongbox" @click="danmu = $store.state.hasLogin">
       <view class="danmufasongboxback"></view>
       <image src="../../static/danmu.png" class="danmubianji"></image>
-      <text style="font-size:26rpx;color:#fff;margin-left:20rpx">想说点什么</text>
+      <text style="font-size:26rpx;color:#fff;margin-left:20rpx">{{ $store.state.hasLogin ? '想说点什么' : '请先登录'}}</text>
     </view>
     <image class="liketap" src="../../static/like.png" @click="">
 
@@ -388,7 +388,10 @@ export default {
             that.list= res.data.data
           }
         })
-    },6 * 1000)
+          that.$forceUpdate();
+          console.log(that.room)
+
+    },60 * 1000)
     uni.request({
       url:"https://dmmall.sdbairui.com/api/Specialci/livingUserInfo",
       data:{
@@ -424,30 +427,14 @@ export default {
               id : a.rid + "",
               name : a.rid + ""
           };
+           that.chatRoomService = getApp().globalData.im
           console.log(room,currentUser)
           //构造chatRoomService
-            that.chatRoomService = new ChatRoomService(room, currentUser);
+          that.chatRoomService.subscribeRoomMessage(room,currentUser)
-
           that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
-            that.chatRoomService.connectGoEasyIM();
-
           //获取当前聊天室数据
           that.room = that.chatRoomService.room;
-            setTimeout(function() {
+          console.log(that.room)
-              that.chatRoomService.quitRoom();
-              that.chatRoomService = {}
-               
-            }, 1000);
-            setTimeout(function(){
-              that.chatRoomService = new ChatRoomService(room, currentUser);
-
-            that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
-            that.chatRoomService.connectGoEasyIM();
-
-			//获取当前聊天室数据
-            that.room = that.chatRoomService.room;
-            console.log(that.room.onlineUsers)
-            }, 2000);
         }
       })
     } catch (error) {
@@ -465,7 +452,7 @@ export default {
 		},
   methods:{
     sendMessage (messageType, content) {//发送消息
-    console.log(123)
+    console.log(this.room,this.room.id,messageType, content)
 				if(content == "" && messageType == 0) return;
 				var message = {
 					senderNickname : this.room.currentUser.nickname ,

static/imservice.js

@@ -69,6 +69,14 @@ function IMService() {
     this.onFriendListChange = function (friends) {};
     //群列表发生改变
     this.onGroupListChange = function (groups) {};
+
+
+    this.whenNewMessage = function () {
+
+    };
+    this.whenOnlineUserChange = function () {
+
+    };
 }
 
 //登录
@@ -289,7 +297,8 @@ IMService.prototype.initialIMListeners = function () {
                         friend.text = message.type != "text" ? "其他消息" : message.payload.text
                         let time = new Date(message.timestamp)
                         friend.date = message.timestamp
-                        friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                        friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+                        
                         console.log(that.friends)
                         that.friendsarr = []
                         for(let i in that.friends){
@@ -314,7 +323,7 @@ IMService.prototype.initialIMListeners = function () {
                 friend.text = message.type != "text" ? "其他消息" : message.payload.text
                 let time = new Date(message.timestamp)
                 friend.date = message.timestamp
-                friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
                 console.log(this.friends)  
                 that.friendsarr = []
                 for(let i in this.friends){
@@ -354,23 +363,23 @@ IMService.prototype.initialIMListeners = function () {
         this.onNewPrivateMessageReceive(friendId, message);
     });
 
-    //监听群聊消息
+    // //监听群聊消息
-    this.im.on(GoEasyIM.EVENT.GROUP_MESSAGE_RECEIVED, (message) => {
+    // this.im.on(GoEasyIM.EVENT.GROUP_MESSAGE_RECEIVED, (message) => {
-        let groupId = message.groupId;
+    //     let groupId = message.groupId;
-        //群未读消息+1
+    //     //群未读消息+1
-        let group = this.groups[groupId];
+    //     let group = this.groups[groupId];
-        group.unReadMessage++;
+    //     group.unReadMessage++;
-        removeGroupPendingMessage(this, groupId, message);
+    //     removeGroupPendingMessage(this, groupId, message);
-        //如果页面传入了相应的listener，执行listener
+    //     //如果页面传入了相应的listener，执行listener
-        this.onGroupListChange(this.groups);
+    //     this.onGroupListChange(this.groups);
 
-        //更新群聊消息记录
+    //     //更新群聊消息记录
-        let groupMessages = this.getGroupMessages(groupId);
+    //     let groupMessages = this.getGroupMessages(groupId);
-        let sentMessages = groupMessages.sentMessages;
+    //     let sentMessages = groupMessages.sentMessages;
-        sentMessages.push(message);
+    //     sentMessages.push(message);
-        //如果页面传入了相应的listener，执行listener
+    //     //如果页面传入了相应的listener，执行listener
-        this.onNewGroupMessageReceive(groupId, message);
+    //     this.onNewGroupMessageReceive(groupId, message);
-    })
+    // })
 };
 
 
@@ -450,6 +459,8 @@ IMService.prototype.sendPrivateTextMessage = function (friendId, text) {
         text: text
     });
     this.sendPrivateMessage(friendId, textMessage);
+    this.sendMessagesSetStorage(friendId, text)
+
 };
 
 //私聊图片消息
@@ -461,6 +472,7 @@ IMService.prototype.sendPrivateImageMessage = function (friendId, imageFile) {
         }
     });
     this.sendPrivateMessage(friendId, imageMessage);
+    this.sendMessagesSetStorage(friendId, '其他消息')
 };
 
 //私聊视频消息
@@ -472,6 +484,8 @@ IMService.prototype.sendPrivateVideoMessage = function (friendId, videoFile) {
         }
     });
     this.sendPrivateMessage(friendId, videoMessage);
+    this.sendMessagesSetStorage(friendId, '其他消息')
+
 };
 
 IMService.prototype.sendPrivateAudioMessage = function (friendId, audiofile) {
@@ -483,8 +497,92 @@ IMService.prototype.sendPrivateAudioMessage = function (friendId, audiofile) {
     });
 
     this.sendPrivateMessage(friendId, audioMessage);
-};
+    this.sendMessagesSetStorage(friendId, '其他消息')
 
+};
+IMService.prototype.sendMessagesSetStorage = function (friendId,message){
+    let friend = this.friends[friendId];
+    console.log(friend)
+    // return ;
+    let sorts = function (friends){
+        let paixu = function (a,b){
+            if(a.date > b.date){
+                return 0;
+            }else{
+                return 1;
+            }
+
+        }
+        friends.sort(paixu)
+       
+    }
+    
+    let that = this
+    if(!friend && friend == undefined){
+        const token = uni.getStorageSync('token');
+        console.log(token)
+        uni.request({
+            url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
+            data:{
+                userId:friendId
+            },
+            method:"POST",
+            header:{
+                "Authorization" : 'Bearer' + " " + token
+            },
+            success(res){
+                console.log(res)
+                that.friends[friendId] = new Friend(res.data.data.member_id, res.data.data.member_nickname, res.data.data.member_avatar);
+                friend = that.friends[friendId];
+                console.log(friend)
+                friend.text = message
+                let time = new Date()
+                friend.date = time.getTime()
+                friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+               
+
+                console.log(that.friends)
+                that.friendsarr = []
+                for(let i in that.friends){
+                    console.log(i)
+                    that.friendsarr.push(that.friends[i])
+                }
+                sorts(that.friendsarr)
+                let arr = []
+                for(let i in that.friends){
+                    arr.push([that.friends[i].uuid,that.friends[i].time,that.friends[i].text,that.friends[i].date,0])
+                }
+                console.log(arr)
+                uni.setStorageSync('imlist',JSON.stringify(arr))
+
+                that.onFriendListChange(that.friends);
+
+            }
+        })
+    }else{
+        console.log(friend)
+        friend.text = message
+        let time = new Date()
+        friend.date = time.getTime()
+        friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+        
+
+        console.log(this.friends)  
+        that.friendsarr = []
+        for(let i in this.friends){
+            that.friendsarr.push(this.friends[i])
+        }
+        sorts(that.friendsarr)
+        let arr = []
+        for(let i in that.friends){
+            arr.push([that.friends[i].uuid,that.friends[i].time,that.friends[i].text,that.friends[i].date,0])
+        }
+        console.log(arr)
+        uni.setStorageSync('imlist',JSON.stringify(arr))
+        this.onFriendListChange(this.friends);
+
+    }
+}
 //发送私聊消息
 IMService.prototype.sendPrivateMessage = function (friendId, message) {
 
@@ -602,4 +700,240 @@ function removeGroupPendingMessage(imService,groupId, message){
     }
 }
 
+
+
+
+
+
+
+//下面是合并的
+
+
+//用户
+function User(id, nickname, avatar) {
+    this.id = id;
+    this.nickname = nickname;
+    this.avatar = avatar;
+}
+
+//消息
+function Message(senderUserId, senderNickname, content, type) {
+    this.senderNickname = senderNickname;
+    this.senderUserId = senderUserId;
+    this.content = content;
+    this.type = type
+}
+
+//聊天室
+function Room(id, name, currentUser) {
+
+    this.id = id;
+    this.name = name;
+    this.currentUser = currentUser;
+
+    this.onlineUsers = {
+        count: 0,
+        users: []
+    };
+
+    this.messages = [];
+
+    this.MessageType = {
+        CHAT: 0,//文字聊天
+        PROP: 1//道具
+    };
+
+    this.Prop = {
+        HEART: 0,//桃心
+        ROCKET: 1//火箭
+    };
+}
+
+IMService.prototype.initialWhenNewMessage = function (whenNewMessage) {
+    this.whenNewMessage = whenNewMessage;
+};
+
+IMService.prototype.initialWhenOnlineUserChange = function (whenOnlineUserChange) {
+    this.whenOnlineUserChange = whenOnlineUserChange;
+};
+
+
+//监听新消息
+IMService.prototype.listenerNewMessage = function () {
+
+    this.im.on(GoEasyIM.EVENT.GROUP_MESSAGE_RECEIVED, (message) => {
+		var content = JSON.parse(message.payload.text);
+        this.addNewMessage(message);
+        this.whenNewMessage(content);
+    })
+}
+
+IMService.prototype.addNewMessage = function (message) {
+    var content = JSON.parse(message.payload.text);
+    let messageContent = "";
+    //聊天消息
+    if (content.type == this.room.MessageType.CHAT) {
+        messageContent = content.content;
+    }
+    //道具消息
+    if (content.type == this.room.MessageType.PROP) {
+        if (content.content == this.room.Prop.ROCKET) {
+            messageContent = "送出了一枚大火箭";
+        }
+        if (content.content == this.room.Prop.HEART) {
+            messageContent = "送出了一个大大的比心";
+        }
+    }
+    //添加消息
+    let newMessage = new Message(message.senderId, content.senderNickname, messageContent);
+    this.room.messages.push(newMessage);
+};
+
+//监听用户上下线
+IMService.prototype.listenerGroupPresence = function () {
+    this.im.on(GoEasyIM.EVENT.GROUP_PRESENCE, (event) => {
+        //更新在线用户数
+        this.room.onlineUsers.count = event.groupOnlineCount;
+
+        if (event.action == 'join' || event.action == 'online') {
+            let userData = JSON.parse(event.userData);
+            //添加新用户
+            let user = new User(event.userId, userData.nickname, userData.avatar);
+
+            //添加在线用户，避免用户重复
+            if (!this.room.onlineUsers.users.find(item => item.id == event.userId)) {
+                this.room.onlineUsers.users.push(user);
+            }
+
+            //添加进入房间的消息
+            let message = new Message(event.userId, userData.nickname, " 进入房间", this.room.MessageType.CHAT);
+            this.room.messages.push(message);
+        } else {
+            let offlineUserIndex = this.room.onlineUsers.users.findIndex(item => item.id == event.userId);
+            if (offlineUserIndex > -1) {
+                //将离开的用户从onlineUsers中删掉
+                let offlineUser = Object.assign(this.room.onlineUsers.users[offlineUserIndex]);
+                this.room.onlineUsers.users.splice(offlineUserIndex, 1);
+                //添加离开消息
+                let message = new Message(offlineUser.id, offlineUser.nickname, " 离开房间", this.room.MessageType.CHAT)
+                this.room.messages.push(message);
+            }
+        }
+        this.whenOnlineUserChange(this.room.onlineUsers);
+    })
+};
+
+//查询和初始化在线用户列表和在线用户数
+IMService.prototype.initialOnlineUsers = function (roomId) {
+    let self = this;
+
+    //查询最新上线的用户列表
+    this.im.groupHereNow(roomId)
+        .then(result => {
+            if (result.code == 200) {
+                let users = [];
+                result.content && result.content.map(function (onlineUser) {
+                    let userData = JSON.parse(onlineUser.userData);
+                    let user = new User(onlineUser.userId, userData.nickname, userData.avatar);
+                    users.push(user);
+                });
+                self.room.onlineUsers = {
+                    users: users
+                };
+            }
+        }).catch(e => {
+        if (e.code == 401) {
+            console.log("您还没有开通用户在线状态提醒，登录goeasy->我的应用->查看详情->高级功能，自助开通.");
+        } else {
+            console.log(e);
+        }
+    });
+    //获取聊天室在线用户数
+    this.im.groupOnlineCount(roomId)
+        .then(result => {
+            this.room.onlineUsers.count = result.content.onlineCount;
+        }).catch(e => {
+        console.log(e)
+    })
+};
+
+//订阅聊天室成员上下线
+IMService.prototype.subscribePresence = function (roomId) {
+    this.im.subscribeGroupPresence([roomId])
+        .then(() => {
+            console.log('成员上下线订阅成功')
+        }).catch(e => {
+        console.log(e)
+    })
+}
+
+//订阅聊天室消息
+IMService.prototype.subscribeRoomMessage = function (room, user) {
+    this.room = new Room(room.id, room.name, user);
+    
+
+    //监听上下线提醒
+    this.listenerGroupPresence();
+
+    //监听新消息
+    this.listenerNewMessage();
+     //订阅用户上下线事件
+     this.subscribePresence(this.room.id);
+     //订阅聊天室消息
+    //  this.subscribeRoomMessage(this.room.id);
+    this.im.subscribeGroup([this.room.id])
+        .then(result => {
+            console.log('消息订阅成功')
+        }).catch(e => {
+        console.log(e,'失败')
+    })
+}
+
+//历史消息
+IMService.prototype.initialChatHistory = function (roomId) {
+    var self = this;
+    this.im.history({
+        groupId: roomId
+    }).then(res => {
+        res.content.forEach(function (message) {
+            self.addNewMessage(message);
+        })
+    }).catch(function (error) {
+        if (error.code == 401) {
+            console.log("您还没有开通历史消息的权限，登录goeasy->我的应用->查看详情->高级功能，自助开通.");
+        } else {
+            console.log(error);
+        }
+    })
+};
+
+//发送消息
+IMService.prototype.sendMessages = function (roomId, content) {
+	var contentMessage = {
+		text: JSON.stringify(content)
+	};
+	let message = this.im.createTextMessage(contentMessage);
+    this.im.sendGroupMessage(roomId, message)
+        .then(() => {
+            console.log('消息发送成功')
+        }).catch(e => {
+        console.log(e);
+    })
+};
+
+//退出聊天室
+IMService.prototype.quitRoom = function (roomId) {
+    // this.im.subscribeGroup([0])
+    //     .then(result => {
+    //         console.log('消息订阅成功')
+    //     }).catch(e => {
+    //     console.log(e,'失败')
+    // })
+    // this.subscribePresence(0);
+    this.disconnect()
+    this.connectIM()
+
+};
+
+
 export default IMService;