From 61c550e3a82e52e4532cf156bc07f77cf7f85d65 Mon Sep 17 00:00:00 2001
From: unknown <748718190@qq.com>
Date: Wed, 22 Jun 2022 18:55:16 +0800
Subject: [PATCH] sdg

---
 uniapp-wuduhuajiao/pages/user.vue                       | 746 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 uniapp-wuduhuajiao/pages/wanl-home/components/list1.vue |  20 +++++++++++++++++---
 2 files changed, 434 insertions(+), 332 deletions(-)

diff --git a/uniapp-wuduhuajiao/pages/user.vue b/uniapp-wuduhuajiao/pages/user.vue
index 3685b1d..356086f 100644
--- a/uniapp-wuduhuajiao/pages/user.vue
+++ b/uniapp-wuduhuajiao/pages/user.vue
@@ -1,10 +1,13 @@
 <template>
 	<view>
 		<!-- #ifdef MP -->
-		<view class="cu-custom text-white" :style="{color: common.appStyle.user_font_color == 'light'?'#ffffff':'#222222'}">
-			<view class="cu-bar fixed" :style="{ height: $wanlshop.wanlsys().height + 'px', paddingTop: $wanlshop.wanlsys().top + 'px' }">
+		<view class="cu-custom text-white"
+			:style="{color: common.appStyle.user_font_color == 'light'?'#ffffff':'#222222'}" v-if="false">
+			<view class="cu-bar fixed"
+				:style="{ height: $wanlshop.wanlsys().height + 'px', paddingTop: $wanlshop.wanlsys().top + 'px' }">
 				<view class="action mp text-bold">
-					<text class="wlIcon-shezhi" style="margin-right: 0.6em;" @tap="$wanlshop.auth('/pages/user/setting/setting')"></text>
+					<text class="wlIcon-shezhi" style="margin-right: 0.6em;"
+						@tap="$wanlshop.auth('/pages/user/setting/setting')"></text>
 					<text class="wlIcon-shiyongbangzhu1" @tap="help"></text>
 				</view>
 				<!-- 背景 -->
@@ -18,11 +21,14 @@
 		</view>
 		<!-- #endif -->
 		<!-- #ifndef MP -->
-		<view class="cu-custom" :style="{color: common.appStyle.user_font_color == 'light'?'#ffffff':'#222222'}">
-			<view class="cu-bar fixed" :style="{ height: $wanlshop.wanlsys().height + 'px', paddingTop: $wanlshop.wanlsys().top + 'px' }">
+		<view class="cu-custom" v-if="false" :style="{color: common.appStyle.user_font_color == 'light'?'#ffffff':'#222222'}">
+			<view class="cu-bar fixed"
+				:style="{ height: $wanlshop.wanlsys().height + 'px', paddingTop: $wanlshop.wanlsys().top + 'px' }">
 				<view class="text-lg" @tap="$wanlshop.auth('/pages/user/setting/user')">
 					<view v-if="headerOpacity == 1">
-						<view class="cu-avatar round margin-right-xs" :style="{ backgroundImage: 'url(' + $wanlshop.oss(user.avatar, 35, 35, 2, 'avatar') + ')' }"></view>
+						<view class="cu-avatar round margin-right-xs"
+							:style="{ backgroundImage: 'url(' + $wanlshop.oss(user.avatar, 35, 35, 2, 'avatar') + ')' }">
+						</view>
 						<text v-if="user.isLogin">{{ user.nickname }}</text>
 						<text v-else>登录 / 注册</text>
 					</view>
@@ -42,18 +48,23 @@
 					</block>
 					<text class="wlIcon-shezhi" @tap="$wanlshop.auth('/pages/user/setting/setting')"></text>
 					<text class="wlIcon-xiaoxizhongxin" @tap="$wanlshop.to('/pages/notice/notice')"></text>
-					<view class="cu-tag badge" v-if="statistics.notice.notice +statistics.notice.order +statistics.notice.chat > 0">{{ statistics.notice.notice +statistics.notice.order +statistics.notice.chat }}</view>
+					<view class="cu-tag badge"
+						v-if="statistics.notice.notice +statistics.notice.order +statistics.notice.chat > 0">
+						{{ statistics.notice.notice +statistics.notice.order +statistics.notice.chat }}
+					</view>
 				</view>
 			</view>
 		</view>
 		<!-- #endif -->
