页面修改

pages/order/index/index.vue

@@ -96,8 +96,9 @@
 		<good-list :list="goodData" v-if="showGoodList" @close="closeGoodListHandler"></good-list>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth='goback'></auth>
 		<payCom v-if="payBtn&&u.TenantId!=27" :payInfo="payInfo" @closePay="closePay"></payCom>
-			<submit2PayCom v-if="payBtn&&u.TenantId==27" :payInfo="payInfo" :isAlipay="isAlipay" :StuId='StuId'   :TeacherIds='TeacherIds' @closePay="closePay"></submit2PayCom>
-		
+		<submit2PayCom v-if="payBtn&&u.TenantId==27" :payInfo="payInfo" :isAlipay="isAlipay" :StuId='StuId' :TeacherIds='TeacherIds'
+		 @closePay="closePay"></submit2PayCom>
+
 		<u-popup v-model="payExit" mode="center" :mask-close-able="false">
 			<view style="background:#fff;width:500rpx">
 				<view style="padding:10px 0 0 10px">提交失败</view>
@@ -124,9 +125,9 @@
 		},
 		data() {
 			return {
-				StuId:'',
-				TeacherIds:'',
-				isAlipay:2,//1微信 2微信支付宝
+				StuId: '',
+				TeacherIds: '',
+				isAlipay: 2, //1微信 2微信支付宝
 				pageTitle: "我的订单",
 				current: 0,
 				list: [],
@@ -204,11 +205,12 @@
 			});
 		},
 		onLoad: function(option) {
+			this.current = 0;
 			//option为object类型，会序列化上个页面传递的参数
-			this.current = option.status || -1;
-			
+			if (option && option.status && option.status != '') {
+				this.current = option.status;
+			}
 			this.u = uni.getStorageSync("mall_UserInfo");
-			
 			if (!this.u) {
 				this.u = {
 					nickName: "未登录",
@@ -224,7 +226,6 @@
 				this.msg.pageIndex = 1;
 				this.g = [];
 				this.payInfo.OpenId = uni.getStorageSync('mall_UserInfo').OpenId;
-				
 				this.request2({
 						url: '/api/order/GetOrderStatusEnumList',
 						data: {}
@@ -246,22 +247,19 @@
 				);
 			},
 			redirectToDetail(item) {
-				if(item.VersionSource!=1){
+				if (item.VersionSource != 1) {
 					uni.navigateTo({
 						url: "/pages/order/order-detail?id=" + item.OrderId,
 					});
-				}else{
+				} else {
 					uni.navigateTo({
 						url: "/pages/order/educationO-detail?id=" + item.OrderId,
 					});
 				}
-				
-				
 			},
 			shouhuoHandler(id) {
 				this.showReviceModal = true;
 				this.submitId = id;
-
 			},
 			submitReviceGoodHandler() { //确认收货
 				let that = this
@@ -323,21 +321,19 @@
 				this.Cancelmsg.OrderId = e.OrderId;
 				this.Cancelmsg.Type = e.OrderStatus == 1 ? 1 : 2;
 			},
-			
+
 			// 待付款立即支付
 			payment(e) {
-				let list =[]
+				let list = []
 				this.payInfo.OrderId = e.OrderId;
 				this.payInfo.GoodsName = e.DetailList[0].GoodsName.slice(0, 10);
 				this.payInfo.PaymentWay = e.PaymentWay;
 				this.payInfo.total_price = e.Income;
-				this.StuId= e.JJSWStuId
-				e.DetailList.forEach(item=>{
-					list.push(item.EduTeacherId) 
+				this.StuId = e.JJSWStuId
+				e.DetailList.forEach(item => {
+					list.push(item.EduTeacherId)
 				})
 				this.TeacherIds = list.toString()
-				// console.log('jjjjjjjjjj',this.StuId)
-				// console.log('lllllllllllllll',this.TeacherIds)
 				this.payBtn = true
 			},
 			exitPay() {
@@ -393,7 +389,6 @@
 			},
 			showGoodListHandler(i) {
 				this.goodData = this.g[i].DetailList;
-				console.log(this.goodData);
 				this.showGoodList = true;
 			},
 			buy(y) {
@@ -416,18 +411,18 @@
 					good.DetailList.push(g);
 				});
 				forms = good;
-				if(y.VersionSource !=1){
+				if (y.VersionSource != 1) {
 					uni.navigateTo({
 						url: '/pages/order-submit/order-submit?formData=' + encodeURIComponent(JSON.stringify(forms)) +
 							'&IsFormShoppingCart=2&ShoppingCartIdList=' + JSON.stringify(ShoppingCartIdList)
 					});
-				}else{
+				} else {
 					uni.navigateTo({
 						url: '/pages/order-submit/neweducation-submit?formData=' + encodeURIComponent(JSON.stringify(forms)) +
 							'&IsFormShoppingCart=2&ShoppingCartIdList=' + JSON.stringify(ShoppingCartIdList)
 					});
 				}
-				
+
 			},
 			reloadUserinfo() {
 				this.u = uni.getStorageSync("mall_UserInfo");
@@ -565,4 +560,4 @@
 		-webkit-line-clamp: 2;
 		/** 显示的行数 **/
 	}
-</style>
+</style>
\ No newline at end of file