1

components/common-loading/common-loading.vue

@@ -8,7 +8,7 @@
 	>
 		<view class="common-loading__box">
 			<view class="common-loading__halo"></view>
-			<image class="common-loading__gif" src="/static/images/img/loading.gif" mode="aspectFit"></image>
+			<image class="common-loading__gif" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/f7227759d693497a8beab87ff437a875.png" mode="aspectFit"></image>
 			<view v-if="title" class="common-loading__text">{{ title }}</view>
 			<view class="common-loading__hint">请稍候，正在为你处理</view>
 		</view>

components/tab-bar/delivery.vue

@@ -123,8 +123,7 @@
 							{{item.mustFinishTime != null ? item.mustFinishTime : '' | formatHourMinute }}前送达
 						</view>
 					</view>
-					<view class="" v-if="item.remark != '' && item.remark != null"
+					<view class="delivery-remark" v-if="item.remark != '' && item.remark != null">
-						style="background: rgba(247, 248, 248, 0.6);height: 80rpx;line-height: 80rpx;font-weight: 500;padding: 0 20rpx;border-radius: 20rpx;">
 						备注：{{item.remark}}
 					</view>
 					<view class="express-info-card" v-if="item.deliveryType == 3 || item.deliveryType == 2">
@@ -144,8 +143,12 @@
 						</view>
 						<view class="express-picture-list" v-if="getPickupPictures(item).length > 0">
 							<view class="express-picture-title">取件码截图</view>
-							<image class="express-picture" v-for="(pic,picIndex) in getPickupPictures(item)" :key="picIndex"
+							<scroll-view scroll-x class="express-picture-scroll">
-								:src="pic" mode="aspectFill" @tap.stop="largeImg(pic)"></image>
+								<view class="express-picture-track">
+									<image class="express-picture" v-for="(pic,picIndex) in getPickupPictures(item)" :key="picIndex"
+										:src="pic" mode="aspectFill" @tap.stop="previewPickupPicture(item, picIndex)"></image>
+								</view>
+							</scroll-view>
 						</view>
 						<!-- <view style="display: flex;padding: 10px 0;">
 							<view class="code-box" style="margin-right:10px;">
@@ -370,7 +373,7 @@
 					</scroll-view>
 					<view class="dispatch-actions">
 						<view class="dispatch-action-btn dispatch-action-btn--secondary" @tap="buchong">
-							补充范围
+							去设置接单规则
 						</view>
 						<view class="dispatch-action-btn dispatch-action-btn--primary" @tap="selectRule">
 							确认并保存
@@ -693,6 +696,14 @@
 					urls: [url]
 				});
 			},
