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

components/tab-bar/delivery.vue

@@ -79,7 +79,9 @@
 						<view  v-if="item.deliveryType == 3" style="height: 40rpx;line-height: 40rpx;background: rgba(130, 255, 130, 1);padding: 0 16rpx;border-radius: 40rpx;margin: 14rpx 20rpx 0 0;">
 							代跑腿
 						</view>
-						（{{item.mustFinishTime != null ? item.mustFinishTime : '' | formatHourMinute }}前送达）
+						<view class="" :style="{'color':shouldNotify(item.mustFinishTime)?'red':''}">
+							{{item.mustFinishTime != null ? item.mustFinishTime : '' | formatHourMinute }}前送达
+						</view>
 					</view>
 					<view class="" v-if="item.remark != '' && item.remark != null"
 						style="background: #f5f5f5;height: 80rpx;line-height: 80rpx;font-weight: 500;padding: 0 20rpx;border-radius: 20rpx;">
@@ -370,7 +372,7 @@
 		        const minute = String(date.getMinutes()).padStart(2, '0');
 		        
 		        // 拼接格式：日-日-时:分
-		        return `${day}-${hour}:${minute}`;
+		        return `${day}日${hour}:${minute}`;
 		  }
 		},
 		methods: {
@@ -408,6 +410,20 @@
 				this.getDelivery()
 				this.$forceUpdate();
 			},