-		<view class="wanl-user" :style="{ 
-			backgroundColor: common.appStyle.user_bg_color?common.appStyle.user_bg_color:'#f7f7f7',
-			backgroundImage: 'url(' + $wanlshop.oss(common.appStyle.user_bg_image, 414, 0, 1, 'transparent', 'png') + ')',
-			color: common.appStyle.user_font_color == 'light'?'#ffffff':'#222222'}">
+		<view class="wanl-user" v-if="true" :style="{ 
 			
+			backgroundImage: 'url(../../static/home/banck1.png)',
+			color: common.appStyle.user_font_color == 'light'?'#ffffff':'#222222'}">
+
 			<view class="user" :style="{ paddingTop: $wanlshop.wanlsys().height + 'px' }">
-				<view class="avatar margin-right-bj" @tap="portrai"><image class="round" :src="$wanlshop.oss(user.avatar, 62, 62, 2, 'avatar')" mode="widthFix"></image></view>
+				<view class="avatar margin-right-bj" @tap="portrai">
+					<image class="round" :src="$wanlshop.oss(user.avatar, 62, 62, 2, 'avatar')" mode="widthFix"></image>
+				</view>
 				<view class="content" v-if="user.isLogin">
 					<view class="text-xxl" @tap="$wanlshop.auth('/pages/user/setting/user')">{{ user.nickname }}</view>
 					<view class="text-sm" @tap="$wanlshop.auth('/pages/user/signin/signin')">
@@ -71,7 +82,7 @@
 					<view class="cu-tag wanl-bg-pink sm radius">Hi，欢迎登录</view>
 				</view>
 			</view>
-			<view class="operate">
+			<!-- <view class="operate">
 				<view class="text-sm" @tap="$wanlshop.auth('/pages/user/collect')">
 					<text class="text-bold">{{ statistics.dynamic.collection }}</text>
 					收藏夹
@@ -88,7 +99,7 @@
 					<text class="text-bold">{{ $wanlshop.toFormat(statistics.order.whole, 'hundred') }}</text>
 					全部订单
 				</view>
-				
+
 			</view>
 			<view class="activity padding-bj">
 				<view class="bg-white radius grid text-center col-2 padding-lr-bj padding-tb-sm">
@@ -100,7 +111,9 @@
 								<text class="wlIcon-fanhui2 margin-left-xs"></text>
 							</view>
 						</view>
-						<view class="cu-avatar" :style="{ backgroundImage: 'url(' + $wanlshop.appstc('/user/icon_card_bag.png') + ')' }"></view>
+						<view class="cu-avatar"
+							:style="{ backgroundImage: 'url(' + $wanlshop.appstc('/user/icon_card_bag.png') + ')' }">
+						</view>
 					</view>
 					<view class="flex justify-between" @tap="$wanlshop.auth('/pages/user/signin/log')">
 						<view class="content margin-left-bj">
@@ -110,38 +123,66 @@
 								<text class="wlIcon-fanhui2 margin-left-xs"></text>
 							</view>
 						</view>
-						<view class="cu-avatar" :style="{ backgroundImage: 'url(' + $wanlshop.appstc('/user/icon_super_vip.png') + ')' }"></view>
+						<view class="cu-avatar"
+							:style="{ backgroundImage: 'url(' + $wanlshop.appstc('/user/icon_super_vip.png') + ')' }">
+						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
-		
-		<view class="wanl-user-order padding-sm margin-bj">
-			<view class="project text-sm wanl-gray-dark">
+
+		<view class="wanl-user-order padding-sm margin-bj operate">
+			<view class="project text-sm wanl-gray-dark" >
+
 				<view @tap="$wanlshop.auth('/pages/user/order/order?state=1')">
-					<text class="wlIcon-31daifukuan wanl-pip"></text>
+					<view>
+						<image src="../static/home/order1.png" style="width: 50rpx;" mode="widthFix">
+						</image>
+					</view>
 					待支付
