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

components/tab-bar/delivery.vue

@@ -129,7 +129,7 @@
 						</view> -->
 					</view>
 					<view style="display: flex;border-radius: 20rpx;margin-top: 32rpx;border: 1px solid rgba(166, 255, 234, 0.78);padding: 10px;">
-						<view class="goods-content">
+						<view class="goods-content" @tap="productDetail(item)">
 							<view class="goods-name" style="font-size: 24rpx;line-height: 50rpx;display: flex;">
 								<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1f77398a73454a6595c12a3c18731599.png"
 									alt="" style="width: 50rpx;height: 50rpx;" />
@@ -138,17 +138,13 @@
 										{{item.shopName}}
 									</view>
 									<view class="shop-address-row">
-										<view @tap="productDetail(item)" v-if="item.deliveryType == 1"
-											class="detail-tag">
-											祥
-										</view>
 										<view class="shop-address">
 											{{item.shopAddress}}
 										</view>
 									</view>
 								</view>
 								<view class="right">
-									<img @tap="makeCall(item.shopPhone)"
+									<img @tap.stop="makeCall(item.shopPhone)"
 										src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
 										alt="" style="width: 60rpx;height: 60rpx;" />
 								</view>
@@ -166,7 +162,7 @@
 									</view>
 								</view>
 								<view class="right">
-									<img @tap="makeCall(item.receiverPhone)"
+									<img @tap.stop="makeCall(item.receiverPhone)"
 										src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
 										alt="" style="width: 60rpx;height: 60rpx;" />
 								</view>

pages/index/index.vue

@@ -805,8 +805,6 @@
 				// 获取用户当前位置
 				// this.getUserLocation();
 				this.getUserOrders();
-				// 建立WebSocket连接或定时请求获取配送员位置
-				this.getDeliveryLocation();
 				if (!uni.getStorageSync('area')) {
 					this.checkArea()
 				} else {
@@ -1303,44 +1301,6 @@
 					phoneNumber: phone
 				});
 			},
-			// 获取配送员位置，这里假设使用WebSocket
-			getDeliveryLocation() {
-				// WebSocket连接，需要时放开
-				// uni.connectSocket({
-				//   url: "wss://www.example.com/socket",
-				//   header: {
-				//     "content-type": "application/json",
-				//   },
-				//   protocols: ["protocol1"],
-				//   method: "GET",
-				// });
-
-
-
-				// 假设我们有一个WebSocket连接，这里用setInterval模拟定时获取
-				// this.deliveryTimer = setInterval(() => {
-				// 实际开发中，这里应该是从WebSocket推送或后端API获取
-				// 模拟数据
-				const deliveryLat = this.latitude;
-				const deliveryLng = this.longitude;
-				// 更新配送员位置标记
-				// 先清除之前的配送员标记，假设配送员标记id为1
-				this.markers = this.markers.filter(marker => marker.id !== 1);
-				// 添加新的配送员标记
-				this.markers.push({
-					id: 1,
-					latitude: deliveryLat,
-					longitude: deliveryLng,
-					title: '张三',
-					iconPath: '/static/images/tabbar/fabu1.png', // 配送员图标
-					width: 30,
-					height: 30
-				});
-				// 将地图中心移动到配送员位置
-				this.latitude = deliveryLat;
-				this.longitude = deliveryLng;
-				// }, 5000);
-			},
 			// 页面卸载时清除定时器
 			onUnload() {
 				if (this.deliveryTimer) {