123456

api/user.js

@@ -1,246 +1,238 @@
-import request from '@/utils/request'
-
-//我的推广
-export function tuiguang(data) {
-	return request({
-		url: '/api/dow',
-		method: 'get',
-		data
-	})
-}
-
-//查看子点位
-export function lookSubpoints(data, id) {
-	return request({
-		url: '/api/tree/children/' + id,
-		method: 'get',
-		data
-	})
-}
-//查看自己的点位
-export function lookOneself(data) {
-	return request({
-		url: '/api/tree/points',
-		method: 'get',
-		data
-
-	})
-}
-
-//绑定上级
-export function spread(data) {
-	return request({
-		url: '/api/user/spread',
-		method: 'post',
-		data
-	})
-}
-
-//我的推广
-export function myspread(data) {
-	return request({
-		url: '/api/spread/people',
-		method: 'POST',
-		data
-	});
-}
-
-// 订单统计信息
-export function orderData(data) {
-	return request({
-		url: '/api/order/data',
-		method: 'get',
-		data
-	});
-}
-
-// 获取用户信息
-export function getUserInfo(data) {
-	return request({
-		url: '/api/userinfo',
-		method: 'get',
-		data
-	});
-}
-// 获取用户信息
-export function userinfo(data) {
-	return request({
-		url: '/api/userinfo',
-		method: 'get',
-		data
-	});
-}
-
-// 用户分享图
-export function spreadBanner(data) {
-	return request({
-		url: '/api/spread/banner',
-		method: 'get',
-		data
-	});
-}
-
-// 获取地址列表
-export function getAddressList(data) {
-	return request({
-		url: '/api/address/list',
-		method: 'get',
-		data
-	});
-}
-// 修改地址
-export function addressEdit(data) {
-	return request({
-		url: '/api/address/edit',
-		method: 'post',
-		data
-	});
-}
-// 删除地址
-export function addressDel(data) {
-	return request({
-		url: '/api/address/del',
-		method: 'post',
-		data
-	});
-}
-// 设为默认地址
-export function setAddressDefault(data) {
-	return request({
-		url: '/api/address/default/set',
-		method: 'post',
-		data
-	});
-}
-// 购物车列表
-export function getCartList(data) {
-	return request({
-		url: '/api/cart/list',
-		method: 'get',
-		data
-	});
-}
-
-// 修改购物车数量
-export function getCartNum(data) {
-	return request({
-		url: '/api/cart/num',
-		method: 'post',
-		data
-	});
-}
-//删除购物车
-export function cartDel(data) {
-	return request({
-		url: '/api/cart/del',
-		method: 'post',
-		data
-	});
-}
-//获取收藏夹列表
-export function getcollectList(data) {
-	return request({
-		url: '/api/collect/user',
-		method: 'get',
-		data
-	});
-}
-// 取消收藏
-export function delcollect(data) {
-	return request({
-		url: '/api/collect/del',
-		method: 'post',
-		data
-	});
-}
-
-//积分转账
-export function transfer(data) {
-	return request({
-		url: '/api/trade',
-		method: 'post',
-		data
-	})
-}
-
-//余额转账
-export function yuetransfer(data) {
-	return request({
-		url: '/api/yue/trade',
-		method: 'post',
-		data
-	})
-} //喜嗨购
-export function yueXhg(data) {
-	return request({
-		url: '/api/dow_user',
-		method: 'post',
-		data
-	})
-}
-
-//现金转账
-export function cashtransfer(data) {
-	return request({
-		url: '/api/cash/trade',
-		method: 'post',
-		data
-	})
-}
-
-//用户修改信息
-export function edit(data) {
-	return request({
-		url: '/api/user/edit',
-		method: 'post',
-		data
-	});
-}
-
-// 申请入驻
-export function ssrz(data) {
-	return request({
-		url: '/api/enter/apply',
-		method: 'post',
-		data
-	});
-}
-
-
-
-//商家记录
-export function getShopIntegral(data) {
-	return request({
-		url: '/api/business_integral/list',
-		method: 'get',
-		data
-	})
-}
-//文章列表
-export function article(data, id) {
-	return request({
-		url: '/api/article/list/' + id,
-		method: 'GET',
-		data
-	});
-}
-
-//文章详情
-export function details(data, id) {
-	return request({
-		url: '/api/article/details/' + id,
-		method: 'GET',
-		data
-	});
-}
-
-//种植详情
-export function getJl(data) {
-	return request({
-		url: '/api/many_order/list',
-		method: 'GET',
-		data
-	});
+import request from '@/utils/request'
+
+
+//查看子点位
+export function lookSubpoints(data, id) {
+	return request({
+		url: '/api/tree/children/' + id,
+		method: 'get',
+		data
+	})
+}
+//查看自己的点位
+export function lookOneself(data) {
+	return request({
+		url: '/api/tree/points',
+		method: 'get',
+		data
+
+	})
+}
+
+//绑定上级
+export function spread(data) {
+	return request({
+		url: '/api/user/spread',
+		method: 'post',
+		data
+	})
+}
+
+//我的推广
+export function myspread(data) {
+	return request({
+		url: '/api/spread/people',
+		method: 'POST',
+		data
+	});
+}
+
+// 订单统计信息
+export function orderData(data) {
+	return request({
+		url: '/api/order/data',
+		method: 'get',
+		data
+	});
+}
+
+// 获取用户信息
+export function getUserInfo(data) {
+	return request({
+		url: '/api/userinfo',
+		method: 'get',
+		data
+	});
+}
+// 获取用户信息
+export function userinfo(data) {
+	return request({
+		url: '/api/userinfo',
+		method: 'get',
+		data
+	});
+}
+
+// 用户分享图
+export function spreadBanner(data) {
+	return request({
+		url: '/api/spread/banner',
+		method: 'get',
+		data
+	});
+}
+
+// 获取地址列表
+export function getAddressList(data) {
+	return request({
+		url: '/api/address/list',
+		method: 'get',
+		data
+	});
+}
+// 修改地址
+export function addressEdit(data) {
+	return request({
+		url: '/api/address/edit',
+		method: 'post',
+		data
+	});
+}
+// 删除地址
+export function addressDel(data) {
+	return request({
+		url: '/api/address/del',
+		method: 'post',
+		data
+	});
+}
+// 设为默认地址
+export function setAddressDefault(data) {
+	return request({
+		url: '/api/address/default/set',
+		method: 'post',
+		data
+	});
+}
+// 购物车列表
+export function getCartList(data) {
+	return request({
+		url: '/api/cart/list',
+		method: 'get',
+		data
+	});
+}
+
+// 修改购物车数量
+export function getCartNum(data) {
+	return request({
+		url: '/api/cart/num',
+		method: 'post',
+		data
+	});
+}
+//删除购物车
+export function cartDel(data) {
+	return request({
+		url: '/api/cart/del',
+		method: 'post',
+		data
+	});
+}
+//获取收藏夹列表
+export function getcollectList(data) {
+	return request({
+		url: '/api/collect/user',
+		method: 'get',
+		data
+	});
+}
+// 取消收藏
+export function delcollect(data) {
+	return request({
+		url: '/api/collect/del',
+		method: 'post',
+		data
+	});
+}
+
+//积分转账
+export function transfer(data) {
+	return request({
+		url: '/api/trade',
+		method: 'post',
+		data
+	})
+}
+
+//余额转账
+export function yuetransfer(data) {
+	return request({
+		url: '/api/yue/trade',
+		method: 'post',
+		data
+	})
+} //喜嗨购
+export function yueXhg(data) {
+	return request({
+		url: '/api/dow_user',
+		method: 'post',
+		data
+	})
+}
+
+//现金转账
+export function cashtransfer(data) {
+	return request({
+		url: '/api/cash/trade',
+		method: 'post',
+		data
+	})
+}
+
+//用户修改信息
+export function edit(data) {
+	return request({
+		url: '/api/user/edit',
+		method: 'post',
+		data
+	});
+}
+
+// 申请入驻
+export function ssrz(data) {
+	return request({
+		url: '/api/enter/apply',
+		method: 'post',
+		data
+	});
+}
+
+
+
+//商家记录
+export function getShopIntegral(data) {
+	return request({
+		url: '/api/business_integral/list',
+		method: 'get',
+		data
+	})
+}
+//文章列表
+export function article(data, id) {
+	return request({
+		url: '/api/article/list/' + id,
+		method: 'GET',
+		data
+	});
+}
+
+//文章详情
+export function details(data, id) {
+	return request({
+		url: '/api/article/details/' + id,
+		method: 'GET',
+		data
+	});
+}
+
+//种植详情
+export function getJl(data) {
+	return request({
+		url: '/api/many_order/list',
+		method: 'GET',
+		data
+	});
 }
 
 // 我的nft
@@ -259,7 +251,7 @@ export function myGdList(data) {
 		method: 'get',
 		data
 	});
-}
+}
 
 //获取vip列表
 export function vipList(data) {
@@ -268,7 +260,7 @@ export function vipList(data) {
 		method: 'get',
 		data
 	});
-}
+}
 //开通分公司
 export function vipCompany(data) {
 	return request({
@@ -276,7 +268,7 @@ export function vipCompany(data) {
 		method: 'post',
 		data
 	});
-}
+}
 
 //开通分销商
 export function vipPartner(data) {
@@ -285,7 +277,7 @@ export function vipPartner(data) {
 		method: 'post',
 		data
 	});