+			previewPickupPicture(item, index) {
+				const urls = this.getPickupPictures(item);
+				if (urls.length === 0) return;
+				uni.previewImage({
+					current: urls[index] || urls[0],
+					urls: urls
+				});
+			},
 			ensureLogin() {
 				const token = uni.getStorageSync('hiver_token')
 				if (token && typeof token === 'string' && token.trim() && token !== 'null' && token !== 'undefined') {
@@ -749,7 +760,7 @@
 			},
 			goDeliveryRanking() {
 				uni.navigateTo({
-					url: '/package2/shop/ranking'
+					url: '/package3/shop/ranking'
 				})
 			},
 			goPartTimeRegister() {
@@ -980,7 +991,9 @@
 			productDetail(item) {
 				const goodsList = item.goodsList || item.mallOrderGoodsList || item.orderGoodsList || [];
 				this.productData = goodsList;
-				this.$refs.productPopup.open()
+				if(item.deliveryType != undefined && item.deliveryType  == 1){
+					this.$refs.productPopup.open()
+				}
 			},
 			buchong() {
 				this.$refs.carPopup.close()
@@ -1761,6 +1774,19 @@
 		white-space: normal;
 	}
 
+	.delivery-remark {
+		margin-top: 12rpx;
+		padding: 18rpx 20rpx;
+		border-radius: 20rpx;
+		background: rgba(247, 248, 248, 0.72);
+		color: #33433f;
+		font-size: 26rpx;
+		font-weight: 600;
+		line-height: 40rpx;
+		word-break: break-all;
+		overflow-wrap: break-word;
+	}
+
 	.express-info-card {
 		margin-top: 16rpx;
 		padding: 16rpx 18rpx;
@@ -1813,10 +1839,6 @@
 
 	.express-picture-list {
 		margin-top: 14rpx;
-		display: flex;
-		align-items: center;
-		flex-wrap: wrap;
-		gap: 12rpx;
 	}
 
 	.express-picture-title {
@@ -1830,9 +1852,24 @@
 		font-weight: 800;
 	}
 
+	.express-picture-scroll {
+		width: 100%;
+		margin-top: 12rpx;
+		white-space: nowrap;
+	}
+
+	.express-picture-track {
+		display: inline-flex;
+		align-items: center;
+		gap: 14rpx;
+		padding-right: 8rpx;
+	}
+
 	.express-picture {
-		width: 112rpx;
+		width: 156rpx;
-		height: 112rpx;
+		height: 156rpx;
+		flex-shrink: 0;
+		margin-right: 14rpx;
 		border-radius: 14rpx;
 		background: #eef4f1;
 		border: 1px solid rgba(0, 35, 28, 0.08);

components/tab-bar/myCenter.vue

@@ -426,7 +426,7 @@
 					action: 'collect'
 				}, {
 					type: 'agent',
-					title: '成为代理',
+					title: '加入合伙人',
 					tip: '',
 					icon: this.getMyCenterImage('quickAgent'),
 					action: 'agent'
@@ -742,7 +742,7 @@
 				} else if (this.schoolShop.length == 1) {
 					this.setCurrentShop(this.schoolShop[0])
 					uni.navigateTo({
-						url: '/package2/shop/merchantCenter'
+						url: '/package3/shop/merchantCenter'
 					})
 					return
 				}
@@ -754,7 +754,7 @@
 					success: function(res) {
 						if (res.confirm) {
 							uni.navigateTo({
-								url: '/package2/shop/merchantRegister'
+								url: '/package3/shop/merchantRegister'
 							})
 						}
 					}
@@ -850,7 +850,7 @@
 				this.setCurrentShop(item)
 				this.$refs.shopPopup.close()
 				uni.navigateTo({
-					url: '/package2/shop/merchantCenter'
+					url: '/package3/shop/merchantCenter'
 				})
 			},
 			checkArea() {
@@ -907,11 +907,21 @@
 				} else if (e == 'goodsList') {
 					url = '/package2/myCenter/goodsList'
 				} else if (e == 'merchant') {
-					url = '/package2/shop/merchantRegister'
+					url = '/package3/shop/merchantRegister'
 				} else if (e == 'tuichu') {
-					uni.clearStorageSync()
+					uni.showModal({
-					uni.reLaunch({
+						title: '确认退出',
-						url: '/package2/login/login'
+						content: '确定要退出当前账号吗？',
+						confirmText: '确认退出',
+						cancelText: '取消',
+						confirmColor: '#FF4D4D',
+						success: (res) => {
+							if (!res.confirm) return
+							uni.clearStorageSync()
+							uni.reLaunch({
+								url: '/package2/login/login'
+							})
+						}
 					})
 					return
 				} else if (e == 'qiehuan') {
@@ -920,7 +930,7 @@
 				} else if (e == 'address') {
 					url = '/package1/address/addressPage'
 				} else if (e == 'collect') {
-					url = '/package2/myCenter/problemFeedback'
+					url = '/package3/myCenter/problemFeedback'
 				} else if (e == 'evaluate') {
 					this.showComingSoon('我的评价')
 					return
@@ -937,16 +947,15 @@
 				} else if (e == 'idleTrad') {
 					url = '/package2/IdleTrad/detail'
 				} else if (e == 'agent') {
-					this.showComingSoon('成为代理')
+					url = '/package2/myCenter/campusPartner'
-					return
 				} else if (e == 'ie') {
-					url = '/package1/ieBrowser/index'
+					url = '/package4/ieBrowser/index'
 				} else if (e == 'planet') {
-					url = '/package1/planet/index'
+					url = '/package5/planet/index'
 				}  else if (e == 'planetPK') {
-					url = '/package1/planet/adventure'
+					url = '/package5/planet/adventure'
 				} else if (e == 'deliveryRank') {
-					url = '/package2/shop/ranking'
+					url = '/package3/shop/ranking'
 				} else if (e == 'shopData') {
 					url = '/package2/myCenter/dataStatistics'
 				} else if (e == 'jianzhichaping') {
@@ -993,7 +1002,7 @@
 						return
 					}
 				} else if (e == 'jianzhizhuye') {
-					url = '/package2/partTimeJob/partTimeJobCenter'
+					url = '/package3/partTimeJob/partTimeJobCenter'
 				}
 				if (!url) return
 				uni.navigateTo({

components/tab-bar/postList.vue

@@ -255,6 +255,9 @@
 			this.applyCachedPostListImages()
 			uni.$on('fishUnreadChange', this.handleFishUnreadChange)
 		},
+		onShow() {
+			this.keyword = ''
+		},
 		beforeDestroy() {
 			Object.keys(this.likeEffectTimers || {}).forEach(key => {
 				clearTimeout(this.likeEffectTimers[key])
@@ -393,6 +396,7 @@
 				this.savePostListImageCache(cache)
 			},
 			init() {
+				this.keyword = ''
 				const menuInfo = uni.getMenuButtonBoundingClientRect()
 				if (menuInfo && menuInfo.top) {
 					this.menuButtonInfo = menuInfo
@@ -559,7 +563,7 @@
 						xiangyao: item.likeCount || 0,
 						browseCount: item.browseCount || 0,
 						distance: item.distance || '本校',
-						icon: item.userAvatar || '/static/images/img/songshu.png',
+						icon: item.userAvatar || 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/f7227759d693497a8beab87ff437a875.png',
 						shopName: item.userName || '校园同学',
 						regionName: item.regionName || item.schoolName || item.areaName || fallbackRegionName,
 						tags: tags.length ? tags : (item.negotiable == 1 ? ['可小刀'] : []),

components/tab-bar/release.vue

@@ -280,7 +280,7 @@
 				reactionBurstTimer: null,
 				reactionBurstEffects: [],
 				imageSizeMap: {},
-				defaultAvatar: '/static/images/img/songshu.png'
+				defaultAvatar: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/f7227759d693497a8beab87ff437a875.png'
 			}
 		},
 		computed: {
@@ -317,6 +317,9 @@
 		created() {
 			this.applyCachedReleaseChannelIcons()
 		},
+		onShow() {
+			this.keyword = ''
+		},
 		mounted() {
 			if (uni.getMenuButtonBoundingClientRect) {
 				this.statusBarHeight = uni.getMenuButtonBoundingClientRect().top || this.statusBarHeight
@@ -461,6 +464,7 @@
 				this.saveReleaseIconCache(cache)
 			},
 			init() {
+				this.keyword = ''
 				if (this.inited && this.loading) return
 				this.inited = true
 				this.loadUnread()