From bd83922d0d1a0cbc726bac24d43c7cc5273624f6 Mon Sep 17 00:00:00 2001
From: unknown <748718190@qq.com>
Date: Thu, 23 Jun 2022 18:12:30 +0800
Subject: [PATCH] 登录

---
 uniapp-wuduhuajiao/pages/user/order/order.vue | 612 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 uniapp-wuduhuajiao/pages/wanl-home/detail.vue |  73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------
 2 files changed, 377 insertions(+), 308 deletions(-)

diff --git a/uniapp-wuduhuajiao/pages/user/order/order.vue b/uniapp-wuduhuajiao/pages/user/order/order.vue
index 43f0d82..534295e 100644
--- a/uniapp-wuduhuajiao/pages/user/order/order.vue
+++ b/uniapp-wuduhuajiao/pages/user/order/order.vue
@@ -1,15 +1,19 @@
 <template>
 	<view class="wanl-order-list">
-		<view class="navbar">
-			<view class="nav-item text-df" v-for="(item, index) in navList" :key="item.state" :class="{ current: tabCurrentIndex === index }" @tap="tabClick(index)">
-				{{ item.text }}
+			<view class="navbar">
+				<view class="nav-item text-df " v-for="(item, index) in navList" :key="item.state"
+					:class="{ list_title: tabCurrentIndex === index }" @tap="tabClick(index)">
+					{{ item.text }}
+					<image src="../../../static/home/border.png"
+						style="position: absolute;width: 40rpx;right: -5rpx;bottom: -10rpx;" mode="widthFix"
+						v-if="tabCurrentIndex==index"></image>
+				</view>
 			</view>
-		</view>
 		<swiper :current="tabCurrentIndex" style="height: calc(100% - 80rpx)" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tag, key) in navList" :key="tag.state">
 				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
 					<!-- 空白页 -->
-					<wanl-empty text="没有找到任何订单"v-if="tag.loaded === true && tag.orderList.length === 0"/>
+					<wanl-empty text="没有找到任何订单" v-if="tag.loaded === true && tag.orderList.length === 0" />
 					<!-- 订单列表 -->
 					<view v-for="(order, okey) in tag.orderList" :key="order.id" class="order-item radius-bock">
 						<view class="head">
@@ -20,12 +24,15 @@
 							</view>
 							<view class="margin-right-bj text-sm">
 								<text class="state" :style="{ color: order.stateTipColor }">{{ order.stateTip }}</text>
-								<text v-if="order.state === 7" class="margin-left-sm wlIcon-lajitong" @tap="deleteOrder(order.id,okey)"></text>
+								<text v-if="order.state === 7" class="margin-left-sm wlIcon-lajitong"
+									@tap="deleteOrder(order.id,okey)"></text>
 							</view>
 						</view>
 						<!-- 商品 -->
-						<view class="goods-box" v-for="(goods, gkey) in order.goods" :key="goods.id" @tap="orderDetails(order.id)">
-							<view class="cu-avatar xl margin-right-bj radius" :style="{backgroundImage: 'url('+$wanlshop.oss(goods.image, 70, 70)+')'}"> </view>
+						<view class="goods-box" v-for="(goods, gkey) in order.goods" :key="goods.id"
+							@tap="orderDetails(order.id)">
+							<view class="cu-avatar xl margin-right-bj radius"
+								:style="{backgroundImage: 'url('+$wanlshop.oss(goods.image, 70, 70)+')'}"> </view>
 							<view class="content margin-right-bj">
 								<view class="describe">
 									<view class="text-cut-2">
@@ -51,30 +58,37 @@
 						</view>
 						<!-- 底部 -->
 						<view class="price-box text-sm flex">
-							<view v-if="order.pay.discount_price > 0" class="margin-right-sm wanl-gray">优惠：<text class="text-price">{{ order.pay.discount_price }}</text></view>
-							<view v-if="order.pay.freight_price > 0" class="margin-right-sm wanl-gray">快递：<text class="text-price">{{ order.pay.freight_price }}</text></view>
+							<view v-if="order.pay.discount_price > 0" class="margin-right-sm wanl-gray">优惠：<text
+									class="text-price">{{ order.pay.discount_price }}</text></view>
+							<view v-if="order.pay.freight_price > 0" class="margin-right-sm wanl-gray">快递：<text
+									class="text-price">{{ order.pay.freight_price }}</text></view>
 							<view>实付款：<text class="text-price">{{ order.pay.price }}</text></view>
 						</view>
 						<view class="action-box padding-bottom-bj" v-if="order.state == 1">
