fix(custom):

src/api/admin.ts

@@ -1,44 +1,44 @@
-import request from "../utils/request";
+import request from '../utils/request';
 
 // 订单核销
 export const orderVerify = (data: object) =>
-  request("/user/cancelPointOrder", data, "POST");
+  request('/user/cancelPointOrder', data, 'POST');
 
 // 活动订单核销
 export const activeOrderVerify = (data: object) =>
-  request("/user/cancelOrder", data, "POST");
+  request('/user/cancelOrder', data, 'POST');
 
 // 获取订单统计
 export const orderStatistics = (data: object) =>
-  request("/store/order/count", data, "POST");
+  request('/store/order/count', data, 'POST');
 
 // 获取商家积分订单列表
 export const getJfOrderList = (data: object) =>
-  request("/store/point/order", data, "POST");
+  request('/store/point/order', data, 'POST');
 
 // 获取商家活动订单列表
 export const getActiveOrderList = (data: object) =>
-  request("/store/order", data, "POST");
+  request('/store/order', data, 'POST');
 
 // 获取积分核销列表
 export const getJfVerifyList = (data: object) =>
-  request("/point/order/details", data, "POST");
+  request('/point/order/details', data, 'POST');
 
 // 获取活动核销列表
 export const getActiveVerifyList = (data: object) =>
-  request("/order/details", data, "POST");
+  request('/order/details', data, 'POST');
 
 // 增长率统计
 export const growthRate = (data: object) =>
-  request("/store/date/count", data, "POST");
+  request('/store/date/count', data, 'POST');
 
 // 获取提现列表
 export const getWithdrawList = (data: object) =>
-  request("/store/withdraw", data, "POST");
+  request('/store/withdraw', data, 'POST');
 
 // 获取提现列表
 export const addWithdraw = (data: object) =>
-  request("/store/withdraw/set", data, "POST");
+  request('/store/withdraw/set', data, 'POST');
 
 /**
  * 后结api
@@ -46,32 +46,36 @@ export const addWithdraw = (data: object) =>
 
 // 创建后结订单
 export const createAfterOrder = (data: object) =>
-  request("/later/order/place", data, "POST");
+  request('/later/order/place', data, 'POST');
 
 // 获取商家后结订单列表
 export const getAfterOrderList = (data: object) =>
-  request("/later/store/user/order", data, "POST");
+  request('/later/store/user/order', data, 'POST');
 
 // 获取单个后结订单
 export const getAfterOrder = (data: object) =>
-  request("/later/order/details", data, "POST");
+  request('/later/order/details', data, 'POST');
 
 // 确定挂帐
 export const confirmAfterOrder = (data: object) =>
-  request("/later/order/onAccount", data, "POST");
+  request('/later/order/onAccount', data, 'POST');
 
 // 修改台号/备注
 export const editAfterOrder = (data: object) =>
-  request("/later/order/edit", data, "POST");
+  request('/later/order/edit', data, 'POST');
 
 // 生成付款二维码
 export const createPayQr = (data: object) =>
-  request("/later/order/pay", data, "POST");
+  request('/later/order/pay', data, 'POST');
 
 // 检查手机号码是否存在
 export const checkPhone = (data: object) =>
-  request("/user/find/phone", data, "POST");
+  request('/user/find/phone', data, 'POST');
 
 // 获取商家特定用户会员积分2024-3-19
 export const getUserPoint = (data: object) =>
-  request("/store/get/user/integral", data, "POST");
+  request('/store/get/user/integral', data, 'POST');
+
+// 取消后结订单
+export const cancelAfterOrder = (data: object) =>
+  request('/user/later/order/remove', data, 'POST');

src/pages/admin/add_order/pending_order/components/Footer.vue

@@ -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">

src/pages/admin/add_order/pending_order/pending_order_detail/index.vue

@@ -24,8 +24,7 @@
             :content="itm.Goods.name"
             rows="3"
             expand-text="展开"
-            collapse-text="收起"
+            collapse-text="收起"></nut-ellipsis>
-          ></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"
+        :desc="data.payment_time"></nut-cell>
-      ></nut-cell>
       <nut-cell
         v-if="data.status !== 0 && data.status !== 1"
         title="挂帐时间"
-        :desc="data.payment_time"
+        :desc="data.payment_time"></nut-cell>
-      ></nut-cell>
       <nut-cell
         title="订单状态"
-        :desc="get_status_text(data.status)"
+        :desc="get_status_text(data.status)"></nut-cell>
-      ></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)"
+        :desc="String(data.pay_amount)"></nut-cell>
-      ></nut-cell>
       <nut-cell
         v-if="data.status !== 0"
         title="抹零"
-        :desc="String(data.zero)"
+        :desc="String(data.zero)"></nut-cell>
-      ></nut-cell>
       <nut-cell
         v-if="data.status !== 0"
         title="收款方式"
-        desc="微信"
+        desc="微信"></nut-cell>
-      ></nut-cell>
       <nut-cell title="备注" :desc="data.notes"></nut-cell>
     </nut-cell-group>
   </view>
 </template>
 
 <script setup lang="ts">
-import { ref } from "vue";
+import {ref} from 'vue';
-import Taro from "@tarojs/taro";
+import Taro from '@tarojs/taro';
-import Footer from "../components/Footer.vue";
+import Footer from '../components/Footer.vue';
-import { getAfterOrder } from "@/api/admin";
+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>