-}
+}
 
 //提交意见
 export function proposal(data) {
@@ -295,7 +287,3 @@ export function proposal(data) {
 		data
 	});
 }
-
-
-
-

manifest.json

@@ -2,8 +2,8 @@
     "name" : "艺绘",
     "appid" : "__UNI__E01ACD1",
     "description" : "",
-    "versionName" : "1.0.10",
-    "versionCode" : 110,
+    "versionName" : "1.1.2",
+    "versionCode" : 112,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/user/personal.vue

@@ -1,161 +1,135 @@
-<template>
-	<view class="content">
-		<view class="box" style="margin-top: 60rpx;">
-			<view class="left">
-				头像
-			</view>
-			<view class="right" @click="chooseImg" v-if="img==''">
-				<image class="img" :src="userInfo.avatar" mode=""></image>
-			</view>
-			<view class="right" v-else @click="chooseImg">
-				<image class="img" :src="img" mode=""></image>
-			</view>
-
-		</view>
-		<view class="box">
-			<view class="left">
-				昵称
-			</view>
-			<input class="right" type="text" v-model="name" placeholder="修改昵称" placeholder-class="placeholder" />
-		</view>
-		<view class="box">
-			<view class="left">
-				手机号
-			</view>
-			<view class="right" style="color: #999;">
-				{{phone}}
-			</view>
-		</view>
-		<view class="box">
-			<view class="left">
-				实名认证
-			</view>
-			<view class="right" @click="navTo('/pages/user/realName')"  v-if="userInfo.real_name_check.status==2">
-				未认证 >
-			</view>
-			<view class="right" v-else>
-				{{userInfo.real_name_check.status==1?"已认证":"审批中"}} >
-			</view>
-
-		</view>
-		<button class="button" @click="confirm">提交</button>
-	</view>
-</template>
-
+<template>
+	<view class="content">
+		<view class="box" style="margin-top: 60rpx;">
+			<view class="left">头像</view>
+			<view class="right" @click="chooseImg" v-if="img == ''"><image class="img" :src="userInfo.avatar" mode=""></image></view>
+			<view class="right" v-else @click="chooseImg"><image class="img" :src="img" mode=""></image></view>
+		</view>
+		<view class="box">
+			<view class="left">昵称</view>
+			<input class="right" type="text" v-model="name" placeholder="修改昵称" placeholder-class="placeholder" />
+		</view>
+		<view class="box">
+			<view class="left">手机号</view>
+			<view class="right" style="color: #999;">{{ phone }}</view>
+		</view>
+		<view class="box">
+			<view class="left">实名认证</view>
+			<view class="right" @click="navTo('/pages/user/realName')" v-if="userInfo.real_name_check == null || userInfo.real_name_check.status == 2">未认证 ></view>
+			<view class="right" v-else>{{ userInfo.real_name_check.status == 1 ? '已认证' : '审批中' }} ></view>
+		</view>
+		<button class="button" @click="confirm">提交</button>
+	</view>
+</template>
+
 <script>
