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-15 00:01:24 +08:00
parent dab4dba0fe
commit a92a6c5baf
10 changed files with 325 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,80 +1,58 @@
<template>
<view class="order-goods bg-white">
<view v-for="(item, index) in list" :key="index" class="item-wrap">
<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="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="goods-img">
<view>
<u-image :src="item.image_str || item.image"
:width="imageWidth"
:height="imageHeight"
:border-radius="imageRadius"
mode="aspectFit"
lazy-load/>
</view>
<view class="goods-info ml20 flex1">
<view class="goods-name line2 mb10">
<u-tag
class="mr10"
v-if="team.need"
:text="team.need + '人团'"
size="mini"
type="primary"
mode="plain"
/>
{{ item.goods_name || item.name }}</view
>
<view class="goods-spec xs muted mb20">{{
item.spec_value_str || item.spec_value
}}</view>
<view class="row-between">
<view class="goods-price row">
<view class="primary">
<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 class="vip-price row" v-if="item.is_member && order_type === 0">
<view class="price-name xxs">会员价</view>
<view style="padding: 0 10rpx">
<price-format
:price="item.goods_price"
:first-size="22"
:second-size="22"
:subscript-size="22"
:weight="500"
color="#7B3200"
></price-format>
</view>
</view>
<view
class="vip-price row"
v-if="order_type === 1 || order_type === 2 || order_type === 3"
>
<view class="price-name xxs" style="background-color: #e74346">
<text v-if="order_type === 1">秒杀价</text>
<text v-if="order_type === 2">拼团价</text>
<text v-if="order_type === 3">砍价</text>
</view>
<view style="padding: 0 10rpx">
<price-format
:price="item.goods_price"
:first-size="22"
:second-size="22"
:subscript-size="22"
:weight="500"
color="#7B3200"
></price-format>
</view>
</view>
</view>
<view class="goods-num sm">x{{ item.goods_num }}</view>
<view class="sm text-999">
<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>{{item.spec_value_str || item.spec_value}}</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'">
<view class="delivery" v-if="delivery === 1 && !item.is_express"
>该商品不支持快递配送</view
@ -158,6 +136,14 @@ export default {
imageRadius: {
type: Number,
default: 0
},
orderDesc: {
type: String,
default: ''
},
orderCancleTime: {
type: Number,
default: 0
}
},
@ -167,8 +153,18 @@ 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">

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

@ -1,63 +1,125 @@
<template>
<view>
<view class="bg-white br16 px20 u-p-t-20 u-p-b-20 u-m-b-24">
<view class="u-p-t-20 u-p-b-20 ">
<view>
<navigator hover-class="none" url="/pages/order_details/order_details?type=0">
<view class="row-between">
<view>煎饼果子套餐</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 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-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>
</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> -->
<!-- <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>
<!-- </view>
</view> -->
</view>
</view>
</template>
<script>
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: '没有更多了'
},
}
},
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);
})
},
orderRefresh() {
this.mescroll.resetUpScroll()
},
// 取消订单
cancleOrder() {