diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue
index 2edf306..87130d5 100644
--- a/package1/buyFood/buyFood.vue
+++ b/package1/buyFood/buyFood.vue
@@ -133,7 +133,7 @@
佣金 ￥
- {{customCommission || '0.1'}}
+ {{customCommission || '请输入'}}
@@ -580,7 +580,7 @@
remark:'',
remarkInputValue: '',
selected: 'buzhiding',
- customCommission: '0.1',
+ customCommission: '',
commissionInputValue: '',
shopItem: {},
cartItems: [],
@@ -831,7 +831,7 @@
formatCommissionValue(value) {
let amount = parseFloat(value);
if (isNaN(amount) || amount < 0.1) {
- return '0.1';
+ return '';
}
amount = Math.floor(amount * 100) / 100;
return amount.toFixed(2).replace(/\.?0+$/, '');
@@ -876,6 +876,11 @@
},
confirmCommission() {
let commission = parseFloat(this.commissionInputValue);
+ if (isNaN(commission) || commission < 0.1) {
+ this.warnPopup = 'psyj';
+ this.$refs.warnPopup.open();
+ return;
+ }
if (commission > 200) {
this.tui.toast('配送佣金不得超过200元');
return;
@@ -1001,7 +1006,6 @@
}
if (this.isPaotui && this.selected === 'buzhiding' && !isJoiningFaceToFace) {
- this.normalizeCustomCommission();
let comm = parseFloat(this.customCommission);
if (isNaN(comm) || comm < 0.1) {
this.warnPopup = 'psyj';
@@ -1012,6 +1016,7 @@
this.tui.toast('配送佣金不得超过200元');
return;
}
+ this.normalizeCustomCommission();
}
if (this.isPaotui && this.selected === 'zhiding' && !this.assignedWorker && !isJoiningFaceToFace) {
diff --git a/package1/ieBrowser/chat.vue b/package1/ieBrowser/chat.vue
index 8b01f2e..896cbb7 100644
--- a/package1/ieBrowser/chat.vue
+++ b/package1/ieBrowser/chat.vue
@@ -1,5 +1,5 @@
-
+
@@ -87,7 +87,7 @@
-
+
🎯 {{ quizButtonText }}
{{ item }}
@@ -103,7 +103,7 @@
-
+
☺
{{ voiceMode ? '⌨' : '🎙' }}
0) {
+ this.keyboardHeight = 0
+ this.$nextTick(() => {
+ this.scrollToBottom(false)
+ })
+ }
+ },
localMessageKey() {
return this.roomId ? 'ie_chat_local_messages_' + this.roomId : ''
},
@@ -590,6 +605,7 @@
mediaFormat: item.mediaFormat,
poster: item.poster || item.thumbTempFilePath || '',
mine,
+ hasPeerReply: !!item.hasPeerReply,
pending: item.mediaAuditStatus === 1,
blocked: item.isBlocked === 1,
blockTip: item.auditTip || (item.isBlocked === 1 ? '内容未通过审核，请换一个更合适的内容' : ''),
@@ -725,6 +741,7 @@
!(item.clientMsgId && exists.has(item.clientMsgId)))
this.mergeMessageStatus(latest)
if (!appended.length) return
+ this.rememberPeerReply(appended)
this.messages = this.messages.concat(appended)
this.scrollToBottom()
},
@@ -738,6 +755,7 @@
local.blocked = !!remote.blocked
local.blockTip = remote.blockTip || (local.blocked ? '内容未通过审核，请换一个更合适的内容' : '')
local.mediaAuditStatus = remote.mediaAuditStatus || local.mediaAuditStatus || 0
+ if (remote.hasPeerReply) this.hasPeerReply = true
local.messageId = remote.messageId || local.messageId
local.poster = remote.poster || local.poster || ''
local.localOnly = false
@@ -756,6 +774,10 @@
const records = Array.isArray(page) ? page : (page.records || [])
return records.map(item => this.normalizeMessage(item)).reverse()
},
+ rememberPeerReply(list) {
+ if (this.hasPeerReply) return
+ this.hasPeerReply = (list || []).some(item => item && (item.hasPeerReply || (!item.mine && item.messageType && !item.blocked)))
+ },
async loadLatestMessages() {
if (!this.roomId) return
this.messagePage = 1
@@ -768,6 +790,7 @@
}
const page = await pageIeMessages(this.roomId, this.messagePage, this.messagePageSize)
const latest = this.normalizePage(page)
+ this.rememberPeerReply(latest)
if (!latest.length && this.messages.length) {
this.hasMoreMessages = false
return
@@ -787,6 +810,7 @@
try {
const page = await pageIeMessages(this.roomId, nextPage, this.messagePageSize)
const older = this.normalizePage(page)
+ this.rememberPeerReply(older)
const exists = new Set(this.messages.map(item => item.messageId || item.clientMsgId))
const deduped = older.filter(item => !exists.has(item.messageId || item.clientMsgId))
this.messages = deduped.concat(this.messages)
@@ -974,8 +998,12 @@
return true
},
needWaitReply() {
+ if (this.hasPeerReply) return false
const delivered = this.messages.filter(item => item && !item.blocked && item.messageType)
- if (delivered.some(item => !item.mine)) return false
+ if (delivered.some(item => !item.mine)) {
+ this.hasPeerReply = true
+ return false
+ }
return delivered.filter(item => item.mine).length >= 3
},
async persistMessage(payload) {
@@ -1005,6 +1033,7 @@
msg.mediaFormat = ack.mediaFormat || msg.mediaFormat
msg.poster = ack.poster || msg.poster || ''
msg.mediaAuditStatus = ack.mediaAuditStatus || msg.mediaAuditStatus || 0
+ if (ack.hasPeerReply) this.hasPeerReply = true
msg.blocked = ack.isBlocked === 1
msg.localOnly = false
msg.localState = ''
@@ -1628,7 +1657,9 @@
this.applyAck(msg)
return
}
- this.messages.push(this.normalizeMessage(msg))
+ const normalized = this.normalizeMessage(msg)
+ this.rememberPeerReply([normalized])
+ this.messages.push(normalized)
this.scrollToBottom()
})
ieSocket.onPresence((event) => {
diff --git a/package1/index/deliveryPersonList.vue b/package1/index/deliveryPersonList.vue
index ba6f5a3..83fd68d 100644
--- a/package1/index/deliveryPersonList.vue
+++ b/package1/index/deliveryPersonList.vue
@@ -25,15 +25,11 @@
@tap="searchShop('area',item.id)">{{item.title}}
-
- 交易保障
-
相同地址
-
+
@@ -117,7 +113,6 @@
markers: [], // 标记点，可以包括配送员位置和用户位置
polyline: [], // 路线，如果需要显示配送员路线
menuButtonInfo: {},
- baozhang: false,
xiangtong: false,
shopArea: [{
id: 0,
@@ -285,7 +280,6 @@
shopAreaId: this.shopAreaId,
orderType: this.orderType,
putAreaId: this.putAreaId,
- baozhang: this.baozhang,
xiangtong: this.xiangtong,
sortField: this.sortField,
regionId: this.regionId,
@@ -357,8 +351,6 @@
} else {
this.sortField = 'score'
}
- } else if (type == 'baozhang') {
- this.baozhang = !this.baozhang
} else if (type == 'xiangtong') {
this.xiangtong = !this.xiangtong
}
@@ -473,6 +465,11 @@
border-radius: 10rpx;
}
+ .search-member {
+ width: 44%;
+ box-sizing: border-box;
+ }
+
.sort-value {
width: 160rpx;
height: auto;
diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue
index 5107bf8..ff8b520 100644
--- a/package1/order/orderDetail.vue
+++ b/package1/order/orderDetail.vue
@@ -635,50 +635,60 @@
-
-
-
-
- ![]()
-
-
-
- {{item.createByName}}
-
-
- {{item.createTime}}
-
-
+
+
@@ -969,7 +979,8 @@
assignWorkerSelectionKey: '',
payCountdownText: '60:00',
payCountdownSeconds: 0,
- payCountdownTimer: null
+ payCountdownTimer: null,
+ isExpanded: false
}
},
computed: {
@@ -1175,6 +1186,13 @@
const second = String(date.getSeconds()).padStart(2, '0');
return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
},
+ isWorkerEvaluate(item) {
+ const shopId = item && item.shopId ? String(item.shopId) : '';
+ return shopId.charAt(0).toUpperCase() == 'W';
+ },
+ getEvaluateTargetText(item) {
+ return this.isWorkerEvaluate(item) ? '配送员评价' : '商家评价';
+ },
previewImage(url) {
if (!url) return;
uni.previewImage({
@@ -1361,6 +1379,9 @@
this.tui.toast("暂无评价");
}
},
+ toggleReply() {
+ this.isExpanded = !this.isExpanded;
+ },
orderStatus(item) {
if (item.status == 0 || item.status == 10 || item.status == 2 || (item.status == 3 && item.deliveryType ==
1) || (item.status == 3 && item.deliveryType == 2) || item.status == 4) {
@@ -2231,7 +2252,13 @@
top: 0;
left: 0;
right: 0;
- z-index: 50;
+ height: 430rpx;
+ z-index: 999;
+ background:
+ radial-gradient(circle at 12% 8%, rgba(166, 255, 234, 0.48) 0, rgba(166, 255, 234, 0) 260rpx),
+ radial-gradient(circle at 92% 18%, rgba(255, 221, 176, 0.26) 0, rgba(255, 221, 176, 0) 300rpx),
+ linear-gradient(180deg, #ecfff7 0%, #f7fbf6 100%);
+ overflow: visible;
}
.order-detail-header-content {
@@ -2239,6 +2266,7 @@
top: 190rpx;
left: 0;
width: 100%;
+ z-index: 2;
}
.content {
@@ -2248,12 +2276,13 @@
}
.order-detail-content {
- padding-top: 396rpx;
+ padding-top: 430rpx;
box-sizing: border-box;
+ z-index: 1;
}
.order-detail-content-address-long {
- padding-top: 456rpx;
+ padding-top: 490rpx;
}
.title-sreach {
@@ -2425,8 +2454,10 @@
.order-status-card {
background:
radial-gradient(circle at 94% 4%, rgba(255, 221, 176, 0.2) 0, rgba(255, 221, 176, 0) 170rpx),
- linear-gradient(135deg, rgba(255, 255, 255, 0.98) 0%, rgba(244, 255, 251, 0.96) 100%);
+ linear-gradient(135deg, #ffffff 0%, #f4fffb 100%);
border-radius: 36rpx;
+ position: relative;
+ z-index: 3;
}
.goods-img {
@@ -2886,6 +2917,48 @@
.evaluate-content {
background: linear-gradient(180deg, #ffffff 0%, #f7fffb 100%);
+ width: 100vw;
+ max-height: 78vh;
+ padding: 34rpx 28rpx calc(28rpx + env(safe-area-inset-bottom));
+ box-sizing: border-box;
+ overflow: hidden;
+ }
+
+ .evaluate-popup-header {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 8rpx 24rpx;
+ }
+
+ .evaluate-popup-title {
+ color: #243f38;
+ font-size: 34rpx;
+ font-weight: 900;
+ line-height: 48rpx;
+ }
+
+ .evaluate-popup-subtitle {
+ margin-top: 6rpx;
+ color: #7b8883;
+ font-size: 24rpx;
+ line-height: 34rpx;
+ }
+
+ .evaluate-popup-close {
+ height: 56rpx;
+ padding: 0 24rpx;
+ border-radius: 999rpx;
+ background: rgba(0, 35, 28, 0.06);
+ color: #243f38;
+ font-size: 24rpx;
+ font-weight: 700;
+ line-height: 56rpx;
+ }
+
+ .evaluate-scroll {
+ max-height: 62vh;
+ overflow: hidden;
}
.evaluate-list {
@@ -3353,15 +3426,23 @@
margin-top: 40rpx;
}
+ .evaluate-list:first-child {
+ margin-top: 0;
+ }
+
.eval-title {
width: 100%;
- height: 80rpx;
+ min-height: 80rpx;
display: flex;
+ align-items: center;
}
.eval-icon {
height: 80rpx;
width: 80rpx;
+ flex-shrink: 0;
+ border-radius: 50%;
+ overflow: hidden;
img {
width: 100%;
@@ -3372,28 +3453,71 @@
.eval-name {
margin-left: 20rpx;
+ flex: 1;
+ min-width: 0;
}
.name1 {
font-size: 28rpx;
line-height: 50rpx;
font-weight: 700;
+ color: #243f38;
+ }
+
+ .eval-time {
+ color: #9aa6a2;
+ font-size: 22rpx;
+ line-height: 32rpx;
+ }
+
+ .eval-target-tag {
+ flex-shrink: 0;
+ height: 44rpx;
+ padding: 0 18rpx;
+ border-radius: 999rpx;
+ background: #f0fffa;
+ color: #0f806d;
+ font-size: 22rpx;
+ font-weight: 700;
+ line-height: 44rpx;
+ }
+
+ .eval-target-tag.worker {
+ background: #fff7e8;
+ color: #d87800;
}
.eval-rate {
display: flex;
- margin: 20rpx 0 0 100rpx;
- height: 48rpx;
- line-height: 40rpx;
+ margin-left: 14rpx;
+ padding-top: 4rpx;
}
.eval-content {
- margin-left: 100rpx;
+ margin: 22rpx 0 0 100rpx;
font-size: 28rpx;
color: #777;
line-height: 48rpx;
}
+ .eval-rate-row {
+ display: flex;
+ align-items: center;
+ min-height: 50rpx;
+ color: #243f38;
+ font-size: 24rpx;
+ font-weight: 700;
+ line-height: 50rpx;
+ }
+
+ .eval-text {
+ margin-top: 10rpx;
+ color: #4f5e59;
+ font-size: 26rpx;
+ line-height: 40rpx;
+ word-break: break-all;
+ }
+
.eval-img {
display: flex;
width: 100%;
@@ -3401,13 +3525,54 @@
margin-top: 20rpx;
img {
- width: 100rpx;
- height: 100rpx;
+ width: 132rpx;
+ height: 132rpx;
background-size: 100%;
margin-right: 20rpx;
+ border-radius: 18rpx;
+ object-fit: cover;
}
}
+ .reply-card {
+ margin-top: 18rpx;
+ padding: 18rpx 20rpx;
+ border-radius: 18rpx;
+ background: rgba(255, 255, 255, 0.78);
+ border: 1rpx solid rgba(0, 35, 28, 0.06);
+ }
+
+ .reply-header {
+ display: flex;
+ align-items: flex-start;
+ }
+
+ .reply-content {
+ flex: 1;
+ min-width: 0;
+ color: #65736f;
+ font-size: 24rpx;
+ line-height: 36rpx;
+ word-break: break-all;
+ }
+
+ .reply-content.collapsed {
+ display: -webkit-box;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ }
+
+ .reply-expand-btn {
+ flex-shrink: 0;
+ margin-left: 18rpx;
+ color: #0f806d;
+ font-size: 24rpx;
+ font-weight: 700;
+ line-height: 36rpx;
+ }
+
.car-close {
width: 60rpx;
height: 60rpx;
diff --git a/package1/order/orderEvaluate.vue b/package1/order/orderEvaluate.vue
index e5d704d..86a3bea 100644
--- a/package1/order/orderEvaluate.vue
+++ b/package1/order/orderEvaluate.vue
@@ -16,7 +16,7 @@
{{shopData.shopName}}
-
+
![]()
@@ -50,7 +50,7 @@
- 您对本次消费体验还满意吗？
+ 您对本单商家服务还满意吗？
@@ -61,19 +61,19 @@
-
+
-
+
+ style="background: rgba(247, 248, 248, 0.6);text-align: center;line-height: 120rpx;">
+ :key="index" style="width: 120rpx;height: 120rpx;margin-left: 20rpx;">
![]()
-
+
发图/发视频能更有效地帮助他人哦~
@@ -81,7 +81,7 @@
- 您对本次配送人员还满意吗？
+ 您对本单配送服务还满意吗？
@@ -92,19 +92,19 @@
-
+
+ style="background: rgba(247, 248, 248, 0.6);text-align: center;line-height: 120rpx;">
+ :key="index" style="width: 120rpx;height: 120rpx;margin-left: 20rpx;">
![]()
-
+
发图/发视频能更有效地帮助他人哦~
@@ -141,8 +141,8 @@
return {
selected:'niming',
menuButtonInfo: {},
- shopEvaluateNum:5,
- manEvaluateNum:5,
+ shopEvaluateNum:0,
+ manEvaluateNum:0,
shopRemark:'',
manRemark:'',
shopPicture:'',
@@ -200,6 +200,14 @@
},
submit(){
let that = this;
+ if(!this.shopEvaluateNum){
+ that.tui.toast("请选择商家评分");
+ return;
+ }
+ if(this.shopData.deliveryType == 1 && !this.manEvaluateNum){
+ that.tui.toast("请选择配送评分");
+ return;
+ }
let data = [{ //店铺
parentId:'',
leve:0,
@@ -354,18 +362,20 @@
-webkit-overflow-scrolling: touch;
position: absolute;
top: 200rpx;
+ bottom: 0;
left: 2.5%;
+ padding-bottom: 20rpx;
}
.box1 {
width: 100%;
- margin: 0 auto 20rpx;
+ margin: 0 auto 14rpx;
background: #fff;
border-radius: 20rpx;
- padding: 20rpx;
+ padding: 16rpx;
}
.goods-img {
- width: 160rpx;
- height: 160rpx;
+ width: 128rpx;
+ height: 128rpx;
position: relative;
img {
@@ -376,17 +386,17 @@
}
.goods-content {
flex: 1;
- padding-left: 20rpx;
+ padding-left: 16rpx;
}
.goods-name {
- font-size: 32rpx;
+ font-size: 28rpx;
font-weight: 900;
}
.goods-content-center {
display: flex;
- margin: 16rpx 0;
+ margin: 10rpx 0;
color: #777;
}
.goods-deal1 {
@@ -394,7 +404,7 @@
}
.goods-content-bottom {
display: flex;
- line-height: 56rpx;
+ line-height: 44rpx;
color: #777;
}
.pintuan-left-price {
@@ -404,13 +414,13 @@
color: #000;
}
.eval-img{
- width: 92rpx;
- height: 92rpx;
+ width: 72rpx;
+ height: 72rpx;
background-size: 100%;
}
.eval-title{
- height: 108rpx;
- font-size: 28rpx;
+ height: 88rpx;
+ font-size: 26rpx;
text-align: center;
background: rgba(235, 255, 243, 1);
border-top-left-radius: 20rpx;
@@ -419,7 +429,7 @@
border-left: 1px solid rgba(178, 255, 208, 1);
border-right: 1px solid rgba(178, 255, 208, 1);
z-index: 77;
- line-height: 88rpx;
+ line-height: 72rpx;
}
.eval-name{
margin-top: -20rpx;
@@ -431,30 +441,30 @@
background: #fff;
}
.eval-name1{
- height: 108rpx;
- font-size: 40rpx;
+ height: 88rpx;
+ font-size: 34rpx;
font-weight: 700;
text-align: center;
border-bottom: 1px solid #eee;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
- line-height: 108rpx;
+ line-height: 88rpx;
overflow: hidden;
display: block;
}
.eval-num{
- padding-bottom: 30rpx;
+ padding-bottom: 20rpx;
border-bottom: 1px solid #eee;
}
.eval-num1{
- height: 40rpx;
- font-size: 28rpx;
- margin: 30rpx;
+ height: 36rpx;
+ font-size: 26rpx;
+ margin: 22rpx 30rpx;
font-weight: 700;
}
.upload-img {
- width: 160rpx;
- height: 160rpx;
+ width: 120rpx;
+ height: 120rpx;
}
.radio-check {
background: linear-gradient(90deg, #e3ff96, #a6ffea);
@@ -474,18 +484,18 @@
}
.bottom-btn{
width: 95%;
- height: 100rpx;
- line-height: 100rpx;
+ height: 84rpx;
+ line-height: 84rpx;
text-align: center;
- margin: 22rpx auto;
+ margin: 16rpx auto;
border-radius: 100rpx;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
- font-size: 32rpx;
+ font-size: 30rpx;
font-weight: 700;
}
.bottom{
overflow: hidden;
- height: 152rpx;
+ height: 116rpx;
background:#fff;
}
\ No newline at end of file
diff --git a/package1/planet/index.vue b/package1/planet/index.vue
index ce5e405..2dd9a0c 100644
--- a/package1/planet/index.vue
+++ b/package1/planet/index.vue
@@ -194,6 +194,17 @@
+
+
+
+ TOP
+ 学院排位赛获奖啦
+ {{rankTopRewardModal.data.title || '学院排位赛荣耀榜奖励'}}
+ 奖励已发放到账户余额，继续为学院冲榜吧
+ 知道了
+
+
+
@@ -349,6 +360,13 @@
data: {},
receiving: false
},
+ rankTopRewardModal: {
+ show: false,
+ data: {}
+ },
+ winningFallbackLoading: false,
+ winningReadMarked: {},
+ rankTopReminderReadMarked: false,
poolRuleVisible: false,
guideVisible: false,
taskDrawerVisible: false,
@@ -624,7 +642,10 @@
if (res.code == 200 && res.result) {
this.home = res.result
this.loadedOnce = true
- this.showUnreadWinning()
+ if (!this.showUnreadWinning()) {
+ this.loadUnreadWinningFallback()
+ }
+ this.showRankTopRewardIfNeeded()
this.showGuideTaskIfNeeded()
} else if (res.message) {
this.tui.toast(res.message)
@@ -674,14 +695,88 @@
},
showUnreadWinning() {
const win = this.home && this.home.unreadWinning
+ return this.showWinningModal(win)
+ },
+ showWinningModal(win) {
const winnerId = this.getWinnerId(win)
- if (!win || !winnerId) return
- if (this.winningModal.show && this.getWinnerId(this.winningModal.data) === winnerId) return
+ if (!win || !winnerId) return false
+ if (this.winningModal.show && this.getWinnerId(this.winningModal.data) === winnerId) return true
this.winningModal = {
show: true,
data: win,
receiving: false
}
+ this.markWinningRead(win)
+ return true
+ },
+ loadUnreadWinningFallback() {
+ if (this.winningFallbackLoading || this.winningModal.show) return
+ this.winningFallbackLoading = true
+ this.tui.request('/app/planet/draw/myWinning', 'POST', {
+ userId: this.userId,
+ regionId: this.regionId
+ }, false, false, true).then((res) => {
+ this.winningFallbackLoading = false
+ if (res.code != 200) return
+ const list = Array.isArray(res.result) ? res.result : []
+ for (let i = 0; i < list.length; i++) {
+ const item = list[i]
+ if (this.getWinnerId(item) && Number(item.isRead || 0) !== 1) {
+ this.showWinningModal(item)
+ return
+ }
+ }
+ }).catch(() => {
+ this.winningFallbackLoading = false
+ })
+ },
+ markWinningRead(win) {
+ const winnerId = this.getWinnerId(win)
+ if (!winnerId || Number((win && win.isRead) || 0) === 1 || this.winningReadMarked[winnerId]) return
+ this.winningReadMarked[winnerId] = true
+ this.tui.request('/app/planet/draw/read', 'POST', {
+ userId: this.userId,
+ regionId: this.regionId,
+ winnerId
+ }, false, false, true).then((res) => {
+ if (res.code == 200) {
+ win.isRead = 1
+ if (this.home && this.home.unreadWinning && this.getWinnerId(this.home.unreadWinning) === winnerId) {
+ this.home.unreadWinning.isRead = 1
+ }
+ } else {
+ this.winningReadMarked[winnerId] = false
+ }
+ }).catch(() => {
+ this.winningReadMarked[winnerId] = false
+ })
+ },
+ showRankTopRewardIfNeeded() {
+ const reminders = (this.home && this.home.homeReminders) || {}
+ const reward = reminders.planetRankTop
+ if (!reward || this.rankTopRewardModal.show || this.rankTopReminderReadMarked) return false
+ if (this.winningModal.show) return false
+ this.rankTopRewardModal = {
+ show: true,
+ data: reward
+ }
+ this.markRankTopRewardRead()
+ return true
+ },
+ closeRankTopReward() {
+ this.rankTopRewardModal.show = false
+ },
+ markRankTopRewardRead() {
+ if (this.rankTopReminderReadMarked) return
+ this.rankTopReminderReadMarked = true
+ this.tui.request('/app/planet/rankTop/read', 'POST', {
+ userId: this.userId,
+ regionId: this.regionId
+ }, false, false, true).then((res) => {
+ if (res.code != 200) this.rankTopReminderReadMarked = false
+ }).catch(() => {
+ this.rankTopReminderReadMarked = false
+ })
},
getWinnerId(win) {
if (!win) return ''
@@ -697,6 +792,7 @@
}
if (win.isReceived === 1) {
this.winningModal.show = false
+ this.showRankTopRewardIfNeeded()
return
}
this.winningModal.receiving = true
@@ -709,6 +805,7 @@
this.tui.toast(res.message, 1500, res.code == 200)
if (res.code == 200) {
this.winningModal.show = false
+ this.showRankTopRewardIfNeeded()
this.loadHome(true)
}
}).catch(() => {
@@ -2420,6 +2517,17 @@
animation: bounce 1s ease infinite;
}
+ .rank-reward-card {
+ background: linear-gradient(155deg, rgba(255,255,255,0.96), rgba(232,246,255,0.9) 54%, rgba(244,255,250,0.9));
+ box-shadow: 0 38rpx 90rpx rgba(79,183,255,0.22);
+ }
+
+ .rank-reward-medal {
+ background: linear-gradient(145deg, #E8F6FF, #4FB7FF);
+ color: #0B6D9F;
+ box-shadow: inset -12rpx -16rpx 28rpx rgba(11,109,159,0.12), 0 22rpx 48rpx rgba(79,183,255,0.26);
+ }
+
.win-title {
position: relative;
margin-top: 24rpx;
diff --git a/package1/runErrand/runErrand.vue b/package1/runErrand/runErrand.vue
index 8a8e1a5..f287cea 100644
--- a/package1/runErrand/runErrand.vue
+++ b/package1/runErrand/runErrand.vue
@@ -118,7 +118,7 @@
佣金 ￥
- {{customCommission || '0.1'}}
+ {{customCommission || '请输入'}}
@@ -401,7 +401,7 @@
menuButtonInfo: {},
selectedWorker:'buzhiding',
assignedWorker:null,
- customCommission:'0.1',
+ customCommission:'',
commissionInputValue: '',
remarkInputValue: '',
shopArea: [],
@@ -509,7 +509,7 @@
formatCommissionValue(value) {
let amount = parseFloat(value);
if (isNaN(amount) || amount < 0.1) {
- return '0.1';
+ return '';
}
amount = Math.floor(amount * 100) / 100;
return amount.toFixed(2).replace(/\.?0+$/, '');
@@ -536,6 +536,11 @@
},
confirmCommission() {
let commission = parseFloat(this.commissionInputValue);
+ if (isNaN(commission) || commission < 0.1) {
+ this.warnPopup = 'psyj';
+ this.$refs.warnPopup.open();
+ return;
+ }
if (commission > 200) {
this.tui.toast('配送佣金不得超过200元');
return;
@@ -892,7 +897,6 @@
return;
}
if (this.selectedWorker === 'buzhiding') {
- this.customCommission = this.formatCommissionValue(this.customCommission);
let comm = parseFloat(this.customCommission);
if (isNaN(comm) || comm < 0.1) {
this.warnPopup = 'psyj';
@@ -903,6 +907,7 @@
this.tui.toast('配送佣金不得超过200元');
return;
}
+ this.customCommission = this.formatCommissionValue(this.customCommission);
}
if (this.selectedWorker === 'zhiding' && !this.assignedWorker) {
this.warnPopup = 'psy';