wk450097098
/
mrr.sj.front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

This commit is contained in:
cjl520cy 2026-04-30 11:17:25 +08:00
parent 8347f81269
commit ad97d5683c
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pages/home/components/filters.vue
View File

@ -515,27 +515,27 @@
if (this.idType == 1) { if (this.idType == 1) {
if (this.activeFirstId == 1) { if (this.activeFirstId == 1) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}`, url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
}); });
} }
if (this.activeFirstId == 2) { if (this.activeFirstId == 2) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2`, url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2&haveButton=${this.haveButton}`,
}); });
} }
if (this.activeFirstId == 3) { if (this.activeFirstId == 3) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/shop/SellerDetail?order_id=${order.id}`, url: `/pages/shop/SellerDetail?order_id=${order.id}&haveButton=${this.haveButton}`,
}); });
} }
if (this.activeFirstId == 4) { if (this.activeFirstId == 4) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}`, url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
}); });
} }
if (this.activeFirstId == 5) { if (this.activeFirstId == 5) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2`, url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2&haveButton=${this.haveButton}`,
}); });
} }
} }

3
pages/shop/buy-order.vue
View File

@ -272,7 +272,8 @@
}, },
getDisplayPrice(order) { getDisplayPrice(order) {
const price = order.pay_money || order.order_money || 0 const price = Number(order.pay_money) || Number(order.order_money) || 0
return Number(price).toFixed(2) return Number(price).toFixed(2)
}, },

6
pages/shop/buyorder-detail.vue
View File

@ -82,7 +82,11 @@
</view> </view>
<text class="service-count">×1</text> <text class="service-count">×1</text>
</view> </view>
<view class="service-real"> <view class="service-real" v-if="orderInfo.state==7 || orderInfo.state==1">
<text class="real-lable">应付金额：</text>
<text class="real-price">￥{{orderInfo.order_money}}</text>
</view>
<view class="service-real" v-else>
<text class="real-lable">实际支付金额：</text> <text class="real-lable">实际支付金额：</text>
<text class="real-price">￥{{orderInfo.pay_money}}</text> <text class="real-price">￥{{orderInfo.pay_money}}</text>
</view> </view>

5
pages/shop/userorder-detail.vue
View File

@ -272,7 +272,7 @@
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="bottom-buttons" <view class="bottom-buttons"
v-if="haveButton && (orderInfo.state == 2) || orderInfo.state == 3 || orderInfo.state == 4"> v-if="haveButton && (orderInfo.state == 2 || orderInfo.state == 3 || orderInfo.state == 4)">
<!-- <view class="contact-button" @click="contactService(orderInfo.phone_user)"> <!-- <view class="contact-button" @click="contactService(orderInfo.phone_user)">
<image src="/static/images/tell_icon.png" class="tell-icon"></image> <image src="/static/images/tell_icon.png" class="tell-icon"></image>
<text class="contact-text">联系TA</text> <text class="contact-text">联系TA</text>
@ -370,6 +370,9 @@
if (options.push_id) { if (options.push_id) {
this.messageRead(options.push_id) this.messageRead(options.push_id)
} }
if(options.haveButton){
this.haveButton = options.haveButton
}
// 添加调试日志 // 添加调试日志

4
pages/shop/userorders.vue
View File

@ -265,10 +265,10 @@
// 去订单详情 // 去订单详情
goOrderDetail(item) { goOrderDetail(item) {
let path = ""; let path = "";
path = `/pages/shop/userorder-detail?order_id=${item.id}&order_kind=${item.order_kind}`; path = `/pages/shop/userorder-detail?order_id=${item.id}&order_kind=${item.order_kind}&haveButton=${this.haveButton}`;
if (item.table_source == "order_self") { if (item.table_source == "order_self") {
//如果是自营订单 //如果是自营订单
path = `/pages/shop/userorder-detail?order_id=${item.id}&serviceType=2&order_kind=${item.order_kind}`; path = `/pages/shop/userorder-detail?order_id=${item.id}&serviceType=2&order_kind=${item.order_kind}&haveButton=${this.haveButton}`;
} }
uni.navigateTo({ uni.navigateTo({
url: path, url: path,