-					<view class="cu-tag badge bg-orange" v-if="statistics.order.pay > 0">{{ $wanlshop.toFormat(statistics.order.pay, 'hundred') }}</view>
+					<view class="cu-tag badge bg-orange" v-if="statistics.order.pay > 0">
+						{{ $wanlshop.toFormat(statistics.order.pay, 'hundred') }}
+					</view>
 				</view>
 				<view @tap="$wanlshop.auth('/pages/user/order/order?state=2')">
-					<text class="wlIcon-31daifahuo wanl-pip"></text>
+					<view>
+						<image src="../static/home/order2.png" style="width: 50rpx;" mode="widthFix">
+						</image>
+					</view>
 					待发货
-					<view class="cu-tag badge bg-orange" v-if="statistics.order.delive > 0">{{ $wanlshop.toFormat(statistics.order.delive, 'hundred') }}</view>
+					<view class="cu-tag badge bg-orange" v-if="statistics.order.delive > 0">
+						{{ $wanlshop.toFormat(statistics.order.delive, 'hundred') }}
+					</view>
 				</view>
 				<view @tap="$wanlshop.auth('/pages/user/order/order?state=3')">
-					<text class="wlIcon-31daishouhuo wanl-pip"></text>
+					<view>
+						<image src="../static/home/order3.png" style="width: 50rpx;" mode="widthFix">
+						</image>
+					</view>
 					待收货
-					<view class="cu-tag badge bg-orange" v-if="statistics.order.receiving > 0">{{ $wanlshop.toFormat(statistics.order.receiving, 'hundred') }}</view>
+					<view class="cu-tag badge bg-orange" v-if="statistics.order.receiving > 0">
+						{{ $wanlshop.toFormat(statistics.order.receiving, 'hundred') }}
+					</view>
 				</view>
 				<view @tap="$wanlshop.auth('/pages/user/order/order?state=4')">
-					<text class="wlIcon-31daipingjia wanl-pip"></text>
+					<view>
+						<image src="../static/home/order6.png" style="width: 50rpx;" mode="widthFix">
+						</image>
+					</view>
 					待评价
-					<view class="cu-tag badge bg-orange" v-if="statistics.order.evaluate > 0">{{ $wanlshop.toFormat(statistics.order.evaluate, 'hundred') }}</view>
+					<view class="cu-tag badge bg-orange" v-if="statistics.order.evaluate > 0">
+						{{ $wanlshop.toFormat(statistics.order.evaluate, 'hundred') }}
+					</view>
 				</view>
 				<view class="solid-left" @tap="$wanlshop.auth('/pages/user/refund/lists')">
-					<text class="wlIcon-31youhuiquan wanl-orange"></text>
+					<view>
+						<image src="../static/home/order5.png" style="width: 50rpx;" mode="widthFix">
+						</image>
+					</view>
 					退货/售后
-					<view class="cu-tag badge bg-orange" v-if="statistics.order.customer > 0">{{ $wanlshop.toFormat(statistics.order.customer, 'hundred') }}</view>
+					<view class="cu-tag badge bg-orange" v-if="statistics.order.customer > 0">
+						{{ $wanlshop.toFormat(statistics.order.customer, 'hundred') }}
+					</view>
 				</view>
 			</view>
 			<!-- <view class="logistics margin-top-bj padding-sm" v-if="statistics.logistics.length > 0">
@@ -165,8 +206,8 @@
 				</swiper>
 			</view> -->
 		</view>
-		
-		<view class="wanl-user-order padding-sm margin-bj" style="margin-top: 25rpx;">
+
+		<!-- <view class="wanl-user-order padding-sm margin-bj" style="margin-top: 25rpx;">
 			<view class="project text-sm wanl-gray-dark">
 				<view style="line-height: 1.8;" @tap="$wanlshop.auth('/pages/user/coupon/mycard')">
 					<view class="wanl-pip text-lg text-bold6">{{ statistics.dynamic.coupon }}</view>
@@ -189,31 +230,45 @@
 					账单明细
 				</view>
 			</view>
-		</view>
-		
+		</view> -->
+
 		<view class="wanl-user-tool padding-top-bj margin-lr-bj">
