From 908b9876dde97acbb09c53dc6debe3eecbb9d1b4 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:10:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/luggage-storage/luggage-storage.vue | 79 ++++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 26 deletions(-)
diff --git a/small-program/pages/luggage-storage/luggage-storage.vue b/small-program/pages/luggage-storage/luggage-storage.vue
index 0633e92..26fb854 100644
--- a/small-program/pages/luggage-storage/luggage-storage.vue
+++ b/small-program/pages/luggage-storage/luggage-storage.vue
@@ -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,7 +145,9 @@
: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.remark || '' }}</text>
@@ -209,7 +211,7 @@
</view>
</view>
<view v-if="amountData || showInsuranceTip" class="insurance-tip-row">
- <text v-if="showInsuranceTip" class="insurance-tip-warning">鎮ㄧ殑鐗╁搧浠峰�艰緝楂橈紝寤鸿璐拱淇濅环鏈嶅姟</text>
+ <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>
@@ -284,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>
@@ -321,19 +326,31 @@
</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="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>
@@ -347,9 +364,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">
@@ -392,7 +409,7 @@
{ label: '灏卞湴瀵勫瓨', value: 'local' },
{ label: '鍚屽煄瀵勯��', value: 'city' }
],
- agreementChecked: true,
+ agreementChecked: false,
tempSelectedStoreId: 2,
selectedStoreId: 2,
tempSelectedGoodsIds: [1],
@@ -412,6 +429,7 @@
},
amountData: null,
showInsuranceTip: false,
+ showInsuranceTipText: '',
luggageTypes: [],
serviceTimes: [],
@@ -473,7 +491,7 @@
this.getNearbyShopList()
this.getCategoryList()
this.getCitySizeList()
-
+ this.agreementChecked=false
uni.$on('updateAddress', (data) => {
console.log(data)
this.receiveAddr = data
@@ -646,14 +664,15 @@
}
this.showStorePopup = false
},
- confirmGoods(relationOtherField) {
+ confirmGoods() {
if (!this.goodsOptions.find(item => item.active)) {
uni.showToast({ title: '璇烽�夋嫨鐗╁搧淇℃伅', icon: 'none' })
return
}
this.form.goodTypeName = this.goodsOptions.find(item => item.active)?.name || ''
this.form.goodType = this.goodsOptions.find(item => item.active)?.id || ''
- this.showInsuranceTip = relationOtherField === 1
+ this.showInsuranceTip = this.goodsOptions.find(item => item.active)?.relationOtherField === '1'
+ this.showInsuranceTipText = this.goodsOptions.find(item => item.active)?.relationRemark
this.showGoodsPopup = false
},
confirmArriveTime(e) {
@@ -962,9 +981,11 @@
} else {
uni.showToast({ title: '鏀粯澶辫触', icon: 'none' })
}
- uni.redirectTo({
- url: '/pages/delivery-order-detail/delivery-order-detail?id=' + orderId
+ uni.setStorageSync("orderStatus",-2)
+ uni.switchTab({
+ url: '/pages/itinerary/itinerary'
});
+
}
})
}
@@ -1484,7 +1505,7 @@
.luggage-item {
display: flex;
- align-items: baseline;
+ align-items: flex-end;
justify-content: space-between;
padding: 24rpx;
box-sizing: border-box;
@@ -1510,6 +1531,9 @@
height: 100rpx;
border-radius: 8rpx;
margin-right: 18rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
background: #f0f1f4;
overflow: hidden;
margin-right: 24rpx;
@@ -1755,6 +1779,9 @@
font-weight: 500;
color: #333333;
border: 2rpx solid transparent;
+ white-space: nowrap; /* 闃叉鏂囨湰鎹㈣ */
+ overflow: hidden; /* 闅愯棌婧㈠嚭鐨勫唴瀹� */
+ text-overflow: ellipsis; /* 鏄剧ず鐪佺暐鍙锋潵浠ｈ〃琚慨鍓殑鏂囨湰 */
box-sizing: border-box;
}
--
Gitblit v1.9.3