2025-2-8

components/mao-scroll/mao-scroll.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<view class="maoScroll-main" :style="'height:'+(lineHeight*showLine)+'rpx;'">
-			<view :style="'margin-top:-'+marginTop+'rpx;'">
-				<view v-for="(item,index) in showdata" :key="'maoScroll'+index" :style="'height:'+lineHeight+'rpx;'">
+		<view class="maoScroll-main" :style="'height:'+(lineHeight*showLine)+'px;'">
+			<view :style="'margin-top:-'+marginTop+'px;'">
+				<view v-for="(item,index) in showdata" :key="'maoScroll'+index" :style="'height:'+lineHeight+'px;'">
 					<slot :line="item" />
 				</view>
 			</view>

manifest.json

@@ -2,8 +2,8 @@
     "name" : "长城易趣拍",
     "appid" : "__UNI__EFA020E",
     "description" : "一款电商App",
-    "versionName" : "3.4.0",
-    "versionCode" : 340,
+    "versionName" : "3.4.1",
+    "versionCode" : 341,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/chat/group/info/groupInfo/adminJdd.vue

@@ -1,288 +1,410 @@
 <template>
 	<view>
 		<view id="app-top">
-			<uni-nav-bar statusBar backgroundColor="transparent" fixed title="移除管理员" left-icon="left" @clickLeft="utils.navigateBack()">
-				<view  slot="right" @tap="tapSubmit">
+			<uni-nav-bar statusBar backgroundColor="transparent" fixed title="移除管理员" left-icon="left"
+				@clickLeft="utils.navigateBack()">
+				<view slot="right" @tap="tapSubmit">
 					<view class="sub-btn">完成{{inAr()}}</view>
-				</view>	
-			</uni-nav-bar>	
+				</view>
+			</uni-nav-bar>
 			<view class="search fx-r fx-bc">
 				<image src="/static/img/tb-seach.png"></image>
 				<input @input="tapKeyWord" class="fx-g1" type="text" placeholder="搜索联系人" />
 			</view>
 		</view>
-		
-		
-		<scroll-view class="search-view" :style="'height: calc(100vh - ' + barheight + 'px);'" scroll-y :scroll-into-view="toView" scroll-with-animation='true'  show-scrollbar="false" >
+
+
+		<scroll-view class="search-view" :style="'height: calc(100vh - ' + barheight + 'px);'" scroll-y
+			:scroll-into-view="toView" scroll-with-animation='true' show-scrollbar="false">
 			<view class="lists">
 				<view v-for="(item,index) in letter">
 					<view class="letter" :id="'letter_' + item.letter">{{item.letter}}</view>
 					<view class="item fx-r fx-bc" @tap="tapSelect(index,index2)" v-for="(item2,index2) in item.data">
 						<view v-if="item2.isDisable">
-							<image class="select"  src="/static/chat/radio_buttons_0.png" mode="widthFix"></image>
+							<image class="select" src="/static/chat/radio_buttons_0.png" mode="widthFix"></image>
 						</view>
 						<view v-else>
-							<image class="select" v-if="!item2.select" src="/static/chat/check.png" mode="widthFix"></image>
+							<image class="select" v-if="!item2.select" src="/static/chat/check.png" mode="widthFix">
+							</image>
 							<image class="select" v-else src="/static/chat/check-btn.png" mode="widthFix"></image>
 						</view>
-						<image style="border-radius: 50%;" :src="item2.avatar == '' ? '/static/chat/user-avatar.png' : item2.avatar" mode="aspectFill"></image>
+						<image style="border-radius: 50%;"
+							:src="item2.avatar == '' ? '/static/chat/user-avatar.png' : item2.avatar" mode="aspectFill">
+						</image>
 						<view class="info fx-h fx-ac">
 							<rich-text class="title" :nodes="getRanValue(item2.remark || item2.nickname)"></rich-text>
 						</view>
 					</view>
 				</view>
-				
+
 				<view class="foot-value">{{count}}个朋友</view>
 			</view>
-			
-			
+
+
 		</scroll-view>
-		
-		<view class="SideMenu" >
-			<view  @tap="tapOpenLetter(item.letter)" v-for="(item, index) in letter"> {{item.letter}} </view>
+
+		<view class="SideMenu">
+			<view @tap="tapOpenLetter(item.letter)" v-for="(item, index) in letter"> {{item.letter}} </view>
 		</view>
-		
+
 		<view class="choice" v-if="isChoice">{{choice}}</view>
-		
+
 	</view>
 </template>
 <style lang="scss">