-			<view class="list text-sm grid col-5 wanl-gray-dark">
-				<view @tap="$wanlshop.auth('/pages/user/money/money')">
+			<view class="list text-sm  col-5 wanl-gray-dark">
+				<view class="flex justify-content-between"
+					style="align-items: center;border-bottom: 2rpx solid #fff;line-height: 50rpx;padding: 0 20rpx;border-bottom: 1rpx solid #efefef;"
+					v-for="(item, index) of lists" :key="index" @click="goNav(item.link)"
+					@tap="$wanlshop.auth(item.link)">
+					<view class="list_text">{{ item.name }}</view>
+					<uni-icons type="forward" size="20" color="#000"></uni-icons>
+				</view>
+				<view class="flex justify-content-between"
+					style="align-items: center;border-bottom: 2rpx solid #fff;line-height: 50rpx;padding: 0 20rpx;" @tap="setting">
+					设置
+					<uni-icons type="forward" size="20" color="#000"></uni-icons>
+				</view>
+
+				<!-- <view @tap="$wanlshop.auth('/pages/user/money/money')">
 					<text class="wlIcon-youhuiquantuangou wanl-orange"></text>
 					钱包
 				</view>
 				<view @tap="$wanlshop.auth('/pages/apps/groups/order/order')">
 					<text class="wlIcon-pintuan2 wanl-text-yellow"></text>
 					拼团订单
-					<view class="cu-tag badge bg-orange" v-if="statistics.order.groups > 0">{{ $wanlshop.toFormat(statistics.order.groups, 'hundred') }}</view>
+					<view class="cu-tag badge bg-orange" v-if="statistics.order.groups > 0">
+						{{ $wanlshop.toFormat(statistics.order.groups, 'hundred') }}</view>
 				</view>
 				<view @tap="$wanlshop.auth('/pages/user/comment/comment')">
 					<text class="wlIcon-icon_pinglun wanl-text-red"></text>
 					评论
 				</view>
-				<!-- <view @tap="$wanlshop.auth('/pages/user/distribution/distribution')">
+				<view @tap="$wanlshop.auth('/pages/user/distribution/distribution')">
 					<text class="wlIcon-fenxiao wanl-text-yellow"></text>
 					分销
 				</view>
 				<view @tap="$wanlshop.auth('/pages/user/order/bargain')">
 					<text class="wlIcon-jiage wanl-text-light-blue"></text>
 					我的砍价
-				</view> -->
+				</view>
 				<view @tap="$wanlshop.auth('/pages/user/address/address')">
 					<text class="wlIcon-dizhi wanl-text-yellow"></text>
 					收货地址
@@ -241,311 +296,344 @@
 				<view @tap="$wanlshop.auth('/pages/apps/find/user')">
 					<text class="wlIcon-pengyouquan wanl-text-red"></text>
 					创作中心
-				</view>
-				<view @tap="setting">
-					<text class="wlIcon-shezhi1 wanl-text-green"></text>
-					设置
-				</view>
+				</view> -->
+
 			</view>
 		</view>
-		<view class="wanl-you-like" :style="{ backgroundImage: 'url(' + $wanlshop.appstc('/common/guess_you_like_it.png') + ')' }"></view>
-		<wanl-product :dataList="likeData"/>
+		<!-- <view class="wanl-you-like"
+			:style="{ backgroundImage: 'url(' + $wanlshop.appstc('/common/guess_you_like_it.png') + ')' }"></view> -->
+		<!-- <wanl-product :dataList="likeData" /> -->
 		<uni-load-more :status="status" :content-text="contentText" />
 		<view class="edgeInsetBottom"></view>
 	</view>
 </template>
 
 <script>
