fix(custom):
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-05-28 19:26:23 +08:00
parent e6173319d9
commit 1bbaeb821d
3 changed files with 68 additions and 49 deletions

View File

@@ -2,14 +2,17 @@
<view>
<view class="footer" v-if="info.status !== 1">
<nut-popover
v-if="info.status !== 2"
v-model:visible="popoverShow"
:list="popoverList"
:duration="0"
location="bottom-start"
@choose="popoverChoose">
<template #reference>
<view class="text-[#9C9C9C] text-[30px]">更多</view>
</template>
</nut-popover>
<view v-else></view>
<view class="flex">
<!-- <view
v-if="info.status !== 2"
@@ -29,7 +32,7 @@
v-if="info.status !== 2"
class="btn"
style="background-color: none; color: black; border: 1px solid #000"
@click="to_menu_page"
@click="cancelOrder"
>取消订单</view
>
<!-- <view
@@ -76,7 +79,7 @@
<script setup lang="ts">
import {onMounted, ref} from 'vue';
import {confirmAfterOrder, editAfterOrder} from '@/api/admin';
import {cancelAfterOrder, confirmAfterOrder, editAfterOrder} from '@/api/admin';
import Taro from '@tarojs/taro';
const props = defineProps({
@@ -93,18 +96,20 @@ onMounted(() => {
name: '修改',
value: 1,
disabled: props.info.status === 2,
className: 'text-[35px] p-[10px]',
},
{
name: '挂帐',
value: 2,
disabled: props.info.status === 2,
className: 'text-[35px] p-[10px]',
},
];
console.log(popoverList.value);
});
const emits = defineEmits(['ok']);
const emits = defineEmits(['ok', 'cancelOrderOk']);
const visible = ref(false);
const visible1 = ref(false);
@@ -179,6 +184,17 @@ const popoverChoose = e => {
break;
}
};
const cancelOrder = async () => {
const res = await cancelAfterOrder({
oid: props.info.oid,
});
Taro.showToast({
title: res.msg,
icon: 'none',
});
emits('cancelOrderOk');
};
</script>
<style lang="scss">

View File

@@ -24,8 +24,7 @@
:content="itm.Goods.name"
rows="3"
expand-text="展开"
collapse-text="收起"
></nut-ellipsis>
collapse-text="收起"></nut-ellipsis>
<!-- <view class="title">{{ itm.Goods.name }}</view> -->
</view>
<view class="num">
@@ -34,7 +33,7 @@
</view>
</view>
<!-- <view class="line"></view> -->
<Footer :info="data" @ok="get_data" />
<Footer :info="data" @ok="get_data" @cancelOrderOk="back" />
</view>
<nut-cell-group>
<nut-cell>
@@ -50,17 +49,14 @@
<nut-cell
v-if="data.status !== 0"
title="收款时间"
:desc="data.payment_time"
></nut-cell>
:desc="data.payment_time"></nut-cell>
<nut-cell
v-if="data.status !== 0 && data.status !== 1"
title="挂帐时间"
:desc="data.payment_time"
></nut-cell>
:desc="data.payment_time"></nut-cell>
<nut-cell
title="订单状态"
:desc="get_status_text(data.status)"
></nut-cell>
:desc="get_status_text(data.status)"></nut-cell>
<nut-cell title="下单数量" :desc="String(data.count)"></nut-cell>
<nut-cell title="订单金额" :desc="String(data.payments)"></nut-cell>
<nut-cell title="应收金额" :desc="String(data.payments)"></nut-cell>
@@ -68,28 +64,25 @@
<nut-cell
v-if="data.status !== 0"
title="实收金额"
:desc="String(data.pay_amount)"
></nut-cell>
:desc="String(data.pay_amount)"></nut-cell>
<nut-cell
v-if="data.status !== 0"
title="抹零"
:desc="String(data.zero)"
></nut-cell>
:desc="String(data.zero)"></nut-cell>
<nut-cell
v-if="data.status !== 0"
title="收款方式"
desc="微信"
></nut-cell>
desc="微信"></nut-cell>
<nut-cell title="备注" :desc="data.notes"></nut-cell>
</nut-cell-group>
</view>
</template>
<script setup lang="ts">
import { ref } from "vue";
import Taro from "@tarojs/taro";
import Footer from "../components/Footer.vue";
import { getAfterOrder } from "@/api/admin";
import {ref} from 'vue';
import Taro from '@tarojs/taro';
import Footer from '../components/Footer.vue';
import {getAfterOrder} from '@/api/admin';
// import BackComponent from "../../../../../components/Back.vue";
const data = ref<any>({});
@@ -103,7 +96,7 @@ Taro.useLoad((e: any) => {
const get_data = async () => {
Taro.showLoading({
title: "加载中",
title: '加载中',
});
const res = await getAfterOrder({
bid: params.value.bid,
@@ -116,26 +109,32 @@ const get_data = async () => {
const get_color = (status: number) => {
switch (status) {
case 0:
return "#FD0100";
return '#FD0100';
case 1:
return "#03A113";
return '#03A113';
case 2:
return "#FFA938";
return '#FFA938';
}
};
const get_status_text = (status: number) => {
switch (status) {
case 0:
return "未付款";
return '未付款';
case 1:
return "已付款";
return '已付款';
case 2:
return "挂帐中";
return '挂帐中';
}
};
const back = () => {
Taro.navigateBack({
delta: 1,
});
};
</script>
<style lang="scss">
@import "./index.scss";
@import './index.scss';
</style>