From ef46d13d5fa70d1c94f25de294f5ed177b751234 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 02 三月 2026 16:40:30 +0800
Subject: [PATCH] 提交
---
mini-program/pagesA/pages/order-details/order-details.vue | 106 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 78 insertions(+), 28 deletions(-)
diff --git a/mini-program/pagesA/pages/order-details/order-details.vue b/mini-program/pagesA/pages/order-details/order-details.vue
index 539f579..0baccbc 100644
--- a/mini-program/pagesA/pages/order-details/order-details.vue
+++ b/mini-program/pagesA/pages/order-details/order-details.vue
@@ -18,7 +18,21 @@
<text v-if="info.orderStatus ==6" class="info-status grey">宸查��娆�</text>
<template v-if="userType==1">
<view class="info-desc" v-if="info.orderStatus ==0">
- 鍓╀綑鏀粯鏃堕棿 08:32锛岃繃鏈熷皢鑷姩鍙栨秷~
+ 鍓╀綑鏀粯鏃堕棿
+ <u-count-down
+ :time="info.countdown"
+ format="HH:mm:ss"
+ autoStart
+ millisecond
+ @change="onChange"
+ >
+ <view class="time">
+ <text class="time__item">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}:</text>
+ <text class="time__item">{{ timeData.minutes }}:</text>
+ <text class="time__item">{{ timeData.seconds }}</text>
+ </view>
+ </u-count-down>
+ 锛岃繃鏈熷皢鑷姩鍙栨秷~
</view>
<view class="info-desc" v-if="info.orderStatus ==1">
{{info.receiveType==1?'璇风瓑寰呭鎴疯嚜鎻愯喘涔扮殑鍟嗗搧锝�':'绛夊緟骞冲彴鍙戣揣'}}
@@ -38,7 +52,21 @@
</template>
<view class="info-desc" v-if="userType==0">
<view class="info-desc" v-if="info.orderStatus ==0">
- 鍓╀綑鏀粯鏃堕棿 08:32锛岃灏藉揩浠樻鍝︼紝杩囨湡灏嗚嚜鍔ㄥ彇娑垀
+ 鍓╀綑鏀粯鏃堕棿
+ <u-count-down
+ :time="info.countdown"
+ format="HH:mm:ss"
+ autoStart
+ millisecond
+ @change="onChange"
+ >
+ <view class="time">
+ <text class="time__item">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}:</text>
+ <text class="time__item">{{ timeData.minutes }}:</text>
+ <text class="time__item">{{ timeData.seconds }}</text>
+ </view>
+ </u-count-down>
+ 锛岃灏藉揩浠樻鍝︼紝杩囨湡灏嗚嚜鍔ㄥ彇娑垀
</view>
<view class="info-desc" v-if="info.orderStatus ==1">
{{info.receiveType==1?'璇峰墠寰�鎸囧畾闂ㄥ簵杩涜鏍搁攢锝�':'鍟嗗搧宸叉墦鍖咃紝绛夊緟鍙戣揣锝�'}}
@@ -58,32 +86,49 @@
</view>
</view>
<view class="user" v-if="userType!=1">
- <view class="user-jxa">
- <view class="user-jxa-title">
- <image src="/static/icon/ic_address@2x1.png" mode="widthFix"></image>
- <text>{{info.shopInfo.name||''}}</text>
+ <template v-if="info.receiveType==1">
+ <view class="user-jxa">
+ <view class="user-jxa-title">
+ <image src="/static/icon/ic_address@2x1.png" mode="widthFix"></image>
+ <text>{{info.shopInfo.name||''}}</text>
+ </view>
+ <view class="user-jxa-lx" @click="contact( info.shopInfo.phone)">
+ <image src="/static/icon/ic_call@2x.png" mode="widthFix"></image>
+ <text > 鑱旂郴缁忛攢鍟�</text>
+ </view>
</view>
- <view class="user-jxa-lx" @click="contact( info.shopInfo.phone)">
- <image src="/static/icon/ic_call@2x.png" mode="widthFix"></image>
- <text > 鑱旂郴缁忛攢鍟�</text>
+ <view class="user-jxtime">
+ <image class="user-jxtime-icon" src="/static/icon/ic_openinghours@2x.png" mode="widthFix"></image>
+ <text>钀ヤ笟鏃堕棿锛歿{info.shopInfo.startTime || ''}}</text>
</view>
- </view>
- <view class="user-jxtime">
- <image class="user-jxtime-icon" src="/static/icon/ic_openinghours@2x.png" mode="widthFix"></image>
- <text>钀ヤ笟鏃堕棿锛歿{info.shopInfo.startTime || ''}}</text>
- </view>
- <view class="user-jxtime" @click="jumpMap()">
- <image class="user-jxtime-icon" src="/static/icon/ic_shopaddress@2x.png" mode="widthFix"></image>
- <text>{{info.shopInfo.addr || ''}}</text>
- <image class="user-jxtime-to" src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
- </view>
- <view class="user-qrcode" v-if="info.orderStatus ==1 &&info.receiveType==1">
- <view class="user-qrcode-image">
- <image v-if="qrCodeBase64" :src="qrCodeBase64" ></image>
+ <view class="user-jxtime" @click="jumpMap()">
+ <image class="user-jxtime-icon" src="/static/icon/ic_shopaddress@2x.png" mode="widthFix"></image>
+ <text>{{info.linkAddress || ''}}</text>
+ <image class="user-jxtime-to" src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
</view>
- <view class="user-qrcode-code">{{info.exchangeCode || ''}}</view>
- <view class="user-qrcode-btn" @click="copyText(info.exchangeCode)">澶嶅埗鑷彁鐮�</view>
- </view>
+ <view class="user-qrcode" v-if="info.orderStatus ==1 &&info.receiveType==1">
+ <view class="user-qrcode-image">
+ <image v-if="qrCodeBase64" :src="qrCodeBase64" ></image>
+ </view>
+ <view class="user-qrcode-code">{{info.exchangeCode || ''}}</view>
+ <view class="user-qrcode-btn" @click="copyText(info.exchangeCode)">澶嶅埗鑷彁鐮�</view>
+ </view>
+ </template>
+ <template v-else>
+ <view class="user-top">
+ <view class="user-icon" style="width: 48rpx; height: 48rpx;">
+ <image src="/static/icon/ic_location@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="user-info">
+ <view class="user-info-a">
+ <text>{{info.linkName || ''}} {{info.linkPhone || ''}}</text>
+ </view>
+ <view class="user-info-b">
+ <text>{{info.linkAddress || ''}}</text>
+ </view>
+ </view>
+ </view>
+ </template>
</view>
<view class="user" v-if="userType==1">
<view class="user-top">
@@ -151,7 +196,7 @@
<view class="shop">
<view class="shop-top">
<view :class="'shop-top-tips '+(info.receiveType==1?'shop-top-tips-a':'shop-top-tips-b' )">{{info.receiveType==1?'鑷彁':'閰嶉��'}}</view>
- <text>{{info.shopInfo.name || ''}}</text>
+ <text>{{info.shopInfo.name || '鍚堣偉榧庡厓瀹樻柟閰嶉��'}}</text>
</view>
<view class="b" v-if="info.goodsorderDetailList && info.goodsorderDetailList.length">
<view class="b-item" v-for="(item, index) in info.goodsorderDetailList" :key="index" @click="jumpGoodsDetail(item,index)" >
@@ -263,7 +308,7 @@
<text>{{info.doneDate || ''}}</text>
</view>
</view>
- <view class="xinxi-list-item" v-if="1==2">
+ <view class="xinxi-list-item">
<view class="xinxi-list-item-label">璁㈠崟澶囨敞锛�</view>
<view class="xinxi-list-item-right">
<text>{{info.memberInfo||'-'}}</text>
@@ -351,7 +396,8 @@
id:null,
userType:0,
shop:{},
- info:{shopInfo:{}}
+ info:{shopInfo:{}},
+ timeData: {}
};
},
onShow() {
@@ -376,6 +422,9 @@
this.qrCodeUrl=''
},
methods:{
+ onChange(e) {
+ this.timeData = e
+ },
payOrder() {
var that = this;
this.$u.api.replayPay({
@@ -697,6 +746,7 @@
color: #FFFFFF;
}
.info-desc {
+ display: flex;
font-weight: 400;
font-size: 26rpx;
color: #FFFFFF;
--
Gitblit v1.9.3