-import { mapState } from 'vuex';
-export default {
-	data() {
-		return {
-			headerOpacity: 0,
-			// 上拉刷新
-			reload: true,
-			likeData: [],
-			current_page: 1, //当前页码
-			last_page: 1, //总页码
-			status: 'loading',
-			contentText: {
-				contentdown: ' ',
-				contentrefresh: '正在加载...',
-				contentnomore: '没有更多数据了'
-			}
-		};
-	},
-	computed: {
-		...mapState(['user', 'statistics','common'])
-	},
-	onPullDownRefresh() {
-		this.loadData();
-	},
-	onShow() {
-		setTimeout(()=> {
-			uni.setNavigationBarColor({  
-				frontColor: this.$store.state.common.appStyle.user_font_color == 'light'?'#ffffff':'#000000',  
-				backgroundColor: this.$store.state.common.appStyle.user_nav_color
-		    })  
-		}, 200);
-	},
-	onLoad() {
-		if (this.$store.state.user.isLogin) {
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				headerOpacity: 0,
+				// 上拉刷新
+				reload: true,
+				likeData: [],
+				current_page: 1, //当前页码
+				last_page: 1, //总页码
+				status: 'loading',
+				contentText: {
+					contentdown: ' ',
+					contentrefresh: '正在加载...',
+					contentnomore: '没有更多数据了'
+				},
+				lists: [{
+						name: '需求发布',
+						// link: '/pages/my/news/index'
+					},
+					{
+						name: '收货地址',
+						// link: '/pages/my/pay/index'
+					},
+					{
+						name: '建议',
+						link: '/pages/my/opinion/index'
+					}, {
+						name: '投诉',
+						// link: '/pages/my/news/index'
+					},
+					{
+						name: '黑名单',
+						// link: '/pages/my/pay/index'
+					},
+					{
+						name: '免责声明',
+						// link: '/pages/my/opinion/index'
+					}, {
+						name: '入驻协议',
+						// link: '/pages/my/opinion/index'
+					}
+				]
+			};
+		},
+		computed: {
+			...mapState(['user', 'statistics', 'common'])
+		},
+		onPullDownRefresh() {
 			this.loadData();
-		}
-		this.loadlikeData();
-	},
-	onPageScroll(e) {
-		let tmpY = 50;
-		e.scrollTop = e.scrollTop > tmpY ? 50 : e.scrollTop; //如果当前高度大于250则250否则当前高度
-		this.headerOpacity = e.scrollTop * (1 / tmpY); //$headerOpacity 赋值当前高度x（1÷250）
-	},
-	onReachBottom() {
-		//判断是否最后一页
-		if (this.current_page >= this.last_page) {
-			this.status = 'noMore';
-		} else {
-			this.reload = false;
-			this.current_page = this.current_page + 1; //页码+1
-			this.status = 'loading';
-			this.loadlikeData();
-		}
-	},
-	methods: {
-		async loadData() {
-			this.$api.post({
-				url: '/wanlshop/user/refresh',
-				success: res => {
-					this.$store.commit('statistics/edit', res.statistics);
-					this.$store.commit('user/setUserInfo', res.userinfo);
-				}
-			});
-			uni.stopPullDownRefresh();
 		},
-		// 滚动底部加载猜你喜欢
-		async loadlikeData() {
-			this.$api.get({
-				url: '/wanlshop/product/likes?pages=user',
-				data: {
-					page: this.current_page
-				},
-				success: res => {
-					this.likeData = this.reload ? res.data : this.likeData.concat(res.data); //评论数据 追加
-					this.current_page = res.current_page; //当前页码
-					this.last_page = res.last_page; //总页码
-					this.status = res.total == 0 ? 'noMore' : 'more';
-				}
-			});
+		onShow() {
+			setTimeout(() => {
+				uni.setNavigationBarColor({
+					frontColor: this.$store.state.common.appStyle.user_font_color == 'light' ? '#ffffff' :
+						'#000000',
+					backgroundColor: this.$store.state.common.appStyle.user_nav_color
+				})
+			}, 200);
 		},
-		// 帮助
-		help() {
-			this.$wanlshop.to('/pages/user/help');
+		onLoad() {
+			if (this.$store.state.user.isLogin) {
+				this.loadData();
+			}
+			this.loadlikeData();
 		},
-		// 设置
-		setting() {
-			this.$wanlshop.to('/pages/user/setting/setting');
+		onPageScroll(e) {
+			let tmpY = 50;
+			e.scrollTop = e.scrollTop > tmpY ? 50 : e.scrollTop; //如果当前高度大于250则250否则当前高度
+			this.headerOpacity = e.scrollTop * (1 / tmpY); //$headerOpacity 赋值当前高度x（1÷250）
+		},
+		onReachBottom() {
+			//判断是否最后一页
+			if (this.current_page >= this.last_page) {
+				this.status = 'noMore';
+			} else {
+				this.reload = false;
+				this.current_page = this.current_page + 1; //页码+1
+				this.status = 'loading';
+				this.loadlikeData();
+			}
 		},
-		portrai() {
-			this.$wanlshop.to('/pages/user/portrait/portrait');
+		methods: {
+			async loadData() {
+				this.$api.post({
+					url: '/wanlshop/user/refresh',
+					success: res => {
+						this.$store.commit('statistics/edit', res.statistics);
+						this.$store.commit('user/setUserInfo', res.userinfo);
+					}
+				});
+				uni.stopPullDownRefresh();
+			},
+			// 滚动底部加载猜你喜欢
+			async loadlikeData() {
+				this.$api.get({
+					url: '/wanlshop/product/likes?pages=user',
+					data: {
+						page: this.current_page
+					},
+					success: res => {
+						this.likeData = this.reload ? res.data : this.likeData.concat(res.data); //评论数据 追加
+						this.current_page = res.current_page; //当前页码
+						this.last_page = res.last_page; //总页码
+						this.status = res.total == 0 ? 'noMore' : 'more';
+					}
+				});
+			},
+			// 帮助
+			help() {
+				this.$wanlshop.to('/pages/user/help');
+			},
+			// 设置
+			setting() {
+				this.$wanlshop.to('/pages/user/setting/setting');
+			},
+			portrai() {
+				this.$wanlshop.to('/pages/user/portrait/portrait');
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style>
-.cu-bar .action.mp:first-child > text[class*='wlIcon-'] {
-	margin-left: 0;
-}
-
-.wanl-user {
-	background-repeat: no-repeat;
-	background-size: 100%;
-	position: relative;
-}
-
-.wanl-user .user {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding: 0 30rpx;
-	padding-bottom: 30rpx;
-}
-
-.wanl-user .user .avatar {
-	position: relative;
-	height: 123rpx;
-	width: 123rpx;
-	border-radius: 5000rpx;
-	overflow: hidden;
-	border: 3px solid rgba(255, 255, 255, .25);
-}
-
-.wanl-user .user .avatar image {
-	height: 120rpx;
-}
-
-.wanl-user .user .avatar .tag {
-	position: absolute;
-	bottom: 0;
-	right: 0;
-}
-
-.wanl-user .user .content {
-	flex: 1;
-}
-
-/* 操作 */
-.wanl-user .operate {
-	display: flex;
-	justify-content: space-around;
-	text-align: center;
-	padding-bottom: 70rpx;
-	line-height: 1.3;
-}
-
-.wanl-user .operate text {
-	display: block;
-	font-size: 32rpx;
-}
-
-/* 活动 */
-.wanl-user .activity {
-	position: absolute;
-	width: 100%;
-	bottom: -80rpx;
-}
-
-.wanl-user .activity .radius {
-	border-radius: 24rpx;
-}
-
-.wanl-user .activity .cu-avatar {
-	width: 69rpx;
-	height: 69rpx;
-	margin-right: 30rpx;
-	background-color: transparent;
-	/* border: 1px solid rgba(255,255,255,.6); */
-}
-
-.wanl-user .activity .content {
-	text-align: left;
-	height: 68rpx;
-}
-
-/* 订单 */
-.wanl-user-order {
-	margin-top: 80rpx;
-	border-radius: 24rpx;
-	background-color: white;
-}
-
-.wanl-user-order .title {
-	display: flex;
-	justify-content: space-between;
-	align-items: flex-end;
-}
-
-.wanl-user-order .title text {}
-
-
-
-/* 状态 */
-.wanl-user-order .project {
-	display: flex;
-	justify-content: space-around;
-	text-align: center;
-}
-
-.wanl-user-order .project>view {
-	position: relative;
-	flex: 1;
-}
-
-.wanl-user-order .project>view .cu-tag {
-	top: -4rpx;
-	right: 26rpx;
-}
-
-.wanl-user-order .project text {
-	display: block;
-	font-size: 50rpx;
-	margin-bottom: 6rpx;
-}
-
-/* 物流 */
-.wanl-user-order .logistics {
-	background-color: #f9f9f9;
-	border-radius: 24rpx;
-}
-
-.wanl-user-order .logistics .swiper {
-	height: 120rpx;
-}
-
-.wanl-user-order .logistics .swiper .title {
-	display: flex;
-	justify-content: space-between;
-	margin-bottom: 10rpx;
-	color: #999999;
-}
-
-.wanl-user-order .logistics .swiper .cu-avatar {
-	margin-right: 10rpx;
-	height: 66rpx;
-	width: 66rpx;
-	border-radius: 12rpx;
-	background-color: #ffffff;
-}
-
-.wanl-user-order .logistics .swiper .content .text-df {
-	color: #3797e0;
-	font-size: 27rpx;
-	margin-bottom: 2rpx;
-}
-
-.wanl-user-order .logistics .swiper .content .text-sm {
-	color: #999999;
-}
-
-.wanl-user-order .logistics .swiper .content text {
-	font-size: 32rpx;
-	margin-left: 15rpx;
-	margin-right: 10rpx;
-}
-
-/* 工具箱 */
-.wanl-user-tool {
-	background-color: #ffffff;
-	border-radius: 24rpx;
-}
-
-.wanl-user-tool .title {
-	display: flex;
-	justify-content: space-between;
-	align-items: flex-end;
-}
-
-.wanl-user-tool .title text {
-	margin-left: 2rpx;
-}
-
-/* 状态 */
-.wanl-user-tool .list {
-	text-align: center;
-}
-
-.wanl-user-tool .list>view {
-	margin-bottom: 28rpx;
-	position: relative;
-}
-.wanl-user-tool .list>view .cu-tag {
-	top: -8rpx;
-	left: 80rpx;
-	right: unset;
-}
-
-.wanl-user-tool .list text {
-	display: block;
-	font-size: 54rpx;
-	margin-bottom: 8rpx;
-}
+	.cu-bar .action.mp:first-child>text[class*='wlIcon-'] {
+		margin-left: 0;
+	}
+
+	.wanl-user {
+		background-repeat: no-repeat;
+		background-size: 100%;
+		position: relative;
+		border-radius: 0 0 20% 20%;
+			height: 360rpx;
+	}
+
+	.wanl-user .user {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 30rpx;
+		padding-bottom: 30rpx;
+	}
+
+	.wanl-user .user .avatar {
+		position: relative;
+		height: 123rpx;
+		width: 123rpx;
+		border-radius: 5000rpx;
+		overflow: hidden;
+		border: 3px solid rgba(255, 255, 255, .25);
+	}
+
+	.wanl-user .user .avatar image {
+		height: 120rpx;
+	}
+
+	.wanl-user .user .avatar .tag {
+		position: absolute;
+		bottom: 0;
+		right: 0;
+	}
+
+	.wanl-user .user .content {
+		flex: 1;
+	}
+
+	/* 操作 */
+	.wanl-user .operate {
+		display: flex;
+		justify-content: space-around;
+		text-align: center;
+		padding-bottom: 70rpx;
+		line-height: 1.3;
+	}
+
+	.wanl-user .operate text {
+		display: block;
+		font-size: 32rpx;
+	}
+
+	/* 活动 */
+	.wanl-user .activity {
+		position: absolute;
+		width: 100%;
+		bottom: -80rpx;
+	}
+
+	.wanl-user .activity .radius {
+		border-radius: 24rpx;
+	}
+
+	.wanl-user .activity .cu-avatar {
+		width: 69rpx;
+		height: 69rpx;
+		margin-right: 30rpx;
+		background-color: transparent;
+		/* border: 1px solid rgba(255,255,255,.6); */
+	}
+
+	.wanl-user .activity .content {
+		text-align: left;
+		height: 68rpx;
+	}
+
+	/* 订单 */
+	.wanl-user-order {
+		position: relative;
+		margin-top: -100rpx;
+		border-radius: 24rpx;
+		background-color: white;
+		z-index: 99;
+	}
+
+	.wanl-user-order .title {
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-end;
+	}
+
+	.wanl-user-order .title text {}
+
+
+
+	/* 状态 */
+	.wanl-user-order .project {
+		display: flex;
+		justify-content: space-around;
+		text-align: center;
+	}
+
+	.wanl-user-order .project>view {
+		position: relative;
+		flex: 1;
+	}
+
+	.wanl-user-order .project>view .cu-tag {
+		top: -4rpx;
+		right: 26rpx;
+	}
+
+	.wanl-user-order .project text {
+		display: block;
+		font-size: 50rpx;
+		margin-bottom: 6rpx;
+	}
+
+	/* 物流 */
+	.wanl-user-order .logistics {
+		background-color: #f9f9f9;
+		border-radius: 24rpx;
+	}
+
+	.wanl-user-order .logistics .swiper {
+		height: 120rpx;
+	}
+
+	.wanl-user-order .logistics .swiper .title {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 10rpx;
+		color: #999999;
+	}
+
+	.wanl-user-order .logistics .swiper .cu-avatar {
+		margin-right: 10rpx;
+		height: 66rpx;
+		width: 66rpx;
+		border-radius: 12rpx;
+		background-color: #ffffff;
+	}
+
+	.wanl-user-order .logistics .swiper .content .text-df {
+		color: #3797e0;
+		font-size: 27rpx;
+		margin-bottom: 2rpx;
+	}
+
+	.wanl-user-order .logistics .swiper .content .text-sm {
+		color: #999999;
+	}
+
+	.wanl-user-order .logistics .swiper .content text {
+		font-size: 32rpx;
+		margin-left: 15rpx;
+		margin-right: 10rpx;
+	}
+
+	/* 工具箱 */
+	.wanl-user-tool {
+		background-color: #ffffff;
+		border-radius: 24rpx;
+	}
+
+	.wanl-user-tool .title {
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-end;
+	}
+
+	.wanl-user-tool .title text {
+		margin-left: 2rpx;
+	}
+
+	/* 状态 */
+	.wanl-user-tool .list {
+		text-align: center;
+	}
+
+	.wanl-user-tool .list>view {
+		margin-bottom: 28rpx;
+		position: relative;
+	}
+
+	.wanl-user-tool .list>view .cu-tag {
+		top: -8rpx;
+		left: 80rpx;
+		right: unset;
+	}
+
+	.wanl-user-tool .list text {
+		display: block;
+		font-size: 54rpx;
+		margin-bottom: 8rpx;
+	}
 </style>
diff --git a/uniapp-wuduhuajiao/pages/wanl-home/components/list1.vue b/uniapp-wuduhuajiao/pages/wanl-home/components/list1.vue
index 60208e5..a799ff1 100644
--- a/uniapp-wuduhuajiao/pages/wanl-home/components/list1.vue
+++ b/uniapp-wuduhuajiao/pages/wanl-home/components/list1.vue
@@ -16,18 +16,32 @@
 					</view>
 				
 					<view class="flex " >
-						<view style="position: relative;margin-right: 20rpx;" v-for="item of 3">
-							<image src="../../../static/home/index4.png" class="img" mode="aspectFill"></image>
+						<view style="position: relative;margin-right: 20rpx;" v-if="item.user.cz">
+							<image :src="'http://t1.sherkxuan.cn/'+item.user.cz.image" class="img" mode="aspectFill"></image>
 							<view class="postion">
 								<image src="/static/home/shi.png" mode="widthFix"></image>
 								<text style="font-size: 21rpx;color: #fff;">村长</text>
 							</view>
 						</view>
+						<view style="position: relative;margin-right: 20rpx;" v-if="item.user.sz">
+							<image :src="'http://t1.sherkxuan.cn/'+item.user.cz.image" class="img" mode="aspectFill"></image>
+							<view class="postion">
+								<image src="/static/home/shi.png" mode="widthFix"></image>
+								<text style="font-size: 21rpx;color: #fff;">社长</text>
+							</view>
+						</view>
+						<view style="position: relative;margin-right: 20rpx;" v-if="item.user.cm">
+							<image :src="'http://t1.sherkxuan.cn/'+item.user.cz.image" class="img" mode="aspectFill"></image>
+							<view class="postion">
+								<image src="/static/home/shi.png" mode="widthFix"></image>
+								<text style="font-size: 21rpx;color: #fff;">村民</text>
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>
 			
-			<view style="width:300rpx;margin-left: 15rpx;" > 
+			<view style="width:170rpx;margin-left: 15rpx;" > 
 				<view class="flex justify-content-around" @click="goNav('/pages/wanl-home/detail?id='+item.id)">
 					<image src="../../../static/home/message.png" style="width: 30rpx;" mode="widthFix"></image>
 					<image src="../../../static/home/v.png" style="width: 30rpx;" mode="widthFix"></image>
--
libgit2 0.21.4