From b40a03e6cbba769c752d6d8f3b8a8c9af2e50955 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 28 四月 2026 16:07:04 +0800
Subject: [PATCH] 小程序端和PC端bug修复
---
small-program/shop/pages/write-off-a/write-off-a.vue | 12 ++++++++++--
small-program/pages/delivery-order-detail/delivery-order-detail.vue | 13 ++++++++++---
small-program/shop/pages/order-details/order-details.vue | 16 ++++++++++------
small-program/pages/payment-success/payment-success.vue | 14 +++++++++++---
4 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/small-program/pages/delivery-order-detail/delivery-order-detail.vue b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
index 5c8f781..5ff0fbc 100644
--- a/small-program/pages/delivery-order-detail/delivery-order-detail.vue
+++ b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
@@ -30,7 +30,7 @@
<text>{{info.depositShopName || ''}}</text>
<image src="/static/icon/ar_jicundian@2x.png" mode="widthFix"></image>
</view>
- <text>{{info.takeUser || ''}} {{info.takePhone || ''}}</text>
+ <text>{{info.depositShopAddress || ''}} </text>
</view>
<view class="addr-item" v-if="info.type === 1">
<view class="ji bg1">鏀�</view>
@@ -38,14 +38,13 @@
<text>{{info.takeShopName || info.takeLocation || ''}}</text>
<image src="/static/icon/ar_jicundian@2x.png" mode="widthFix"></image>
</view>
- <text>{{info.takeUser || ''}} {{info.takePhone || ''}}</text>
+ <text>{{info.takeShopAddress || ''}}</text>
</view>
</view>
<view class="item-qrcode" v-if=" (info.type ===0 && info.status >=1 &&info.status <7) || (info.type ===1 && (info.status ===1 || (info.takeShopId && info.status ===5)))">
<!-- <image src="/static/image/btn_upload@2x.png" mode="widthFix"></image> -->
<view style="width: 360rpx; height: 360rpx;">
<canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas" style="width: 180px; height: 180px;"></canvas>
- <!-- <image :src="qrcodeImage" mode="widthFix"></image> -->
</view>
<text>{{info.memberVerifyCode || ''}}</text>
<text @tap="copyCode(info.memberVerifyCode||'')">鏍搁攢鐮�</text>
@@ -53,6 +52,14 @@
<view class="item-x"></view>
<view class="item-list">
<view class="item-list-row">
+ <view class="item-form-label">鏀朵欢浜�</view>
+ <view class="item-form-val">{{info.takeUser || ''}}</view>
+ </view>
+ <view class="item-list-row">
+ <view class="item-form-label">鏀朵欢浜虹數璇�</view>
+ <view class="item-form-val">{{info.takePhone || ''}}</view>
+ </view>
+ <view class="item-list-row">
<view class="item-form-label">棰勮鍒板簵鏃堕棿</view>
<view class="item-form-val">{{info.expectedDepositTime || ''}}</view>
</view>
diff --git a/small-program/pages/payment-success/payment-success.vue b/small-program/pages/payment-success/payment-success.vue
index feacaff..bf9bbe0 100644
--- a/small-program/pages/payment-success/payment-success.vue
+++ b/small-program/pages/payment-success/payment-success.vue
@@ -18,7 +18,7 @@
<view class="pickup-card">
<text class="pickup-title">鏍搁攢鐮�</text>
<view class="qrcode-box">
- <canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas" style="width: 100px; height: 100px;"></canvas>
+ <canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas" :style="'width: '+width+'px; height:'+height+'px;'"></canvas>
<image class="qrcode-image" :src="qrcodeImage" mode="widthFix"></image>
</view>
<text class="pickup-code">{{ orderDetail.memberVerifyCode }}</text>
@@ -33,7 +33,10 @@
export default {
data() {
+
return {
+ height:100,
+ width:100,
orderId: '',
orderDetail: null,
qrcodeImage: ''
@@ -45,6 +48,8 @@
title: '鏀粯鎴愬姛'
})
this.getOrderDetail()
+ this.width = this.rpxToPx(200)
+ this.height = this.rpxToPx(200)
},
methods: {
async getOrderDetail() {
@@ -56,12 +61,15 @@
}
}
},
+ rpxToPx(rpx) {
+ return rpx * wx.getSystemInfoSync().windowWidth / 750
+ },
generateQrcode(code) {
drawQrcode({
canvasId: 'qrcodeCanvas',
text: code,
- width: 100,
- height: 100,
+ width: this.width,
+ height: this.height,
correctLevel: 2
})
setTimeout(() => {
diff --git a/small-program/shop/pages/order-details/order-details.vue b/small-program/shop/pages/order-details/order-details.vue
index 924a1ca..4cb367f 100644
--- a/small-program/shop/pages/order-details/order-details.vue
+++ b/small-program/shop/pages/order-details/order-details.vue
@@ -28,7 +28,7 @@
<view class="addr-item-top">
<text>{{info.depositShopName || ''}}</text>
</view>
- <text>{{info.takeUser || ''}} </text>
+ <text>{{info.depositShopAddress || ''}} </text>
<view class='addr-link' style="top: 50rpx;">
<image style="margin-right: 10rpx;" @click="contactPhoneDo(info.takePhone)" src="/static/icon/ic_call@2x.png" mode="widthFix" ></image>
<text class=" txt-d1">鑱旂郴瀹㈡埛</text>
@@ -39,16 +39,20 @@
<view class="addr-item-top">
<text>{{info.takeShopName || info.takeLocation || ''}}</text>
</view>
- <text>{{info.takeUser || ''}} </text>
- <!-- <view class='addr-link' style="top: 50rpx;">
- <image style="margin-right: 10rpx;" @click="contactPhoneDo(info.takePhone)" src="/static/icon/ic_call@2x.png" mode="widthFix" ></image>
- <text class=" txt-d1">鑱旂郴瀹㈡埛</text>
- </view> -->
+ <text>{{info.takeShopAddress || ''}} </text>
</view>
</view>
<view class="item-x"></view>
<view class="item-list">
<view class="item-list-row">
+ <view class="item-form-label">鏀朵欢浜�</view>
+ <view class="item-form-val">{{info.takeUser || ''}}</view>
+ </view>
+ <view class="item-list-row">
+ <view class="item-form-label">鏀朵欢浜虹數璇�</view>
+ <view class="item-form-val">{{info.takePhone || ''}}</view>
+ </view>
+ <view class="item-list-row">
<view class="item-form-label">棰勮鍒板簵鏃堕棿</view>
<view class="item-form-val">{{info.expectedDepositTime || ''}}</view>
</view>
diff --git a/small-program/shop/pages/write-off-a/write-off-a.vue b/small-program/shop/pages/write-off-a/write-off-a.vue
index a9a83c4..9aff9ff 100644
--- a/small-program/shop/pages/write-off-a/write-off-a.vue
+++ b/small-program/shop/pages/write-off-a/write-off-a.vue
@@ -19,19 +19,27 @@
<view class="addr-item-top">
<text>{{info.depositShopName || ''}}</text>
</view>
- <text>{{info.takeUser || ''}} </text>
+ <text>{{info.depositShopAddress || ''}} </text>
</view>
<view class="addr-item" v-if="info.type === 1">
<view class="ji bg1">鏀�</view>
<view class="addr-item-top">
<text>{{info.takeShopName || info.takeLocation || ''}}</text>
</view>
- <text>{{info.takeUser || ''}} </text>
+ <text>{{info.takeShopAddress || ''}} </text>
</view>
</view>
<view class="item-x"></view>
<view class="item-list">
<view class="item-list-row">
+ <view class="item-form-label">鏀朵欢浜�</view>
+ <view class="item-form-val">{{info.takeUser || ''}}</view>
+ </view>
+ <view class="item-list-row">
+ <view class="item-form-label">鏀朵欢浜虹數璇�</view>
+ <view class="item-form-val">{{info.takePhone || ''}}</view>
+ </view>
+ <view class="item-list-row">
<view class="item-form-label">棰勮鍒板簵鏃堕棿</view>
<view class="item-form-val">{{info.expectedDepositTime || ''}}</view>
</view>
--
Gitblit v1.9.3