From f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 30 四月 2026 15:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/luggage-storage/luggage-storage.vue | 182 +++++++++++++++++++++++++++++++++++----------
1 files changed, 140 insertions(+), 42 deletions(-)
diff --git a/small-program/pages/luggage-storage/luggage-storage.vue b/small-program/pages/luggage-storage/luggage-storage.vue
index 937f3dc..f56b395 100644
--- a/small-program/pages/luggage-storage/luggage-storage.vue
+++ b/small-program/pages/luggage-storage/luggage-storage.vue
@@ -16,7 +16,7 @@
<scroll-view scroll-y class="page-scroll">
<view class="page-content">
- <view v-if="activeMode === 'local'" class="service-point-card cell-card" @click="openStorePopup">
+ <view v-if="activeMode === 'local'" class="service-point-card cell-card" @click="openStorePopup0">
<view class="cell-left with-icon">
<image class="cell-icon" src="/static/icon/ic_store@2x.png" mode="widthFix"></image>
<view class="store-cell-copy">
@@ -133,7 +133,7 @@
<text class="section-title">瀵勫瓨琛屾潕绫诲瀷</text>
<text class="section-desc">锛堝閫夛紝蹇呭～锛�</text>
</view>
- <view class="price-note">
+ <view class="price-note" @click="goRichText(9)">
<image class="price-note-icon" src="/static/icon/ic_tips@2x.png" mode="widthFix"></image>
<text>浠锋牸璇存槑</text>
</view>
@@ -145,15 +145,17 @@
:class="{ active: item.count > 0 }"
>
<view class="luggage-info">
- <image class="luggage-image" :src="item.iconFull" mode="widthFix"></image>
+ <view class="luggage-image">
+ <image style="height: 100%;" :src="item.iconFull" mode="heightFix"></image>
+ </view>
<view class="luggage-copy">
<text class="luggage-name">{{ item.name }}</text>
- <text class="luggage-size">{{ item.otherField || '' }}</text>
+ <text class="luggage-size">{{ item.remark || '' }}</text>
</view>
</view>
<view class="luggage-stepper">
<image class="step-btn" src="/static/icon/ic_jian@2x.png" mode="widthFix" @click="decreaseCount(index)"></image>
- <text class="step-count">{{ item.count }}</text>
+ <text class="step-count">{{ item.count || 0}}</text>
<image class="step-btn" src="/static/icon/ic_jia@2x.png" mode="widthFix" @click="increaseCount(index)"></image>
</view>
</view>
@@ -208,9 +210,13 @@
<text class="unit-text">鍏�</text>
</view>
</view>
- <view v-if="amountData" class="insurance-tip-row">
- <text class="insurance-tip-label">鐗╁搧淇濊垂:</text>
- <text class="insurance-tip-value">锟{ amountData.insuranceFee }}</text>
+ <view v-if="amountData || showInsuranceTip" class="insurance-tip-row">
+ <text v-if="showInsuranceTip" class="insurance-tip-warning">{{ showInsuranceTipText }}</text>
+ <text v-else></text>
+ <view style="display: flex; align-items: center;">
+ <text v-if="amountData" class="insurance-tip-label">鐗╁搧淇濊垂:</text>
+ <text v-if="amountData" class="insurance-tip-value">锟{ amountData.insuranceFee }}</text>
+ </view>
</view>
</view>
@@ -245,7 +251,7 @@
@click="storeList.forEach((row,i) => row.active = index === i)"
>
<view class="store-option-main">
- <image class="store-thumb" src="" mode="aspectFill"></image>
+ <image class="store-thumb" :src="item.coverImg || '/static/icon/default2.png'" mode="aspectFill"></image>
<view class="store-option-copy">
<view class="store-option-head">
<text class="store-option-name">{{ item.name }}</text>
@@ -255,7 +261,7 @@
<image class="store-option-address-icon" src="/static/icon/home_ic_location3@2x.png" mode="widthFix"></image>
<text class="store-option-address">{{ item.address }}</text>
</view>
- <text class="store-option-time">{{ item.time }}</text>
+ <text class="store-option-time">{{ item.shopHours || '' }}</text>
</view>
</view>
<view v-if="tempSelectedStoreId === item.id" class="store-check">
@@ -280,23 +286,26 @@
<text class="goods-main-title">鐗╁搧鍚嶇О</text>
<text class="goods-main-required">锛堝繀閫夛級</text>
</view>
- <view class="goods-danger-tip">
+ <view class="goods-danger-tip" @click="goRichText(10)">
<image class="goods-danger-icon" src="/static/icon/ic_tips@2x.png" mode="widthFix"></image>
<text>绂佸瘎鐗╁搧</text>
</view>
</view>
<text class="goods-popup-desc">涓虹‘淇濈墿鍝佸瘎閫掑畨鍏紝璇锋鏌ユ槸鍚︿笉澶瑰甫鏄撶噧鏄撶垎鐗╁搧</text>
- <view class="goods-tag-grid">
- <view
- v-for="(item, index) in goodsOptions"
- :key="index"
- class="goods-tag"
- :class="{ active: item.active }"
- @click="goodsOptions.forEach((row,i) => row.active = i === index)"
- >
- <text>{{ item.name }}</text>
+ <view style="display: block;height: 500rpx;overflow-y: auto;margin-top:10px ;">
+ <view class="goods-tag-grid">
+ <view
+ v-for="(item, index) in goodsOptions"
+ :key="index"
+ class="goods-tag"
+ :class="{ active: item.active }"
+ @click="goodsOptions.forEach((row,i) => row.active = i === index)"
+ >
+ <text>{{ item.name }}</text>
+ </view>
</view>
- </view>
+ </view>
+
<view class="goods-save-btn" @tap="confirmGoods">淇濆瓨</view>
</view>
</u-popup>
@@ -317,19 +326,37 @@
</view>
<text class="amount-row-value">{{ '锟�' + item.unitPrice }}</text>
</view>
+ <view v-if="activeMode === 'city' && amountData.distance" class="amount-row amount-row-extra">
+ <view class="amount-row-left">
+ <text class="amount-row-label">閰嶉�侀噷绋�</text>
+ </view>
+ <text class="amount-row-value">{{ amountData.distance + 'km' }}</text>
+ </view>
+ <view v-if="activeMode !== 'city' && amountData.days" class="amount-row amount-row-extra">
+ <view class="amount-row-left">
+ <text class="amount-row-label">瀵勫瓨澶╂暟</text>
+ </view>
+ <text class="amount-row-value">{{ amountData.days + '澶�' }}</text>
+ </view>
+ <view v-if="amountData.insuranceFee" class="amount-row amount-row-extra">
+ <view class="amount-row-left">
+ <text class="amount-row-label">鐗╁搧淇濊垂</text>
+ </view>
+ <text class="amount-row-value">{{ '锟�' + amountData.insuranceFee }}</text>
+ </view>
</view>
<view class="agreement-bar popup-agreement-bar" @click="toggleAgreement">
<image class="agreement-icon" :src="agreementChecked ? '/static/icon/ic_accept_sel@2x.png' : '/static/icon/ic_accept@2x.png'" mode="widthFix" />
<text class="agreement-text">鎴戝凡闃呰骞跺悓鎰�</text>
- <text class="agreement-link" @tap="goRichText('protocol')">銆婄敤鎴锋湇鍔″崗璁��</text>
+ <text class="agreement-link" @tap="goRichText(0)">銆婄敤鎴锋湇鍔″崗璁��</text>
<text class="agreement-text">鍙�</text>
- <text class="agreement-link" @tap="goRichText('privacy')">銆婇殣绉佹斂绛栥��</text>
+ <text class="agreement-link" @tap="goRichText(1)">銆婇殣绉佹斂绛栥��</text>
</view>
<view class="bottom-action-row popup-action-row">
<view class="total-wrap">
<text class="total-label">鎬昏垂鐢�</text>
<text class="total-price">{{ amountData ? '锟�' + amountData.totalPrice : '锟�--' }}</text>
- <view @click="showAmountPopup = false">
+ <view style="display: flex; align-items: center;" @click="showAmountPopup = false">
<text class="detail-text">鏄庣粏</text>
<u-icon name="arrow-up" size="13" color="#7B7F86"></u-icon>
</view>
@@ -343,9 +370,9 @@
<view class="agreement-bar" @click="toggleAgreement">
<image class="agreement-icon" :src="agreementChecked ? '/static/icon/ic_accept_sel@2x.png' : '/static/icon/ic_accept@2x.png'" mode="widthFix" />
<text class="agreement-text">鎴戝凡闃呰骞跺悓鎰�</text>
- <text class="agreement-link" @tap="goRichText('protocol')">銆婄敤鎴锋湇鍔″崗璁��</text>
+ <text class="agreement-link" @click="goRichText(0)">銆婄敤鎴锋湇鍔″崗璁��</text>
<text class="agreement-text">鍙�</text>
- <text class="agreement-link" @tap="goRichText('privacy')">銆婇殣绉佹斂绛栥��</text>
+ <text class="agreement-link" @click="goRichText(1)">銆婇殣绉佹斂绛栥��</text>
</view>
<view class="bottom-action-row">
<view class="total-wrap">
@@ -359,6 +386,7 @@
<view class="submit-btn active-submit-btn" @click="createOrder">绔嬪嵆涓嬪崟</view>
</view>
</view>
+
<!-- 閫夋嫨鏈嶅姟鐐�/鍦板潃 -->
<u-action-sheet
:show="showReceiveAddress"
@@ -387,7 +415,7 @@
{ label: '灏卞湴瀵勫瓨', value: 'local' },
{ label: '鍚屽煄瀵勯��', value: 'city' }
],
- agreementChecked: true,
+ agreementChecked: false,
tempSelectedStoreId: 2,
selectedStoreId: 2,
tempSelectedGoodsIds: [1],
@@ -406,6 +434,8 @@
goodsImages: [],
},
amountData: null,
+ showInsuranceTip: false,
+ showInsuranceTipText: '',
luggageTypes: [],
serviceTimes: [],
@@ -467,7 +497,7 @@
this.getNearbyShopList()
this.getCategoryList()
this.getCitySizeList()
-
+ this.agreementChecked=false
uni.$on('updateAddress', (data) => {
console.log(data)
this.receiveAddr = data
@@ -557,9 +587,10 @@
})
try {
const uploadResults = await this.uploadFiles(tempFilePaths, maxCount)
+ const addrs = uploadResults.map(item => item.imgaddr)
const fullPaths = uploadResults.map(item => item.url || item.path || item)
this.uploadedImages = [...this.uploadedImages, ...fullPaths.map(url => ({ url }))]
- this.form.goodsImages = [...this.form.goodsImages, ...fullPaths]
+ this.form.goodsImages = [...this.form.goodsImages, ...addrs]
uni.hideLoading()
uni.showToast({
title: '涓婁紶鎴愬姛',
@@ -617,8 +648,16 @@
this.tempSelectedStoreId = null
this.showStorePopup = true
},
+ openStorePopup0() {
+ this.storePopupType = 'send0'
+ this.tempSelectedStoreId = null
+ this.showStorePopup = true
+ },
confirmStore() {
+
+ console.log("=========================")
const selected = this.storeList.find(item => item.active)
+ console.log(selected)
if (this.storePopupType === 'send') {
this.sendStore = selected
} else if (this.storePopupType === 'receive') {
@@ -638,6 +677,8 @@
}
this.form.goodTypeName = this.goodsOptions.find(item => item.active)?.name || ''
this.form.goodType = this.goodsOptions.find(item => item.active)?.id || ''
+ this.showInsuranceTip = this.goodsOptions.find(item => item.active)?.relationOtherField === '1'
+ this.showInsuranceTipText = this.goodsOptions.find(item => item.active)?.relationRemark
this.showGoodsPopup = false
},
confirmArriveTime(e) {
@@ -695,6 +736,7 @@
latitude: this.latitude,
longitude: this.longitude,
cityId: this.cityId,
+ name:this.storeForm.keyword,
sortType: 1
}
})
@@ -726,6 +768,7 @@
},
async calculateLocalPriceOnly() {
if (!this.selectedStore || !this.form.arriveTime || !this.form.pickupTime) {
+ this.amountData = null
return
}
const luggageList = this.luggageTypes
@@ -735,6 +778,7 @@
quantity: item.count
}))
if (luggageList.length === 0) {
+ this.amountData = null
return
}
const res = await this.$u.api.calculateLocalPrice({
@@ -756,9 +800,11 @@
},
async calculateRemotePrice() {
if (!this.sendStore || !this.form.arriveTime || !this.form.pickupTime) {
+ this.amountData = null
return
}
if (!this.receiveStore && !this.receiveAddr) {
+ this.amountData = null
return
}
const luggageList = this.luggageTypes
@@ -768,6 +814,7 @@
quantity: item.count
}))
if (luggageList.length === 0) {
+ this.amountData = null
return
}
let fromLat = ''
@@ -811,10 +858,6 @@
}
},
async createOrder() {
- if (!this.agreementChecked) {
- uni.showToast({ title: '璇峰厛闃呰骞跺悓鎰忕敤鎴锋湇鍔″崗璁強闅愮鏀跨瓥', icon: 'none' })
- return
- }
if (this.activeMode === 'local') {
if (!this.selectedStore) {
uni.showToast({ title: '璇烽�夋嫨闂ㄥ簵', icon: 'none' })
@@ -829,6 +872,20 @@
uni.showToast({ title: '璇烽�夋嫨鍙栦欢鍦板潃', icon: 'none' })
return
}
+ }
+ if (!this.form.receiver) {
+ uni.showToast({ title: '璇疯緭鍏ユ敹浠朵汉濮撳悕', icon: 'none' })
+ return
+ }
+ if (!this.form.mobile) {
+ uni.showToast({ title: '璇疯緭鍏ユ敹浠朵汉鐢佃瘽', icon: 'none' })
+ return
+ }
+ const mobileRegex = /^1\d{10}$/
+ const landlineRegex = /^\d{3,4}-?\d{7,8}$/
+ if (!mobileRegex.test(this.form.mobile) && !landlineRegex.test(this.form.mobile)) {
+ uni.showToast({ title: '璇疯緭鍏ユ纭殑鎵嬫満鍙锋垨鍥哄畾鐢佃瘽', icon: 'none' })
+ return
}
if (!this.form.arriveTime) {
uni.showToast({ title: '璇烽�夋嫨棰勮鍒板簵鏃堕棿', icon: 'none' })
@@ -850,6 +907,26 @@
}))
if (luggageList.length === 0) {
uni.showToast({ title: '璇烽�夋嫨琛屾潕绫诲瀷', icon: 'none' })
+ return
+ }
+ if (!this.form.goodType) {
+ uni.showToast({ title: '璇烽�夋嫨鐗╁搧淇℃伅', icon: 'none' })
+ return
+ }
+ if (!this.form.goodsImages ||!this.form.goodsImages.length) {
+ uni.showToast({ title: '璇蜂笂浼犵墿鍝佺収鐗�', icon: 'none' })
+ return
+ }
+ if (!this.form.goodsImages ||!this.form.goodsImages.length) {
+ uni.showToast({ title: '璇蜂笂浼犵墿鍝佺収鐗�', icon: 'none' })
+ return
+ }
+ if (this.form.insurance === '' || this.form.insurance <= 0) {
+ uni.showToast({ title: '璇疯緭鍏ヤ繚浠疯垂', icon: 'none' })
+ return
+ }
+ if (!this.agreementChecked) {
+ uni.showToast({ title: '璇峰厛闃呰骞跺悓鎰忕敤鎴锋湇鍔″崗璁強闅愮鏀跨瓥', icon: 'none' })
return
}
const items = luggageList.map(item => ({
@@ -877,7 +954,7 @@
orderParams.fromShopId = this.sendStore.id
if (this.receiveStore) {
orderParams.toType = 0
- orderParams.toShopId = this.receiveStore.id
+ orderParams.takeShopId = this.receiveStore.id
orderParams.takeLat = this.receiveStore.latitude
orderParams.takeLgt = this.receiveStore.longitude
orderParams.takeLocation = this.receiveStore.address
@@ -905,7 +982,7 @@
signType: paymentData.signType || 'MD5',
paySign: paymentData.paySign || '',
success: (res) => {
- uni.navigateTo({
+ uni.redirectTo({
url: '/pages/payment-success/payment-success?orderId=' + orderId
});
},
@@ -915,6 +992,11 @@
} else {
uni.showToast({ title: '鏀粯澶辫触', icon: 'none' })
}
+ uni.setStorageSync("orderStatus",-2)
+ uni.switchTab({
+ url: '/pages/itinerary/itinerary'
+ });
+
}
})
}
@@ -954,8 +1036,8 @@
position: relative;
width: 50%;
text-align: center;
- font-size: 28rpx;
- font-weight: 500;
+ font-weight: 600;
+ font-size: 32rpx;
color: #9097a3;
}
@@ -988,8 +1070,7 @@
.store-popup-wrap {
background: #ffffff;
border-radius: 24rpx 24rpx 0 0;
- padding: 0 30rpx;
- box-sizing: border-box;
+ padding: 0 30rpx 16rpx 30rpx;
box-sizing: border-box;
}
@@ -1113,16 +1194,20 @@
.store-option-address-row {
margin-top: 8rpx;
display: flex;
- align-items: center;
+ align-items: flex-start;
+ flex-wrap: wrap;
}
.store-option-address-icon {
+ flex-shrink: 0;
width: 24rpx;
height: 24rpx;
margin-right: 4rpx;
+ margin-top: 6rpx;
}
.store-option-address {
+ flex: 1;
font-size: 26rpx;
color: #9ea4af;
}
@@ -1206,6 +1291,7 @@
display: flex;
align-items: center;
image {
+ flex-shrink: 0;
width: 24rpx;
height: 24rpx;
margin-right: 4rpx;
@@ -1430,7 +1516,7 @@
.luggage-item {
display: flex;
- align-items: baseline;
+ align-items: flex-end;
justify-content: space-between;
padding: 24rpx;
box-sizing: border-box;
@@ -1456,6 +1542,9 @@
height: 100rpx;
border-radius: 8rpx;
margin-right: 18rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
background: #f0f1f4;
overflow: hidden;
margin-right: 24rpx;
@@ -1701,6 +1790,9 @@
font-weight: 500;
color: #333333;
border: 2rpx solid transparent;
+ white-space: nowrap; /* 闃叉鏂囨湰鎹㈣ */
+ overflow: hidden; /* 闅愯棌婧㈠嚭鐨勫唴瀹� */
+ text-overflow: ellipsis; /* 鏄剧ず鐪佺暐鍙锋潵浠ｈ〃琚慨鍓殑鏂囨湰 */
box-sizing: border-box;
}
@@ -1818,7 +1910,7 @@
padding-bottom: 14rpx;
display: flex;
align-items: center;
- justify-content: flex-end;
+ justify-content: space-between;
font-size: 22rpx;
}
@@ -1826,6 +1918,12 @@
color: #999999;
}
+ .insurance-tip-warning {
+ color: #ff4d4f;
+ font-size: 22rpx;
+ font-weight: 400;
+ }
+
.insurance-tip-value {
margin-left: 8rpx;
color: #ff4d4f;
--
Gitblit v1.9.3