From f6d94b37247115a6a017b10f37320f9f116593fe Mon Sep 17 00:00:00 2001
From: wangxiaoping <809126545@qq.com>
Date: Fri, 13 Aug 2021 17:33:16 +0800
Subject: [PATCH] up

---
 packages/packageBuy/pages/buyMember/buyMember.vue        | 2 ++
 .../pages/buyMemberSuccess/buyMemberSuccess.vue          | 9 ++++++---
 packages/packageOrder/pages/myOrder/myOrder.vue          | 8 +++++++-
 pages/my/my.vue                                          | 2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/packageBuy/pages/buyMember/buyMember.vue b/packages/packageBuy/pages/buyMember/buyMember.vue
index 04bc04e..35c8e4d 100644
--- a/packages/packageBuy/pages/buyMember/buyMember.vue
+++ b/packages/packageBuy/pages/buyMember/buyMember.vue
@@ -76,6 +76,7 @@
 				}
 				
 				this.reqByToken('/api/member/order-add', this.info, r => {
+					uni.showLoading({title: '加载中',mask:true});
 					uni.request({
 						url: this.baseUrl + '/api/member/order-payment',
 						method: 'GET',
@@ -85,6 +86,7 @@
 							openid: this.openid
 						},
 						success: res => {
+							setTimeout(function () {uni.hideLoading();}, 100);
 							let payParams = JSON.parse(res.data.jsApiParameters)
 							payParams.provider = 'wxpay'
 							payParams.success = result => {
diff --git a/packages/packageBuy/pages/buyMemberSuccess/buyMemberSuccess.vue b/packages/packageBuy/pages/buyMemberSuccess/buyMemberSuccess.vue
index 911de97..25f3260 100644
--- a/packages/packageBuy/pages/buyMemberSuccess/buyMemberSuccess.vue
+++ b/packages/packageBuy/pages/buyMemberSuccess/buyMemberSuccess.vue
@@ -5,8 +5,7 @@
 			<view class="h3">您已经购买成功</view>
 			<view class="p">请等待客户人员联系您</view>
 		</view>
-		<navigator url="../../../packageOrder/pages/myOrder/myOrder" open-type="switchTab"><view class="pinkBtn">我的订单</view></navigator>
-		<navigator url="../../../../pages/home/home" open-type="switchTab"><view class="pinkBtn">返回首页</view></navigator>
+		<view class="pinkBtn" @tap="goMyOrder">我的订单</view>
 	</view>
 </template>
 
@@ -20,7 +19,11 @@
 
 		},
 		methods: {
-
+			goMyOrder(){
+				uni.navigateTo({
+					url:"../../../packageOrder/pages/myOrder/myOrder"
+				})
+			}
 		}
 	}
 </script>
diff --git a/packages/packageOrder/pages/myOrder/myOrder.vue b/packages/packageOrder/pages/myOrder/myOrder.vue
index 62743e5..d13a022 100644
--- a/packages/packageOrder/pages/myOrder/myOrder.vue
+++ b/packages/packageOrder/pages/myOrder/myOrder.vue
@@ -9,6 +9,7 @@
 			<view class="statusBox">
 				<text v-for="(item,index) in statusLabels" :key="index" @click="changeStatus(index)" :class="{cur: index == status}">{{item}}</text>
 			</view>
+			<view style="height:120rpx;"></view>
 		　　<view class="orderCol"  v-for="(item, index) in list" :key="item.id" @click="goDetail(item.id)">
 				<view class="title">
 					<view>{{item.order_name || '暂无'}}<!-- <text class="free">免费</text> --></view>
@@ -87,6 +88,7 @@
 			},
 			getOrderList() {
 				const phone_token = uni.getStorageSync('phone_token')
+				uni.showLoading({title: '加载中',mask:true});
 				uni.request({
 					url: this.baseUrl + '/api/member/get-orders',
 					method: 'GET',
@@ -96,6 +98,7 @@
 						token: phone_token.token
 					},
 					success: r => {
+						setTimeout(function () {uni.hideLoading();}, 100);
 						this.list = this.list.concat(r.data.data)
 						this.page++
 					}
@@ -210,12 +213,15 @@
 		height:120rpx;
 		background: #fff;
 		display: flex;
-		paddind:0 30rpx;
+		padding:0 30rpx;
 		justify-content: space-around;
 		align-items: center;
 		align-content: center;
 		color:#666;
 		font-size:28rpx;
+		position: fixed;
+		left:0;
+		top:-1rpx;
 		text{display:block;width: 156rpx;height: 64rpx;background: #F0F0F0;border-radius: 32rpx;text-align: center;line-height:64rpx;}
 		.cur{background: #FF578A;color:#fff;}
 	}
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 59cb1e6..d6689e6 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -257,7 +257,7 @@
 }
 .myOrder{width:710rpx;background:rgba(255,255,255,1);border-radius: 16rpx;margin:30rpx auto 0 auto;}
 .orderTab{
-	font-size: 32rpx;font-weight: 400;width:60%;margin-left:10rpx;padding:30rpx 30rpx 0 30rpx;
+	font-size: 34rpx;font-weight: 400;width:60%;margin-left:10rpx;padding:30rpx 30rpx 0 30rpx;
 }
 .segmented-control__item--text{border-color: rgba(255,255,255,0)!important;}
 .segmented-control__text{color:#666666;}