+			shouldNotify(mustFinishTimeStr) {
+			    // 直接解析 ISO 8601 格式的时间字符串（自动处理时区偏移）
+			    const targetTime = new Date(mustFinishTimeStr);
+			    // 校验解析是否成功
+			    if (isNaN(targetTime.getTime())) {
+			        throw new Error('Invalid date format: ' + mustFinishTimeStr);
+			    }
+			
+			    const currentTime = new Date();
+			    const diffMs = targetTime - currentTime; // 毫秒差，正数表示未来，负数表示已过
+			
+			    // 超过目标时间（diffMs <= 0）或 剩余时间不到10分钟（0 < diffMs < 600000）
+			    return diffMs <= 0 || diffMs < 10 * 60 * 1000;
+			},
 			getDelivery(){
 				let that = this
 				this.tui.request("/mall/delivery/pagebyworker", "POST", this.searchForm, false, false).then((res) => {
@@ -756,7 +772,7 @@
 	}
 
 	.maotou {
-		width: 90rpx;
+		width: 280rpx;
 		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/a1584a13e9db4b6fbcc66890219d0018.png') no-repeat;
 		height: 90rpx;
 		background-size: 100%;

components/tab-bar/tab-bar.vue

@@ -120,6 +120,11 @@
 				this.indexWorkerCount = 0
 				this.indexMyCount = 0
 				let that = this
+				let shopId = uni.getStorageSync('shopId')
+				let worker = uni.getStorageSync('worker')
+				if(!shopId && !worker){
+					return
+				}
 				this.tui.request("/mall/delivery/countOrderByStatus", "POST", {workerId:uni.getStorageSync('worker').workerId}, false, true).then((res) => {
 					if (res.code == 200) {
 						if(res.result != null){

package1/group/shopEvaluate.vue

@@ -45,7 +45,7 @@
 							{{item.createByName}}
 						</view>
 						<view class="eval-time">
-							{{item.createTime}}
+							{{item.createTime | formatTime}}
 						</view>
 					</view>
 				</view>
@@ -125,6 +125,32 @@
 		},
 		components: {
 
+		},
+		filters:{
+			formatTime(value) {
+			  const date = new Date(value);
+			  
+			  // 获取年份
+			  const year = date.getFullYear();
+			  
+			  // 获取月份 (getMonth 返回 0-11，所以需要 +1)，并补齐0
+			  const month = String(date.getMonth() + 1).padStart(2, '0');
+			  
+			  // 获取日 (getDate)，并补齐0
+			  const day = String(date.getDate()).padStart(2, '0');
+			  
+			  // 获取小时 (getHours)，并补齐0
+			  const hour = String(date.getHours()).padStart(2, '0');
+			  
+			  // 获取分钟 (getMinutes)，并补齐0
+			  const minute = String(date.getMinutes()).padStart(2, '0');
+			  
+			  // 获取秒 (getSeconds)，并补齐0
+			  const second = String(date.getSeconds()).padStart(2, '0');
+			  
+			  // 拼接格式：年-月-日 时:分:秒
+			  return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+			}
 		},
 		onLoad(option) {
 			this.shopItem = JSON.parse(option.item)

package1/order/orderEvaluate.vue

@@ -211,18 +211,21 @@
 					score:this.shopEvaluateNum,
 					orderId:this.shopData.id,
 					shopId:this.shopData.shopId,
-				},{  //配送员
-					parentId:'',
-					leve:0,
-					remark:this.shopRemark,
-					picture:this.manPicture,
-					createBy:uni.getStorageSync('id'),
-					createByName:'微信用户',
-					createByIcon:'https://ooo.0o0.ooo/2019/04/28/5cc5a71a6e3b6.png',
-					score:this.manEvaluateNum,
-					orderId:this.shopData.id,
-					shopId:this.manId,
 				}]
+				if(this.shopData.deliveryType == 1){
+					data.push({  //配送员
+						parentId:'',
+						leve:0,
+						remark:this.shopRemark,
+						picture:this.manPicture,
+						createBy:uni.getStorageSync('id'),
+						createByName:'微信用户',
+						createByIcon:'https://ooo.0o0.ooo/2019/04/28/5cc5a71a6e3b6.png',
+						score:this.manEvaluateNum,
+						orderId:this.shopData.id,
+						shopId:this.manId,
+					})
+				}
 				that.tui.request("/app/comment/save", "POST", data, false, false).then((res) => {
 					if (res.code == 200) {
 						uni.showToast({

package2/shop/merchantCenter.vue

@@ -281,7 +281,7 @@
 					case 'pj':
 						let item = {
 							shopScore:uni.getStorageSync('shopScore'),
-							id:uni.getStorageSync('id')
+							id:uni.getStorageSync('shopId')
 						}
 						url = '/package1/group/shopEvaluate?item=' + JSON.stringify(item)
 						break;

package2/shop/shopOrderList.vue

@@ -53,13 +53,84 @@
 				</view>
 			</view>
 			<view style="height: 80rpx;border-top: 1px solid #eee;display: flex;">
-				<view v-if="item.orderType != 1" style="margin: 20rpx 0;background: linear-gradient(90deg, #FF4500, #FFA07A);width: 40rpx;height: 40rpx;line-height: 40rpx;text-align: center;border-radius: 10rpx;color: #fff;">拼</view>
+				<view class="pinzi" @tap.stop="tanchuang(item.deliveryType)" style="width:80rpx;font-weight:700;margin-right: 20rpx;color:#00231C;background:linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))">
+					{{item.deliveryType == 1?'配送':'自取'}}
+				</view>
+				<view v-if="item.orderType != 1" @tap.stop="getGroupOrders(item.id)" class="pinzi">
+					拼
+				</view>
 				<view style="flex: 1;"></view>
 				<view @tap.stop="mealServing(item)" v-if="currentIndex == 13" class="btn" style="margin: 10rpx 0 0 20rpx;">
 					已出餐
 				</view>
 			</view>
 		</view>
+		<!-- 拼团详情弹窗 -->
+		<uni-popup ref="pintuanPopup" background-color="#fff">
+			<view class="guize-list">
+				<view v-for="(item,index) in tuanzhangOrder" :key="index">
+					<view style="height: 80rpx;line-height: 80rpx;font-size: 36rpx;font-weight: 700;">
+						订单{{index + 1}}
+					</view>
+					<view class="">
+						<view class="dingdan">
+							<view class="pt-title">
+								配送信息
+							</view>
+							<view style="display:flex">
+								<view style="width:300rpx;">
+									配送编号：
+								</view>
+								<view class="pituan-text">
+									{{item.numberCode}}
+								</view>
+							</view>
+							<view style="display:flex">
+								<view style="width:300rpx;">
+									订单号：
+								</view>
+								<view class="pituan-text">
+									{{item.id}}
+								</view>
+								
+							</view>
+							<view style="display:flex">
+								<view style="width:300rpx;">
+									订单时间：
+								</view>
+								<view class="pituan-text">
+									{{item.createTime | formatISOTime}}
+								</view>
+							</view>
+						</view>
+						<view class="dingdan" v-for="(item1,index1) in item.goodsList" :key="index1">
+							<view class="pt-title">
+								商品信息
+							</view>
+							<view style="display: flex;font-weight: 700;">
+								<view style="flex:1">
+									商品名：{{item1.productName}}
+								</view>
+								<view style="width:100rpx;">
+									X{{item1.quantity}}
+								</view>
+								<view style="width:220rpx;text-align: right;padding-right:20rpx;">
+									￥{{item1.price}}
+								</view>
+							</view>
+						</view>
+						<view class="dingdan">
+							<view style="text-align: right;padding-right: 20rpx;color: #777;">
+								餐盒费：￥{{item.packageFee}} 配送费：￥{{item.deliveryFee}}
+							</view>
+							<view style="text-align: right;padding-right: 20rpx;font-size: 28rpx;font-weight: 700;color: red;">
+								总计：￥{{item.totalAmount}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -77,6 +148,7 @@
 					regionId: JSON.parse(uni.getStorageSync('area')).id
 				},
 				totalPages: 1,
+				tuanzhangOrder:[],
 				orderList: [],
 				currentIndex: 10,
 				menuButtonInfo: {},
@@ -197,6 +269,21 @@
 					uni.hideLoading();
 				}).catch((res) => {});
 			},
+			tanchuang(v){
+				this.tui.toast('该订单为'+(v==1?'配送':'自取')+'单')
+			},
+			getGroupOrders(id){
+				this.tui.request("/mall/order/selectAllOrderByOrderId/"+id, "GET", {}, false, true).then((res) => {
+					if (res.code == 200) {
+						this.tuanzhangOrder = res.result;
+						this.$refs.pintuanPopup.open('bottom')
+					} else {
+						that.tui.toast(res.message)
+						return
+					}
+					uni.hideLoading()
+				}).catch((res) => {})
+			},
 			openPopup(){
 				this.$refs.groupPopup.open()
 			},
@@ -373,4 +460,39 @@
 		font-weight: 700;
 		margin-top: 20rpx;
 	}
+	.pinzi{
+		margin: 20rpx 0;
+		background: linear-gradient(90deg, #FF4500, #FFA07A);
+		width: 40rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		text-align: center;
+		border-radius: 10rpx;
+		color: #fff;
+	}
+	.guize-list {
+		width: 100%;
+		padding: 20rpx;
+		overflow: scroll;
+		background: #fff;
+		max-height: 1000rpx;
+		line-height: 25px;
+	}
+	.pt-title{
+		font-size: 28rpx;
+		    font-weight: 700;
+		    color: #777;
+	}
+	.dingdan{
+		    border-top: 1px solid #eee;
+	}
+	.uni-popup__wrapper{
+		border-radius: 20rpx !important;
+	}
+	.pituan-text{
+		flex:1;
+		text-align:right;
+		padding-right:20rpx;
+		font-weight: 700;
+	}
 </style>

pages/index/index.vue

@@ -26,38 +26,41 @@
 							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/eaae29a344a241b3b46e7b91882ca197.png" alt="" />
 						</swiper-item>
 					</swiper>
-					<swiper class="swiper" vertical circular :autoplay="orderLists.length > 0"
+					<view class="" style="background: #fff;">
-					:interval="onlineWorkerInterval" :duration="onlineWorkerDuration">
+						<swiper class="swiper" vertical circular :autoplay="orderLists.length > 0"
-						<swiper-item v-if="orderLists.length > 0" v-for="(item,index) in orderLists" :key="index" @tap="goOrderDetail(item)">
+						:interval="onlineWorkerInterval" :duration="onlineWorkerDuration" style="height: 74px;margin-top: -50px;">
-							<view class="order-msg-box">
+							<swiper-item v-if="orderLists.length > 0" v-for="(item,index) in orderLists" :key="index" @tap="goOrderDetail(item)">
-								<view class="order-msg-left">
+								<view class="order-msg-box">
-									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/bf2bb7f80e17428391c407aef769517a.png" alt="" />
+									<view class="order-msg-left">
-								</view>
+										<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/bf2bb7f80e17428391c407aef769517a.png" alt="" />
-								<view class="order-msg-center">
-									<view style="font-weight: 700;font-size: 30rpx;line-height: 60rpx;margin-top: 5%;">
-										<text v-if="item.status == 0">待支付</text>
-										<text v-if="item.status == 2">等待配送员接单</text>
-										<text v-if="item.status == 10">待成团</text>
-										<text v-if="item.status == 3 && item.deliveryType == 1">配送员已接单</text>
-										<text v-if="item.status == 3 && item.deliveryType == 2">待消费</text>
-										<text v-if="item.status == 4 && item.deliveryType == 1">配送员已取货</text>
-										<text v-if="item.status == 5">订单已完成</text>
-										<text v-if="item.status == 7">等待同意退款</text>
-										<text v-if="item.status == 6">订单已取消</text>
-										<text v-if="item.status == 8">订单已退款</text>
-										<text v-if="item.status == 11">售后中</text>
-										<text v-if="item.status == 12">订单已售后</text>
 									</view>
-									<view style="font-size: 24rpx;" v-if="item.deliveryType == 1 && (item.status == 3 || item.status == 4) && item.deliveryInfo != null">
+									<view class="order-msg-center">
-										预计<text style="color: red;">{{item.deliveryInfo.mustFinishTime | formatHourMinute }}</text>送达
+										<view style="font-weight: 700;font-size: 30rpx;line-height: 60rpx;margin-top: 5%;">
+											<text v-if="item.status == 0">待支付</text>
+											<text v-if="item.status == 2">等待配送员接单</text>
+											<text v-if="item.status == 10">待成团</text>
+											<text v-if="item.status == 3 && item.deliveryType == 1">配送员已接单</text>
+											<text v-if="item.status == 3 && item.deliveryType == 2">待消费</text>
+											<text v-if="item.status == 4 && item.deliveryType == 1">配送员已取货</text>
+											<text v-if="item.status == 5">订单已完成</text>
+											<text v-if="item.status == 7">等待同意退款</text>
+											<text v-if="item.status == 6">订单已取消</text>
+											<text v-if="item.status == 8">订单已退款</text>
+											<text v-if="item.status == 11">售后中</text>
+											<text v-if="item.status == 12">订单已售后</text>
+										</view>
+										<view style="font-size: 24rpx;" v-if="item.deliveryType == 1 && (item.status == 3 || item.status == 4) && item.deliveryInfo != null">
+											预计<text style="color: red;">{{item.deliveryInfo.mustFinishTime | formatHourMinute }}</text>送达
+										</view>
+									</view>
+									<view class="order-msg-right" @tap.stop="$refs.pagesPopup.open()">
+										<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/579569bfcc954f52baea06f6f11951be.png" alt="" />
 									</view>
 								</view>
-								<view class="order-msg-right" @tap.stop="$refs.pagesPopup.open()">
+							</swiper-item>
-									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/579569bfcc954f52baea06f6f11951be.png" alt="" />
+						</swiper>
-								</view>
+					</view>
-							</view>
+					
-						</swiper-item>
-					</swiper>
 					
 					<view class="menu-box">
 						<view class="menu-list" @tap="goDetail('1')">