-							<button class="cu-btn round line-black margin-lr-bj" @tap="editAddress(order.id)">修改地址</button>
+							<button class="cu-btn round line-black margin-lr-bj"
+								@tap="editAddress(order.id)">修改地址</button>
 							<button class="cu-btn round line-black" @tap="cancelOrder(order)">取消订单</button>
-							<button class="cu-btn round margin-lr-bj wanl-bg-orange" @tap="paymentOrder(order.id)">立即支付</button>
+							<button class="cu-btn round margin-lr-bj wanl-bg-orange"
+								@tap="paymentOrder(order.id)">立即支付</button>
 						</view>
 						<view class="action-box padding-bottom-bj" v-if="order.state == 2">
 							<button class="cu-btn round line-black" @tap="toChat(order.shop_id)">联系商家</button>
-							<button class="cu-btn round margin-lr-bj wanl-bg-orange" @tap="editAddress(order.id)">修改地址</button>
+							<button class="cu-btn round margin-lr-bj wanl-bg-orange"
+								@tap="editAddress(order.id)">修改地址</button>
 						</view>
 						<view class="action-box padding-bottom-bj" v-if="order.state == 3">
 							<button class="cu-btn round line-black" @tap="onLogistics(order.id)">查看物流</button>
-							<button class="cu-btn round margin-lr-bj wanl-bg-orange" @tap="confirmOrder(order)">确认收货</button>
+							<button class="cu-btn round margin-lr-bj wanl-bg-orange"
+								@tap="confirmOrder(order)">确认收货</button>
 						</view>
 						<view class="action-box padding-bottom-bj" v-if="order.state == 4">
 							<button class="cu-btn round line-black" @tap="onLogistics(order.id)">查看物流</button>
-							<button class="cu-btn round margin-lr-bj line-black" @tap="commentOrder(order.id)">评论订单</button>
+							<button class="cu-btn round margin-lr-bj line-black"
+								@tap="commentOrder(order.id)">评论订单</button>
 						</view>
 					</view>
