cmy 2 anni fa
parent
commit
00cb62d023

+ 4 - 1
App.vue

@@ -295,8 +295,11 @@
 	}
 
 	page {
-		background-color: $page-color-base;
+		// background-color: $page-color-base;
 		// 设置默认字体
 		font-family: PingFang SC, STHeitiSC-Light, Helvetica-Light, arial, sans-serif, Droid Sans Fallback;
+		background:url("@/static/img/pageBg.png") ;
+		background-repeat: repeat;
+		min-height: 100%;
 	}
 </style>

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "艺绘",
     "appid" : "__UNI__E01ACD1",
     "description" : "",
-    "versionName" : "1.1.6",
-    "versionCode" : 116,
+    "versionName" : "1.1.7",
+    "versionCode" : 117,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

+ 2 - 2
pages/index/bazaar.vue

@@ -192,8 +192,8 @@ export default {
 <style lang="scss">
 page {
 	width: 750rpx;
-	height: 100%;
-	background: #111111;
+	min-height: 100%;
+	// background: #111111;
 }
 .container {
 	/* #ifdef H5 */

+ 1 - 1
pages/index/cangp.vue

@@ -300,7 +300,7 @@
 	page {
 		width: 750rpx;
 		min-height: 100%;
-		background: #111111;
+		// background: #111111;
 	}
 
 	.container {

+ 0 - 1
pages/index/guide.vue

@@ -130,7 +130,6 @@
 	page {
 		width: 750rpx;
 		min-height: 100%;
-		background: #111111;
 	}
 
 	.container {

+ 2 - 2
pages/index/index.vue

@@ -251,7 +251,7 @@
 	page {
 		width: 750rpx;
 		min-height: 100%;
-		background: #111111;
+		// background: #111111;
 	}
 
 	.carousel {
@@ -291,7 +291,7 @@
 				justify-content: flex-start;
 				width: 698rpx;
 				height: 60rpx;
-				background: #26262E;
+				background: #1d1c21;
 				border-radius: 10rpx;
 				padding-left: 20rpx;
 

+ 16 - 11
pages/index/myNftList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="flex dy-list">
-			<view class="box-content" v-for="item in navitem.list" @click="type==1?navto(item):''">
+			<view class="box-content" v-for="item in navitem.list" @click="!item.extract&&type==1&&item.hang?navto(item):alertErr(item)">
 				<view class="img">
 					<image :src="item.class_info.uri" mode=""></image>
 				</view>
@@ -21,11 +21,11 @@
 							¥{{ item.price }}
 						</view>
 						<view class="" v-if="!item.extract&&type==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="button" @click.stop="navPop(item)" v-if="item.hang == null">卖出</view>
+							<view class="button" @click.stop="qxMai(item.hang.id)" v-else>取消卖出</view>
 						</view>
 						<view class="" v-if="type==2&&!item.hang&&!item.extract">
-							<view class="button" @click="checked(item)">选择</view>
+							<view class="button" @click.stop="checked(item)">选择</view>
 						</view>
 					</view>
 				</view>
@@ -103,6 +103,14 @@
 			this.craftGuide()
 		},
 		methods: {
+			// alert
+			alertErr(){
+				uni.showModal({
+					title: '错误',
+					content: '商品未卖出无法查看详情',
+					showCancel: false,
+				});
+			},
 			// 跳转商品详情页面
 			navto(item){
 				uni.navigateTo({
@@ -230,7 +238,6 @@
 	page {
 		width: 750rpx;
 		min-height: 100%;
-		background: #111111;
 	}
 
 	.container {
@@ -248,7 +255,8 @@
 			width: 330rpx;
 			height: 415rpx;
 			// margin:0 15rpx 50rpx ;
-
+			border-radius: 10rpx;
+			overflow: hidden;
 			.img {
 				width: 330rpx;
 				height: 280rpx;
@@ -260,16 +268,13 @@
 			}
 
 			.content-title {
-				z-index: 99;
 				display: flex;
-
-				margin-top: -10rpx;
 				padding: 20rpx;
+				padding-top: 10rpx;
 				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);
+				background-color: #1d1c21;
 
 				.title {
 					display: flex;

+ 16 - 14
pages/product/product.vue

@@ -9,7 +9,7 @@
 			</view>
 		</view>
 		<view class="content-box">
-			<view class="content-top">
+			<view class="content-top" v-if="isSc == 2">
 				<view class="hd flex">
 					<view>
 						{{ shopDetail.store_name }}
@@ -55,15 +55,17 @@
 		</view>
 		<view class="rz">
 			<view class="rz-title">链上信息</view>
-			<view class="tc-item flex">
-				<view class="tcitem-name">地址</view>
-				<view class="ali-name clamp">{{ nft.id }}</view>
-				<image class="tcitem-image" src="../../static/img/copy.png" mode="" @click="copy(nft.id)"></image>
-			</view>
-			<view class="tc-item flex">
-				<view class="tcitem-name">Token Hash</view>
-				<view class="ali-name clamp">{{ nft.tx_hash }}</view>
-				<image class="tcitem-image" src="../../static/img/copy.png" mode="" @click="copy(nft.id)"></image>
+			<view class="rz-ms">
+				<view class="tc-item flex">
+					<view class="tcitem-name">地址</view>
+					<view class="ali-name clamp">{{ nft.id }}</view>
+					<image class="tcitem-image" src="../../static/img/copy.png" mode="" @click="copy(nft.id)"></image>
+				</view>
+				<view class="tc-item flex margin-t-30">
+					<view class="tcitem-name">Token Hash</view>
+					<view class="ali-name clamp">{{ nft.tx_hash }}</view>
+					<image class="tcitem-image" src="../../static/img/copy.png" mode="" @click="copy(nft.id)"></image>
+				</view>
 			</view>
 		</view>
 		<view class="rz" v-show="isSc == 2">
@@ -516,7 +518,7 @@
 <style lang="scss">
 	.container,
 	page {
-		background: #111111;
+		// background: #111111;
 		min-height: 100%;
 	}
 
@@ -680,13 +682,15 @@
 		}
 
 		.rz-ms {
-			padding: 0 20rpx;
+			padding: 30rpx;
 			width: 690rpx;
 			font-size: 24rpx;
 			line-height: 36rpx;
 			color: #ffffff;
 			word-wrap: break-word;
 			word-break: normal;
+			background-color:#1D1D22 ;
+			border-radius: 30rpx;
 		}
 
 		.rz-content {
@@ -739,9 +743,7 @@
 
 		.tc-item {
 			width: 100%;
-			padding: 50rpx 40rpx 0;
 			line-height: 1;
-
 			.tcitem-name {
 				flex-shrink: 0;
 				font-size: 30rpx;

+ 5 - 13
pages/product/productMh.vue

@@ -8,9 +8,6 @@
 		<view class="content-box">
 			<view class="content-top">
 				<view class="hd">{{ shopDetail.name }}</view>
-				<!-- <view class="content-img">
-					<image src="../../static/img/fx.png" mode=""></image>分享
-				</view> -->
 			</view>
 			<view class="content-center">
 				<view class="title">发行方:艺绘官方 </view>
@@ -287,7 +284,6 @@
 <style lang="scss">
 	.container,
 	page {
-		background: #111111;
 		min-height: 100%;
 	}
 
@@ -309,14 +305,10 @@
 
 	/* #endif */
 
-	.swiper-box {
-		background: #0c0a36;
-	}
-
 	.img {
 		margin: 0 auto;
 		width: 750rpx;
-
+		line-height: 0;
 		image {
 			width: 100%;
 		}
@@ -348,11 +340,11 @@
 				font-size: 24rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #585be7;
+				color: #FDD58A;
 				line-height: 39rpx;
 				padding: 10rpx;
 				height: 41rpx;
-				border: 2rpx solid #585be7;
+				border: 2rpx solid #FDD58A;
 				border-radius: 5rpx;
 
 				image {
@@ -385,7 +377,7 @@
 				justify-content: flex-end;
 				font-size: 48rpx;
 				font-weight: bold;
-				color: #585be7;
+				color: #FDD58A;
 
 				span {
 					font-size: 24rpx;
@@ -403,7 +395,7 @@
 				border-radius: 10rpx;
 				font-size: 36rpx;
 				font-weight: 500;
-				color: #ffffff;
+				color: #9F570E;
 				line-height: 90rpx;
 				text-align: center;
 			}

+ 0 - 13
pages/set/set.vue

@@ -26,19 +26,6 @@
 				<image src="../../static/user/right01.png" mode=""></image>
 			</view>
 		</view>
-		<view class="box" @click="navTo('/pages/user/about')">
-			<view class="box-left">
-				<view class="img">
-					<image src="../../static/user/set02.png" mode=""></image>
-				</view>
-				<view class="title">
-					注销账号
-				</view>
-			</view>
-			<view class="img-right">
-				<image src="../../static/user/right01.png" mode=""></image>
-			</view>
-		</view>
 		<view class="box" @click="navTo('/pages/set/userinfo')">
 			<view class="box-left">
 				<view class="img">

+ 0 - 2
pages/user/team.vue

@@ -144,8 +144,6 @@ export default {
 <style lang="scss">
 page {
 	min-height: 100%;
-	background:url("@/static/img/pageBg.png") ;
-	background-repeat: repeat;
 }
 .info-box {
 	width: 670rpx;

+ 629 - 584
pages/user/user.vue

@@ -1,7 +1,9 @@
 <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-bottom">
@@ -21,44 +23,64 @@
 		</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="flex-center">
+					<image src="../../static/user/user13.png" mode="widthFix"></image>
+				</view>
 				<view class="manage-title">市场未付</view>
 			</view>
 			<view class="manage" @click="navTo('/pages/order/order?state=0')">
-				<view class="flex-center"><image src="../../static/user/user15.png" mode="widthFix"></image></view>
+				<view class="flex-center">
+					<image src="../../static/user/user15.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="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="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="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="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="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="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="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="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')">
@@ -71,18 +93,20 @@
 			</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">
 			<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>
 							<view class="content-price">
 								<view class="price" v-if="tabCurrentIndex==1">
@@ -98,13 +122,16 @@
 						</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>
@@ -121,673 +148,691 @@
 	</view>
 </template>
 <script>
-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,myClass, myGdList } from '@/api/user.js';
-import { loadIndexs } from '@/api/index.js';
-import { saveUrl, interceptor } from '@/utils/loginUtils.js';
-export default {
-	components: {
-		uniList,
-		uniListItem,
-		uEmpty
-	},
-	data() {
-		return {
-			id: 0,
-			item: '', //当前选中要操作卖出商品的数据
-			money: '', //卖出价格
-			kfWX: 'liuniu', //客服微信
-			// 头部图高度
-			tabCurrentIndex: 0,
-			isshow: 1, //是否可以交易1可以交易2不能交易
-			navList: [
-				{
-					state: 0,
-					text: '我拥有的',
-					loadingType: 'more',
-					orderList: [],
-					page: 1,
-					limit: 10,
-					loaded: false
-				},
-				{
-					state: 1,
-					text: '我卖出的',
-					loadingType: 'more',
-					orderList: [],
-					page: 1,
-					limit: 10,
-					loaded: false
-				}
-			]
-		};
-	},
-	onShow() {
-		if (this.hasLogin) {
-			this.loadBaseData();
-			// 返回页面刷新我的挂单数据
-			this.navList = [
-				{
-					state: 0,
-					text: '我拥有的',
-					loadingType: 'more',
-					orderList: [],
-					page: 1,
-					limit: 10,
-					loaded: false
-				},
-				{
-					state: 1,
-					text: '我卖出的',
-					loadingType: 'more',
-					orderList: [],
-					page: 1,
-					limit: 10,
-					loaded: false
-				}
-			];
-			// 获取我的挂单
-			this.getMyNft();
-			// 判断是否可以交易
-			this.pdshow();
-		} else {
-			this.loadBaseData();
-		}
-	},
-	onReady() {},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		// 跳转转开列表
-		listInfo(item){
-			uni.navigateTo({
-				url: '/pages/index/myNftList?id=' + item.nft_class_id + '&type=1'
-			});
-		},
-		// 判断是否可以交易
-		pdshow() {
-			loadIndexs().then(e => {
-				if (e.data.market_switch == '1') {
-					this.isshow = 1;
-				} else {
-					this.isshow = 2;
-				}
-			});
-		},
-		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);
-				});
-		},
-		navGet(index) {
-			this.tabCurrentIndex = index;
-			this.getMyNft('tab');
+	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,
+		myClass,
+		myGdList
+	} from '@/api/user.js';
+	import {
+		loadIndexs
+	} from '@/api/index.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	export default {
+		components: {
+			uniList,
+			uniListItem,
+			uEmpty
 		},
-		//swiper切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.getMyNft('tab');
+		data() {
+			return {
+				id: 0,
+				item: '', //当前选中要操作卖出商品的数据
+				money: '', //卖出价格
+				kfWX: 'liuniu', //客服微信
+				// 头部图高度
+				tabCurrentIndex: 0,
+				isshow: 1, //是否可以交易1可以交易2不能交易
+				navList: [{
+						state: 0,
+						text: '我拥有的',
+						loadingType: 'more',
+						orderList: [],
+						page: 1,
+						limit: 10,
+						loaded: false
+					},
+					{
+						state: 1,
+						text: '我卖出的',
+						loadingType: 'more',
+						orderList: [],
+						page: 1,
+						limit: 10,
+						loaded: false
+					}
+				]
+			};
 		},
-		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
-						});
+		onShow() {
+			if (this.hasLogin) {
+				this.loadBaseData();
+				// 返回页面刷新我的挂单数据
+				this.navList = [{
+						state: 0,
+						text: '我拥有的',
+						loadingType: 'more',
+						orderList: [],
+						page: 1,
+						limit: 10,
+						loaded: false
+					},
+					{
+						state: 1,
+						text: '我卖出的',
+						loadingType: 'more',
+						orderList: [],
+						page: 1,
+						limit: 10,
+						loaded: false
 					}
-				});
+				];
+				// 获取我的挂单
+				this.getMyNft();
+				// 判断是否可以交易
+				this.pdshow();
+			} else {
+				this.loadBaseData();
 			}
 		},
-		// 客服打开
-		kfOpen() {
-			this.$refs.popupkf.open();
+		onReady() {},
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
 		},
-		// 客服关闭
-		kfClose() {
-			this.$refs.popupkf.close();
-		},
-		// 赋值客服
-		uniCopy(text) {
-			this.$refs.popupkf.close();
-			const a = uniCopy(text);
-			if (a) {
-				uni.showModal({
-					title: '提示',
-					content: '复制成功',
-					showCancel: false
-				});
-			}
-		},
-
-		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) {
-				myClass({
-					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);
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			// 跳转转开列表
+			listInfo(item) {
+				uni.navigateTo({
+					url: '/pages/index/myNftList?id=' + item.nft_class_id + '&type=1'
 				});
-			}
-			if (index == 1) {
-				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';
+			},
+			// 判断是否可以交易
+			pdshow() {
+				loadIndexs().then(e => {
+					if (e.data.market_switch == '1') {
+						this.isshow = 1;
 					} else {
-						navitem.loadingType = 'noMore';
+						this.isshow = 2;
 					}
-					obj.$set(navitem, 'loaded', true);
 				});
+			},
+			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);
+					});
+			},
+			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
+					});
+				}
+			},
+
+			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) {
+					myClass({
+						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) {
+					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;
-}
-.hashAddress{
-	line-height: 1;
-	margin: 30rpx;
-	border: 1px solid #4D3414;
-	border-radius: 10rpx;
-	color:#9F570E;
-	font-size: 20rpx;
-	height: 60rpx;
-	padding: 0 30rpx;
-	.fzButtom{
-		padding: 6rpx 0;
-		padding-left: 20rpx;
-		padding-right: 20rpx;
+	page,
+	.container {
+		width: 750rpx;
+		height: 100%;
+		// background: #111111;
+	}
+
+	.hashAddress {
+		line-height: 1;
+		margin: 30rpx;
+		border: 1px solid #4D3414;
+		border-radius: 10rpx;
 		color: #9F570E;
-		border-radius: 100rpx;
-		border-top-right-radius: 0rpx;
-		background: $bgBaseBg;
-		flex-shrink: 0;
+		background-color: #1D1D22;
+		font-size: 20rpx;
+		height: 60rpx;
+		padding: 0 30rpx;
+
+		.fzButtom {
+			padding: 6rpx 0;
+			padding-left: 20rpx;
+			padding-right: 20rpx;
+			color: #9F570E;
+			border-radius: 100rpx;
+			border-top-right-radius: 0rpx;
+			background: $bgBaseBg;
+			flex-shrink: 0;
+		}
 	}
-}
 
 
-.title-box {
-	margin: 80rpx 0 40rpx 0;
-	display: flex;
-	align-items: center;
+	.title-box {
+		margin: 80rpx 0 40rpx 0;
+		display: flex;
+		align-items: center;
 
-	.title-img {
-		width: 100rpx;
-		height: 100rpx;
-		border-radius: 50%;
-		overflow: hidden;
+		.title-img {
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			overflow: hidden;
 
-		image {
-			width: 100%;
-			height: 100%;
+			image {
+				width: 100%;
+				height: 100%;
+			}
 		}
-	}
 
-	.title-tit {
-		margin-left: 30rpx;
-		flex-grow: 1;
-		.title-top {
-			font-size: 36rpx;
-			font-weight: 500;
-			color: #ffffff;
-			line-height: 50rpx;
-		}
+		.title-tit {
+			margin-left: 30rpx;
+			flex-grow: 1;
+
+			.title-top {
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #ffffff;
+				line-height: 50rpx;
+			}
 
-		.title-bottom {
-			font-size: 22rpx;
-			font-weight: 500;
-			color: #ffffff;
-			line-height: 40rpx;
+			.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: #FDD58A;
-
-	.address-text {
-		margin: 0 25rpx;
-		width: 520rpx;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		overflow: hidden;
-	}
 
-	.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 {
+	.address-box {
 		display: flex;
-		flex-direction: column;
+		justify-content: space-between;
 		align-items: center;
-		margin: 30rpx 0 20rpx;
-		width: 25%;
-
-		.flex-center {
-			min-height: 60rpx;
-		}
+		margin: 0 30rpx;
+		height: 60rpx;
+		background: #181818;
+		border: 2rpx solid #7d5fa4;
+		border-radius: 8rpx;
+		font-size: 20rpx;
+		font-weight: 500;
+		line-height: 61rpx;
+		color: #FDD58A;
 
-		image {
-			width: 42rpx;
-			margin-bottom: 15rpx;
+		.address-text {
+			margin: 0 25rpx;
+			width: 520rpx;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
 		}
 
-		.manage-title {
-			font-size: 24rpx;
-			font-weight: 500;
-			color: #ffffff;
-			line-height: 42rpx;
+		.fuzhi {
+			width: 86rpx;
+			height: 40rpx;
+			border-radius: 10rpx;
+			border: 2px solid #7d5fa4;
+			text-align: center;
+			line-height: 32rpx;
+			margin-right: 40rpx;
 		}
 	}
-}
 
-.vheigh {
-	height: var(--status-bar-height);
-}
+	.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%;
 
-.navbar {
-	margin-top: 30rpx;
-	display: flex;
+			.flex-center {
+				min-height: 60rpx;
+			}
 
-	justify-content: space-around;
-	font-size: 24rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #999999;
-	line-height: 42rpx;
+			image {
+				width: 42rpx;
+				margin-bottom: 15rpx;
+			}
 
-	.current {
-		color: #FDD58A;
+			.manage-title {
+				font-size: 24rpx;
+				font-weight: 500;
+				color: #ffffff;
+				line-height: 42rpx;
+			}
+		}
 	}
-}
-
-.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%;
-		}
+	.vheigh {
+		height: var(--status-bar-height);
 	}
 
-	.content-title {
-		z-index: 99;
+	.navbar {
+		margin-top: 30rpx;
 		display: flex;
 
-		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);
+		justify-content: space-around;
+		font-size: 24rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #999999;
+		line-height: 42rpx;
 
-		.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 #FDD58A;
-			margin-left: 10rpx;
-			border-radius: 5rpx;
-			font-size: 16rpx;
-			font-weight: 500;
+		.current {
 			color: #FDD58A;
-			// line-height: 30rpx;
-			text-align: center;
 		}
+	}
 
-		.text {
-			color: #ffffff;
-			font-size: 24rpx;
-			margin: 10rpx 0;
-		}
+	.uni-scroll-view-content {
+		height: 100%;
+		flex-wrap: wrap;
 	}
 
-	.content-price {
+	.box {
 		display: flex;
-		justify-content: space-between;
-
-		.price {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #ffffff;
-		}
-
-		.button {
-			width: 104rpx;
-			height: 35rpx;
-			background: $bgBaseBg;
-			border-radius: 18rpx;
-			font-size: 20rpx;
-			font-weight: 500;
-			color: #9F570E;
-			line-height: 35rpx;
-			text-align: center;
-		}
+		// justify-content: space-around;
+		flex-wrap: wrap;
+		width: 750rpx;
 	}
-}
 
-.popup-box {
-	width: 522rpx;
-	height: 605rpx;
-	background-color: #ffffff;
-	border-radius: 20rpx;
-	position: relative;
+	.box-content {
+		width: 330rpx;
+		height: 415rpx;
+		margin-bottom: 20rpx;
+		background-color: #1D1D22;
+		border-radius: 10rpx;
+		overflow: hidden;
 
-	.img {
-		position: relative;
-		top: -56rpx;
-		left: 0;
-		width: 522rpx;
-		height: 132rpx;
-		display: flex;
-		justify-content: center;
+		.img {
+			width: 330rpx;
+			height: 280rpx;
 
-		image {
-			border-radius: 20rpx 20rpx 0 0;
-			width: 450rpx;
-			height: 132rpx;
+			image {
+				width: 100%;
+				height: 100%;
+			}
 		}
-	}
 
-	.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;
-
-		.delivery {
-			font-size: 40rpx;
-			color: #333333;
+		.content-title {
 			display: flex;
-			align-items: center;
+			padding: 20rpx;
+			padding-top: 10rpx;
 			flex-direction: column;
+			border-bottom-left-radius: 10rpx;
+			border-bottom-right-radius: 10rpx;
 
 			.title {
+				display: flex;
+				align-items: center;
+				// font-size: 39rpx;
+				// font-weight: bold;
+				// color: #FFFFFF;
+				// margin-bottom: 20rpx;
 			}
 
-			image {
-				margin-top: 48rpx;
-				width: 172rpx;
-				height: 160rpx;
+			.zm {
+				flex-shrink: 0;
+				// margin: 10rpx;
+				// width: 63rpx;
+				display: inline-block;
+				// padding: 2rpx;
+				// height: 30rpx;
+				// border: 1rpx solid #FDD58A;
+				margin-left: 10rpx;
+				border-radius: 5rpx;
+				font-size: 16rpx;
+				font-weight: 500;
+				color: #FDD58A;
+				// line-height: 30rpx;
+				text-align: center;
 			}
-		}
 
-		.nocancel {
-			font-size: 32rpx;
-			color: #333333;
-			margin-top: 14rpx;
+			.text {
+				color: #ffffff;
+				font-size: 24rpx;
+				margin: 10rpx 0;
+			}
 		}
 
-		.comfirm-box {
-			margin-top: 52rpx;
+		.content-price {
 			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;
+			justify-content: space-between;
 
-				font-size: 32rpx;
-				color: #605128;
+			.price {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #ffffff;
 			}
 
-			.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;
+			.button {
+				width: 104rpx;
+				height: 35rpx;
+				background: $bgBaseBg;
+				border-radius: 18rpx;
+				font-size: 20rpx;
+				font-weight: 500;
+				color: #9F570E;
+				line-height: 35rpx;
+				text-align: 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;
+	.popup-box {
+		width: 522rpx;
+		height: 605rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		position: relative;
 
-	.title {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 24rpx;
-		border-bottom: 1px solid #2f2f2f;
+		.img {
+			position: relative;
+			top: -56rpx;
+			left: 0;
+			width: 522rpx;
+			height: 132rpx;
+			display: flex;
+			justify-content: center;
+
+			image {
+				border-radius: 20rpx 20rpx 0 0;
+				width: 450rpx;
+				height: 132rpx;
+			}
+		}
 
-		.title-left {
+		.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;
+
+			.delivery {
+				font-size: 40rpx;
+				color: #333333;
+				display: flex;
+				align-items: center;
+				flex-direction: column;
 
-			.title-icon {
-				width: 32rpx;
-				height: 32rpx;
+				.title {}
+
+				image {
+					margin-top: 48rpx;
+					width: 172rpx;
+					height: 160rpx;
+				}
 			}
 
-			.title-font {
-				margin-left: 20rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #fff;
+			.nocancel {
+				font-size: 32rpx;
+				color: #333333;
+				margin-top: 14rpx;
 			}
-		}
 
-		.title-right {
-			width: 14rpx;
-			height: 24rpx;
+			.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;
+				}
+			}
 		}
 	}
 
-	.main {
-		padding: 50rpx 0 30rpx;
+	.main-box {
+		margin: 30rpx auto;
+		width: 690rpx;
+		background: #181818;
+		// box-shadow: 0px 4rpx 14rpx 0px rgba(229, 229, 229, 0.46);
+		border-radius: 20rpx;
 
-		.jg {
-			width: 1px;
-			height: 100rpx;
-			background: #eeeeee;
-		}
-
-		.item {
-			padding-bottom: 20rpx;
-			width: 25%;
+		.title {
 			display: flex;
-			flex-direction: column;
+			justify-content: space-between;
 			align-items: center;
+			padding: 24rpx;
+			border-bottom: 1px solid #2f2f2f;
 
-			.item-num {
-				font-size: 36rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #333333;
+			.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-font {
-				margin-top: 18rpx;
-				font-size: 22rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #666666;
+			.title-right {
+				width: 14rpx;
+				height: 24rpx;
 			}
 		}
 
-		.oitem {
-			width: 25%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
+		.main {
+			padding: 50rpx 0 30rpx;
 
-			.oitem-image {
-				height: 50rpx;
-				width: 48rpx;
+			.jg {
+				width: 1px;
+				height: 100rpx;
+				background: #eeeeee;
 			}
 
-			.oitem-font {
-				margin-top: 20rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #fff;
+			.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;
+				}
+
+				.item-font {
+					margin-top: 18rpx;
+					font-size: 22rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+				}
+			}
+
+			.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;
+				}
 			}
 		}
 	}
-}
 
-.dy-list {
-	flex-wrap: wrap;
-	padding: 30rpx;
-}
-</style>
+	.dy-list {
+		flex-wrap: wrap;
+		padding: 30rpx;
+	}
+</style>