diff --git a/pages/activity/intimate.vue b/pages/activity/intimate.vue
index 3ca3c8a..be65d8d 100644
--- a/pages/activity/intimate.vue
+++ b/pages/activity/intimate.vue
@@ -44,7 +44,8 @@
 							{{a.comment_num}}条评论 {{a.comment_rate}}好评率
 						</view>
 					</view>
-					<!-- <u-empty v-if="isShow" text="暂无信息" mode="list"></u-empty> -->
+					<u-empty v-if="isShow" text="暂无信息" mode="list"></u-empty>
+					<u-divider v-if="list1.length == total && total>=1">没有更多了</u-divider>
 				</scroll-view>
 			</view>
 		</view>
@@ -71,6 +72,7 @@
 				storeInfo: {},
 				keyword: "",
 				list: [],
+				total: 0,
 				list1: [],
 				filterFlag: true,
 			}
@@ -125,6 +127,7 @@
 							a.line_price = Number(a.line_price)
 						})
 						this.list1 = data.list
+						this.total = data.total
 						this.isShow = data.total == 0 ? true : false
 					}
 				}
diff --git a/pages/activity/newPeople.vue b/pages/activity/newPeople.vue
index c4f307f..b4721e8 100644
--- a/pages/activity/newPeople.vue
+++ b/pages/activity/newPeople.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="newpeople">
 		<view class="newpeople-navbar">
-			<u-navbar title="新人首单礼" title-color="#fff" back-icon-color="#fff" :border-bottom="false"
+			<u-navbar :title="title" title-color="#fff" back-icon-color="#fff" :border-bottom="false"
 				:background="background"></u-navbar>
 		</view>
 		<view class="newpeople-hd">
@@ -36,9 +36,9 @@
 						</view>
 						<view class="price">
 							<view class="n">￥<text
-									style="margin-right: 6rpx;">{{item.goods_price_min?Number(item.goods_price_min):''}}</text>新人价
+									style="margin-right: 6rpx;">{{item.goods_price_min?Number(item.goods_price_min):'0.00'}}</text>新人价
 							</view>
-							<view class="o">￥{{item.line_price_min?Number(item.line_price_min):''}}</view>
+							<view class="o">￥{{item.line_price_min?Number(item.line_price_min):'0.00'}}</view>
 						</view>
 					</view>
 				</view>
@@ -50,16 +50,16 @@
 						</view>
 						<view class="price">
 							<view class="n">￥<text
-									style="margin-right: 6rpx;">{{item.goods_price_min?Number(item.goods_price_min):''}}</text>新人价
+									style="margin-right: 6rpx;">{{item.goods_price_min?Number(item.goods_price_min):'0.00'}}</text>新人价
 							</view>
-							<view class="o">￥{{item.line_price_min?Number(item.line_price_min):''}}</view>
+							<view class="o">￥{{item.line_price_min?Number(item.line_price_min):'0.00'}}</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="newpeople-fd" @click="openPage()">
-			<image :src="$picUrl+'/static/news/top.png'"></image>
+			<image :src="$picUrl+'/static/toTop.png?=1'"></image>
 		</view>
 	</view>
 </template>
