wangxiaowei/jianbing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善订单模块

Browse Source
This commit is contained in:
wangxiaowei
2025-05-16 09:14:08 +08:00
parent a92a6c5baf
commit 2b0d3c9c20
10 changed files with 463 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
components/cate-one/cate-one.vue
View File

@ -186,6 +186,7 @@
},
created() {
this.getCartNum()
this.getCartListFun()
},
methods: {
...mapActions(['getCartNum']),
@ -241,8 +242,7 @@
showCartPopup() {
if (this.cartLists.length > 0) {
this.showCart = true
}
else {
} else {
this.$toast({
title: '请先添加商品'
});
@ -285,30 +285,29 @@
// 获取购物车列表数据
getCartListFun() {
console.log("1>>>", 1);
getCartList().then((res) => {
if (res.code == 1) {
console.log("res>>>", res);
let {
lists,
total_amount
} = res.data;
// let cartType = 0;
// if (lists.length == 0) {
// cartType = 2;
// } else {
// cartType = 1;
// }
this.cartLists = lists;
// this.cartType = cartType;
// // let cartType = 0;
// // if (lists.length == 0) {
// // cartType = 2;
// // } else {
// // cartType = 1;
// // }
// this.cartLists = list;
// console.log(">>>", this.cartLists);
// // this.cartType = cartType;
this.totalPrice = total_amount
// this.isShow = true;
this.getCartNum();
// // this.isShow = true;
// this.getCartNum();
}
});
},
@ -415,7 +414,7 @@
.main-wrap {
position: relative;
padding: 0 20rpx;
padding: 0 20rpx 160rpx;
.goods {
.info {
width: 100%;
@ -432,7 +431,7 @@
position: fixed;
left: 0;
right: 0;
bottom: env(safe-area-inset-bottom);
bottom: calc(env(safe-area-inset-bottom) + 10rpx);
height: 100rpx;
background-color: #212526;
}

79
components/order-dialog/order-dialog.vue Normal file
View File

@ -0,0 +1,79 @@
<template>
<u-modal v-model="show" :show-cancel-button ="true" :content="getTipsText" @confirm="onConfirm" confirm-color="#ff2c3c"></u-modal>
</template>
<script>
import {
cancelOrder,
delOrder,
confirmOrder
} from '@/api/order';
export default {
props: {
type: Number,
orderId: [Number, String]
},
data() {
return {
show: false
};
},
methods: {
open() {
this.show = true
},
close() {
this.show = false
},
async onConfirm() {
const {
type,
orderId
} = this;
let res = null;
switch (type) {
case 0:
res = await cancelOrder(orderId);
break;
case 1:
res = await delOrder(orderId);
break;
case 2:
res = await confirmOrder(orderId);
break;
}
if (res.code == 1) {
this.close()
this.$emit("refresh")
this.$toast({
title: res.msg
});
}
},
},
computed: {
getTipsText() {
const {
type
} = this
switch (type) {
case 0:
return "确认取消订单吗？"
case 1:
return "确认删除订单吗?"
case 2:
return "确认收货吗?"
}
}
}
}
</script>
<style>
</style>

90
components/order-goods/order-goods.vue
View File

@ -1,59 +1,61 @@
<template>
<view class="order-goods bg-white">
<view class="bg-white">
<view v-for="(item, index) in list" :key="index" class="item-wrap u-p-b-20">
<view class="row-between u-p-l-20 u-p-r-20 u-p-t-20">
<view class="row-between u-p-r-20 u-p-t-20 u-p-b-24" v-if="mode === 'order'">
<view class="u-line-1 nr bold-500 text-000"> {{ item.goods_name || item.name }}</view>
<view class="text-999 flex1 u-m-l-40 text-nowrap">{{ orderDesc }}</view>
</view>
<view class="item row" @tap="toGoods(item.goods_id)">
<view class="item" :class="{row: mode != 'pay', 'row-start': mode == 'pay'}" @tap="toGoods(item.goods_id)">
<view>
<u-image :src="item.image_str || item.image"
:width="imageWidth"
:height="imageHeight"
:border-radius="imageRadius"
mode="aspectFit"
:mode="mode === 'confirm' ? 'aspectFill' : 'aspectFit'"
lazy-load/>
</view>
<view class="goods-info ml20 flex1">
<view class="sm text-999">
<view class="sm text-999" v-if="mode === 'order'">
<view>下单时间:2024-10-10 16:58:53</view>
<view>预计时间:2025-10-10 16:58:54</view>
<view>数量:x{{ item.goods_num }}</view>
<view>实付:￥0.00</view>
<view>实付:
<price-format
v-if="!item.is_member && order_type === 0"
:weight="500"
:subscript-size="24"
:first-size="34"
:second-size="24"
:price="item.original_price || item.goods_price"
></price-format>
</view>
<view>{{item.spec_value_str || item.spec_value}}</view>
</view>
<view class="sm text-999" v-if="mode === 'confirm'">
<view class="u-line-2" style="color: #1D2129">{{ item.goods_name || item.name }}</view>
<view class="u-m-t-4">周一至周日可用</view>
<view class="row u-m-t-10">
<view class="primary">
<price-format :price="item.original_price || item.goods_price" :subscriptSize="22" :firstSize="40" :secondSize="32"></price-format>
</view>
</view>
</view>
<view class="sm text-999" v-if="mode === 'pay'">
<view class="u-line-2" style="color: #1D2129">{{ item.goods_name || item.name }}</view>
</view>
<view class="sm text-999" v-if="mode === 'order_detail'">
<view class="u-line-2" style="color: #1D2129">{{ item.goods_name || item.name }}</view>
<view class="u-m-t-4">x{{ item.goods_num }}</view>
<view class="row u-m-t-10">
<view class="primary">
<price-format :price="item.original_price || item.goods_price" :subscriptSize="22" :firstSize="40" :secondSize="32"></price-format>
</view>
</view>
</view>
</view>
</view>
<view class="u-m-t-26 u-m-b-26 u-p-l-20 u-p-r-20">
<u-line color="#EEE" />
</view>
<view class="u-m-t-26 row-between u-p-l-20 u-p-r-20">
<view class="primary flex1">
<view v-if="getCancelTime(orderCancleTime) > 0" >
<u-count-down separator="zh"
:timestamp="getCancelTime(item.order_cancel_time)" separator-color="#FF2C3C"
color="#FF2C3C" :separator-size="26" :font-size="26" bg-color="transparent"
@end="refresh"></u-count-down>
</view>
</view>
<view class="row">
<view class="u-m-r-16">
<u-button @click="cancleOrder" hover-class="none" :customStyle="{width: '164rpx', height: '60rpx', color: '#999', border: '1px solid #DDD'}" :plain="true" :hair-line="false" shape="circle">取消订单</u-button>
</view>
<view>
<u-button @click="toPay" hover-class="none" :customStyle="{width: '164rpx', height: '60rpx', backgroundColor: themeColor, color: '#fff', border: 'none'}" :hair-line="false" shape="circle">去付款</u-button>
</view>
<!-- <view>
<u-button @click="seeDetails" hover-class="none" :customStyle="{width: '164rpx', height: '60rpx', backgroundColor: themeColor, color: '#fff', border: 'none'}" :hair-line="false" shape="circle">查看详情</u-button>
</view>
<view>
<u-button @click="toRefund" hover-class="none" :customStyle="{width: '164rpx', height: '60rpx', backgroundColor: themeColor, color: '#fff', border: 'none'}" :hair-line="false" shape="circle">查看详情</u-button>
</view> -->
</view>
</view>
<template v-if="mode === 'comfirm'">
<template v-if="mode === 'confirm'">
<view class="delivery" v-if="delivery === 1 && !item.is_express"
>该商品不支持快递配送</view
>
@ -116,7 +118,7 @@ export default {
type: Number,
default: 1
},
// order | comfirm
// order | confirm | pay
mode: {
type: String,
default: 'order'
@ -140,10 +142,6 @@ export default {
orderDesc: {
type: String,
default: ''
},
orderCancleTime: {
type: Number,
default: 0
}
},
@ -153,18 +151,8 @@ export default {
uni.navigateTo({
url: `/pages/goods_details/goods_details?id=${id}`
})
},
refresh() {
this.$emit('refresh')
}
},
computed: {
getCancelTime() {
return (time) => time - Date.now() / 1000;
},
},
}
}
</script>
<style lang="scss">

275
components/order-list/order-list.vue
View File

@ -1,148 +1,165 @@
<template>
<view>
<view class="u-p-t-20 u-p-b-20 ">
<view>
<mescroll-body ref="mescroll" @init="mescrollInit" @down="downCallback" :up="upOption" @up="upCallback">
<navigator
class="br16 px20 u-m-b-24"
hover-class="none"
url="/pages/order_details/order_details?type=0"
v-for="(item, index ) in orderList" :key="index">
<order-goods :list="item.order_goods"
:order_type="item.order_type"
:imageRadius="12"
:orderDesc="item.order_status_desc"
:orderCancleTime="item.order_cancle_time"
@refresh="orderRefresh"></order-goods>
<!-- <view class="row-between">
<view>{{ item. }}</view>
<view class="text-999">待付款</view> -->
<!-- <view class="text-999">已完成</view>
<view class="text-999">退款</view>
<view class="primary" >未制作</view>
<view class="primary" >未取餐</view> -->
<!-- </view>
<view class="u-m-t-16 row">
<view>
<u-image :src="cloudPath + 'img/banner.png'" width="124" height="124" border-radius="16"></u-image>
</view>
<view class="sm ml20 text-999">
<view>下单时间:2024-10-10 16:58:53</view>
<view>预计时间:2025-10-10 16:58:54</view>
<view>数量:1</view>
<view>实付:￥0.00</view>
</view>
</view>
<view class="u-m-t-26 u-m-b-26">
<u-line color="#EEE" />
</view> -->
</navigator>
</mescroll-body>
</view>
<!-- <view class="u-m-t-26 row-between">
<view class="primary">等待时间:15分钟</view> -->
<!-- <view class="row">
<view class="u-m-r-16">
<u-button @click="cancleOrder" hover-class="none" :customStyle="{width: '164rpx', height: '60rpx', color: '#999', border: '1px solid #DDD'}" :plain="true" :hair-line="false" shape="circle">取消订单</u-button>
<mescroll-uni ref="mescroll" top="100rpx" @init="mescrollInit" @down="downCallback" :down="downOption" :up="upOption" @up="upCallback">
<view class="u-p-20">
<navigator class="bg-white br16 px20 u-m-b-24 u-p-b-20" hover-class="none"
v-for="(item, index) in orderList"
:key="index"
:url="'/pages/order_details/order_details?id=' + item.id">
<order-goods :list="item.order_goods" :order_type="item.order_type" :imageRadius="12"
:orderDesc="item.order_status_desc"></order-goods>
<view class="u-m-t-26 u-m-b-26 u-p-l-20 u-p-r-20">
<u-line color="#EEE" />
</view>
<view class="u-m-t-26 row-between u-p-l-20 u-p-r-20">
<view class="primary flex1">
<view v-if="getCancelTime(item.order_cancel_time) > 0">
<u-count-down separator="zh" :timestamp="getCancelTime(item.order_cancel_time)"
separator-color="#FF2C3C" color="#FF2C3C" :separator-size="26" :font-size="26"
bg-color="transparent" @end="orderRefresh"></u-count-down>
</view>
<!-- 这边还缺一个未制作等待的时间 -->
<view class="primary" v-if="type === 'finish'">
存餐格号:15号
</view>
</view>
<view>
<u-button @click="toPay" hover-class="none" :customStyle="{width: '164rpx', height: '60rpx', backgroundColor: themeColor, color: '#fff', border: 'none'}" :hair-line="false" shape="circle">去付款</u-button>
</view> -->
<!-- <view>
<u-button @click="seeDetails" hover-class="none" :customStyle="{width: '164rpx', height: '60rpx', backgroundColor: themeColor, color: '#fff', border: 'none'}" :hair-line="false" shape="circle">查看详情</u-button>
<view class="row">
<view class="u-m-r-16" v-if="item.cancel_btn">
<u-button @click="cancelOrder(item.id)" hover-class="none"
:customStyle="{ width: '164rpx', height: '60rpx', color: '#999', border: '1px solid #DDD' }"
:plain="true" :hair-line="false" shape="circle">取消订单</u-button>
</view>
<view v-if="item.pay_btn">
<u-button @click="payNow(item.id)" hover-class="none"
:customStyle="{ width: '164rpx', height: '60rpx', backgroundColor: themeColor, color: '#fff', border: 'none' }"
:hair-line="false" shape="circle">去付款</u-button>
</view>
<view v-if="type === 'delivery' || type === 'finish'">
<u-button @click="seeDetails" hover-class="none" :customStyle="{width: '164rpx', height: '60rpx', backgroundColor: themeColor, color: '#fff', border: 'none'}" :hair-line="false" shape="circle">查看详情</u-button>
</view>
<!-- <view>
<u-button @click="toRefund" hover-class="none" :customStyle="{width: '164rpx', height: '60rpx', backgroundColor: themeColor, color: '#fff', border: 'none'}" :hair-line="false" shape="circle">申请退款</u-button>
</view> -->
</view>
<view>
<u-button @click="toRefund" hover-class="none" :customStyle="{width: '164rpx', height: '60rpx', backgroundColor: themeColor, color: '#fff', border: 'none'}" :hair-line="false" shape="circle">查看详情</u-button>
</view> -->
<!-- </view>
</view> -->
</view>
</navigator>
<order-dialog ref="orderDialog" :order-id="orderId" :type="orderType" @refresh="reflesh"></order-dialog>
</view>
</view>
</mescroll-uni>
</template>
<script>
import {
getOrderList,
cancelOrder,
delOrder,
confirmOrder,
completeAudit
} from '@/api/order'
import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js"
import {
getOrderList,
cancelOrder,
delOrder,
confirmOrder,
completeAudit
} from '@/api/order'
import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js"
export default {
name: 'order-list',
mixins: [MescrollMixin],
props: {
type: {
type: String,
default: 'all'
}
},
data() {
return {
orderList: [],
upOption:{
noMoreSize: 4,
empty:{
tip: '~ 空空如也 ~', // 提示
btnText: ''
},
textNoMore: '没有更多了'
export default {
name: 'order-list',
mixins: [MescrollMixin],
props: {
type: {
type: String,
default: 'all'
}
},
data() {
return {
orderList: [],
downOption: {
auto: false
},
upOption: {
noMoreSize: 4,
empty: {
tip: '~ 空空如也 ~', // 提示
btnText: '',
fixed: true
},
}
textNoMore: '没有更多了'
},
orderId: "",
pay_way: "",
showCancel: false,
orderType: 0
}
},
created() {
},
methods: {
// 初始化数据
upCallback(page) {
let pageNum = page.num // 页码, 默认从1开始
let pageSize = page.size // 页长, 默认每页10条
let { type } = this
getOrderList({
page_size: pageSize,
page_no: pageNum,
type
}).then(({
data
}) => {
let curPageData = data.list;
let curPageLen = curPageData.length;
let hasNext = !!data.more;
if (page.num == 1) this.orderList = [];
this.orderList = this.orderList.concat(curPageData);
this.mescroll.endSuccess(curPageLen, hasNext);
})
},
created() {
orderRefresh() {
this.mescroll.resetUpScroll()
},
methods: {
// 初始化数据
upCallback(page) {
let pageNum = page.num // 页码, 默认从1开始
let pageSize = page.size // 页长, 默认每页10条
let {type} = this
getOrderList({
page_size: pageSize,
page_no: pageNum,
type
}).then(({
data
}) => {
let curPageData = data.list;
let curPageLen = curPageData.length;
let hasNext = !!data.more;
if (page.num == 1) this.orderList = [];
this.orderList = this.orderList.concat(curPageData);
this.mescroll.endSuccess(curPageLen, hasNext);
})
},
orderRefresh() {
this.mescroll.resetUpScroll()
},
cancelOrder(id) {
this.orderId = id;
this.orderType = 0;
this.$nextTick(() => {
this.orderDialog();
});
},
// 取消订单
cancleOrder() {
},
// 去付款
toPay() {
},
// 查看详情
seeDetails() {
},
// 申请退款
toRefund() {
}
payNow(id) {
uni.navigateTo({
url: `/pages/payment/payment?from=${"order"}&order_id=${id}`,
});
},
reflesh() {
this.mescroll.resetUpScroll()
},
orderDialog() {
this.$refs.orderDialog.open();
},
// 查看详情
seeDetails() {
},
// 申请退款
toRefund() {
}
},
computed: {
getCancelTime() {
return (time) => time - Date.now() / 1000;
},
},
watch: {
type() {
this.mescroll.resetUpScroll()
}
}
}
</script>
<style lang="scss">
</style>