111

src/pages/tabbar/food.vue

@@ -1,59 +0,0 @@
-<script setup lang="ts">
-import { ref, reactive } from "vue";
-import { onLoad, onShow } from "@dcloudio/uni-app";
-
-import { hooks } from "@@/index"
-import { foodApi } from "@@/api"
-
-import zTabs from "@@/components/other/z-tabs/z-tabs.vue"
-
-const data = {
-    tabs: ['早餐', '午餐', '晚餐'],
-}
-const state = reactive<any>({
-    pa: {
-        status: 1,
-    },
-})
-
-onLoad(() => {
-
-});
-onShow(() => {
-
-})
-
-const pageRef = ref<any>(null)
-const pageHook = hooks.usePage(pageRef, foodApi.page, null, 'data.list')
-const query = (page: number, pagesize: number) => {
-    pageHook.startPage(page, pagesize, false, state.pa);
-}
-const doTab = (e: any) => {
-    if (state.pa.status != e + 1) {
-        state.pa.status = e + 1
-        pageRef.value.reload(true)
-    }
-}
-
-</script>
-
-
-<template>
-    <crud-layout title="每日菜谱" bg="/static/page/blue-bg.png">
-        <z-paging ref="pageRef" height="100%" :fixed="false" v-model="pageHook.list" :default-page-size="5"
-            safe-area-inset-bottom :loading-more-enabled="true" :show-scrollbar="false" @query="query"
-            :auto-clean-list-when-reload="false" :auto-scroll-to-top-when-reload="false" @scroll="pageHook.scroll">
-            <template #top>
-                <view class="h-30rpx" />
-                <view class="bg-white rounded-16rpx px-20rpx">
-                    <z-tabs :list="data.tabs" @change="doTab" />
-                </view>
-            </template>
-            <view class="h-20rpx" />
-            <view class="flex-col card p-x-20rpx p-y-30rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i">
-            </view>
-        </z-paging>
-    </crud-layout>
-</template>
-
-<style lang="scss" scoped></style>

src/pages/tabbar/home.vue

@@ -15,7 +15,9 @@ onLoad(() => {
 
 });
 onShow(() => {
-
+    if (pageRef.value) {
+        pageRef.value.reload(false)
+    }
 })
 
 const pageRef = ref<any>(null)
@@ -29,7 +31,7 @@ const query = (page: number, pagesize: number) => {
 
 <template>
     <crud-layout bg="/static/page/blue-bg.png">
-        <z-paging ref="pageRef" height="100%" :fixed="false" v-model="pageHook.list" :default-page-size="5"
+        <z-paging ref="pageRef" height="100%" :fixed="false" v-model="pageHook.list" :default-page-size="10"
             safe-area-inset-bottom :loading-more-enabled="true" :show-scrollbar="false" @query="query"
             :auto-clean-list-when-reload="false" :auto-scroll-to-top-when-reload="false" @scroll="pageHook.scroll">
             <template #top>

src/pages/tabbar/order.vue

@@ -3,7 +3,7 @@ import { ref, reactive } from "vue";
 import { onLoad, onShow } from "@dcloudio/uni-app";
 
 import { hooks, router } from "@@/index"
-import { orderApi } from "@@/api"
+import { orderApi, payApi } from "@@/api"
 
 import zTabs from "@@/components/other/z-tabs/z-tabs.vue"
 
@@ -18,7 +18,7 @@ const data = {
 }
 const state = reactive<any>({
     pa: {
-        orderStatus: null,
+        orderStatus: data.tabs[0].id,
     },
 })
 
@@ -26,7 +26,9 @@ onLoad(() => {
 
 });
 onShow(() => {
-
+    if (pageRef.value) {
+        pageRef.value.reload(false)
+    }
 })
 const doTab = (e: any) => {
     const target = data.tabs[e];
@@ -44,6 +46,33 @@ const doToDetail = (v: any) => {
     router.jump("/pages/order/detail", { id: v.id })
 }
 
+const doAppraise = () => {
+
+}
+
+const doRefund = (v: any) => {
+    uni.showModal({
+        title: '提示',
+        content: '是否确定退款',
+        confirmColor: '#0094ff',
+        success: async (res) => {
+            if (!res.confirm) return
+            try {
+                uni.showLoading({ title: '退款中...', mask: true });
+                const _pa = { id: v.id }
+                const { data, code }: any = await payApi.refundHardwareOrder(_pa)
+                if (code != 0) throw new Error()
+                pageRef.value.reload(true)
+                uni.hideLoading()
+                uni.showToast({ title: '退款成功', icon: "none" });
+            } catch (error) {
+                console.error(error);
+                uni.hideLoading()
+            }
+        }
+    });
+}
+
 </script>
 
 
@@ -67,7 +96,7 @@ const doToDetail = (v: any) => {
                         <view class="flex-row items-center justify-between">
                             <view class="flex-row items-center">
                                 <view class="main-text-28">{{ v.merchantStr }}</view>
-                                <view class="m-l-15rpx color-#c4c4c4 font-size-26rpx! iconfont icon-youjiantou" />
+                                <view class="m-l-15rpx color-#999 font-size-26rpx! iconfont icon-youjiantou" />
                             </view>
                             <tm-tag v-if="v.orderStatus == 1" color="info" size="xs">未支付</tm-tag>
                             <tm-tag v-if="v.orderStatus == 5" color="success" size="xs">待核销</tm-tag>
@@ -110,7 +139,9 @@ const doToDetail = (v: any) => {
                     </view>
                 </view>
                 <view v-if="[5, 10].includes(v.orderStatus)" class="flex-row items-center justify-end p-t-20rpx">
-                    <view v-if="v.orderStatus == 10" class="botder_btn">评价</view>
+                    <view v-if="v.orderStatus == 10" class="botder_btn" @tap.stop="doAppraise">评价</view>
+                    <view v-if="v.orderStatus == 5 && v.orderType == 2" class="botder_btn" @tap.stop="doRefund(v)">退款
+                    </view>
                     <view v-if="v.orderStatus == 5 && v.orderType == 2" class="m-l-20rpx botder_btn"
                         @tap.stop="hooks.usePreviewImage(v.orderTypeExtendReserve.qrCode)">
                         核销码
@@ -121,13 +152,4 @@ const doToDetail = (v: any) => {
     </crud-layout>
 </template>
 
-<style lang="scss" scoped>
-.botder_btn {
-    border: 1px solid #c4c4c4;
-    color: #c4c4c4;
-    font-weight: 500;
-    font-size: 28rpx;
-    border-radius: 10rpx;
-    padding: 8rpx 15rpx;
-}
-</style>
+<style lang="scss" scoped></style>