-	import { userEdit } from '@/api/set.js';
-	import {realname} from '@/api/index.js'
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		upload
-	} from '@/api/order.js'
-	export default {
-		data() {
-			return {
-				name: '',
-				phone: '',
-				img: '',
-			};
-		},
-		computed: {
-			...mapState('user', ['userInfo'])
-		},
-		onLoad() {
+import { userEdit } from '@/api/set.js';
+import { realname } from '@/api/index.js';
+import { mapState, mapMutations } from 'vuex';
+import { upload } from '@/api/order.js';
+export default {
+	data() {
+		return {
+			name: '',
+			phone: '',
+			img: ''
+		};
+	},
+	computed: {
+		...mapState('user', ['userInfo'])
+	},
+	onLoad() {
+		console.log(this.userInfo);
+		this.name = this.userInfo.nickname;
+		this.phone = this.userInfo.phone;
 		console.log(this.userInfo);
-			this.name = this.userInfo.nickname
-			this.phone = this.userInfo.phone
-			// console.log(this.userInfo)
-		},
-		methods: {
-			chooseImg() {
-				let obj = this
-				uni.chooseImage({
-					count: 1,
-					sourceType: ['album'], //从相册选择
-					success: (e) => {
-						obj.img = e.tempFilePaths[0]
-						// upload({
-						//  	filename: ''
-						// }).then(res=>{
-						//  console.log(res,'res');
-						//  	obj.img = res[0].url
-						// })
-					}
-				})
-			},
-			navTo(url) {
-				uni.navigateTo({
-					url
-				})
-			},
-			confirm() {
-				userEdit({ nickname: this.name, avatar: this.img})
-					.then(e => {
-						this.$api.msg('修改成功');
-						setTimeout(()=> {
-							uni.switchTab({
-								url:'/pages/user/user'
-							});
-						}, 1000);
-						console.log(e);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page,
-	.content {
-		background: #111111;
-		width: 750rpx;
-		height: 100%;
-
-		.box {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin: 0 30rpx;
-			border-bottom: 2rpx solid #AEAEAE;
-			padding: 30rpx 40rpx;
-
-			.left {
-				font-size: 26rpx;
-				font-weight: 500;
-				color: #FFFFFF;
-			}
-
-			.right {
-				font-size: 26rpx;
-				font-weight: 400;
-				color: #FFFFFF;
-text-align: right;
-				.img {
-					width: 80rpx;
-					height: 80rpx;
-					border-radius: 50%;
-					overflow: hidden;
-				}
-			}
-		}
-
-		.button {
-			margin-top: 160rpx;
-			width: 690rpx;
-			height: 80rpx;
-			background: linear-gradient(270deg, #6E8DF7, #9977F6);
-			border-radius: 10rpx;
-			font-size: 30rpx;
-			font-weight: 500;
-			color: #FFFFFF;
-			line-height: 80rpx;
-			
-		}
-	}
+	},
+	methods: {
+		chooseImg() {
+			let obj = this;
+			uni.chooseImage({
+				count: 1,
+				sourceType: ['album'], //从相册选择
+				success: e => {
+					obj.img = e.tempFilePaths[0];
+					// upload({
+					//  	filename: ''
+					// }).then(res=>{
+					//  console.log(res,'res');
+					//  	obj.img = res[0].url
+					// })
+				}
+			});
+		},
+		navTo(url) {
+			uni.navigateTo({
+				url
+			});
+		},
+		confirm() {
+			userEdit({ nickname: this.name, avatar: this.img })
+				.then(e => {
+					this.$api.msg('修改成功');
+					setTimeout(() => {
+						uni.switchTab({
+							url: '/pages/user/user'
+						});
+					}, 1000);
+					console.log(e);
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: #111111;
+	width: 750rpx;
+	height: 100%;
+
+	.box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin: 0 30rpx;
+		border-bottom: 2rpx solid #aeaeae;
+		padding: 30rpx 40rpx;
+
+		.left {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #ffffff;
+		}
+
+		.right {
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #ffffff;
+			text-align: right;
+			.img {
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+				overflow: hidden;
+			}
+		}
+	}
+
+	.button {
+		margin-top: 160rpx;
+		width: 690rpx;
+		height: 80rpx;
+		background: linear-gradient(270deg, #6e8df7, #9977f6);
+		border-radius: 10rpx;
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #ffffff;
+		line-height: 80rpx;
+	}
+}
 </style>

pages/user/team.vue

@@ -1,83 +1,42 @@
 <template>
 	<view class="content">
 		<view class="status_bar"><!-- 这里是状态栏 --></view>
-		<view class="" style="height: 20rpx;">
-			
-		</view>
+		<view class="" style="height: 20rpx;"></view>
 		<view class="user-top flex">
-			id: {{userInfo.uid}}<text style="margin-left: 20rpx;" class="clamp">昵称:{{userInfo.nickname}}</text>
+			id: {{ userInfo.uid }}
+			<text style="margin-left: 20rpx;" class="clamp">昵称:{{ userInfo.nickname }}</text>
 		</view>
 		<view class="yeji-wraper flex">
 			<view class="yeji-item">
-				<view class="yeji-val">
-					{{wlgsbList.price || '0'}}
-				</view>
-				<view class="yeji-name">
-					销售业绩
-				</view>
+				<view class="yeji-val">{{ group_num || '0' }}</view>
+				<view class="yeji-name">团队总人数</view>
 			</view>
 			<view class="yeji-item">
-				<view class="yeji-val">
-					{{wlgsbList.today_price || '0'}}
-				</view>
-				<view class="yeji-name">
-					今日业绩
-				</view>
+				<view class="yeji-val">{{ group_price || '0' }}</view>
+				<view class="yeji-name">总销售额</view>
 			</view>
 			<view class="yeji-item">
-				<view class="yeji-val">
-					{{wlgsbList.yesterday_price || '0'}}
-				</view>
-				<view class="yeji-name">
-					昨日业绩
-				</view>
-			</view>
-		</view>
-		<view class="nav-wraper flex">
-			<view class="nav-item" v-for="(nitem,nindex) in navList" :class="{'action':nindex == tabCurrentIndex}" @click="navClick(nindex)">
-				{{nitem.text}}
+				<view class="yeji-val">{{ group_award || '0' }}</view>
+				<view class="yeji-name">团队奖</view>
 			</view>
 		</view>
+		<!-- <view class="nav-wraper flex">
+			<view class="nav-item" v-for="(nitem, nindex) in navList" :class="{ action: nindex == tabCurrentIndex }" @click="navClick(nindex)">{{ nitem.text }}</view>
+		</view> -->
 		<template v-if="tabCurrentIndex == 0">
-			<view class="wlg-sb flex" style="margin-top: 40rpx;" @click="navto('/pages/user/teamList?key=direct_push')">
-				<view class="">
-					服务直属消费者
-				</view>
-				<view class="">
-					{{wlgsbList.direct_push_count || '0'}}
-				</view>
+			<view class="wlg-sb flex" style="margin-top: 40rpx;" @click="navto('/pages/user/teamList?type=0')">
+				<view class="">直推列表</view>
+				<view class="">></view>
 			</view>
-			<view class="wlg-sb flex" @click="navto('/pages/user/teamList?key=between')">
-				<view class="">
-					服务体系消费者
-				</view>
-				<view class="">
-					{{wlgsbList.between_count || '0'}}
-				</view>
+			<view class="wlg-sb flex" @click="navto('/pages/user/teamList?type=1')">
+				<view class="">间推列表</view>
+				<view class="">></view>
 			</view>
 		</template>
-		<template  v-if="tabCurrentIndex == 1">
-			<view class="wlg-sb flex" style="margin-top: 40rpx;"  @click="navto('/pages/user/teamList?key=user_list')">
-				<view class="">
-					服务茶农
-				</view>
-				<view class="">
-					{{wlgsbList.user_count || '0'}}
-				</view>
-			</view>
-			<!-- <view class="wlg-sb flex">
-				<view class="">
-					服务体系茶农
-				</view>
-				<view class="">
-					0
-				</view>
-			</view> -->
-		</template>
 	</view>
 </template>
 <script>
-import { myspread, tuiguang } from '@/api/user.js';
+import { myspread } from '@/api/user.js';
 import { mapState, mapMutations } from 'vuex';
 export default {
 	data() {
@@ -85,34 +44,16 @@ export default {
 			// 头部图高度
 			maxheight: '',
 			tabCurrentIndex: 0,
-			navList: [
-				{
-					state: 0,
-					text: '消费者',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 1,
-					text: '茶农',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}
-			],
-			all: '',
-			list: '',
-			xsyj: '',
-			jrye: '',
-			zrye: ''
+			group_num: '',
+			group_price: '',
+			group_award: '',
+			direct_push_count: '', //直推人数
+			between_count: '', //间推人数
+			list: ''
 		};
 	},
 	computed: {
 		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
-		...mapState(['wlgsbList']),
 		getPhone() {
 			let reg = /(\d{3})\d{4}(\d{4})/;
 			this.navList.user_list.forEach(e => {
@@ -128,7 +69,7 @@ export default {
 	methods: {
 		...mapMutations(['setSbList']),
 		navClick(index) {
-			this.tabCurrentIndex = index
+			this.tabCurrentIndex = index;
 		},
 		// 页面跳转
 		navto(e) {
@@ -138,10 +79,12 @@ export default {
 		},
 		//获取收入支出信息
 		async loadData(source) {
-			let obj = this
-			tuiguang().then(res => {
+			let obj = this;
+			myspread().then(res => {
 				console.log(res, 'data');
-				obj.setSbList(res.data)
+				this.group_num = res.data.group_num;
+				this.group_price = res.data.group_sells;
+				this.group_award = res.data.group_vip_award;
 			});
 		},
 		// 点击返回 我的页面
@@ -155,312 +98,22 @@ export default {
 </script>
 
 <style lang="scss">
-page {
-	background: #f8f8f8;
-	height: 100%;
+page,
+.content {
+	background: #111111;
+	min-height: 100%;
+	height: auto;
+}
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
 }
-
-// .info-box {
-// 	width: 670rpx;
-// 	height: 186rpx;
-// 	background: #ffffff;
-// 	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-// 	border-radius: 20rpx;
-// 	margin: -100rpx auto 0;
-// 	position: relative;
-// 	z-index: 2;
-
-// 	.info-item {
-// 		width: 50%;
-// 		display: flex;
-// 		flex-direction: column;
-// 		align-items: center;
-// 		line-height: 1;
-
-// 		.info-font {
-// 			font-size: 30rpx;
-// 			font-family: PingFang SC;
-// 			font-weight: bold;
-// 			color: #999999;
-// 		}
-
-// 		.info-num {
-// 			margin-top: 30rpx;
-// 			font-size: 30rpx;
-// 			font-family: PingFang SC;
-// 			font-weight: bold;
-// 			color: #181818;
-// 		}
-// 	}
-
-// 	.shu {
-// 		width: 2rpx;
-// 		height: 74rpx;
-// 		background: #dcdfe6;
-// 	}
-// }
-
-// .status_bar {
-// 	height: var(--status-bar-height);
-// 	width: 100%;
-// 	background: #5dbc7c;
-// }
-
-// .content-money {
-// 	position: relative;
-// 	height: 480rpx;
-
-// 	.content-bg {
-// 		position: absolute;
-// 		top: 0;
-// 		left: 0;
-// 		right: 0;
-// 		width: 750rpx;
-// 		height: 480rpx;
-
-// 		image {
-// 			width: 100%;
-// 			height: 100%;
-// 		}
-// 	}
-
-// 	.body-title {
-// 		height: 80rpx;
-// 		text-align: center;
-// 		font-size: 35rpx;
-// 		position: relative;
-
-// 		.header {
-// 			position: absolute;
-// 			left: 0;
-// 			top: 0;
-// 			width: 100%;
-// 			font-size: 36rpx;
-// 			font-family: PingFang SC;
-// 			font-weight: bold;
-// 			color: #fffeff;
-// 			height: 80rpx;
-// 			font-size: 36rpx;
-// 			font-weight: 700;
-// 			z-index: 9;
-// 			display: flex;
-// 			justify-content: center;
-// 			align-items: center;
-// 		}
-
-// 		.goback-box {
-// 			position: absolute;
-// 			left: 18rpx;
-// 			top: 0;
-// 			height: 80rpx;
-// 			display: flex;
-// 			align-items: center;
-// 		}
-
-// 		.goback {
-// 			z-index: 100;
-// 			width: 34rpx;
-// 			height: 34rpx;
-// 		}
-// 	}
-// }
-
-// .money-box {
-// 	position: relative;
-// 	z-index: 2;
-// 	padding-top: 90rpx;
-// 	color: #ffffff;
-// 	text-align: center;
-
-// 	.money {
-// 		font-size: 72rpx;
-// 		font-family: PingFang SC;
-// 		font-weight: bold;
-// 		color: #ffffff;
-// 	}
-
-// 	.text {
-// 		font-size: 30rpx;
-// 	}
-// }
-
-// .order-item {
-// 	padding: 20rpx 30rpx;
-// 	line-height: 1.5;
-
-// 	.title-box {
-// 		width: 100%;
-
-// 		.title-avatar {
-// 			flex-shrink: 0;
-// 			width: 100rpx;
-// 			height: 100rpx;
-// 			margin-right: 25rpx;
-// 			border-radius: 100%;
-
-// 			image {
-// 				width: 100%;
-// 				height: 100%;
-// 				border-radius: 100%;
-// 			}
-// 		}
-
-// 		.list_tpl {
-// 			width: 85%;
-
-// 			.title {
-// 				display: flex;
-// 				justify-content: flex-start;
-// 				font-size: $font-lg;
-// 				color: $font-color-base;
-// 				overflow: hidden; //超出的文本隐藏
-// 				text-overflow: ellipsis; //溢出用省略号显示
-// 				white-space: nowrap;
-// 				line-height: 1;
-// 				text-align: center;
-
-// 				.title-name {
-// 					max-width: 40%;
-// 				}
-
-// 				.dl {
-// 					margin-left: 10rpx;
-// 					width: 93rpx;
-// 					height: 32rpx;
-// 					border-radius: 16rpx;
-
-// 					image {
-// 						width: 93rpx;
-// 						height: 32rpx;
-// 						border-radius: 16rpx;
-// 					}
-// 				}
-
-// 				.class {
-// 					display: inline-block;
-// 					margin-left: 10rpx;
-// 					padding: 6rpx;
-// 					text-align: center;
-// 					border: 1px solid #2e58ff;
-// 					border-radius: 16rpx;
-// 					font-size: 20rpx;
-// 					font-family: PingFang SC;
-// 					font-weight: 500;
-// 					color: #2e58ff;
-// 				}
-// 			}
-
-// 			.time {
-// 				font-size: $font-base;
-// 				color: $font-color-light;
-// 			}
-// 		}
-// 	}
-
-// 	.money {
-// 		width: 50%;
-// 		text-align: right;
-// 		color: #db1935;
-// 		font-size: $font-lg;
-// 	}
-// }
-
-// .yeji {
-// 	position: relative;
-// 	margin: -72rpx auto 0;
-// 	width: 690rpx;
-// 	height: 143rpx;
-// 	background: #ffffff;
-// 	box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
-// 	border-radius: 10rpx;
-// 	display: flex;
-// 	align-items: center;
-
-// 	.yeji-a {
-// 		width: 50%;
-// 		display: flex;
-// 		flex-direction: column;
-// 		justify-content: center;
-// 		align-items: center;
-
-// 		.yeji-top {
-// 			font-size: 28rpx;
-// 			font-family: PingFang SC;
-// 			font-weight: bold;
-// 			color: #333333;
-// 		}
-
-// 		.yeji-buttom {
-// 			font-size: 42rpx;
-// 			font-family: PingFang SC;
-// 			font-weight: bold;
-// 			color: #333333;
-// 		}
-// 	}
-
-// 	.border {
-// 		width: 1rpx;
-// 		height: 51rpx;
-// 		background: #dddddd;
-// 	}
-// }
-
-// .content-box {
-// 	display: flex;
-// 	justify-content: space-between;
-// 	align-items: center;
-// 	margin: 30rpx;
-
-// 	.content-box-left {
-// 		display: flex;
-
-// 		.left-img {
-// 			width: 100rpx;
-// 			height: 100rpx;
-// 			border-radius: 50%;
-// 			overflow: hidden;
-// 			image {
-// 				width: 100%;
-// 				height: 100%;
-// 			}
-// 		}
-
-// 		.right-title {
-// 			margin-left: 15rpx;
-// 			display: flex;
-// 			flex-direction: column;
-// 			justify-content: space-around;
-
-// 			.top {
-// 				font-weight: 500;
-// 				font-size: 30rpx;
-// 			}
-
-// 			.bottom {
-// 				color: #999999;
-// 			}
-// 		}
-// 	}
-
-// 	.content-box-right {
-// 		display: flex;
-// 		flex-direction: column;
-// 		width: 230rpx;
-// 		color: #999999;
-// 		.state {
-// 			color: red;
-// 		}
-// 		span {
-// 			color: red;
-// 			font-size: 28rpx;
-// 		}
-// 	}
-// }
 .user-top {
+	color: #fff;
 	width: 680rpx;
 	height: 80rpx;
 	line-height: 80rpx;
-	box-shadow: 0 0 10rpx rgba(0,0,0,0.2);
+	box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2);
 	margin: 20rpx auto;
 	border-radius: 8rpx;
 	padding: 0 30rpx;
@@ -470,24 +123,24 @@ page {
 .yeji-wraper {
 	width: 590rpx;
 	height: 134rpx;
-	box-shadow: 0 0 10rpx rgba(0,0,0,0.2);
-	margin:20rpx auto;
+	box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2);
+	margin: 20rpx auto;
 	border-radius: 10rpx;
 	text-align: center;
 	font-size: 28rpx;
+	color: #fff;
 	.yeji-item {
 		width: 33%;
 		.yeji-val {
 			padding-bottom: 20rpx;
 			font-weight: bold;
-			
 		}
 	}
 }
 .nav-wraper {
 	width: 630rpx;
 	height: 80rpx;
-	box-shadow: 0 0 10rpx rgba(0,0,0,0.2);
+	box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2);
 	margin: auto;
 	border-radius: 15rpx;
 	.nav-item {
@@ -504,9 +157,10 @@ page {
 	}
 }
 .wlg-sb {
+	color: #fff;
 	width: 590rpx;
 	height: 140rpx;
-	box-shadow: 0 0 10rpx rgba(0,0,0,0.2);
+	border: 1px solid #fff;
 	margin: 20rpx auto;
 	border-radius: 10rpx;
 	padding: 20rpx;

pages/user/teamList.vue

@@ -4,130 +4,141 @@
 		<view class="" style="background-color: #fff;">
 			<view class="content-box" v-for="item in list">
 				<view class="content-box-left">
-					<view class="left-img">
-						<image :src="item.avatar" mode=""></image>
-					</view>
+					<view class="left-img"><image :src="item.avatar" mode=""></image></view>
 					<view class="right-title">
 						<!-- <view class="top">{{ item.nickname }}</view> -->
 						<view class="bottom">ID:{{ item.uid }}</view>
-						<view class="bottom " style="font-size: 24rpx;">手机号:{{ item.phone }}</view>
+						<view class="bottom " style="font-size: 24rpx;">昵称:{{ item.nickname }}</view>
 					</view>
 				</view>
-				<!-- <view class="content-box-right">
-					<view class="state">{{ item.zt == 0 ? '间推' : '直推' }}</view>
+				<view class="content-box-right">
 					<view class="box-right">
-						参与积分:
-						<span>{{ item.price }}</span>
+						参与金额:
+						<span>{{ item.sells }}</span>
 					</view>
-				</view> -->
+				</view>
 			</view>
 		</view>
-		
 	</view>
 </template>
 
 <script>
-	import {
-		myspread,
-		tuiguang
-	} from '@/api/user.js';
-	import empty from '@/components/empty';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	export default {
-		components: {
-			empty
-		},
-		data() {
-			return {
-				list: [],
-				key: ''
+import { myspread } from '@/api/user.js';
+import empty from '@/components/empty';
+import { mapState, mapMutations } from 'vuex';
+export default {
+	components: {
+		empty
+	},
+	data() {
+		return {
+			list: [],
+			key: '',
+			page: 1,
+			limit: 20,
+			loadingType: 'more'
+		};
+	},
+	computed: {
+		...mapState(['wlgsbList'])
+	},
+	onLoad(opt) {
+		this.key = opt.type * 1;
+	},
+	onShow() {
+		this.loadData();
+	},
+	onReachBottom() {
+		this.loadData();
+	},
+	onReady() {},
+	methods: {
+		...mapMutations(['setSbList']),
+		//获取收入支出信息
+		async loadData(source) {
+			let obj = this;
+			if (obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
+				//防止重复加载
+				return;
 			}
-		},
-		computed: {
-			...mapState(['wlgsbList']),
-		},
-		onLoad(opt) {
-			this.key = opt.key
-		},
-		onShow() {
-			this.loadData();
-		},
-		onReachBottom() {
-
-		},
-		onReady() {
-
-		},
-		methods: {
-			...mapMutations(['setSbList']),
-			//获取收入支出信息
-			async loadData(source) {
-				let obj = this
-				tuiguang().then(res => {
-					console.log(res, 'data');
-					obj.setSbList(res.data)
-					obj.list = res.data[obj.key]
-					console.log(obj.list, 'ddddd')
-				});
-			},
+			// 修改当前对象状态为加载中
+			obj.loadingType = 'loading';
+			myspread({ page: obj.page, limit: obj.limit, grade: obj.key }).then(({ data }) => {
+				obj.list = obj.list.concat(data.list);
+				console.log(obj.list);
+				obj.page++;
+				if (obj.limit == data.list.length) {
+					//判断是否还有数据， 有改为 more， 没有改为noMore
+					obj.loadingType = 'more';
+					return;
+				} else {
+					//判断是否还有数据， 有改为 more， 没有改为noMore
+					obj.loadingType = 'noMore';
+				}
+			});
 		}
 	}
+};
 </script>
 
 <style lang="scss">
-	.content-box {
+.content,
+page {
+	height: auto;
+	min-height: 100%;
+	background: #111;
+}
+.content-box {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	// margin: 30rpx 0;
+	background-color: #111;
+	padding: 0 20rpx 10rpx;
+	border-bottom: 1px solid #fff;
+	.content-box-left {
 		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin: 30rpx 0;
-		background-color: #fff;
-	
-		.content-box-left {
-			display: flex;
-	
-			.left-img {
-				width: 100rpx;
-				height: 100rpx;
-				border-radius: 50%;
-				overflow: hidden;
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-	
-			.right-title {
-				margin-left: 15rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-around;
-	
-				.top {
-					font-weight: 500;
-					font-size: 30rpx;
-				}
-	
-				.bottom {
-					color: #999999;
-				}
+
+		.left-img {
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			overflow: hidden;
+			image {
+				width: 100%;
+				height: 100%;
 			}
 		}
-	
-		.content-box-right {
+
+		.right-title {
+			margin-left: 15rpx;
 			display: flex;
 			flex-direction: column;
-			width: 230rpx;
-			color: #999999;
-			.state {
-				color: red;
+			justify-content: space-around;
+
+			.top {
+				font-weight: 500;
+				font-size: 30rpx;
 			}
-			span {
-				color: red;
-				font-size: 28rpx;
+
+			.bottom {
+				color: #fff;
 			}
 		}
 	}
+
+	.content-box-right {
+		display: flex;
+		flex-direction: column;
+		width: 230rpx;
+		color: #fff;
+		.state {
+			color: red;
+		}
+		span {
+			color: #fff;
+			font-size: 28rpx;
+		}
+	}
+}
 </style>

pages/user/user.vue

@@ -1,19 +1,13 @@
 <template>
 	<view class="container">
 		<view class="title-box">
-			<view class="title-img">
-				<image :src="userInfo.avatar" mode=""></image>
-			</view>
+			<view class="title-img"><image :src="userInfo.avatar" mode=""></image></view>
 			<view class="title-tit">
-				<view class="title-top">
-					{{userInfo.nickname || '游客'}}
-				</view>
+				<view class="title-top">{{ userInfo.nickname || '游客' }}</view>
 				<view class="title-bottom">
-					<text class="padding-r-10">{{userInfo.phone}}</text>
-					<text v-if="userInfo.is_company==1">分公司</text>
-					<text v-else>
-						{{userInfo.is_partner==1?'分销商':''}}
-					</text>
+					<text class="padding-r-10">{{ userInfo.phone }}</text>
+					<text v-if="userInfo.is_company == 1">分公司</text>
+					<text v-else>{{ userInfo.is_partner == 1 ? '分销商' : '' }}</text>
 				</view>
 			</view>
 		</view>
@@ -38,7 +32,7 @@
 					<image class="oitem-image" src="../../static/user/dsh.png" mode=""></image>
 					<view class="oitem-font">待收货</view>
 				</view>
-				<view class="oitem" @click="navTo('/pages/order/order?state=3')">
+				<view class="oitem" @click="navTo('/pages/order/order?state=2')">
 					<image class="oitem-image" src="../../static/user/dfk.png" mode=""></image>
 					<view class="oitem-font">已完成</view>
 				</view>
@@ -46,69 +40,41 @@
 		</view>
 		<view class="manage-box">
 			<view class="manage" @click="navTo('/pages/order/orderSC')">
-				<view class="flex-center">
-					<image src="../../static/user/user13.png" mode="widthFix"></image>
-				</view>
-				<view class="manage-title">
-					市场未付
-				</view>
+				<view class="flex-center"><image src="../../static/user/user13.png" mode="widthFix"></image></view>
+				<view class="manage-title">市场未付</view>
 			</view>
 			<view class="manage" @click="navTo('/pages/money/wallet')">
-				<view class="flex-center">
-					<image src="../../static/user/user06.png" mode="widthFix"></image>
-				</view>
-				<view class="manage-title">
-					钱包
-				</view>
+				<view class="flex-center"><image src="../../static/user/user06.png" mode="widthFix"></image></view>
+				<view class="manage-title">钱包</view>
 			</view>
 			<view class="manage" @click="navTo('/pages/user/myvip')">
-				<view class="flex-center">
-					<image src="../../static/user/user12.png" mode="widthFix"></image>
-				</view>
-				<view class="manage-title">
-					加盟
-				</view>
+				<view class="flex-center"><image src="../../static/user/user12.png" mode="widthFix"></image></view>
+				<view class="manage-title">加盟</view>
 			</view>
 			<view class="manage" @click="navTo('/pages/user/personal')">
-				<view class="flex-center">
-					<image src="../../static/user/user08.png" mode="widthFix"></image>
-				</view>
-				<view class="manage-title">
-					实名认证
-				</view>
+				<view class="flex-center"><image src="../../static/user/user08.png" mode="widthFix"></image></view>
+				<view class="manage-title">实名认证</view>
 			</view>
 			<view class="manage" @click="navTo('/pages/user/shareQrCode')">
-				<view class="flex-center">
-					<image src="../../static/user/user05.png" mode="widthFix"></image>
-				</view>
-				<view class="manage-title">
-					邀请好友
-				</view>
+				<view class="flex-center"><image src="../../static/user/user05.png" mode="widthFix"></image></view>
+				<view class="manage-title">邀请好友</view>
 			</view>
 			<view class="manage" @click="kfOpen()">
-				<view class="flex-center">
-					<image src="../../static/user/kf.png" mode="widthFix"></image>
-				</view>
-				<view class="manage-title">
-					联系客服
-				</view>
+				<view class="flex-center"><image src="../../static/user/kf.png" mode="widthFix"></image></view>
+				<view class="manage-title">联系客服</view>
 			</view>
 
 			<view class="manage" @click="navTo('/pages/user/feedback')">
-				<view class="flex-center">
-					<image src="../../static/user/user09.png" mode="widthFix"></image>
-				</view>
-				<view class="manage-title">
-					提交意见
-				</view>
+				<view class="flex-center"><image src="../../static/user/user09.png" mode="widthFix"></image></view>
+				<view class="manage-title">提交意见</view>
 			</view>
 			<view class="manage" @click="navTo('/pages/set/set')">
-				<view class="flex-center">
-					<image src="../../static/user/user07.png" mode="widthFix"></image>
-				</view>
-				<view class="manage-title">
-					设置
-				</view>
+				<view class="flex-center"><image src="../../static/user/user07.png" mode="widthFix"></image></view>
+				<view class="manage-title">设置</view>
+			</view>
+			<view class="manage" @click="navTo('/pages/user/team')">
+				<view class="flex-center"><image src="../../static/user/user14.png" mode="widthFix"></image></view>
+				<view class="manage-title">我的推广</view>
 			</view>
 			<!-- <view class="manage" @click="navTo('/pages/user/about')">
 				<view class="flex-center">
@@ -120,56 +86,40 @@
 			</view> -->
 		</view>
 		<view class="navbar">
-			<view class="nav-item" v-for="(item,index) in navList" :class="{current:tabCurrentIndex===index}"
-				@click="navGet(index)">
-				{{item.text}}
-			</view>
+			<view class="nav-item" v-for="(item, index) in navList" :class="{ current: tabCurrentIndex === index }" @click="navGet(index)">{{ item.text }}</view>
 		</view>
-		<view v-for="(navitem,key) in navList" v-if="key==tabCurrentIndex">
+		<view v-for="(navitem, key) in navList" v-if="key == tabCurrentIndex">
 			<scroll-view scroll-y="true" class="uni-scroll-view-content ">
 				<u-empty v-if="navitem.orderList && navitem.orderList.length == 0 && navitem.loaded"></u-empty>
 				<view class="flex dy-list">
 					<view class="box-content" v-for="item in navitem.orderList">
-						<view class="img">
-							<image :src="item.class_info.uri" mode=""></image>
-						</view>
+						<view class="img"><image :src="item.class_info.uri" mode=""></image></view>
 						<view class="content-title">
 							<view class="title">
-								<view class="text clamp">
-									{{item.class_info.name}}
-								</view>
-								<view class="zm" v-if="item.hang!=null">
-									转卖中
-								</view>
+								<view class="text clamp">{{ item.class_info.name }}</view>
+								<view class="zm" v-if="item.hang != null">转卖中</view>
 							</view>
 							<view class="content-price">
 								<view class="price">
-									￥{{item.price}}
+									￥{{ item.price }}
 
 									<!-- ￥{{item.class_info.name}} -->
 								</view>
-								<view class="" v-show="tabCurrentIndex!=1">
-									<view class="button" @click="navPop(item)" v-if="item.hang==null ">
-										卖出
-									</view>
-									<view class="button" @click="qxMai(item.hang.id)" v-else>
-										取消卖出
-									</view>
+								<view class="" v-show="tabCurrentIndex != 1">
+									<view class="button" @click="navPop(item)" v-if="item.hang == null">卖出</view>
+									<view class="button" @click="qxMai(item.hang.id)" v-else>取消卖出</view>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-				<uni-load-more :status="navitem.loadingType" v-if="!(navitem.orderList.length == 0 && navitem.loaded)">
-				</uni-load-more>
+				<uni-load-more :status="navitem.loadingType" v-if="!(navitem.orderList.length == 0 && navitem.loaded)"></uni-load-more>
 			</scroll-view>
 		</view>
 		<!-- 客服 -->
 		<uni-popup ref="popupkf" type="center">
 			<view class="popup-box">
-				<view class="img">
-					<image src="../../static/img/img009.png" mode=""></image>
-				</view>
+				<view class="img"><image src="../../static/img/img009.png" mode=""></image></view>
 				<view class="mian">
 					<view class="delivery">
 						<view class="title">已经为您定制专属客服</view>
@@ -185,78 +135,51 @@
 		</uni-popup>
 		<uni-popup ref="maipop" type="center">
 			<view class="mai-box">
-				<view class="mai-title">
-					卖出价格
-				</view>
-				<input type="number" v-model="money" placeholder="请输入">
+				<view class="mai-title">卖出价格</view>
+				<input type="number" v-model="money" placeholder="请输入" />
 				<view class="mai-button">
-					<view class="button-left" @click="maiClose()">
-						取消
-					</view>
-					<view class="button-right" @click="buy()">
-						确定
-					</view>
+					<view class="button-left" @click="maiClose()">取消</view>
+					<view class="button-right" @click="buy()">确定</view>
 				</view>
 			</view>
 		</uni-popup>
 		<uni-popup ref="qumaipop" type="center">
 			<view class="mai-box">
-				<view class="mai-title">
-					提示
-				</view>
-				<view class="mai-title">
-					您正在转卖这件藏品确认取消卖出?
-				</view>
+				<view class="mai-title">提示</view>
+				<view class="mai-title">您正在转卖这件藏品确认取消卖出?</view>
 				<view class="mai-button">
-					<view class="button-left" @click="maiClose()">
-						取消
-					</view>
-					<view class="button-right" @click="quxbuy(item)">
-						确定
-					</view>
+					<view class="button-left" @click="maiClose()">取消</view>
+					<view class="button-right" @click="quxbuy(item)">确定</view>
 				</view>
 			</view>
 		</uni-popup>
 	</view>
 </template>
 <script>
-	import {
-		sell,
-		qxgd
-	} from '@/api/order.js'
-	import uniCopy from '@/js_sdk/xb-copy/uni-copy.js';
-	import uEmpty from '@/uview-ui/components/u-empty/u-empty.vue'
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import uniList from '@/components/uni-list/uni-list.vue';
-	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-	import {
-		orderData,
-		getUserInfo,
-		getMyNft,
-		myGdList
-	} from '@/api/user.js';
-	import {
-		saveUrl,
-		interceptor
-	} from '@/utils/loginUtils.js';
-	export default {
-		components: {
-			uniList,
-			uniListItem,
-			uEmpty
-		},
-		data() {
-			return {
-				id: 0,
-				item: '', //当前选中要操作卖出商品的数据
-				money: '', //卖出价格
-				kfWX: 'liuniu', //客服微信
-				// 头部图高度
-				tabCurrentIndex: 0,
-				navList: [{
+import { sell, qxgd } from '@/api/order.js';
+import uniCopy from '@/js_sdk/xb-copy/uni-copy.js';
+import uEmpty from '@/uview-ui/components/u-empty/u-empty.vue';
+import { mapState, mapMutations } from 'vuex';
+import uniList from '@/components/uni-list/uni-list.vue';
+import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+import { orderData, getUserInfo, getMyNft, myGdList } from '@/api/user.js';
+import { saveUrl, interceptor } from '@/utils/loginUtils.js';
+export default {
+	components: {
+		uniList,
+		uniListItem,
+		uEmpty
+	},
+	data() {
+		return {
+			id: 0,
+			item: '', //当前选中要操作卖出商品的数据
+			money: '', //卖出价格
+			kfWX: 'liuniu', //客服微信
+			// 头部图高度
+			tabCurrentIndex: 0,
+			navList: [
+				{
 					state: 0,
 					text: '我拥有的',
 					loadingType: 'more',
@@ -264,7 +187,8 @@
 					page: 1,
 					limit: 10,
 					loaded: false
-				}, {
+				},
+				{
 					state: 1,
 					text: '我卖出的',
 					loadingType: 'more',
@@ -272,14 +196,16 @@
 					page: 1,
 					limit: 10,
 					loaded: false
-				}],
-			};
-		},
-		onShow() {
-			if (this.hasLogin) {
-				this.loadBaseData();
-				// 返回页面刷新我的挂单数据
-				this.navList = [{
+				}
+			]
+		};
+	},
+	onShow() {
+		if (this.hasLogin) {
+			this.loadBaseData();
+			// 返回页面刷新我的挂单数据
+			this.navList = [
+				{
 					state: 0,
 					text: '我拥有的',
 					loadingType: 'more',
@@ -287,7 +213,8 @@
 					page: 1,
 					limit: 10,
 					loaded: false
-				}, {
+				},
+				{
 					state: 1,
 					text: '我卖出的',
 					loadingType: 'more',
@@ -295,682 +222,675 @@
 					page: 1,
 					limit: 10,
 					loaded: false
-				}]
-				// 获取我的挂单
-				this.getMyNft()
-			} else {
-				this.loadBaseData();
-			}
-		},
-		onReady() {},
-		computed: {
-			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-		},
-		methods: {
-			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-			loadBaseData() {
-				getUserInfo({})
-					.then(({
-						data
-					}) => {
-						this.setUserInfo(data);
-						// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
-						orderData({})
-							.then(({
-								data
-							}) => {
-								this.setOrderInfo(data);
-							})
-							.catch(e => {
-								this.setOrderInfo({
-									complete_count: 0, //完成
-									received_count: 0, //待收货
-									unshipped_count: 0, //待发货
-									order_count: 0, //订单总数
-									unpaid_count: 0 //待付款
-								});
-							});
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			navPop(item) {
-				this.item = item
-				this.$refs.maipop.open()
-
-			},
-
-			buy() {
-				let obj = this
-				console.log(obj.item, 'item');
-				if (obj.price == '') {
-					obj.$api.msg('请输入价格')
-					return
 				}
-				sell({
-					price: obj.money
-				}, obj.item.id).then(res => {
-					console.log(res, 'res');
-					uni.showModal({
-						title: '成功',
-						content: '挂售成功!',
-						showCancel: false,
-					});
-					obj.$refs.maipop.close()
-				})
-			},
-			//取消卖出弹窗
-			qxMai(item) {
-				this.$refs.qumaipop.open()
-				console.log(item, 'id');
-				this.id = item
-			},
-			// 取消挂单
-			quxbuy() {
-				qxgd({}, this.id).then(res => {
-					console.log(res, "取消挂单");
-					this.$refs.qumaipop.close()
-					uni.showModal({
-						title: '成功',
-						content: '已成功取消挂单',
-						showCancel: false,
-					});
+			];
+			// 获取我的挂单
+			this.getMyNft();
+		} else {
+			this.loadBaseData();
+		}
+	},
+	onReady() {},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	methods: {
+		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+		loadBaseData() {
+			getUserInfo({})
+				.then(({ data }) => {
+					this.setUserInfo(data);
+					// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
+					orderData({})
+						.then(({ data }) => {
+							this.setOrderInfo(data);
+						})
+						.catch(e => {
+							this.setOrderInfo({
+								complete_count: 0, //完成
+								received_count: 0, //待收货
+								unshipped_count: 0, //待发货
+								order_count: 0, //订单总数
+								unpaid_count: 0 //待付款
+							});
+						});
 				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+		navPop(item) {
+			this.item = item;
+			this.$refs.maipop.open();
+		},
 
-			},
-
-			navGet(index) {
-				this.tabCurrentIndex = index
-				this.getMyNft('tab')
-			},
-			//swiper切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current
-				this.getMyNft('tab')
-			},
-			async loadData(sourse) {},
-			navTo(url) {
-				if (url == '') {
-					this.$api.msg('敬请期待');
-				}
-				//判断是否登录了,没有等去,请去登录
-				if (!this.hasLogin) {
-					//保存地址
-					saveUrl();
-					// 登录拦截
-					interceptor();
-					// uni.showModal({
-					// 	title:'去登录'
-					// })
-					// uni.navigateTo({
-					// 	url,
-					// 	fail() {
-					// 		uni.switchTab({
-					// 			url
-					// 		});
-					// 	}
-					// });
-				} else {
-					uni.navigateTo({
-						url,
-						fail() {
-							uni.switchTab({
-								url
-							});
-						}
-					});
-				}
-			},
-			// 客服打开
-			kfOpen() {
-				this.$refs.popupkf.open();
-			},
-			// 客服关闭
-			kfClose() {
-				this.$refs.popupkf.close();
-			},
-			// 赋值客服
-			uniCopy(text) {
-				this.$refs.popupkf.close();
-				const a = uniCopy(text)
-				if (a) {
-					uni.showModal({
-						title: '提示',
-						content: '复制成功',
-						showCancel: false,
-					});
-				}
-			},
-			maiClose() {
-				this.$refs.maipop.close();
-				this.$refs.qumaipop.close();
-			},
-			getMyNft(type) {
-				let obj = this
-				let index = obj.tabCurrentIndex
-				let navitem = obj.navList[index]
-				if (type == 'tab' && navitem.loaded) {
-					return
-				}
-				if (navitem.loadingType == 'loading' || navitem.loadingType == 'noMore') {
-					return
-				}
-				navitem.loadingType = 'loading'
-				if (index == 0) {
-					getMyNft({
-						page: navitem.page,
-						limit: navitem.limit
-					}).then(res => {
-						// console.log(res, 'res');
-						navitem.orderList = navitem.orderList.concat(res.data.list)
-						navitem.page++
-						if (res.data.list.length == navitem.limit) {
-							navitem.loadingType = 'more'
-						} else {
-							navitem.loadingType = 'noMore'
-						}
-						obj.$set(navitem, 'loaded', true)
-					})
-				}
-				if (index == 1) {
-					console.log('get22')
-					myGdList({
-						page: navitem.page,
-						limit: navitem.limit,
-						status: 2,
-					}).then(res => {
-						navitem.orderList = navitem.orderList.concat(res.data.list)
-						console.log(navitem.orderList, 'navitem.orderList');
-						navitem.page++
-						if (res.data.list.length == navitem.limit) {
-							navitem.loadingType = 'more'
-						} else {
-							navitem.loadingType = 'noMore'
-						}
-						obj.$set(navitem, 'loaded', true)
-					})
-				}
+		buy() {
+			let obj = this;
+			console.log(obj.item, 'item');
+			if (obj.price == '') {
+				obj.$api.msg('请输入价格');
+				return;
 			}
+			sell(
+				{
+					price: obj.money
+				},
+				obj.item.id
+			).then(res => {
+				console.log(res, 'res');
+				uni.showModal({
+					title: '成功',
+					content: '挂售成功!',
+					showCancel: false
+				});
+				obj.$refs.maipop.close();
+			});
+		},
+		//取消卖出弹窗
+		qxMai(item) {
+			this.$refs.qumaipop.open();
+			console.log(item, 'id');
+			this.id = item;
+		},
+		// 取消挂单
+		quxbuy() {
+			qxgd({}, this.id).then(res => {
+				console.log(res, '取消挂单');
+				this.$refs.qumaipop.close();
+				uni.showModal({
+					title: '成功',
+					content: '已成功取消挂单',
+					showCancel: false
+				});
+			});
+		},
 
+		navGet(index) {
+			this.tabCurrentIndex = index;
+			this.getMyNft('tab');
+		},
+		//swiper切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.getMyNft('tab');
+		},
+		async loadData(sourse) {},
+		navTo(url) {
+			if (url == '') {
+				this.$api.msg('敬请期待');
+			}
+			//判断是否登录了,没有等去,请去登录
+			if (!this.hasLogin) {
+				//保存地址
+				saveUrl();
+				// 登录拦截
+				interceptor();
+				// uni.showModal({
+				// 	title:'去登录'
+				// })
+				// uni.navigateTo({
+				// 	url,
+				// 	fail() {
+				// 		uni.switchTab({
+				// 			url
+				// 		});
+				// 	}
+				// });
+			} else {
+				uni.navigateTo({
+					url,
+					fail() {
+						uni.switchTab({
+							url
+						});
+					}
+				});
+			}
+		},
+		// 客服打开
+		kfOpen() {
+			this.$refs.popupkf.open();
+		},
+		// 客服关闭
+		kfClose() {
+			this.$refs.popupkf.close();
+		},
+		// 赋值客服
+		uniCopy(text) {
+			this.$refs.popupkf.close();
+			const a = uniCopy(text);
+			if (a) {
+				uni.showModal({
+					title: '提示',
+					content: '复制成功',
+					showCancel: false
+				});
+			}
+		},
+		maiClose() {
+			this.$refs.maipop.close();
+			this.$refs.qumaipop.close();
+		},
+		getMyNft(type) {
+			let obj = this;
+			let index = obj.tabCurrentIndex;
+			let navitem = obj.navList[index];
+			if (type == 'tab' && navitem.loaded) {
+				return;
+			}
+			if (navitem.loadingType == 'loading' || navitem.loadingType == 'noMore') {
+				return;
+			}
+			navitem.loadingType = 'loading';
+			if (index == 0) {
+				getMyNft({
+					page: navitem.page,
+					limit: navitem.limit
+				}).then(res => {
+					// console.log(res, 'res');
+					navitem.orderList = navitem.orderList.concat(res.data.list);
+					navitem.page++;
+					if (res.data.list.length == navitem.limit) {
+						navitem.loadingType = 'more';
+					} else {
+						navitem.loadingType = 'noMore';
+					}
+					obj.$set(navitem, 'loaded', true);
+				});
+			}
+			if (index == 1) {
+				console.log('get22');
+				myGdList({
+					page: navitem.page,
+					limit: navitem.limit,
+					status: 2
+				}).then(res => {
+					navitem.orderList = navitem.orderList.concat(res.data.list);
+					console.log(navitem.orderList, 'navitem.orderList');
+					navitem.page++;
+					if (res.data.list.length == navitem.limit) {
+						navitem.loadingType = 'more';
+					} else {
+						navitem.loadingType = 'noMore';
+					}
+					obj.$set(navitem, 'loaded', true);
+				});
+			}
 		}
-	};
+	}
+};
 </script>
 <style lang="scss">
-	page,
-	.container {
-		width: 750rpx;
-		height: 100%;
-		background: #111111;
+page,
+.container {
+	width: 750rpx;
+	height: 100%;
+	background: #111111;
+}
+
+.mai-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: space-around;
+	width: 582rpx;
+	height: 377rpx;
+	background: #ffffff;
+	border-radius: 20rpx;
+
+	.mai-title {
+		margin: 0 60rpx;
+		font-size: 42rpx;
+		font-weight: 500;
+		color: #0c1732;
+		line-height: 56rpx;
 	}
 
-	.mai-box {
+	input {
+		width: 494rpx;
+		height: 90rpx;
+		font-size: 40rpx;
+		background: rgba(199, 212, 255, 0.35);
+		border-radius: 10rpx;
+		text-align: center;
+	}
+
+	.mai-button {
 		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: space-around;
-		width: 582rpx;
-		height: 377rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx;
-
-		.mai-title {
-			margin: 0 60rpx;
-			font-size: 42rpx;
+		width: 90%;
+		justify-content: space-between;
+
+		.button-left {
+			text-align: center;
+			width: 248rpx;
+			height: 78rpx;
+			border: 2rpx solid #a581ff;
+			border-radius: 10rpx;
+			font-size: 34rpx;
 			font-weight: 500;
-			color: #0C1732;
-			line-height: 56rpx;
+			color: #a581ff;
+			line-height: 78rpx;
 		}
 
-		input {
-			width: 494rpx;
-			height: 90rpx;
-			font-size: 40rpx;
-			background: rgba(199, 212, 255, 0.3500);
-			border-radius: 10rpx;
+		.button-right {
 			text-align: center;
+			width: 248rpx;
+			height: 78rpx;
+			background: linear-gradient(270deg, #6e8df7, #9977f6);
+			border-radius: 10rpx;
+			font-size: 34rpx;
+			font-weight: 500;
+			color: #ffffff;
+			line-height: 78rpx;
+		}
+	}
+}
+
+.title-box {
+	margin: 80rpx 0 40rpx 0;
+	display: flex;
+	align-items: center;
+
+	.title-img {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		overflow: hidden;
+
+		image {
+			width: 100%;
+			height: 100%;
 		}
+	}
 
-		.mai-button {
-			display: flex;
-			width: 90%;
-			justify-content: space-between;
-
-			.button-left {
-				text-align: center;
-				width: 248rpx;
-				height: 78rpx;
-				border: 2rpx solid #A581FF;
-				border-radius: 10rpx;
-				font-size: 34rpx;
-				font-weight: 500;
-				color: #A581FF;
-				line-height: 78rpx;
-			}
+	.title-tit {
+		margin-left: 30rpx;
+		flex-grow: 1;
+		.title-top {
+			font-size: 36rpx;
+			font-weight: 500;
+			color: #ffffff;
+			line-height: 50rpx;
+		}
 
-			.button-right {
-				text-align: center;
-				width: 248rpx;
-				height: 78rpx;
-				background: linear-gradient(270deg, #6E8DF7, #9977F6);
-				border-radius: 10rpx;
-				font-size: 34rpx;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 78rpx;
-			}
+		.title-bottom {
+			font-size: 22rpx;
+			font-weight: 500;
+			color: #ffffff;
+			line-height: 40rpx;
 		}
 	}
+}
+
+.address-box {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin: 0 30rpx;
+	height: 60rpx;
+	background: #181818;
+	border: 2rpx solid #7d5fa4;
+	border-radius: 8rpx;
+	font-size: 20rpx;
+	font-weight: 500;
+	line-height: 61rpx;
+	color: #5c5ee5;
+
+	.address-text {
+		margin: 0 25rpx;
+		width: 520rpx;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
 
-	.title-box {
-		margin: 80rpx 0 40rpx 0;
+	.fuzhi {
+		width: 86rpx;
+		height: 40rpx;
+		border-radius: 10rpx;
+		border: 2px solid #7d5fa4;
+		text-align: center;
+		line-height: 32rpx;
+		margin-right: 40rpx;
+	}
+}
+
+.manage-box {
+	margin: 30rpx auto;
+	width: 690rpx;
+	display: flex;
+	justify-content: left;
+	background: #181818;
+	border-radius: 30rpx;
+	flex-wrap: wrap;
+
+	.manage {
 		display: flex;
+		flex-direction: column;
 		align-items: center;
+		margin: 30rpx 0 20rpx;
+		width: 25%;
 
-		.title-img {
-			width: 100rpx;
-			height: 100rpx;
-			border-radius: 50%;
-			overflow: hidden;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
+		.flex-center {
+			min-height: 60rpx;
 		}
 
-		.title-tit {
-			margin-left: 30rpx;
-			flex-grow: 1;
-			.title-top {
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 50rpx;
-			}
+		image {
+			width: 42rpx;
+			margin-bottom: 15rpx;
+		}
 
-			.title-bottom {
-				font-size: 22rpx;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 40rpx;
-			}
+		.manage-title {
+			font-size: 24rpx;
+			font-weight: 500;
+			color: #ffffff;
+			line-height: 42rpx;
 		}
 	}
+}
 
+.vheigh {
+	height: var(--status-bar-height);
+}
 
-	.address-box {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin: 0 30rpx;
-		height: 60rpx;
-		background: #181818;
-		border: 2rpx solid #7D5FA4;
-		border-radius: 8rpx;
-		font-size: 20rpx;
-		font-weight: 500;
-		line-height: 61rpx;
-		color: #5C5EE5;
-
-		.address-text {
-			margin: 0 25rpx;
-			width: 520rpx;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			overflow: hidden;
-		}
+.navbar {
+	margin-top: 30rpx;
+	display: flex;
 
-		.fuzhi {
-			width: 86rpx;
-			height: 40rpx;
-			border-radius: 10rpx;
-			border: 2px solid #7D5FA4;
-			text-align: center;
-			line-height: 32rpx;
-			margin-right: 40rpx;
+	justify-content: space-around;
+	font-size: 24rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #999999;
+	line-height: 42rpx;
+
+	.current {
+		color: #5c5ee5;
+	}
+}
+
+.uni-scroll-view-content {
+	height: 100%;
+	flex-wrap: wrap;
+}
+
+.box {
+	display: flex;
+	// justify-content: space-around;
+	flex-wrap: wrap;
+	width: 750rpx;
+}
+
+.box-content {
+	width: 330rpx;
+	height: 415rpx;
+	// margin:0 15rpx 50rpx ;
+
+	.img {
+		width: 330rpx;
+		height: 280rpx;
 
+		image {
+			width: 100%;
+			height: 100%;
 		}
 	}
 
-	.manage-box {
-		margin: 30rpx auto;
-		width: 690rpx;
+	.content-title {
+		z-index: 99;
 		display: flex;
-		justify-content: left;
-		background: #181818;
-		border-radius: 30rpx;
-		flex-wrap: wrap;
 
-		.manage {
+		margin-top: -10rpx;
+		padding: 20rpx;
+		flex-direction: column;
+		border-bottom-left-radius: 10rpx;
+		border-bottom-right-radius: 10rpx;
+		border: 2rpx solid #533a6a;
+		// box-shadow: 0px 0px 20rpx 0px rgba(79,59,103,0.0600);
+
+		.title {
 			display: flex;
-			flex-direction: column;
 			align-items: center;
-			margin: 30rpx 0 20rpx;
-			width: 25%;
-
-			.flex-center {
-				min-height: 60rpx;
-			}
-
-			image {
-				width: 42rpx;
-				margin-bottom: 15rpx;
-			}
+			// font-size: 39rpx;
+			// font-weight: bold;
+			// color: #FFFFFF;
+			// margin-bottom: 20rpx;
+		}
 
-			.manage-title {
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 42rpx;
-			}
+		.zm {
+			flex-shrink: 0;
+			// margin: 10rpx;
+			// width: 63rpx;
+			display: inline-block;
+			// padding: 2rpx;
+			// height: 30rpx;
+			// border: 1rpx solid #5C5EE5;
+			margin-left: 10rpx;
+			border-radius: 5rpx;
+			font-size: 16rpx;
+			font-weight: 500;
+			color: #5c5ee5;
+			// line-height: 30rpx;
+			text-align: center;
 		}
-	}
 
-	.vheigh {
-		height: var(--status-bar-height);
+		.text {
+			color: #ffffff;
+			font-size: 24rpx;
+			margin: 10rpx 0;
+		}
 	}
 
-	.navbar {
-		margin-top: 30rpx;
+	.content-price {
 		display: flex;
+		justify-content: space-between;
 
-		justify-content: space-around;
-		font-size: 24rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #999999;
-		line-height: 42rpx;
-
-		.current {
-			color: #5C5EE5;
+		.price {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
 		}
 
+		.button {
+			width: 104rpx;
+			height: 35rpx;
+			background: linear-gradient(270deg, #6e8df7, #9977f6);
+			border-radius: 18rpx;
+			font-size: 20rpx;
+			font-weight: 500;
+			color: #ffffff;
+			line-height: 35rpx;
+			text-align: center;
+		}
 	}
+}
 
-	.uni-scroll-view-content {
-		height: 100%;
-		flex-wrap: wrap;
-	}
+.popup-box {
+	width: 522rpx;
+	height: 605rpx;
+	background-color: #ffffff;
+	border-radius: 20rpx;
+	position: relative;
 
-	.box {
+	.img {
+		position: relative;
+		top: -56rpx;
+		left: 0;
+		width: 522rpx;
+		height: 132rpx;
 		display: flex;
-		// justify-content: space-around;
-		flex-wrap: wrap;
-		width: 750rpx
-	}
-
-	.box-content {
+		justify-content: center;
 
-		width: 330rpx;
-		height: 415rpx;
-		// margin:0 15rpx 50rpx ;
-
-		.img {
-			width: 330rpx;
-			height: 280rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
+		image {
+			border-radius: 20rpx 20rpx 0 0;
+			width: 450rpx;
+			height: 132rpx;
 		}
+	}
 
-		.content-title {
-			z-index: 99;
-			display: flex;
+	.mian {
+		margin-top: -44rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		// padding: 32rpx 32rpx;
+		background-color: #ffffff;
+		border-radius: 0 0 20rpx 20rpx;
+		text-align: center;
 
-			margin-top: -10rpx;
-			padding: 20rpx;
+		.delivery {
+			font-size: 40rpx;
+			color: #333333;
+			display: flex;
+			align-items: center;
 			flex-direction: column;
-			border-bottom-left-radius: 10rpx;
-			border-bottom-right-radius: 10rpx;
-			border: 2rpx solid #533A6A;
-			// box-shadow: 0px 0px 20rpx 0px rgba(79,59,103,0.0600);
 
 			.title {
-				display: flex;
-				align-items: center;
-				// font-size: 39rpx;
-				// font-weight: bold;
-				// color: #FFFFFF;
-				// margin-bottom: 20rpx;
-
 			}
 
-			.zm {
-				flex-shrink: 0;
-				// margin: 10rpx;
-				// width: 63rpx;
-				display: inline-block;
-				// padding: 2rpx;
-				// height: 30rpx;
-				// border: 1rpx solid #5C5EE5;
-				margin-left: 10rpx;
-				border-radius: 5rpx;
-				font-size: 16rpx;
-				font-weight: 500;
-				color: #5C5EE5;
-				// line-height: 30rpx;
-				text-align: center;
+			image {
+				margin-top: 48rpx;
+				width: 172rpx;
+				height: 160rpx;
 			}
+		}
 
-			.text {
-				color: #FFFFFF;
-				font-size: 24rpx;
-				margin: 10rpx 0;
-			}
+		.nocancel {
+			font-size: 32rpx;
+			color: #333333;
+			margin-top: 14rpx;
 		}
 
-		.content-price {
+		.comfirm-box {
+			margin-top: 52rpx;
 			display: flex;
-			justify-content: space-between;
+			// margin-bottom: 32rpx;
 
-			.price {
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FFFFFF;
+			// justify-content: space-around;
+			.cancel {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 197rpx;
+				height: 74rpx;
+				border: 1px solid #dcc786;
+				border-radius: 38rpx;
+
+				font-size: 32rpx;
+				color: #605128;
 			}
 
-			.button {
-				width: 104rpx;
-				height: 35rpx;
-				background: linear-gradient(270deg, #6E8DF7, #9977F6);
-				border-radius: 18rpx;
-				font-size: 20rpx;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 35rpx;
-				text-align: center;
+			.comfirm {
+				margin-left: 32rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 197rpx;
+				height: 74rpx;
+				background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+				border-radius: 38px;
+				font-size: 32rpx;
+				color: #605128;
 			}
 		}
 	}
+}
 
-	.popup-box {
-		width: 522rpx;
-		height: 605rpx;
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		position: relative;
-
-		.img {
-			position: relative;
-			top: -56rpx;
-			left: 0;
-			width: 522rpx;
-			height: 132rpx;
-			display: flex;
-			justify-content: center;
+.main-box {
+	margin: 30rpx auto;
+	width: 690rpx;
+	background: #181818;
+	// box-shadow: 0px 4rpx 14rpx 0px rgba(229, 229, 229, 0.46);
+	border-radius: 20rpx;
 
-			image {
-				border-radius: 20rpx 20rpx 0 0;
-				width: 450rpx;
-				height: 132rpx;
-			}
-		}
+	.title {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 24rpx;
+		border-bottom: 1px solid #2f2f2f;
 
-		.mian {
-			margin-top: -44rpx;
+		.title-left {
 			display: flex;
-			flex-direction: column;
 			align-items: center;
-			// padding: 32rpx 32rpx;
-			background-color: #ffffff;
-			border-radius: 0 0 20rpx 20rpx;
-			text-align: center;
-
-			.delivery {
-				font-size: 40rpx;
-				color: #333333;
-				display: flex;
-				align-items: center;
-				flex-direction: column;
 
-				.title {}
-
-				image {
-					margin-top: 48rpx;
-					width: 172rpx;
-					height: 160rpx;
-				}
+			.title-icon {
+				width: 32rpx;
+				height: 32rpx;
 			}
 
-			.nocancel {
-				font-size: 32rpx;
-				color: #333333;
-				margin-top: 14rpx;
+			.title-font {
+				margin-left: 20rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #fff;
 			}
+		}
 
-			.comfirm-box {
-				margin-top: 52rpx;
-				display: flex;
-				// margin-bottom: 32rpx;
-
-				// justify-content: space-around;
-				.cancel {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 197rpx;
-					height: 74rpx;
-					border: 1px solid #dcc786;
-					border-radius: 38rpx;
-
-					font-size: 32rpx;
-					color: #605128;
-				}
-
-				.comfirm {
-					margin-left: 32rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 197rpx;
-					height: 74rpx;
-					background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
-					border-radius: 38px;
-					font-size: 32rpx;
-					color: #605128;
-				}
-			}
+		.title-right {
+			width: 14rpx;
+			height: 24rpx;
 		}
 	}
 
-	.main-box {
-		margin: 30rpx auto;
-		width: 690rpx;
-		background: #181818;
-		// box-shadow: 0px 4rpx 14rpx 0px rgba(229, 229, 229, 0.46);
-		border-radius: 20rpx;
+	.main {
+		padding: 50rpx 0 30rpx;
 
-		.title {
+		.jg {
+			width: 1px;
+			height: 100rpx;
+			background: #eeeeee;
+		}
+
+		.item {
+			padding-bottom: 20rpx;
+			width: 25%;
 			display: flex;
-			justify-content: space-between;
+			flex-direction: column;
 			align-items: center;
-			padding: 24rpx;
-			border-bottom: 1px solid #2f2f2f;
 
-			.title-left {
-				display: flex;
-				align-items: center;
-
-				.title-icon {
-					width: 32rpx;
-					height: 32rpx;
-				}
-
-				.title-font {
-					margin-left: 20rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #fff;
-				}
+			.item-num {
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
 			}
 
-			.title-right {
-				width: 14rpx;
-				height: 24rpx;
+			.item-font {
+				margin-top: 18rpx;
+				font-size: 22rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
 			}
 		}
 
-		.main {
-			padding: 50rpx 0 30rpx;
-
-			.jg {
-				width: 1px;
-				height: 100rpx;
-				background: #EEEEEE;
-			}
-
-			.item {
-				padding-bottom: 20rpx;
-				width: 25%;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				.item-num {
-					font-size: 36rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #333333;
-				}
+		.oitem {
+			width: 25%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
 
-				.item-font {
-					margin-top: 18rpx;
-					font-size: 22rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #666666;
-				}
+			.oitem-image {
+				height: 50rpx;
+				width: 48rpx;
 			}
 
-			.oitem {
-				width: 25%;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				.oitem-image {
-					height: 50rpx;
-					width: 48rpx;
-				}
-
-				.oitem-font {
-					margin-top: 20rpx;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #fff;
-				}
+			.oitem-font {
+				margin-top: 20rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #fff;
 			}
 		}
 	}
+}
 
-	.dy-list {
-		flex-wrap: wrap;
-		padding: 30rpx;
-	}
+.dy-list {
+	flex-wrap: wrap;
+	padding: 30rpx;
+}
 </style>