Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

package1/order/orderDetail.vue

@@ -270,7 +270,7 @@
 	export default {
 		data() {
 			return {
-				pintuan:true,
+				pintuan:false,
 				menuButtonInfo: {},
 				codeImg:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/3a4e68eb14d7417cbb4f15fa85907c64.jpg'
 			}

pages/index/index.vue

@@ -861,6 +861,7 @@
 			this.getUserLocation();
 			// 建立WebSocket连接或定时请求获取配送员位置
 			this.getDeliveryLocation();
+			this.getDelivery();
 		},
 		onShow() {
 			let that = this
@@ -896,6 +897,9 @@
 				this.checkTab(index);
 				// 400ms后解除锁（动画200ms，预留200ms缓冲）
 				setTimeout(() => { this.isSwitching = false; }, 400);
+			},
+			getDelivery(){
+				
 			},
 			checkTab(index) {
 				for (let i = 0; i < this.menuList.length; i++) {