-	.sub-btn{color: #fff;background:$ic-appcolor;padding: 8px;border-radius: 4px;}
-	.search{background: #fff;border-radius: 6px;margin: 0px 10px;padding: 10px;}
-	.search image{width: 30px;height: 30px;}
-	.search input{font-size: 14px;}
-	.search-view{height: calc(100% - 50px)}
-	.search-view .lists{margin-top: 10px;}
-	.search-view .lists .item{background: #fff;padding:0 10px;position: relative;}
-	.search-view .lists .item:active{background: #f1f1f1;}
-	.search-view .lists .item image{width: 40px;height: 40px;}
-	.search-view .lists .item .info{width: calc(100% - 100px);margin-left: 10px;font-size: 14px;color:#787878;border-bottom: 1px solid #f1f1f1;height: 60px;}
-	.search-view .lists .item .flg{background: #ff5857;width: 20px;height: 20px;border-radius: 50%;font-size: 10px;text-align: center;line-height: 20px;color: #fff;}
-	.search-view .lists .item .select{width: 20px;height: 20px;margin-right: 8px;}
-	.search-view .lists .item:last-child .info{border-bottom: 0;}
-	
-	.search-view .letter{padding: 10px;}
-	
+	.sub-btn {
+		color: #fff;
+		background: $ic-appcolor;
+		padding: 8px;
+		border-radius: 4px;
+	}
+
+	.search {
+		background: #fff;
+		border-radius: 6px;
+		margin: 0px 10px;
+		padding: 10px;
+	}
+
+	.search image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.search input {
+		font-size: 14px;
+	}
+
+	.search-view {
+		height: calc(100% - 50px)
+	}
+
+	.search-view .lists {
+		margin-top: 10px;
+	}
+
+	.search-view .lists .item {
+		background: #fff;
+		padding: 0 10px;
+		position: relative;
+	}
+
+	.search-view .lists .item:active {
+		background: #f1f1f1;
+	}
+
+	.search-view .lists .item image {
+		width: 40px;
+		height: 40px;
+	}
+
+	.search-view .lists .item .info {
+		width: calc(100% - 100px);
+		margin-left: 10px;
+		font-size: 14px;
+		color: #787878;
+		border-bottom: 1px solid #f1f1f1;
+		height: 60px;
+	}
+
+	.search-view .lists .item .flg {
+		background: #ff5857;
+		width: 20px;
+		height: 20px;
+		border-radius: 50%;
+		font-size: 10px;
+		text-align: center;
+		line-height: 20px;
+		color: #fff;
+	}
+
+	.search-view .lists .item .select {
+		width: 20px;
+		height: 20px;
+		margin-right: 8px;
+	}
+
+	.search-view .lists .item:last-child .info {
+		border-bottom: 0;
+	}
+
+	.search-view .letter {
+		padding: 10px;
+	}
+
 	.SideMenu {
 		position: fixed;
 		top: 50%;
 		right: 0;
 		padding: 20rpx 0rpx;
 		width: 45rpx;
-		transform: translate(0,-50%);
+		transform: translate(0, -50%);
 		z-index: 1;
 	}
+
 	.SideMenu view {
 		height: 30rpx;
 		display: block;
 		padding: 4rpx 0;
-		wdith:45rpx;
+		wdith: 45rpx;
 		color: #000;
 		text-align: center;
 		font-size: 22rpx;
 	}
-	.foot-value{height:60px;line-height: 60px;font-size: 14px;text-align: center;color:#787878;}
+
+	.foot-value {
+		height: 60px;
+		line-height: 60px;
+		font-size: 14px;
+		text-align: center;
+		color: #787878;
+	}
 </style>
-	
-	<script>
-		import {mapState,mapMutations} from 'vuex';
-		var LetterList = ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','#'];
-		export default {
-			computed: mapState(['user','sysData']),
-			data() {
-				return {
-					dataAr  : [],
-					letter  : [],
-					noData	: [],
-					count   : 0,
-					keyword : "",
-					isChoice : false,
-					choice   : "",
-					toView:"",
-					barheight : 0,
-					groupId	: 0
-				}
-			},
-			onLoad(options) {
-				this.checkUserLogin({
-					page:this,isLogin:true,fn:this.initView
-				});
-				this.$nextTick(() => {
-					uni.createSelectorQuery().select("#app-top").boundingClientRect(res=>{
-						this.barheight = res.height;
-					}).exec();
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	var LetterList = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+		'U', 'V', 'W', 'X', 'Y', 'Z', '#'
+	];
+	export default {
+		computed: mapState(['user', 'sysData']),
+		data() {
+			return {
+				dataAr: [],
+				letter: [],
+				noData: [],
+				count: 0,
+				keyword: "",
+				isChoice: false,
+				choice: "",
+				toView: "",
+				barheight: 0,
+				groupId: 0
+			}
+		},
+		onLoad(options) {
+			this.checkUserLogin({
+				page: this,
+				isLogin: true,
+				fn: this.initView
+			});
+			this.$nextTick(() => {
+				uni.createSelectorQuery().select("#app-top").boundingClientRect(res => {
+					this.barheight = res.height;
+				}).exec();
+			});
+			this.groupId = options.groupId;
+
+		},
+		onShow() {},
+		methods: {
+			...mapMutations(['checkUserLogin', 'setSys']),
+			/**
+			 * 
+			 */
+			initView: function() {
+				uni.showLoading({
+					title: "加载中..."
 				});
-				this.groupId = options.groupId;
-				
+				this
+					.request
+					.post("chatGroupAdminuser", {
+						groupId: this.groupId
+					})
+					.then(res => {
+						uni.hideLoading();
+						if (res.code == 200) {
+							this.dataAr = res.data;
+							this.letterView();
+						} else {
+							this.utils.showModal(res.msg);
+						}
+					})
+					.catch(err => {
+						uni.hideLoading();
+						uni.showModal({
+							title: '系统提示',
+							content: '加载失败，返回在尝试',
+							showCancel: false
+						});
+					});
 			},
-			onShow() {
+			/**
+			 * 检索关键词
+			 */
+			tapKeyWord: function(ev) {
+				this.keyword = ev.detail.value;
+				this.letterView();
 			},
-			methods: {
-				...mapMutations(['checkUserLogin','setSys']),
-				/**
-				 * 
-				 */
-				initView:function(){
-					uni.showLoading({ title:"加载中..." });
-					this
-						.request
-						.post("chatGroupAdminuser",{groupId : this.groupId})
-						.then(res=>{
-							uni.hideLoading();
-							if(res.code == 200) {
-								this.dataAr = res.data;
-								this.letterView();
+			//字母
+			letterView: function() {
+				var tAr = {};
+				for (var i in LetterList) {
+					var letter = LetterList[i];
+					for (var j in this.dataAr) {
+						var jAr = this.dataAr[j];
+						if (jAr.letter == letter && (jAr.nickname.indexOf(this.keyword) >= 0 || jAr.remark.indexOf(this
+								.keyword) >= 0)) {
+							if (tAr[letter] != null) {
+								tAr[letter].data.push(jAr);
 							} else {
-								this.utils.showModal(res.msg);
-							}
-						})
-						.catch(err=>{
-							uni.hideLoading();
-							uni.showModal({title: '系统提示',content: '加载失败，返回在尝试',showCancel: false});
-						});
-				},
-				/**
-				 * 检索关键词
-				 */
-				tapKeyWord:function(ev){
-					this.keyword = ev.detail.value;
-					this.letterView();
-				},
-				//字母
-				letterView:function(){
-					var tAr = {};
-					for(var i in LetterList) {
-						var letter = LetterList[i];
-						for(var j in this.dataAr) {
-							var jAr = this.dataAr[j];
-							if(jAr.letter == letter && (jAr.nickname.indexOf(this.keyword) >= 0 || jAr.remark.indexOf(this.keyword) >= 0 )) {
-								if(tAr[letter] != null) {
-									tAr[letter].data.push(jAr);
-								} else {
-									tAr[letter] = {'letter':letter,'data':[jAr]};
-								}
+								tAr[letter] = {
+									'letter': letter,
+									'data': [jAr]
+								};
 							}
 						}
 					}
-					var count = 0;
-					var nAr = [];
-					for(var j in tAr) {
-						nAr.push(tAr[j]);
-						count += tAr[j].data.length;
-					}
-					this.letter = nAr;
-					this.count = count;
-			  },
-			  tapSelect:function(index,index2){
-				  if(this.letter[index].data[index2].isDisable)return;
+				}
+				var count = 0;
+				var nAr = [];
+				for (var j in tAr) {
+					nAr.push(tAr[j]);
+					count += tAr[j].data.length;
+				}
+				this.letter = nAr;
+				this.count = count;
+			},
+			tapSelect: function(index, index2) {
+				if (this.letter[index].data[index2].isDisable) return;
 				var bool = this.letter[index].data[index2].select;
-				this.$set(this.letter[index].data[index2],'select',!bool);
-			  },
-			  inAr:function(){
-				  var count = 0;
-					for(var i in this.letter) {
-						for(var j in this.letter[i].data) {
-							if(this.letter[i].data[j].select) {
-								count += 1;
-							}
+				this.$set(this.letter[index].data[index2], 'select', !bool);
+			},
+			inAr: function() {
+				var count = 0;
+				for (var i in this.letter) {
+					for (var j in this.letter[i].data) {
+						if (this.letter[i].data[j].select) {
+							count += 1;
 						}
 					}
-				return count > 0 ? ("(" +  count+ ")") : "";
-			  },
-			  /**
-			   * 遍历字符串
-			   */
-			  getRanValue:function(str) {
-				 let value = str;
-				 if (value.indexOf(this.keyword)!==-1) {
-				 	let reg = new RegExp(this.keyword, 'gi')
-				 	return value.replace(reg, `<font style="color:#2fbec0">${this.keyword}</font>`)
-				 } else {
-				 	return value
-				 }
-			  },
-			  /**
-			   * 打开字母
-			   */
-			  tapOpenLetter:function(item){
-				  this.isChoice = true;
-				  this.choice = item;
-				  setTimeout(()=>{this.isChoice = false;},500);
-				  this.toView = "letter_" + item;
-			  },
-			  /**
-			   * 打开
-			   * @param {Object} ev
-			   */
-			  tapOpen: function(ev) {
-			  	let url = ev.currentTarget.dataset.url;
-			  	this.utils.navigateTo(url);
-			  },
-			  
-			  /**
-			   * 提交创建
-			   */
-			  tapSubmit:function(){
+				}
+				return count > 0 ? ("(" + count + ")") : "";
+			},
+			/**
+			 * 遍历字符串
+			 */
+			getRanValue: function(str) {
+				let value = str;
+				if (value.indexOf(this.keyword) !== -1) {
+					let reg = new RegExp(this.keyword, 'gi')
+					return value.replace(reg, `<font style="color:#2fbec0">${this.keyword}</font>`)
+				} else {
+					return value
+				}
+			},
+			/**
+			 * 打开字母
+			 */
+			tapOpenLetter: function(item) {
+				this.isChoice = true;
+				this.choice = item;
+				setTimeout(() => {
+					this.isChoice = false;
+				}, 500);
+				this.toView = "letter_" + item;
+			},
+			/**
+			 * 打开
+			 * @param {Object} ev
+			 */
+			tapOpen: function(ev) {
+				let url = ev.currentTarget.dataset.url;
+				this.utils.navigateTo(url);
+			},
+
+			/**
+			 * 提交创建
+			 */
+			tapSubmit: function() {
 				var idsAr = [];
-				for(var i in this.letter) {
-					for(var j in this.letter[i].data) {
-						if(this.letter[i].data[j].select) {
+				for (var i in this.letter) {
+					for (var j in this.letter[i].data) {
+						if (this.letter[i].data[j].select) {
 							idsAr.push(this.letter[i].data[j].uid);
 						}
 					}
 				}
-				if(idsAr.length < 0) {
+				if (idsAr.length < 0) {
 					return this.utils.Tip("请选择添加的人");
-				}  
-				uni.showLoading({ title:"提交中.." }); 
+				}
+				uni.showLoading({
+					title: "提交中.."
+				});
 				this
 					.request
-					.post("chatGroupAdminJdd",{groupId:this.groupId,usercodes:idsAr.join(",")})
-					.then(res=>{
+					.post("chatGroupAdminJdd", {
+						groupId: this.groupId,
+						usercodes: idsAr.join(",")
+					})
+					.then(res => {
 						uni.hideLoading();
-						if(res.code == 200) {
-							uni.$emit('groupAdmin','');
+						if (res.code == 200) {
+							uni.$emit('groupAdmin', '');
 							this.utils.Tip("操作成功");
-							setTimeout(()=>{uni.navigateBack();},200);
+							setTimeout(() => {
+								uni.navigateBack();
+							}, 200);
 						} else {
-							uni.showModal({title: '系统提示',content: res.msg,showCancel: false});
+							uni.showModal({
+								title: '系统提示',
+								content: res.msg,
+								showCancel: false
+							});
 						}
 					})
-					.catch(err=>{
+					.catch(err => {
 						console.log(err);
 						uni.hideLoading();
-						uni.showModal({title: '系统提示',content: '加载失败，返回在尝试',showCancel: false});
+						uni.showModal({
+							title: '系统提示',
+							content: '加载失败，返回在尝试',
+							showCancel: false
+						});
 					});
-				
-				  
-			  }
-			  
-			  
-		   }
-		}
-	</script>
-	
-	<style>
-			.app{width: 100vw;height: 100vh;}
-			/* #ifdef H5 */
-			.app{height: calc(100vh - 95px);}
-			/* #endif */
-			.app-run .text{font-size: 24px;font-weight: bold;color: #737373;}
-			
-			.choice {
-				width: 110rpx;
-				height: 110rpx;
-				position: fixed;
-				top: 40%;
-				left: 50%;
-				transform: translate(-50%,-50%);
-				background: rgba(0,0,0,0.3);
-				color: #fff;
-				border-radius: 20rpx;
-				text-align: center;
-				line-height: 110rpx;
-				font-size: 45rpx;
-				z-index: 2;
+
+
 			}
-			
-	</style>
+
+
+		}
+	}
+</script>
+
+<style>
+	.app {
+		width: 100vw;
+		height: 100vh;
+	}
+
+	/* #ifdef H5 */
+	.app {
+		height: calc(100vh - 95px);
+	}
+
+	/* #endif */
+	.app-run .text {
+		font-size: 24px;
+		font-weight: bold;
+		color: #737373;
+	}
+
+	.choice {
+		width: 110rpx;
+		height: 110rpx;
+		position: fixed;
+		top: 40%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		background: rgba(0, 0, 0, 0.3);
+		color: #fff;
+		border-radius: 20rpx;
+		text-align: center;
+		line-height: 110rpx;
+		font-size: 45rpx;
+		z-index: 2;
+	}
+</style>

pages/guild/itemIndex.vue

@@ -45,21 +45,21 @@
 			<view class="team-buy" v-if="data.guData != null">
 				
 				<view class="team-show">
-					<view class="bg">
-						<image src="../../static/ad/team-bg.png" mode="aspectFill"></image>
-						<view class="h"></view>
+					<view class="label">{{ data.guData.name }}</view>
+					<view class="guNickname">
+						{{ data.guData.nickname }}
 					</view>
 					
 					<view class="body fx-h fx-bc fx-ac">
-						<view class="top-input">
+						<!-- <view class="top-input">
 							<image src="/static/img/team-top-title.png" class="tbg"></image>
 							<view class="inner fx-r fx-bc fx-ac">
 								<image src="/static/img/team-top-location.png"></image>
 								<view class="label">{{ data.guData.name }}</view>
 							</view>
-						</view>
+						</view> -->
 						
-						<view class="info fx-r fx-g1 fx-bc fx-ac">
+						<!-- <view class="info fx-r fx-g1 fx-bc fx-ac">
 							<view class="item fx-h fx-bc fx-ac">
 								<view class="label" v-if="data.guData.status == 1">开放中</view>
 								<view class="label" style="color: red;" v-else>闭馆中</view>
@@ -82,11 +82,9 @@
 								<view class="name">流畅</view>
 							</view>
 							
-						</view>
+						</view> -->
 					</view>
 				</view>
-				
-				
 			</view>
 			
 			<view class="venue-list"  v-if="data.auction != null">
@@ -483,63 +481,38 @@
 	
 	
 	//抢货通道
-	.team-buy{
-		background: #F8F8FA;
-		.top{
-			.label{color:#DB292B;font-size: 30rpx;font-weight: bold;}
-			.sbtn{border: 2rpx solid #DB292B;border-radius: 10rpx;color: #DB292B;font-size: 24rpx;padding: 14rpx 16rpx;}
-		}
+	.team-buy {
+		background-image: url("@/static/img/indexChatBg.png");
+		background-repeat: no-repeat;
+		background-position: left bottom;
+		background-size: 100% auto;
+		height: 240rpx;
+		margin-top: 20rpx;
 		.team-show{
-			width: 100%;
-			height: 260rpx;
-			border-radius: 20rpx;
-			margin-top: 20rpx;
-			position: relative;
-			.bg{
-				width: 100%;
-				height: 260rpx;
-				position: absolute;
-				image{
-					width: 100%;
-					height: 100%;
-					border-radius: 20rpx;
-				}
-				.h{background-color: rgba(0, 0, 0, 0.2);position: absolute;z-index: 9;width: 100%;height: 100%;border-radius: 20rpx;top: 0;}
+			color: #fff;
+			font-weight: bold;
+			width: 410rpx;
+			text-align: center;
+			padding-top: 70rpx;
+			flex-direction: column;
+			display: flex;
+			line-height: 1;
+			align-items: center;
+			justify-content: center;
+			.label {
+				font-size: 60rpx;
 			}
-			.body{
-				position: relative;
-				z-index: 10;
-				height: 100%;
-				.top-input{
-					position: relative;
-					.tbg{width: 250rpx;height: 70rpx;}
-					.inner{
-						width: 100%;
-						height: 100%;
-						position: absolute;
-						top: 0;left: 0;
-						image{width: 28rpx;height: 28rpx;}
-						.label{color: #fff;font-weight: bold;font-size: 36rpx;margin-left: 6rpx;}
-					}
-				}
-				.info{
-					width: 100%;
-					.item{
-						width: calc(33% - 1px);
-						.name{color: #fff;font-size: 30rpx;margin-top: 24rpx;}
-						.label{color: #fff;width:80%;font-size: 30rpx;font-weight: bold; overflow: hidden;text-overflow:ellipsis;white-space: nowrap;text-align: center;}
-						.people{
-							image{width: 26rpx;height: 34rpx;}
-						}
-					}
-					.halving{
-						width: 2rpx;
-						height: 80rpx;
-						background: #fff;
-					}
-				}
+			.guNickname{
+				margin-top: 10rpx;
+				font-size: 28rpx;
+				padding: 15rpx 30rpx;
+				background-color: #FE2363;
+				border: 1px solid #EDC299;
+				border-radius: 100rpx;
+				box-shadow: 4rpx 4rpx 10rpx 2rpx #FCD3BF inset;
 			}
 		}
+		
 	}
 	
 	.venue-list{

pages/index/index.vue

@@ -2,7 +2,10 @@
 	<view class="app">
 		<view class="app-top">
 			<view class="atop1">
-				<view class="top2-bg"></view>
+				<view class="top2-bg">
+					<view class="top3-bg">
+					</view>
+				</view>
 			</view>
 			<view class="atop2"></view>
 		</view>
@@ -10,8 +13,14 @@
 			<view class="top-body">
 				<view class="statusBar" :style="'height:'  + statusBarHeight + 'px'"></view>
 				<view class="panel fx-r fx-bc fx-ac">
-					<image src="/static/img/index-logo.png" mode="aspectFill" class="index-img"></image>
-					<view class="fx-g1"></view>
+					<image src="/static/img/logo.png" mode="heightFix" class="index-img"></image>
+					<view class="inputIndex">
+						<navigator url="../goods/list">
+							<view class="inputText fx-ac fx-bc fx-r">
+								<text class="text">请输入关键词搜索</text>
+							</view>
+						</navigator>
+					</view>
 					<image src="/static/img/ic_information.png" class="information"></image>
 				</view>
 			</view>
@@ -19,13 +28,13 @@
 		<scroll-view scroll-y :style="{height:'calc(100vh - 80rpx - ' + statusBarHeight + 'px - ' + h5Foot + 'px)'}">
 			<view class="app-body">
 				<view class="swiper-img">
-					<u-swiper :list="topData.banner" keyName="img" bgColor="transparent" indicator
+					<u-swiper radius='20rpx' :list="topData.banner" keyName="img" bgColor="transparent" indicator
 						indicatorActiveColor="#DB292B" indicatorInactiveColor="#B7B7B7" previousMargin="15"
 						nextMargin="15" indicatorMode="line"></u-swiper>
 				</view>
 				<view class="grid-bg">
 					<!--九宫格-->
-					<view class="grid fx-r fx-bc fx-ac" v-if="sysData.is_audit == 0">
+					<view class="grid fx-r fx-bc fx-ac  gridItem" v-if="sysData.is_audit == 0">
 						<view class="item fx-h fx-bc fx-ac" @tap="tapOpen2" data-url="/pages/user/order/index">
 							<image class="icon" mode="aspectFill" src="/static/ad/1.png"></image>
 							<view class="label">提货订单</view>
@@ -50,50 +59,34 @@
 							<image class="icon" mode="aspectFill" src="/static/ad/5.png"></image>
 							<view class="label">关于我们</view>
 						</view>
-
 					</view>
 					<!--消息通知-->
 					<view class="news-panel fx-r fx-bc" v-if="showData">
 						<image src="/static/img/news-icon.png" class="icon"></image>
 						<view class="label">消息通知</view>
-						<view class="fx-g1" style="height: 30px;">
-							<maoScroll :data="topData.notice" :showNum="1" :lineHeight="60" :animationScroll="800"
-								:animation="4000">
-								<template v-slot="{line}">
-									<view @tap="tapOpen" :data-url="'../news/index?id=' + line.id" class="line">
-										{{ line.title }}
-									</view>
-								</template>
-							</maoScroll>
-						</view>
+						<maoScroll :data="topData.notice" :showNum="1" :lineHeight="30" :animationScroll="800"
+							:animation="4000">
+							<template v-slot="{line}">
+								<view @tap="tapOpen" :data-url="'../news/index?id=' + line.id" class="line">
+									{{ line.title }}
+								</view>
+							</template>
+						</maoScroll>
 						<image @tap="tapNews" src="/static/img/news-right.png" class="icon-right"></image>
 					</view>
 				</view>
 				<view v-if="sysData.is_audit == 0">
 					<!--CBB潮贝抢货通道-->
 					<view class="team-buy" @tap="tapOpen" data-url="/pages/guild/itemIndex" v-if="guData!= null">
-						<view class="top fx-r fx-bc">
-							<view class="label">长城易趣拍抢货通道</view>
-							<view class="fx-g1"></view>
-							<!-- <view class="sbtn">更多CBB代理团队 ></view> -->
-						</view>
-
 						<view class="team-show">
-							<view class="bg">
-								<image src="../../static/ad/team-bg.png" mode="aspectFill"></image>
-								<view class="h"></view>
+							<view class="label">{{ guData.name }}</view>
+							<view class="guNickname">
+								{{ guData.nickname }}
 							</view>
-
 							<view class="body fx-h fx-bc fx-ac">
-								<view class="top-input">
-									<image src="/static/img/team-top-title.png" class="tbg"></image>
-									<view class="inner fx-r fx-bc fx-ac">
-										<image src="/static/img/team-top-location.png"></image>
-										<view class="label">{{ guData.name }}</view>
-									</view>
-								</view>
+								
 
-								<view class="info fx-r fx-g1 fx-bc fx-ac">
+								<!-- <view class="info fx-r fx-g1 fx-bc fx-ac">
 									<view class="item fx-h fx-bc fx-ac">
 										<view class="label" v-if="guData.status == 1">开放中</view>
 										<view class="label" style="color: red;" v-else>闭馆中</view>
@@ -117,7 +110,7 @@
 										<view class="name">流畅</view>
 									</view>
 
-								</view>
+								</view> -->
 							</view>
 						</view>
 					</view>
@@ -147,8 +140,8 @@
 						<view class="label">货款提货</view>
 						<view class="fx-g1"></view>
 						<view class="more fx-r fx-bc fx-ac" @tap="tapOpen" data-url="../goods/list">
-							<view class="text">更多</view>
-							<image class="prv" src="/static/img/ic-pev.png"></image>
+							<view class="text">查看更多></view>
+							<!-- <image class="prv" src="/static/img/ic-pev.png"></image> -->
 						</view>
 					</view>
 					<view class="goods-items fx-r">
@@ -177,7 +170,7 @@
 						<view class="label">易趣C果园({{merchantCount}}家)</view>
 						<view class="fx-g1"></view>
 						<view class="more fx-r fx-bc fx-ac" @tap="tapOpen" data-url="../merchant/list">
-							<view class="text">更多</view>
+							<view class="text">查看更多></view>
 							<image class="prv" src="/static/img/ic-pev.png"></image>
 						</view>
 					</view>
@@ -213,9 +206,6 @@
 										<image src="/static/img/shop-tel.png"></image>
 										<view class="text">电话</view>
 									</view>
-
-									<view class="wline"></view>
-
 									<view class="witem fx-h fx-bc fx-ac" @tap.stop="tapLbs(item)">
 										<image src="/static/img/shop-location.png"></image>
 										<view class="text">导航</view>
@@ -270,7 +260,7 @@
 		mapMutations
 	} from 'vuex';
 	export default {
-		computed: mapState(['user', 'lbs', 'sysData','showData']),
+		computed: mapState(['user', 'lbs', 'sysData', 'showData']),
 		components: {
 			uParse,
 			maoScroll,
@@ -333,8 +323,8 @@
 					visible: type,
 				});
 				uni.setTabBarItem({
-					index:2,
-					visible:type,
+					index: 2,
+					visible: type,
 				})
 			},
 			// #endif
@@ -618,11 +608,14 @@
 </script>
 
 <style lang="scss">
+	.app {
+		background-color: #FEF7F5;
+	}
+
 	.app-top {
 		position: fixed;
 		height: 500rpx;
 		width: 100%;
-		background: #fff;
 
 		.atop1 {
 			height: 300rpx;
@@ -630,13 +623,16 @@
 			position: relative;
 
 			.top2-bg {
-				width: 400vw;
-				height: 400vw;
-				background: #DB292B;
-				border-radius: 50%;
+				height: 100%;
+				width: 100%;
+				background: linear-gradient(to right, #FEA9C8, #FFE4F0, #FFA18E);
 				position: absolute;
-				left: -150vw;
-				bottom: 0;
+
+				.top3-bg {
+					height: 100%;
+					width: 100%;
+					background: linear-gradient(rgba(255, 255, 255, 0), #FEF7F5);
+				}
 			}
 		}
 
@@ -648,9 +644,27 @@
 	.top {
 		.top-body {
 			.panel {
-				height: 80rpx;
+				height: 120rpx;
 				padding: 0 35rpx;
 
+				.inputIndex {
+					z-index: 2;
+					padding: 20rpx;
+					flex-grow: 1;
+
+					.inputText {
+						background-color: #FFF;
+						border-radius: 100px;
+						line-height: 1;
+						padding: 20rpx;
+					}
+
+					.text {
+						font-size: 24rpx;
+						color: rgba(170, 170, 170, 1);
+					}
+				}
+
 				.index-img {
 					width: 80rpx;
 					height: 48rpx;
@@ -666,12 +680,17 @@
 
 	//消息信息
 	.grid-bg {
-		padding: 32rpx;
+		padding: 0 32rpx;
 		margin-top: 20rpx;
-		background: #fff;
+		.gridItem {
+			background-color: #FFF;
+			padding: 20rpx 0;
+			border-radius: 20rpx;
+		}
 
 		//9宫格
 		.grid {
+
 			.item {
 				width: 20%;
 
@@ -690,11 +709,12 @@
 
 		//消息通知
 		.news-panel {
-			margin-top: 40rpx;
-			background: #F8F8FA;
 			border-radius: 8rpx;
 			padding: 15rpx 20rpx;
-
+			background-color: #FFF;
+			margin-top: 20rpx;
+			border-radius: 20rpx;
+			line-height: 1;
 			.icon {
 				width: 28rpx;
 				height: 28rpx;
@@ -727,134 +747,42 @@
 
 	//抢货通道
 	.team-buy {
-		background: #F8F8FA;
-		padding: 20rpx 50rpx;
-
-		.top {
+		background-image: url("@/static/img/indexChatBg.png");
+		background-repeat: no-repeat;
+		background-position: left bottom;
+		background-size: 100% auto;
+		margin:20rpx 30rpx 0;
+		height: 240rpx;
+		.team-show{
+			color: #fff;
+			font-weight: bold;
+			width: 410rpx;
+			text-align: center;
+			padding-top: 70rpx;
+			flex-direction: column;
+			display: flex;
+			line-height: 1;
+			align-items: center;
+			justify-content: center;
 			.label {
-				color: #DB292B;
-				font-size: 30rpx;
-				font-weight: bold;
-			}
-
-			.sbtn {
-				border: 2rpx solid #DB292B;
-				border-radius: 10rpx;
-				color: #DB292B;
-				font-size: 24rpx;
-				padding: 14rpx 16rpx;
-			}
-		}
-
-		.team-show {
-			width: 100%;
-			height: 260rpx;
-			border-radius: 20rpx;
-			margin-top: 20rpx;
-			position: relative;
-
-			.bg {
-				width: 100%;
-				height: 260rpx;
-				position: absolute;
-
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: 20rpx;
-				}
-
-				.h {
-					background-color: rgba(0, 0, 0, 0.2);
-					position: absolute;
-					z-index: 9;
-					width: 100%;
-					height: 100%;
-					border-radius: 20rpx;
-					top: 0;
-				}
+				font-size: 60rpx;
 			}
-
-			.body {
-				position: relative;
-				z-index: 10;
-				height: 100%;
-
-				.top-input {
-					position: relative;
-
-					.tbg {
-						width: 250rpx;
-						height: 70rpx;
-					}
-
-					.inner {
-						width: 100%;
-						height: 100%;
-						position: absolute;
-						top: 0;
-						left: 0;
-
-						image {
-							width: 28rpx;
-							height: 28rpx;
-						}
-
-						.label {
-							color: #fff;
-							font-weight: bold;
-							font-size: 36rpx;
-							margin-left: 6rpx;
-						}
-					}
-				}
-
-				.info {
-					width: 100%;
-
-					.item {
-						width: calc(33% - 1px);
-
-						.name {
-							color: #fff;
-							font-size: 30rpx;
-							margin-top: 24rpx;
-						}
-
-						.label {
-							color: #fff;
-							width: 80%;
-							font-size: 30rpx;
-							font-weight: bold;
-							overflow: hidden;
-							text-overflow: ellipsis;
-							white-space: nowrap;
-							text-align: center;
-						}
-
-						.people {
-							image {
-								width: 26rpx;
-								height: 34rpx;
-							}
-						}
-					}
-
-					.halving {
-						width: 2rpx;
-						height: 80rpx;
-						background: #fff;
-					}
-				}
+			.guNickname{
+				margin-top: 10rpx;
+				font-size: 28rpx;
+				padding: 15rpx 30rpx;
+				background-color: #FE2363;
+				border: 1px solid #EDC299;
+				border-radius: 100rpx;
+				box-shadow: 4rpx 4rpx 10rpx 2rpx #FCD3BF inset;
 			}
 		}
-
+		
 	}
 
 	//文票系统
 	.tradeweb {
 		padding: 20rpx 50rpx;
-		background: #fff;
 		position: relative;
 
 		.bg {
@@ -921,25 +849,39 @@
 
 	//产品中心
 	.goods {
-		background: #fff;
-		padding: 20rpx;
-
+		padding: 20rpx 30rpx;
 		.top {
+			background-image: url("@/static/img/index_item_bg.png");
+			background-size: 100% auto;
+			background-repeat: no-repeat;
+			background-position: left bottom;
+			position: relative;
+			height:74rpx ;
+			padding-left: 86rpx;
+			padding-right: 50rpx;
+			line-height: 1;
 			.icon {
-				width: 36rpx;
-				height: 36rpx;
+				width: 96rpx;
+				height: 123rpx;
+				position:absolute;
+				top: -24rpx;
+				left: 0;
 			}
 
 			.label {
-				color: #000000;
+				color: #fff;
 				font-weight: bold;
 				font-size: 34rpx;
 				margin-left: 12rpx;
+				align-self: self-start;
+				padding-top: 16rpx;
 			}
 
 			.more {
+				align-self: self-start;
+				padding-top: 30rpx;
 				.text {
-					color: #9A9A9A;
+					color: #FFF;
 					font-size: 24rpx;
 				}
 
@@ -953,12 +895,17 @@
 		}
 
 		.goods-items {
+			border: 2px solid rgba(255, 51, 44, 1);
+			border-bottom-left-radius: 20rpx;
+			border-bottom-right-radius: 20rpx;
+			padding: 20rpx;
 			.item {
 				width: calc(50% - 10rpx);
 				margin-right: 10rpx;
-				margin-top: 20rpx;
+				margin-bottom: 20rpx;
 				box-shadow: 0px 0px 20px 0px rgba(50, 50, 52, 0.1);
 				border-radius: 20rpx;
+				background-color: #FFF;
 
 				&:nth-child(2n) {
 					margin-left: 10rpx;
@@ -1013,26 +960,39 @@
 
 	//最新门店
 	.shop {
-		background: #fff;
-		padding: 20rpx;
-		margin-top: 40rpx;
-
+		padding: 20rpx 30rpx;
 		.top {
+			background-image: url("@/static/img/index_item_bg.png");
+			background-size: 100% auto;
+			background-repeat: no-repeat;
+			background-position: left bottom;
+			position: relative;
+			height:74rpx ;
+			padding-left: 86rpx;
+			padding-right: 50rpx;
+			line-height: 1;
 			.icon {
-				width: 36rpx;
-				height: 36rpx;
+				width: 96rpx;
+				height: 123rpx;
+				position:absolute;
+				top: -24rpx;
+				left: 0;
 			}
 
 			.label {
-				color: #000000;
+				color: #fff;
 				font-weight: bold;
 				font-size: 34rpx;
 				margin-left: 12rpx;
+				align-self: self-start;
+				padding-top: 16rpx;
 			}
 
 			.more {
+				align-self: self-start;
+				padding-top: 30rpx;
 				.text {
-					color: #9A9A9A;
+					color: #FFF;
 					font-size: 24rpx;
 				}
 
@@ -1046,6 +1006,10 @@
 		}
 
 		.shop-items {
+			border: 2px solid rgba(255, 51, 44, 1);
+			border-bottom-left-radius: 20rpx;
+			border-bottom-right-radius: 20rpx;
+			padding: 20rpx;
 			.item {
 				margin-top: 30rpx;
 
@@ -1131,12 +1095,15 @@
 						position: absolute;
 						right: 0;
 						bottom: 20rpx;
-
+						.witem:nth-child(even){
+						margin-left: 20rpx;
+						}
 						.wline {
 							margin: 0px 24rpx;
 							height: 40rpx;
 							width: 1px;
 							background: #eee;
+							
 						}
 
 						.witem {
@@ -1232,4 +1199,13 @@
 		width: 120rpx;
 		height: 120rpx;
 	}
+
+	// .app-body {
+	// 	.swiper-img {
+	// 		.imageList {
+	// 			border-radius: 30rpx;
+	// 			overflow: hidden;
+	// 		}
+	// 	}
+	// }
 </style>

pages/user/index.vue

@@ -1,6 +1,12 @@
 <template>
 	<view class="app">
-		<image class="top-bg" src="/static/img/user-bg.png"></image>
+		<view class="top-bg">
+			<view class="top2-bg">
+				<view class="top3-bg">
+
+				</view>
+			</view>
+		</view>
 		<view class="top-view">
 			<view class="top-inner">
 				<view class="statusBar" :style="'height:'  + statusBarHeight + 'px'"></view>
@@ -19,48 +25,51 @@
 					</view>
 					<view class="newPeople" v-if="isNewShow">
 						<view v-if="user.regtime == 0">到期时间:永久</view>
-						<view v-if="user.regtime > 0" class="fx-r fx-bc"><view>到期时间</view>：<u-count-down :time="timeValues" format="DD:HH:mm:ss"></u-count-down></view>
-						
+						<view v-if="user.regtime > 0" class="fx-r fx-bc">
+							<view>到期时间</view>：<u-count-down :time="timeValues" format="DD:HH:mm:ss"></u-count-down>
+						</view>
 					</view>
 				</view>
-
 				<view class="user fx-h fx-bc fx-ac" @tap="tapLogin" v-else>
 					<view class="avatar">
 						<image src="/static/img/user-avatar2.png" mode="aspectFill"></image>
 					</view>
 					<view class="nickname">点击登录</view>
 				</view>
-
 				<!--收益情况-->
 				<view class="earnings fx-r fx-bc" v-if="sysData.is_audit == 0">
-					<view class="item fx-h fx-bc fx-ac">
-						<view class="count">{{ user != null ? user.total_earnings : 0 }}</view>
-						<view class="name">我的收益</view>
+					<view class="item fx-r fx-bc fx-ac">
+						<view class="itemLeftBox">
+							<view class="name">我的收益</view>
+							<view class="count">{{ user != null ? user.total_earnings : 0 }}</view>
+						</view>
+						<image class="rightImageIcon" src="/static/img/userinfo1.png" mode="scaleToFill"></image>
 					</view>
-
 					<view class="line"></view>
-
-					<view class="item fx-h fx-bc fx-ac" @tap="tapOpen" data-url="/pages/user/detail/integral">
-						<view class="count">{{ user != null ? user.integral : 0 }}</view>
-						<view class="name">我的趣豆</view>
+					<view class="item fx-r fx-bc fx-ac" @tap="tapOpen" data-url="/pages/user/detail/integral">
+						<view class="itemLeftBox">
+							<view class="name">我的趣豆</view>
+							<view class="count">{{ user != null ? user.integral : 0 }}</view>
+						</view>
+						<image class="rightImageIcon" src="/static/img/userinfo2.png" mode="scaleToFill"></image>
 					</view>
-
-					<view class="line"></view>
-
-					<view class="item fx-h fx-bc fx-ac" @tap="tapOpen" data-url="/pages/user/detail/anticipate">
-						<view class="count">{{ user != null ? user.anticipate : 0 }}</view>
-						<view class="name">易趣卷</view>
+					<view class="lineAll"></view>
+					<view class="item fx-r fx-bc fx-ac" @tap="tapOpen" data-url="/pages/user/detail/anticipate">
+						<view class="itemLeftBox">
+							<view class="name">易趣卷</view>
+							<view class="count">{{ user != null ? user.anticipate : 0 }}</view>
+						</view>
+						<image class="rightImageIcon" src="/static/img/userinfo3.png" mode="scaleToFill"></image>
 					</view>
-
 					<view class="line"></view>
-
-					<view class="item fx-h fx-bc fx-ac" @tap="tapOpen" data-url="/pages/user/detail/detail">
-						<view class="count">{{ user != null ? user.good_integral : 0 }}</view>
-						<view class="name">货款提货积分</view>
+					<view class="item fx-r fx-bc fx-ac" @tap="tapOpen" data-url="/pages/user/detail/detail">
+						<view class="itemLeftBox">
+							<view class="name">货款提货积分</view>
+							<view class="count">{{ user != null ? user.good_integral : 0 }}</view>
+						</view>
+						<image class="rightImageIcon" src="/static/img/userinfo4.png" mode="scaleToFill"></image>
 					</view>
-
 				</view>
-
 			</view>
 		</view>
 		<!--馆长中心-->
@@ -78,30 +87,28 @@
 				<view class="order-items fx-r fx-bc">
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/user/qrcode/index"
 						v-if="sysData.is_audit == 0">
-						<image src="/static/img/user-invite.png"></image>
+						<image src="/static/img/user-content1.png"></image>
 						<view class="name">邀请好友</view>
 					</view>
 
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/user/team/vermicelli"
 						v-if="sysData.is_audit == 0">
-						<image src="/static/img/user-vermicelli.png"></image>
+						<image src="/static/img/user-content2.png"></image>
 						<view class="name">我的粉丝</view>
 					</view>
 
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/user/order/index">
-						<image src="/static/img/user-order.png"></image>
+						<image src="/static/img/user-content3.png"></image>
 						<view class="name">提货订单</view>
 					</view>
 
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/guild/order/order"
 						v-if="sysData.is_audit == 0">
-						<image src="/static/img/user-rush.png"></image>
+						<image src="/static/img/user-content4.png"></image>
 						<view class="name">购买订单</view>
 					</view>
-
-
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/guild/order/myPro">
-						<image src="/static/img/user-goods.png"></image>
+						<image src="/static/img/user-content5.png"></image>
 						<view class="name">我的商品</view>
 					</view>
 
@@ -128,47 +135,49 @@
 				</view>
 			</view>
 			<view class="pannel mt20">
-				<view class="items-title">更多功能</view>
+				<view class="pannelTopImgBox">
+					<image class="pannelTopImg" src="/static/img/moreGn.png" mode="scaleToFill"></image>
+				</view>
 				<view class="items fx-r">
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/user/bank/bank"
 						v-if="sysData.is_audit == 0">
-						<image src="/static/img/user-bank.png"></image>
+						<image src="/static/img/userico1.png"  mode="heightFix"></image>
 						<view class="name">收款信息</view>
 					</view>
 
 					<view class="item fx-h fx-bc" @tap="tapOpenRz" v-if="sysData.is_audit == 0">
-						<image src="/static/img/user-auth.png"></image>
+						<image src="/static/img/userico2.png"  mode="heightFix"></image>
 						<view class="name">实名认证</view>
 					</view>
 
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/user/address/address">
-						<image src="/static/img/user-address.png"></image>
+						<image src="/static/img/userico3.png"  mode="heightFix"></image>
 						<view class="name">收货地址</view>
 					</view>
 
 					<view class="item fx-h fx-bc" @tap="$refs.customer.open()">
-						<image src="/static/img/user-kfu.png"></image>
+						<image src="/static/img/userico4.png"  mode="heightFix"></image>
 						<view class="name">联系客服</view>
 					</view>
 
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/user/userinfo/index">
-						<image src="/static/img/user-msg.png"></image>
+						<image src="/static/img/userico5.png"  mode="heightFix"></image>
 						<view class="name">个人资料</view>
 					</view>
 
 					<view class="item fx-h fx-bc" @tap="tapPayment" v-if="sysData.is_audit == 0">
-						<image src="/static/img/user-password.png"></image>
+						<image src="/static/img/userico6.png"  mode="heightFix"></image>
 						<view class="name">交易密码</view>
 					</view>
 
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/user/userinfo/bindPhone"
 						v-if="sysData.is_audit == 0">
-						<image src="/static/img/user-bind.png"></image>
+						<image src="/static/img/userico7.png" mode="heightFix"></image>
 						<view class="name">绑定手机</view>
 					</view>
 
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/user/setting/index">
-						<image src="/static/img/user-seting.png"></image>
+						<image src="/static/img/userico8.png"  mode="heightFix"></image>
 						<view class="name">设置</view>
 					</view>
 				</view>
@@ -200,18 +209,33 @@
 	</view>
 </template>
 <style lang="scss">
+	.top2-bg {
+		height: 100%;
+		width: 100%;
+		background: linear-gradient(to right, #FEA9C8, #FFE4F0, #FFA18E);
+		position: absolute;
+
+		.top3-bg {
+			height: 100%;
+			width: 100%;
+			background: linear-gradient(rgba(255, 255, 255, 0), #FEF7F5);
+		}
+	}
+
 	.top-bg {
 		width: 100vw;
 		height: 83vw;
 		position: fixed;
 		top: 0;
 	}
-	.newPeople{
+
+	.newPeople {
 		font-size: 12px;
 		color: #fff;
 		padding-top: 15rpx;
 	}
-	/deep/.u-count-down__text{
+
+	/deep/.u-count-down__text {
 		color: #fff;
 		font-size: 12px;
 	}
@@ -226,6 +250,7 @@
 			.top-h45 {
 				height: 45rpx;
 			}
+
 			.user {
 				position: relative;
 			}
@@ -272,11 +297,13 @@
 				background: linear-gradient(to right, #f9ecc5 0%, #d6ba63 100%);
 				border-radius: 60rpx;
 				padding: 0 36rpx;
+
 				image {
 					width: 30rpx;
 					height: 30rpx;
 					margin-right: 10rpx;
 				}
+
 				.name {
 					font-size: 30rpx;
 					color: #93794B;
@@ -295,23 +322,41 @@
 				font-size: 12px;
 				color: #fff;
 			}
+
 			.earnings {
-				margin-top: 25rpx;
+				margin: 25rpx 30rpx 0;
+				border-radius: 20rpx;
+				background-color: #FFF;
+
+				.lineAll {
+					width: 100%;
+					height: 1px;
+					background-color: rgba(245, 245, 247, 1);
+				}
 
 				.item {
-					width: calc(25% - 1px);
+					width: calc(50% - 1px);
+					padding: 30rpx;
+					box-sizing: border-box;
+					line-height: 1;
+					.itemLeftBox{
+						flex-grow: 1;
+					}
+					.rightImageIcon {
+						width: 66rpx;
+						height: 66rpx;
+					}
 
 					.count {
-						font-weight: bold;
-						font-size: 30rpx;
-						color: #FFFFFF;
+						margin-top: 20rpx;
+						font-size: 25rpx;
+						color: rgba(255, 76, 76, 1);
 					}
 
 					.name {
-						font-weight: 500;
+						font-weight: bold;
 						font-size: 28rpx;
-						color: #FFFFFF;
-						margin-top: 20rpx;
+						color: rgba(35, 35, 38, 1);
 
 					}
 				}
@@ -319,7 +364,7 @@
 				.line {
 					width: 1px;
 					height: 70rpx;
-					background: #FFFFFF;
+					background-color: rgba(245, 245, 247, 1);
 				}
 			}
 
@@ -369,28 +414,34 @@
 	}
 
 	.body {
-		padding: 20rpx;
+		padding: 20rpx 30rpx;
 		position: relative;
-
+		line-height: 1;
 		.pannel {
 			background: #fff;
 			border-radius: 20rpx;
-
+			.pannelTopImgBox{
+				padding:30rpx 25rpx 0;
+				.pannelTopImg{
+					width: 140rpx;
+					height: 26rpx !important;
+				}
+			}
 			.order-items {
-				padding: 40rpx 0;
+				padding: 40rpx 10rpx;
 
 				.item {
 					width: 20%;
 
 					image {
-						width: 56rpx;
-						height: 56rpx;
+						width: 90rpx;
+						height: 88rpx;
 					}
 
 					.name {
 						font-size: 24rpx;
 						color: #0C1732;
-						margin-top: 24rpx;
+						margin-top: 10rpx;
 					}
 				}
 			}
@@ -420,10 +471,8 @@
 				.item {
 					width: 25%;
 					margin-top: 50rpx;
-
 					image {
-						width: 60rpx;
-						height: 60rpx;
+						height: 40rpx;
 					}
 
 					.name {
@@ -546,6 +595,7 @@
 		width: 120rpx;
 		height: 120rpx;
 	}
+	
 </style>
 
 <script>
@@ -567,8 +617,8 @@
 			return {
 				statusBarHeight: 20,
 				isGg: false,
-				isNewShow:false,
-				timeValues:'',
+				isNewShow: false,
+				timeValues: '',
 			}
 		},
 		onLoad() {
@@ -598,33 +648,34 @@
 				// 	this.isGg = true;
 				// }
 				console.log(this.user.mentor_id)
-				if((this.user.mentor_id == 15 || this.user.mentor_id == 6 && this.user.regtime > 0)){
+				if ((this.user.mentor_id == 15 || this.user.mentor_id == 6 && this.user.regtime > 0)) {
 					//获取当前时间的时间戳
 					let nowTime = Math.round(new Date().getTime()).toString();
-					console.log(nowTime,'现在时间')
+					console.log(nowTime, '现在时间')
 					//注册时间 this.user.regtime 两个月后
 					let date = new Date(this.user.regtime * 1000);
-					console.log(date,'注册时间')
+					console.log(date, '注册时间')
 					// 获取日期的月份和年份，用于处理月末变化的情况
 					let currentMonth = date.getMonth();
 					let currentYear = date.getFullYear();
 					date.setMonth(date.getMonth() + 2);
-					if (date.getMonth() !== (currentMonth + 2) % 12 || date.getFullYear() !== currentYear + Math.floor((currentMonth + 2) / 12)) {
-							date.setDate(0);
+					if (date.getMonth() !== (currentMonth + 2) % 12 || date.getFullYear() !== currentYear + Math.floor(
+							(currentMonth + 2) / 12)) {
+						date.setDate(0);
 					}
 					let dateTimeStr = new Date(date);
 					// 将Date对象转换为时间戳（以秒为单位）
 					let timestamp = Math.floor(dateTimeStr.getTime());
-					console.log(timestamp,'注册两个月后时间')
-					if(nowTime > timestamp){
+					console.log(timestamp, '注册两个月后时间')
+					if (nowTime > timestamp) {
 						this.isNewShow = false
-					}else{
+					} else {
 						this.isNewShow = true
 						this.timeValues = timestamp - nowTime
-						console.log(this.timeValues,'到期倒计时')
+						console.log(this.timeValues, '到期倒计时')
 					}
 				}
-				if((this.user.mentor_id == 15 || this.user.mentor_id == 6) && this.user.regtime  == 0){
+				if ((this.user.mentor_id == 15 || this.user.mentor_id == 6) && this.user.regtime == 0) {
 					this.isNewShow = true
 				}
 			},