11

components/tab-bar/tab-bar.vue

@@ -90,11 +90,14 @@
 		methods: {
 			//点击tab切换
 			clickBar(index) {
-				this.getWorkerCounts()
+				
 				for (let i = 0; i < this.tabList.length; i++) {
 					if (index == i) {
 						this.$emit('tab-index', i);
 						if(index == 2) return
+						if(index != 0){
+							this.getWorkerCounts()
+						}
 						this.tabList[i].isCheck = true
 						if (this.tabList[i].shaking) return
 

package2/shop/orderDetail.vue

@@ -13,9 +13,9 @@
 		<view class="content">
 			<view class="box1" style="display: flex;font-size: 14px;font-weight: 700;">
 				<text>#0001</text>
-				<text>期望送达</text>
+				<text style="margin: 0 10px;">期望送达</text>
 				<text>明天 06:30</text>
-				<text>待消费</text>
+				<text style="flex: 1;text-align: right;color: red;">待消费</text>
 			</view>
 			<view class="box1" style="display: flex;height: 50px;line-height: 50px;padding: 0 10px;">
 				<view style="border: 1px solid #48D1CC;height: 25px;line-height: 25px;padding: 0 10px;border-radius: 10px;margin-top: auto;margin-bottom: auto;color: #48D1CC;font-weight: 700;">
@@ -31,15 +31,15 @@
 			</view>
 			<view class="box1" style="display: flex;">
 				<view class="">
-					<view class="">
+					<view style="font-weight: 700;height: 25px;">
 						收货人：田（先生）
 					</view>
-					<view class="">
+					<view style="color: #777;height: 35px;">
 						河北省沧州市东川建设集团优先公司5楼右转右手边第一个门
 					</view>
 				</view>
 				<view class="">
-					<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 30px;height: 30px;margin-top: 10px;" />
+					<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 30px;height: 30px;margin-top: 14px;" />
 				</view>
 			</view>
 		</view>
@@ -70,7 +70,6 @@
 		},
 		onLoad(option) {
 			this.shopId = option.id
-			this.getList()
 		},
 		methods: {
 			getList(){

pages/index/index.vue

@@ -370,6 +370,9 @@
 		data() {
 			return {
 				pages:[{
+					name:'商家订单详情111',
+					url:'/package2/shop/orderDetail'
+				},{
 					name:'发布订单评价111',
 					url:'/package1/order/orderEvaluate'
 				},{
@@ -567,6 +570,19 @@
 			
 		},
 		onShow() {
+			this.indexInit()
+		},
+		onReady() {
+			// 记录分类栏相对页面的偏移量，用于上滑检测
+			setTimeout(() => {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#menuList').boundingClientRect(rect => {
+					if (rect) this.menuListOffsetTop = rect.top + this.lastScrollTop;
+				}).exec();
+			}, 500);
+		},
+		methods: {
+			indexInit(){
 				let that = this
 				uni.getSystemInfo({
 					success: function(info) {
@@ -621,16 +637,6 @@
 				const info = uni.getSystemInfoSync();
 				this.navBarHeight = info.statusBarHeight;
 			},
-		onReady() {
-			// 记录分类栏相对页面的偏移量，用于上滑检测
-			setTimeout(() => {
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#menuList').boundingClientRect(rect => {
-					if (rect) this.menuListOffsetTop = rect.top + this.lastScrollTop;
-				}).exec();
-			}, 500);
-		},
-		methods: {
 			// 内部切换方法：带isSwitching保护，防止程序化滚动期间闪回
 			_switchCategory(index) {
 				if (this.isSwitching) return;
@@ -925,6 +931,9 @@
 				this.lastIndex = this.currentIndex
 				this.currentIndex = index
 				switch (index) {
+					case 0:
+						this.indexInit()
+						break;
 					case 1:
 						let worker = uni.getStorageSync('worker')
 						if(worker == '' || worker == undefined || worker == null){