Compare commits

...

2 Commits

Author SHA1 Message Date
1ff0ee1ed0 【类 型】:feat
【原  因】:
【过  程】:订单列表元素组件 对应的按钮显示 对应的状态显示 如:未付款订单显示 立即支付按钮 状态写待支付
【影  响】:

# 类型 包含:
# feat:新功能(feature)
# fix:修补bug
# docs:文档(documentation)
# style: 格式(不影响代码运行的变动)
# refactor:重构(即不是新增功能,也不是修改bug的代码变动)
# test:增加测试
# chore:构建过程或辅助工具的变动
2024-12-23 20:30:16 +08:00
c8018ceb97 【类 型】:fix
【原  因】:checkUserInfo的函数之前修改过 不用接受参数 再函数内部直接调用的全局变量 ,前端调用时并没有删掉传参
【过  程】:去掉多余的wxLogin函数引用 checkUserInfo这个函数不用传参
【影  响】:

# 类型 包含:
# feat:新功能(feature)
# fix:修补bug
# docs:文档(documentation)
# style: 格式(不影响代码运行的变动)
# refactor:重构(即不是新增功能,也不是修改bug的代码变动)
# test:增加测试
# chore:构建过程或辅助工具的变动
2024-12-23 18:03:00 +08:00
4 changed files with 76 additions and 14 deletions

View File

@ -58,6 +58,10 @@
.pr{ .pr{
position: relative; position: relative;
} }
.pa{
position: absolute;
}
.fc { .fc {
text-align: center; text-align: center;

View File

@ -12,7 +12,7 @@
</view> </view>
</view> </view>
<view class="flex1 flex column md"> <view class="flex1 flex column md">
<view class="fz28 fb fcm l-h-18">{{order.shipment_status}}</view> <view class="fz28 fb fcm l-h-18">{{ orderStatusDisplay }}</view>
<view class="priceBox fz36 fb"> <view class="priceBox fz36 fb">
¥{{Number(order.transport_price) + Number(order.pack_price) + Number(order.total_price) | formatPrice}} ¥{{Number(order.transport_price) + Number(order.pack_price) + Number(order.total_price) | formatPrice}}
</view> </view>
@ -20,12 +20,18 @@
</view> </view>
</view> </view>
<view class="m-t-24 flex mr"> <view class="m-t-24 flex mr">
<view class="numberBut bg-m fci rad8 fz28 fb flex mac mc" :key="foodSn"> <view v-if="showPayButton" class="nullBut bg-m fci rad8 fz28 flex mac mc m-l-24">
立即支付
</view>
<view v-if="showPickupNumber" class="numberBut bg-m fci rad8 fz28 fb flex mac mc m-l-24">
{{ foodSn }} {{ foodSn }}
</view> </view>
<view class="nullBut border fcb rad8 fz28 flex mac mc m-l-24" style=""> <view v-if="showAfterSaleButton" class="nullBut border fcb rad8 fz28 flex mac mc m-l-24">
申请售后 申请售后
</view> </view>
<view v-if="showRefundDetailsButton" class="nullBut border fcb rad8 fz28 flex mac mc m-l-24">
退款详情
</view>
</view> </view>
</view> </view>
</template> </template>
@ -43,7 +49,7 @@
intervalId: null, // ID intervalId: null, // ID
} }
}, },
onReady() { created() {
this.intervalId = setInterval(() => { this.intervalId = setInterval(() => {
this.foodSn = this.foodSn === '取餐号' ? this.order.food_sn : '取餐号' this.foodSn = this.foodSn === '取餐号' ? this.order.food_sn : '取餐号'
}, 1200) }, 1200)
@ -52,6 +58,60 @@
// //
clearInterval(this.intervalId); clearInterval(this.intervalId);
}, },
computed: {
// ""
showPayButton() {
return this.order.main_status === '未付款';
},
// ""
showPickupNumber() {
return this.order.main_status === '已付款' && this.order.refund_status === '未申请';
},
// ""
showAfterSaleButton() {
return this.order.main_status === '已付款' && this.order.refund_status === '未申请';
},
// "退"
showRefundDetailsButton() {
return this.order.refund_status !== '未申请' && this.order.main_status !== '已完成';
},
//
orderStatusDisplay() {
if (this.order.main_status === '未付款') {
return '待支付';
}
if (this.order.main_status === '已付款' && this.order.refund_status === '未申请') {
return this.order.shipment_status;
}
switch (this.order.refund_status) {
case '申请中':
return '申请中';
case '已同意':
return '商家同意退款';
case '主动退':
return '商家退单';
case '拒绝退':
return '商家拒绝退款';
default:
return '';
}
},
// 退
refundStatusDisplay() {
switch (this.order.refund_status) {
case '申请中':
return '申请中';
case '已同意':
return '商家同意退款';
case '主动退':
return '商家退单';
case '拒绝退':
return '商家拒绝退款';
default:
return '';
}
},
},
props: { props: {
order: { order: {
type: Object, type: Object,

View File

@ -47,8 +47,7 @@
<script> <script>
import { import {
checkUserInfo, checkUserInfo
wxLogin
} from '@/utils/index.js' } from '@/utils/index.js'
export default { export default {
@ -69,7 +68,7 @@
return this.$store.state.orderList.filter(item => item.main_status === '已付款') return this.$store.state.orderList.filter(item => item.main_status === '已付款')
} }
}, },
onShow() { created() {
//token //token
this.checkUserInfo() this.checkUserInfo()
// tabber // tabber
@ -77,9 +76,7 @@
}, },
methods: { methods: {
// //
checkUserInfo() { checkUserInfo,
return checkUserInfo(this.$store)
}
} }
} }
</script> </script>

View File

@ -71,12 +71,13 @@
orderList_unpaid() { orderList_unpaid() {
return this.$store.state.orderList.filter(item => item.main_status === '未付款') return this.$store.state.orderList.filter(item => item.main_status === '未付款')
}, },
// 退 // 退
orderList_paid() { orderList_paid() {
return this.$store.state.orderList.filter(item => item.main_status === '已付款' && item.refund_status === return this.$store.state.orderList.filter(item => {
'未申请') return item.main_status === '已付款' && item.refund_status === '未申请';
})
}, },
// 退 退 // 退 退 退
orderList_refund() { orderList_refund() {
return this.$store.state.orderList.filter(item => item.refund_status !== '未申请') return this.$store.state.orderList.filter(item => item.refund_status !== '未申请')
}, },