-					<uni-load-more :status="tag.loadingType" :content-text="contentText"/>
-					<view class="edgeInsetBottom"></view> 
+					<uni-load-more :status="tag.loadingType" :content-text="contentText" />
+					<view class="edgeInsetBottom"></view>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
@@ -82,291 +96,309 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			tabCurrentIndex: 0,
-			navList: [
-				{
-					state: 0,
-					text: '全部',
-					loadingType: 'more',
-					current_page: 1,
-					orderList: []
-				},
-				{
-					state: 1,
-					text: '待支付',
-					loadingType: 'more',
-					current_page: 1,
-					orderList: []
-				},
-				{
-					state: 2,
-					text: '待发货',
-					loadingType: 'more',
-					current_page: 1,
-					orderList: []
-				},
-				{
-					state: 3,
-					text: '待收货',
-					loadingType: 'more',
-					current_page: 1,
-					orderList: []
-				},
-				{
-					state: 4,
-					text: '待评论',
-					loadingType: 'more',
-					current_page: 1,
-					orderList: []
+	export default {
+		data() {
+			return {
+				tabCurrentIndex: 0,
+				navList: [{
+						state: 0,
+						text: '全部',
+						loadingType: 'more',
+						current_page: 1,
+						orderList: []
+					},
+					{
+						state: 1,
+						text: '待支付',
+						loadingType: 'more',
+						current_page: 1,
+						orderList: []
+					},
+					{
+						state: 2,
+						text: '待发货',
+						loadingType: 'more',
+						current_page: 1,
+						orderList: []
+					},
+					{
+						state: 3,
+						text: '待收货',
+						loadingType: 'more',
+						current_page: 1,
+						orderList: []
+					},
+					{
+						state: 4,
+						text: '待评论',
+						loadingType: 'more',
+						current_page: 1,
+						orderList: []
+					}
+					// ,{
+					// 	state: 7,
+					// 	text: '已关闭',
+					// 	loadingType: 'more',
+					// 	current_page: 1,
+					// 	orderList: []
+					// }
+				],
+				contentText: {
+					contentdown: ' ',
+					contentrefresh: '正在加载...',
+					contentnomore: ''
 				}
-				// ,{
-				// 	state: 7,
-				// 	text: '已关闭',
-				// 	loadingType: 'more',
-				// 	current_page: 1,
-				// 	orderList: []
-				// }
-			],
-			contentText: {
-				contentdown: ' ',
-				contentrefresh: '正在加载...',
-				contentnomore: ''
+			};
+		},
+		onLoad(options) {
+			if (!options.state) {
+				options.state = 0;
 			}
-		};
-	},
-	onLoad(options) {
-		if (!options.state) {
-			options.state = 0;
-		}
-		this.tabCurrentIndex = +options.state;
-		// #ifndef MP
-		this.loadData();
-		// #endif
-		// #ifdef MP
-		if (options.state == 0) {
+			this.tabCurrentIndex = +options.state;
+			// #ifndef MP
 			this.loadData();
-		}
-		// #endif
-	},
-	methods: {
-		//获取订单列表
-		loadData(source) {
-			//这里是将订单挂载到tab列表下
-			let index = this.tabCurrentIndex;
-			let navItem = this.navList[index];
-			let state = navItem.state;
-			//判断是否最后一页
-			if (navItem.loadingType == 'noMore') {
-				return;
-			}
-			//tab切换只有第一次需要加载数据
-			if (source === 'tabChange' && navItem.loaded === true) {
-				return;
-			}
-			//防止重复加载
-			if (navItem.loadingType === 'loading') {
-				return;
+			// #endif
+			// #ifdef MP
+			if (options.state == 0) {
+				this.loadData();
 			}
-			navItem.loadingType = 'loading';
-			// 获取列表
-			this.$api.get({
-				url: '/wanlshop/order/getOrderList',
-				data: {
-					state: state,
-					page: navItem.current_page
-				},
-				success: res => {
-					navItem.current_page = res.current_page; //当前页码
-					if (res.last_page === res.current_page) {
-						navItem.loadingType = 'noMore';
-					} else {
-						navItem.loadingType = 'more';
-						navItem.current_page++;
-					}
-					let orderList = res.data.filter(item => {
-						//添加不同状态下订单的表现形式
-						item = Object.assign(item, this.orderStateExp(item.state));
-						//演示数据所以自己进行状态筛选
-						if (state === 0) {
-							//0为全部订单
-							return item;
-						}
-						return item.state === state;
-					});
-					orderList.forEach(item => {
-						navItem.orderList.push(item);
-					});
-					//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
-					this.$set(navItem, 'loaded', true);
-				}
-			});
-		},
-
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadData('tabChange');
+			// #endif
 		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		},
-		//删除订单
-		deleteOrder(order_id, key) {
-			uni.showLoading({
-				title: '请稍后'
-			});
-			this.$api.post({
-				url: '/wanlshop/order/delOrder',
-				data: {
-					id: order_id
-				},
-				success: res => {
-					this.navList[this.tabCurrentIndex].orderList.splice(key, 1);
-					uni.hideLoading();
+		methods: {
+			//获取订单列表
+			loadData(source) {
+				//这里是将订单挂载到tab列表下
+				let index = this.tabCurrentIndex;
+				let navItem = this.navList[index];
+				let state = navItem.state;
+				//判断是否最后一页
+				if (navItem.loadingType == 'noMore') {
+					return;
 				}
-			});
-		},
-		//取消订单- 设置为7 -全局
-		cancelOrder(item) {
-			uni.showLoading({
-				title: '请稍后'
-			});
-			// 获取列表
-			this.$api.post({
-				url: '/wanlshop/order/cancelOrder',
-				data: {
-					id: item.id
-				},
-				success: res => {
-					let { stateTip, stateTipColor } = this.orderStateExp(7);
-					item = Object.assign(item, {
-						state: 7,
-						stateTip,
-						stateTipColor
-					});
-					this.$store.commit('statistics/order', {
-						pay: this.$store.state.statistics.order.pay - 1,
-						whole: this.$store.state.statistics.order.whole - 1
-					});
-					// 取消订单后删除待付款中该项，并修改全部中的状态 1.0.2升级
-					let list = this.navList[1].orderList;
-					let index = list.findIndex(val => val.id === item.id);
-					index !== -1 && list.splice(index, 1);
-					// 删除后修改全部中的为7
-					if (this.tabCurrentIndex == 1) {
-						let list = this.navList[0].orderList;
+				//tab切换只有第一次需要加载数据
+				if (source === 'tabChange' && navItem.loaded === true) {
+					return;
+				}
+				//防止重复加载
+				if (navItem.loadingType === 'loading') {
+					return;
+				}
+				navItem.loadingType = 'loading';
+				// 获取列表
+				this.$api.get({
+					url: '/wanlshop/order/getOrderList',
+					data: {
+						state: state,
+						page: navItem.current_page
+					},
+					success: res => {
+						navItem.current_page = res.current_page; //当前页码
+						if (res.last_page === res.current_page) {
+							navItem.loadingType = 'noMore';
+						} else {
+							navItem.loadingType = 'more';
+							navItem.current_page++;
+						}
+						let orderList = res.data.filter(item => {
+							//添加不同状态下订单的表现形式
+							item = Object.assign(item, this.orderStateExp(item.state));
+							//演示数据所以自己进行状态筛选
+							if (state === 0) {
+								//0为全部订单
+								return item;
+							}
+							return item.state === state;
+						});
+						orderList.forEach(item => {
+							navItem.orderList.push(item);
+						});
+						//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
+						this.$set(navItem, 'loaded', true);
+					}
+				});
+			},
+
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.target.current;
+				this.loadData('tabChange');
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			},
+			//删除订单
+			deleteOrder(order_id, key) {
+				uni.showLoading({
+					title: '请稍后'
+				});
+				this.$api.post({
+					url: '/wanlshop/order/delOrder',
+					data: {
+						id: order_id
+					},
+					success: res => {
+						this.navList[this.tabCurrentIndex].orderList.splice(key, 1);
+						uni.hideLoading();
+					}
+				});
+			},
+			//取消订单- 设置为7 -全局
+			cancelOrder(item) {
+				uni.showLoading({
+					title: '请稍后'
+				});
+				// 获取列表
+				this.$api.post({
+					url: '/wanlshop/order/cancelOrder',
+					data: {
+						id: item.id
+					},
+					success: res => {
+						let {
+							stateTip,
+							stateTipColor
+						} = this.orderStateExp(7);
+						item = Object.assign(item, {
+							state: 7,
+							stateTip,
+							stateTipColor
+						});
+						this.$store.commit('statistics/order', {
+							pay: this.$store.state.statistics.order.pay - 1,
+							whole: this.$store.state.statistics.order.whole - 1
+						});
+						// 取消订单后删除待付款中该项，并修改全部中的状态 1.0.2升级
+						let list = this.navList[1].orderList;
 						let index = list.findIndex(val => val.id === item.id);
-						if (index !== -1) {
-							list[index].state = 7;
+						index !== -1 && list.splice(index, 1);
+						// 删除后修改全部中的为7
+						if (this.tabCurrentIndex == 1) {
+							let list = this.navList[0].orderList;
+							let index = list.findIndex(val => val.id === item.id);
+							if (index !== -1) {
+								list[index].state = 7;
+							}
 						}
+						uni.hideLoading();
 					}
-					uni.hideLoading();
-				}
-			});
-		},
-		commentOrder(id){
-			this.$wanlshop.to('/pages/user/order/comment?order_id=' + id);
-		},
-		//支付订单
-		paymentOrder(id){
-			this.$wanlshop.to(`/pages/user/money/pay?order_id=${id}&order_type=goods`);
-		},
-		//确认收货- 全局
-		confirmOrder(item){
-			uni.showLoading({
-				title: '请稍后'
-			});
-			// 获取列表
-			this.$api.post({
-				url: '/wanlshop/order/confirmOrder',
-				data: {
-					id: item.id
-				},
-				success: res => {
-					let { stateTip, stateTipColor } = this.orderStateExp(4);
-					item = Object.assign(item, {
-						state: 4,
-						stateTip,
-						stateTipColor
-					});
-					this.$store.commit('statistics/order', {
-						receiving: this.$store.state.statistics.order.receiving - 1,
-						evaluate: this.$store.state.statistics.order.evaluate + 1
-					});
-					uni.hideLoading();
+				});
+			},
+			commentOrder(id) {
+				this.$wanlshop.to('/pages/user/order/comment?order_id=' + id);
+			},
+			//支付订单
+			paymentOrder(id) {
+				this.$wanlshop.to(`/pages/user/money/pay?order_id=${id}&order_type=goods`);
+			},
+			//确认收货- 全局
+			confirmOrder(item) {
+				uni.showLoading({
+					title: '请稍后'
+				});
+				// 获取列表
+				this.$api.post({
+					url: '/wanlshop/order/confirmOrder',
+					data: {
+						id: item.id
+					},
+					success: res => {
+						let {
+							stateTip,
+							stateTipColor
+						} = this.orderStateExp(4);
+						item = Object.assign(item, {
+							state: 4,
+							stateTip,
+							stateTipColor
+						});
+						this.$store.commit('statistics/order', {
+							receiving: this.$store.state.statistics.order.receiving - 1,
+							evaluate: this.$store.state.statistics.order.evaluate + 1
+						});
+						uni.hideLoading();
+					}
+				});
+			},
+			//订单状态文字和颜色
+			orderStateExp(state) {
+				let stateTip = '',
+					stateTipColor = '#333';
+				switch (+state) {
+					case 1:
+						stateTip = '等待支付';
+						stateTipColor = '#f40';
+						break;
+					case 2:
+						stateTip = '等待卖家发货';
+						break;
+					case 3:
+						stateTip = '卖家已发货';
+						break;
+					case 4:
+						stateTip = '交易成功';
+						break;
+					case 5:
+						stateTip = '交易成功';
+						break;
+					case 6:
+						stateTip = '已完成';
+						break;
+					case 7:
+						stateTip = '订单已关闭';
+						stateTipColor = '#777';
+						break;
+						//更多自定义
 				}
-			});
-		},
-		//订单状态文字和颜色
-		orderStateExp(state) {
-			let stateTip = '',
-				stateTipColor = '#333';
-			switch (+state) {
-				case 1:
-					stateTip = '等待支付';
-					stateTipColor = '#f40';
-					break;
-				case 2:
-					stateTip = '等待卖家发货';
-					break;
-				case 3:
-					stateTip = '卖家已发货';
-					break;
-				case 4:
-					stateTip = '交易成功';
-					break;
-				case 5:
-					stateTip = '交易成功';
-					break;
-				case 6:
-					stateTip = '已完成';
-					break;
-				case 7:
-					stateTip = '订单已关闭';
-					stateTipColor = '#777';
-					break;
-				//更多自定义
+				return {
+					stateTip,
+					stateTipColor
+				};
+			},
+			getRefund(status) {
+				return ["退款", "退款中", "待退货", "退款完成", "退款关闭", "退款被拒"][status];
+			},
+			// 修改地址
+			editAddress(id) {
+				this.$wanlshop.to('/pages/user/address/address?source=2&order_id=' + id);
+			},
+			//添加或修改成功之后回调
+			async refreshList(address_id, order_id) {
+				uni.showLoading({
+					title: '正在提交新地址'
+				});
+				// 获取列表
+				this.$api.post({
+					url: '/wanlshop/order/editOrderAddress',
+					data: {
+						id: order_id,
+						address_id: address_id
+					},
+					success: res => {
+						this.$wanlshop.msg('地址修改成功');
+						uni.hideLoading();
+					}
+				});
 			}
-			return {
-				stateTip,
-				stateTipColor
-			};
-		},
-		getRefund(status) {
-			return ["退款", "退款中", "待退货", "退款完成", "退款关闭", "退款被拒"][status];
-		},
-		// 修改地址
-		editAddress(id) {
-			this.$wanlshop.to('/pages/user/address/address?source=2&order_id=' + id);
-		},
-		//添加或修改成功之后回调
-		async refreshList(address_id, order_id) {
-			uni.showLoading({
-				title: '正在提交新地址'
-			});
-			// 获取列表
-			this.$api.post({
-				url: '/wanlshop/order/editOrderAddress',
-				data: {
-					id: order_id,
-					address_id: address_id
-				},
-				success: res => {
-					this.$wanlshop.msg('地址修改成功');
-					uni.hideLoading();
-				}
-			});
 		}
-	}
-};
+	};
 </script>
 
-<style>
-page {
-	height: 100%;
-}
+<style lang="scss" scoped>
+	page {
+		height: 100%;
+	}
+
+	.list_title {
+		width: 133%;
+		font-size: 30rpx;
+		font-weight: bold;
+		// height: 100rpx;
+	}
+	.scroll-view-item_H {
+	
+		white-space: nowrap;
+		width: 100%;
+		// height: 390rpx;
+	}
 </style>
diff --git a/uniapp-wuduhuajiao/pages/wanl-home/detail.vue b/uniapp-wuduhuajiao/pages/wanl-home/detail.vue
index 8e448df..90c7324 100644
--- a/uniapp-wuduhuajiao/pages/wanl-home/detail.vue
+++ b/uniapp-wuduhuajiao/pages/wanl-home/detail.vue
@@ -1,33 +1,36 @@
 <template>
 	<view style="background-color: #F7F7F7;">
 		<view class="top flex flex-wrap justify-content-between">
-			<view class="top-list " v-for="(item,index) of 4">
-				<view class="img">
-					<image src="../../static/home/index4.png" mode="aspectFill"></image>
-				</view>
-				<view style="padding: 15rpx;">
-					<view style="font-size: 28rpx;font-weight: bold;" class="title">
-						武都新鲜花椒特麻特香家武都新鲜花椒特麻特香家
+			<view class="top-list " v-for="(item,index) of info.category" :key="index" @click="goNavT(item.id)">
+					<view class="img">
+						<image :src="'http://t1.sherkxuan.cn/'+item.image" v-if="item.image" mode="aspectFill"></image>
 					</view>
-					<view class="text">
-						详情请与客服沟通后再下单
+					<view style="padding: 15rpx;">
+						<view style="font-size: 28rpx;font-weight: bold;" class="title">
+							{{item.name}}
+						</view>
+						<view class="text">
+							详情请与客服沟通后再下单
+						</view>
 					</view>
-				</view>
 			</view>
 		</view>
 
-		<view class="btn flex justify-content-center">
-			<view>点击查看更多</view>
+		<!-- <view class="btn flex justify-content-center">
+			<view >点击查看更多{{show}}</view>
 			<uni-icons type="bottom" size="20" color="#3D3D3D"></uni-icons>
-		</view>
+		</view> -->
 
 		<view style="margin: 20rpx 15rpx;padding-bottom: 20rpx;">
-			<view class="flex justify-content-between list_user" v-for="(item,index) of 3">
+			<view class="flex justify-content-between list_user" v-for="(item,index) of info.user">
 				<view class="flex" style="align-items: center;">
 					<view style="width: 120rpx;">
-						<image src="../../static/header.png" style="width: 100%;" mode="widthFix"></image>
+						<image :src="'http://t1.sherkxuan.cn/'+item.image" style="width: 100%;" mode="widthFix"></image>
 					</view>
-					<view style="color: #A8A8A8;font-size: 26rpx;margin-left: 20rpx;width: 280rpx;" class="title">武都区xx镇xx村村长武都区xx镇xx村村长武都区xx镇xx村村长武都区xx镇xx村村长</view>
+					<view style="color: #A8A8A8;font-size: 26rpx;margin-left: 20rpx;max-width: 180rpx;" class="title">{{item.name}}</view>
+					<view v-if="item.type==1" class="type">村长</view>
+					<view v-if="item.type==2" class="type1">社长</view>
+					<view v-if="item.type==3" class="type2">村民</view>
 				</view>
 
 				<view class="flex justify-content-between">
@@ -43,7 +46,8 @@
 	export default {
 		data() {
 			return {
-
+				info:{},
+				show:false
 			}
 		},
 		onLoad(e) {
@@ -51,7 +55,11 @@
 			this.API.wanlshopGetShopInfo({
 				id:this.id
 			}).then(res=>{
-				console.log(res)
+				this.info=res.data
+				this.info.user=this.info.user.sort((a,b)=>{
+					return a.type-b.type
+				})
+				this.$forceUpdate()
 				uni.setNavigationBarTitle({
 				    title: res.data.shopname
 				   });
@@ -62,6 +70,11 @@
 				uni.navigateTo({
 					url:url
 				})
+			},
+			goNavT(id){
+				uni.navigateTo({
+					url: `/pages/product/goods?id=${id}`
+				})
 			}
 		}
 	}
@@ -136,4 +149,28 @@
 		border-radius: 15rpx;
 		margin-left: 10rpx;
 	}
+	.type{
+		color: #2E607C;
+		background-color: #E3F5FF;
+		font-size: 24rpx;
+		border-radius: 15rpx;
+		padding: 5rpx 20rpx ;
+		margin-left: 20rpx;
+	}
+	.type1{
+		color: #2E7C3B;
+		background-color: #E3FFEE;
+		font-size: 24rpx;
+		border-radius: 15rpx;
+		padding: 5rpx 20rpx ;
+		margin-left: 20rpx;
+	}
+	.type2{
+		color: #7d71b6;
+		background-color: #e1e5ff;
+		font-size: 24rpx;
+		border-radius: 15rpx;
+		padding: 5rpx 20rpx ;
+		margin-left: 20rpx;
+	}
 </style>
--
libgit2 0.21.4