@@ -68,7 +68,8 @@
 	import * as Api from '@/api/activity'
 	export default {
 		data() {
-			return {
+			return {
+				title: "新人首单礼",
 				current: 1,
 				isLoading: true,
 				background: {
@@ -198,8 +199,8 @@
 
 			.rule {
 				right: 0;
-				top: 74rpx;
-				z-index: 999;
+				top: 204rpx;
+				z-index: 2;
 				width: 100rpx;
 				height: 60rpx;
 				background-color: rgba(0, 0, 0, 0.3);
@@ -405,12 +406,17 @@
 		}
 
 		&-fd {
-			width: 132rpx;
-			height: 166rpx;
-			position: fixed;
-			right: 10rpx;
-			bottom: 10%;
-			z-index: 99;
+			position: fixed;
+			bottom: 120rpx;
+			right: 16rpx;
+			width: 99rpx;
+			height: 99rpx;
+			border-radius: 50%;
+			opacity: 1;
+			z-index: 999;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 
 			image {
 				width: 100%;
diff --git a/pages/activity/newsshop.vue b/pages/activity/newsshop.vue
index 741216b..b10a586 100644
--- a/pages/activity/newsshop.vue
+++ b/pages/activity/newsshop.vue
@@ -201,11 +201,11 @@
 							font-weight: 400;
 							color: #3F3F3F;
 							line-height: 50rpx;
-							white-space: nowrap;
 							text-overflow: ellipsis;
 							white-space: nowrap;
 							-webkit-line-clamp: 1;
 							max-width: 200rpx;
+							overflow: hidden;
 						}
 
 						.price {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5f7ee9e..cc0280c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -29,7 +29,7 @@
 			</template>
 		</view>
 		<view v-show="current==0">
-			<view class="tabs">
+			<scroll-view class="tabs" scroll-x>
 				<view :class="tabCurrent==index?'tabItem active':'tabItem'" @click="changeGoodsType(index)"
 					v-for="(item,index) in tabList" :key="index">
 					{{item.name}}
@@ -40,7 +40,7 @@
 				<!-- <u-tabs :list="tabList" name="name" font-size="28" active-color="#F6393D"
 				:show-bar="true" @change="changeGoodsType"
 				 inactive-color="#282828" bg-color="transparent" :is-scroll="true" :current="tabCurrent"></u-tabs> -->
-			</view>
+			</scroll-view>
 			<view class="main">
 				<view class="picContainer">
 					<u-swiper :list="bannerList" height="196" img-mode="heightFix" @click="gotoDetail"></u-swiper>
@@ -55,7 +55,11 @@
 							<text>{{item.text}}</text>
 						</view>
 					</view>
+<<<<<<< HEAD
 					<view class="gridRows secondRows" :style="{'height': catagoryList.length>0?'160rpx':'auto'}">
+=======
+					<view class="gridRows secondRows" :style="{'height': isToggle == false?catagoryList.length >0?'160rpx':'auto':'auto'}">
+>>>>>>> 6e373bfa00736a89d269cd841552ba87aef59342
 						<view class="gridItem" v-for="(item,index) in catagoryList" :key="index"
 							@click="goJump('/pages/goods/list?categoryId=' + item.category_id)">
 							<view class="imageC">
@@ -1063,23 +1067,28 @@
 		}
 
 		.tabs {
-			margin: 0 12rpx;
-			display: flex;
+			width: 100%;
 			height: 80rpx;
+<<<<<<< HEAD
 			align-items: center;
 			white-space: nowrap;
 			width: 100%;
 			overflow-x: auto;
 			overflow-y: hidden;
 
+=======
+			line-height: 80rpx;
+			white-space: nowrap;
+			overflow: hidden;
+>>>>>>> 6e373bfa00736a89d269cd841552ba87aef59342
 			.tabItem {
 			    margin-right: 30rpx;
 				position: relative;
+				display: inline-block;
 				font-size: 28rpx;
-				font-family: PingFang SC, PingFang SC;
 				font-weight: 400;
+				padding: 0 20rpx;
 				color: #282828;
-
 				.flag {
 					position: absolute;
 					bottom: -13px;
diff --git a/pages/invite/index.vue b/pages/invite/index.vue
index 90f1d5d..c906142 100644
--- a/pages/invite/index.vue
+++ b/pages/invite/index.vue
@@ -57,6 +57,7 @@
 						<!-- {{info.integral}}积分 -->
 					</view>
 					<view class="l">
+<<<<<<< HEAD
 						长期返现
 						<!-- 首单返{{info.one_order_rate}}% -->
 					</view>
@@ -115,6 +116,62 @@
 				// this.qrcode = ""
 			}
 		},
+=======
+						长期返现
+						<!-- 首单返{{info.one_order_rate}}% -->
+					</view>
+				</view>
+			</view>
+			<!-- <view class="invite-bd-d">
+				<image :src="$picUrl+'/static/news/invite-bg4.png'"></image>
+				<view class="p" @click="openPage(3)">立即邀请</view>
+			</view> -->
+		</view>
+		<!--  -->
+		<view class="invite-popup" v-if="isPopup">
+				<view class="popup">
+					<image class="bg" :src="qrcode"></image>
+					<view class="tips" @click="download()">保存海报图</view>
+					<view class="close">
+						
+					</view>
+				</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { createQrCodeImg } from '@/utils/qrcode'
+	import * as newFunApi from '@/api/newFun'
+	export default{
+		data(){
+			return{
+				qrcode: "",
+				userInfo: {},
+				backgroundBg: {
+					"background": "rgba(255,255,255,0.22)"
+				},
+				backgroundBg1: {
+					"background-color": "transparent"
+				},
+				isPopup: false,
+				info: {},
+				list: ["邀请更多好友，获得更多奖金"]
+			}
+		},
+		onReady() {
+			this.getList();
+		},
+		onShow() {
+			if(uni.getStorageSync("AccessToken")){
+				this.userInfo = uni.getStorageSync("userInfo");
+				// this.qrcode = createQrCodeImg(this.userInfo.user_id, { 'size': 500 });
+			}else{
+				this.userInfo = {}
+				// this.qrcode = ""
+			}
+		},
+>>>>>>> 6e373bfa00736a89d269cd841552ba87aef59342
 		methods: {
 			// 获取预售规则
 			getCarousel(type) {
@@ -257,6 +314,7 @@
 				} else if (index == 4) {
 					uni.navigateTo({
 						url: "/pages/invite/rule"
+<<<<<<< HEAD
 					})
 
 				}
@@ -515,3 +573,239 @@
 		}
 	}
 </style>
+=======
+					})
+					
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.invite{
+	background: url(https://www.royaum.com.cn/static/news/invite-bg.png?t=2) center top no-repeat;
+	background-size: 100% auto;
+	&-popup{
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, 0.6);
+		position: fixed;
+		left: 0;
+		top: 0;
+		z-index: 55;
+		.popup{
+			width: 672rpx;
+			height: 912rpx;
+			position: absolute;
+			left: 50%;
+			margin-left: -336rpx;
+			top: 50%;
+			margin-top: -506rpx;
+			z-index: 2;
+			.bg{
+				width: 672rpx;
+				height: 100%;
+				border-radius: 26rpx;
+			}
+			.qrcode{
+				width: 200rpx;
+				height: 200rpx;
+				position: absolute;
+				right: 25rpx;
+				top: 670rpx;
+				border: 8rpx solid #FFFFFF;
+				z-index: 2;
+				border-radius: 5rpx;
+			}
+			.tips{
+				width: 600rpx;
+				height: 70rpx;
+				background-color: #FFFFFF;
+				position: absolute;
+				text-align: center;
+				font-size: 30rpx;
+				line-height: 70rpx;
+				border-radius: 10rpx;
+				color: #212121;
+				left: 50%;
+				margin-left: -300rpx;
+				bottom: -100rpx;
+				z-index: 2;
+			}
+			.close{
+				width: 60rpx;
+				height: 60rpx;
+				position: absolute;
+				left: 50%;
+				bottom: -150rpx;
+				color: #FFFFFF;
+				z-index: 2;
+			}
+		}
+		
+	}
+	&-notice{
+		// background-color: #FF5554;
+	}
+	&-hd{
+		width: 100%;
+		text-align: center;
+		// background-color: #FF5554;
+		height: 436rpx;
+		position: relative;
+		.rule{
+			width: 130rpx;
+			height: 50rpx;
+			position: absolute;
+			right: 0;
+			top: 208rpx;
+			z-index: 2;
+		}
+		.btn{
+			width: 396rpx;
+			height: 88rpx;
+			position: absolute;
+			left: 50%;
+			margin-left: -205rpx;
+			bottom:0rpx;
+			z-index: 2;
+		}
+	}
+	&-bd{
+		padding: 0 32rpx 60rpx 32rpx;
+		// background: linear-gradient(181deg, #FF5F55 0%, #FAC39D 100%);
+		overflow: hidden;
+		&-a{
+			width: 100%;
+			height: 366rpx;
+			background: #FFFFFF;
+			border-radius: 12rpx;
+			margin-top: 40rpx;
+			.a{
+				padding: 50rpx 0 30rpx;
+				overflow: hidden;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				text-align: center;
+				.l{
+					flex: 1;
+					border-right: 1px solid #DDDDDD;
+					font-size: 28rpx;
+					font-weight: 500;
+					color: #414141;
+					.p{
+						font-size: 54rpx;
+						font-weight: 500;
+						color: #FF5251;
+						margin-top: 20rpx;
+					}
+				}
+			}
+			.b{
+				width: 396rpx;
+				height: 88rpx;
+				background: linear-gradient(180deg, #FD5B54 0%, #FFC277 100%);
+				border-radius: 106rpx;
+				border: 1px solid #FFFFFF;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 32rpx;
+				color: #FFFFFF;
+				margin: 0 auto;
+			}
+			.c{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 24rpx;
+				color: #FF5251;
+				margin-top: 20rpx;
+			}
+		}
+		&-b{
+			width: 100%;
+			height: 515rpx;
+			margin-top: 20rpx;
+			position: relative;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+			.a{
+				width: 100%;
+				bottom: 40rpx;
+				padding: 0 25rpx;
+				box-sizing: border-box;
+				z-index: 1;
+				left: 0;
+				position: absolute;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				.l{
+					flex: 1;
+					text-align: center;
+					font-size: 28rpx;
+					font-weight: 500;
+					color: #FF4D4C;
+				}
+			}
+		}
+		&-c{
+			width: 100%;
+			height: 375rpx;
+			margin-top: 20rpx;
+			position: relative;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+			.a{
+				width: 260rpx;
+				bottom: -60rpx;
+				box-sizing: border-box;
+				z-index: 1;
+				right: 0;
+				position: absolute;
+				display: flex;
+				flex-wrap: wrap;
+				.l{
+					width: 130rpx;
+					height: 135rpx;
+					text-align: center;
+					font-size: 22rpx;
+					font-weight: 500;
+					color: #414141;
+				}
+			}
+		}
+		&-d{
+			width: 100%;
+			height: 108rpx;
+			position: relative;
+			margin-top: 20rpx;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+			.p{
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				left: 0;
+				top: 0;
+				z-index: 2;
+				text-align: center;
+				line-height: 105rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #FF5251;
+			}
+		}
+	}
+}
+</style>
+>>>>>>> 6e373bfa00736a89d269cd841552ba87aef59342
diff --git a/pages/news/recycling/detail.vue b/pages/news/recycling/detail.vue
index 04ada25..4141875 100644
--- a/pages/news/recycling/detail.vue
+++ b/pages/news/recycling/detail.vue
@@ -13,7 +13,7 @@
 				<view class="exchange">已售{{info.sold}}</view>
 			</view>
 			<view class="b" v-if="type== 1">{{info.server_name}}</view>
-			<view class="c" v-if="type== 1">{{info.server_category}}</view>
+			<!-- <view class="c" v-if="type== 1">{{info.server_category}}</view> -->
 			<!-- <view class="c" v-if="type== 2">{{info.recovery_category}}</view> -->
 			<view class="d">
 				<view class="l">
@@ -134,8 +134,8 @@
 		onLoad(o) {
 			let info = uni.getStorageSync("getInfo");
 			if (info.content) {
-				info.content.replace(/style=""/g, '').replace(/<img src=/g,
-					'<img style="width: 100%; display:block" src=');
+				info.content = info.content.replace(/<img src=/g, '<img style="width: 100%; display:block" src=')
+				console.log(info.content)
 			}
 			this.info = info;
 			this.type = o.type
@@ -454,14 +454,14 @@
 
 				.a {
 					width: 100rpx;
-					font-size: 28rpx;
+					font-size: 30rpx;
 					font-weight: 400;
 					color: #C4C4C4;
 				}
 
 				.b {
 					flex: 1;
-					font-size: 28rpx;
+					font-size: 30rpx;
 					font-weight: 400;
 					color: #3D3D3D;
 					display: flex;
diff --git a/pages/news/recycling/index.vue b/pages/news/recycling/index.vue
index 80c30a7..016f412 100644
--- a/pages/news/recycling/index.vue
+++ b/pages/news/recycling/index.vue
@@ -148,12 +148,31 @@
 </script>
 
 <style lang="scss" scoped>
+<<<<<<< HEAD
 	.recycling {
 		background: url(https://www.royaum.com.cn/static/news/recycling-bg.png) center top no-repeat;
 		background-size: 100% auto;
 
 		&-hd {
 			height: 320rpx;
+=======
+.recycling{
+	background: #fff url(https://www.royaum.com.cn/static/news/recycling-bg.png) center top no-repeat;
+	background-size: 100% auto;
+	&-hd{
+		height: 280rpx;
+	}
+	&-notice{
+		border-radius: 30rpx 30rpx 0 0;
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		padding: 0 30rpx;
+		image{
+			width: 50rpx;
+			height: 50rpx;
+			display: block;
+>>>>>>> 6e373bfa00736a89d269cd841552ba87aef59342
 		}
 
 		&-notice {
diff --git a/pages/news/recycling/order.vue b/pages/news/recycling/order.vue
index 1adebd5..bdb975d 100644
--- a/pages/news/recycling/order.vue
+++ b/pages/news/recycling/order.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="order">
 		<view class="order-navbar">
-			<u-navbar title="订单详情" :border-bottom="false"></u-navbar>
+			<u-navbar title="订单详情" :background="background1" :border-bottom="false"></u-navbar>
 		</view>
 		<view class="order-hd">
 			<view class="l">
@@ -152,7 +152,11 @@
 			return {
 				isScroll: true,
 				isShow: false,
-				currentIndex: 0,
+				currentIndex: 0,
+				background1: {
+					background: `url(${this.$picUrl}/static/news/login-bg.png) center top no-repeat`,
+					backgroundSize: '100%',
+				},
 				recovery_id: '',
 				order_id: '',
 				infor: '',
@@ -285,9 +289,6 @@
 </script>
 
 <style lang="scss" scoped>
-	::v-deep .u-navbar-fixed{
-		background: none !important;
-	}
 	.order {
 		width: 100%;
 		padding: 0 0 150rpx;
diff --git a/pages/news/recycling/orderDetail.vue b/pages/news/recycling/orderDetail.vue
index 3ec13bf..8ff1db5 100644
--- a/pages/news/recycling/orderDetail.vue
+++ b/pages/news/recycling/orderDetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="order">
 		<view class="order-navbar">
-			<u-navbar title="订单详情" :border-bottom="false" :background="isScroll?background:background1"></u-navbar>
+			<u-navbar title="订单详情" :border-bottom="false" :background="background1"></u-navbar>
 		</view>
 		<view class="order-hd">
 			<view class="l">
@@ -122,10 +122,6 @@
 				isScroll: true,
 				isShow: false,
 				currentIndex: 0,
-				background: {
-					background: `url(${this.$picUrl}/static/news/refund-bg.png) center top no-repeat`,
-					backgroundSize: '100%',
-				},
 				background1: {
 					background: `url(${this.$picUrl}/static/news/login-bg.png) center top no-repeat`,
 					backgroundSize: '100%',
@@ -250,10 +246,11 @@
 	width: 100%;
 	padding: 0 0 150rpx;
 	box-sizing: border-box;
-	overflow: hidden;
+	overflow: hidden;
+	background: url(https://www.royaum.com.cn/static/news/login-bg.png?t=2) center top no-repeat;
+	background-size: 100% auto;
+	
 	&-hd{
-		background: linear-gradient(180deg, #FCE2E7 0%, #FFFFFF 100%);
-		overflow: hidden;
 		.l{
 			width: 694rpx;
 			height: 276rpx;
diff --git a/pages/news/user/index.vue b/pages/news/user/index.vue
index 7dbb1ce..be07e4f 100644
--- a/pages/news/user/index.vue
+++ b/pages/news/user/index.vue
@@ -67,7 +67,7 @@
 				</view>
 			</view> -->
 			<view class="items">
-				<view class="a">推广权限
+				<view class="a">用户状态
 					<u-switch v-model="form.is_allow_promotion"
 					:activeValue="1" :inactiveValue="0"
 					 active-color="#55BD6A" ></u-switch>
@@ -77,7 +77,7 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="a">用户状态</view>
+				<view class="a">会员状态</view>
 				<view class="b">
 					<u-switch v-model="form.status"
 					:activeValue="1" :inactiveValue="0"
diff --git a/pages/news1/help.vue b/pages/news1/help.vue
index 0ea34d7..4cb3548 100644
--- a/pages/news1/help.vue
+++ b/pages/news1/help.vue
@@ -139,12 +139,9 @@
 					align-items: center;
 					flex-direction: column;
 					position: relative;
-
-					// border-bottom: 1px solid #dfdbdb;
 					.helpImg {
 						width: 50rpx;
 						height: 50rpx;
-						border-radius: 50%;
 					}
 
 					.titleIcon {
diff --git a/pages/news3/setOutRecords.vue b/pages/news3/setOutRecords.vue
index 2097561..6491f5f 100644
--- a/pages/news3/setOutRecords.vue
+++ b/pages/news3/setOutRecords.vue
@@ -4,7 +4,7 @@
 			<!-- 搜索 -->
 			<view class="searchContent">
 				<u-input v-model="searchText" style="width:400upx" confirm-type="search" @confirm="getOrderList(1)"
-					placeholder="商品名称/编码" />
+					placeholder="收件人名字/订单号/发货公司" />
 				<u-icon name="search" class="search" @click="getOrderList(1)"></u-icon>
 			</view>
 		</view>
@@ -48,7 +48,9 @@
 				</view>
 			</view>
 		</view>
-		<u-empty v-else text="暂无发货记录～" mode="list"></u-empty>
+		<view v-else style="margin-top: 250rpx;">
+			<u-empty text="暂无发货记录～" mode="list"></u-empty>
+			</view>
 		<view class="goods-fd">
 			<view class="btn" @click="manualEntry">手动录入</view>
 		</view>
diff --git a/pages/news3/vipPrice.vue b/pages/news3/vipPrice.vue
index 036e067..1e2ff59 100644
--- a/pages/news3/vipPrice.vue
+++ b/pages/news3/vipPrice.vue
@@ -402,12 +402,15 @@
 				arr.forEach(item => {
 					if (ids.indexOf(item.category_id) > -1) {
 						result.push(item.name);
+					}
+					if(item.children && item.children.length > 0){
+						item.children.forEach(item1 => {
+							if (ids.indexOf(item1.category_id) > -1) {
+								result.push(item1.name);
+							}
+						});
 					}
-					item.children.forEach(item1 => {
-						if (ids.indexOf(item1.category_id) > -1) {
-							result.push(item1.name);
-						}
-					});
+					
 				});
 				return result;
 			},
diff --git a/pages/search/index.vue b/pages/search/index.vue
index e1d9ac2..0c71978 100644
--- a/pages/search/index.vue
+++ b/pages/search/index.vue
@@ -135,9 +135,11 @@
 			},
 			getSearchInfo() {
 				// 搜索
-				this.searchList.push(this.searchValue)
-				this.searchList = Array.from(new Set(this.searchList));
-				uni.setStorageSync('searchList', this.searchList)
+				if(this.searchValue){
+					this.searchList.push(this.searchValue)
+					this.searchList = Array.from(new Set(this.searchList));
+					uni.setStorageSync('searchList', this.searchList)
+				}
 				uni.navigateTo({
 					url: '/pages/goods/list?search=' + this.searchValue
 				})
diff --git a/pages/user/index.vue b/pages/user/index.vue
index a475ed7..733bcd5 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -31,12 +31,12 @@
 						<button open-type="contact" v-if="isLogin"></button>
 					</view>
 					<!-- /  -->
-					<view class="group_4" @click="lookMemberCode('2')" v-if="userInfo.user_type == 20">
+					<view class="group_4" @click="lookMemberCode('2')" v-if="userInfo.user_type == 20 || userInfo.user_type==40">
 						<image :src="$picUrl+'/static/user/code.png'" class="thumbnail_2"></image>
 						<text lines="1" class="text_3">会员码</text>
 					</view>
 					<!-- 、  -->
-					<view class="group_5" @click="lookMemberCode('3')" v-if="userInfo.user_type == 30">
+					<view class="group_5" @click="lookMemberCode('3')" v-if="userInfo.user_type == 30 || userInfo.user_type==40">
 						<image :src="$picUrl+'/static/user/code.png'" class="thumbnail_3"></image>
 						<text lines="1" class="text_4">分销码</text>
 					</view>
@@ -713,9 +713,9 @@
 							that.getOrderInfo();
 							that.getActionCountsInfo();
 							uni.setStorageSync('userInfo', that.userInfo)
-							if (data.user_type == 20) {
+							if (data.user_type == 20 || data.user_type == 40) {
 								that.getMembershipInviteQrcode()
-							} else if (data.user_type == 30) {
+							} else if (data.user_type == 30 || data.user_type == 40) {
 								that.getDealerInviteQrcode()
 							}
 							// that.getMembershipInviteQrcode()
diff --git a/pages/user/vip/goods.vue b/pages/user/vip/goods.vue
index ffaaf95..3ba6d18 100644
--- a/pages/user/vip/goods.vue
+++ b/pages/user/vip/goods.vue
@@ -28,7 +28,7 @@
 					<view class="item" @click="tabFilter(2,5)" :class="filterIndex==2?'item-on':''">销量</view>
 					<view class="item" @click="tabFilter(3,7)" :class="filterIndex==3?'item-on':''">综合</view>
 				</view>
-				<scroll-view scroll-y class="l">
+				<scroll-view scroll-y class="l" @scrolltolower="lowerthreshold" >
 					<view class="item" v-for="(item,index) in list" v-if="list.length>0" :key="index"
 						@click="goodsDetail(item.goods_id)" :isLoading="isLoading">
 						<image :src="item.goods_image"></image>
@@ -43,7 +43,8 @@
 							{{item.goods_sales}}+条评论 {{item.remaizhishu}}%好评率
 						</view> -->
 					</view>
-					<u-empty text="暂无数据显示哦～" v-else mode="list"></u-empty>
+					<u-empty text="暂无数据显示哦～" v-else mode="list"></u-empty>
+					<u-divider v-if="list.length == total && total>=1">没有更多了</u-divider>
 				</scroll-view>
 			</view>
 		</view>
@@ -58,7 +59,9 @@
 				backgroundBg: {
 					"background": "transparent",
 					"overflow": "auto"
-				},
+				},
+				page: 1,
+				total: 0,
 				// 正在加载
 				isLoading: true,
 				tabIndex1: 0,
@@ -84,7 +87,14 @@
 			this.getCarouselList()
 			this.getCategoryList()
 		},
-		methods: {
+		methods: {
+			lowerthreshold() {
+				if(this.list.length <= this.total){
+					this.page ++
+					console.log("g")
+					this.getBrandList(this.category_id)
+				}
+			},
 			// 获取背景图
 			getCarouselList() {
 				const app = this;
@@ -101,9 +111,14 @@
 				const app = this;
 				Api.category({is_in_store:this.type==1?1:0})
 					.then(result => {
-						app.categoryList = result.data.list;
-						app.categoryChildren = result.data.list[0].children;
-						this.getBrandList(result.data.list[0].category_id)
+						app.categoryList = result.data.list;
+						if(result.data.list && result.data.list.length > 0){
+							app.categoryChildren = result.data.list[0].children;
+							app.category_id = result.data.list[0].category_id
+							app.getBrandList(result.data.list[0].category_id)
+						}
+						
+						
 					})
 					.finally(() => app.isLoading = false)
 			},
@@ -112,7 +127,7 @@
 				const app = this;
 				let pamars = {
 					// store_id: 10001,
-					page: 1,
+					page: this.page,
 					is_brand:this.type==1?'':1,
 					is_new: '',
 					categoryId: categoryId,
@@ -122,20 +137,36 @@
 				Api.brandList(pamars)
 					.then(result => {
 						let arr = result.data.data;
-						app.list = arr
+						app.list = app.arrayUnique([...app.list,...arr],'goods_id')
+						app.total = result.data.total
 					})
 					.finally(() => app.isLoading = false)
+			},
+			//数组对象去重
+			arrayUnique(arr, name) {
+			    var hash = {};
+			    return arr.reduce(function (item, next) {
+			        hash[next[name]]
+			            ? ""
+			            : (hash[next[name]] = true && item.push(next));
+			        return item;
+			    }, []);
 			},
 			tabItem(index, item) {
 				this.tabIndex = index;
+				this.page = 1;
+				this.list = [];
+				this.category_id = item.category_id
 				this.getBrandList(item.category_id)
 			},
 			tabItem1(item, index) {
 				this.tabIndex1 = index;
 				let app = this;
+				this.page = 1;
 				app.categoryChildren = [];
 				app.categoryChildren = item.children;
-				app.list = [];
+				app.list = [];
+				app.category_id = item.category_id
 				this.getBrandList(item.category_id)
 			},
 			tabFilter(index, stuts) {
@@ -152,7 +183,10 @@
 				if (index == 3) {
 					this.orderSort = stuts == 7 ? 8 : 7
 				}
-				console.log(this.orderSort)
+				console.log(this.orderSort)
+				this.page = 1
+				this.list = [];
+				this.category_id = this.categoryChildren[0].category_id
 				this.getBrandList(this.categoryChildren[0].category_id)
 			},
 			goodsDetail(orderId) {