From 983674cfc9ba160867b255aef5e58766f21eb2ab Mon Sep 17 00:00:00 2001
From: code <2388224167@qq.com>
Date: Tue, 12 Nov 2024 04:33:34 +0800
Subject: [PATCH] 111

---
 package.json                                  |   1 +
 pnpm-lock.yaml                                |   8 +
 src/App.vue                                   |  16 ++
 src/pages.json                                |  38 +++++
 src/pages/apply/stride-apply.vue              |  11 ++
 src/pages/apply/stride-items.vue              |  72 +++++++++
 src/pages/apply/stride-list.vue               |   1 +
 src/pages/merchant/components/product-row.vue |  27 ++++
 src/pages/merchant/detail.vue                 | 132 +++++++++++++++++
 src/pages/merchant/index.vue                  |  33 +++++
 src/pages/merchant/product-detail.vue         |  71 +++++++++
 src/pages/order/detail.vue                    | 140 ++++++++++++++++++
 src/pages/tabbar/food.vue                     |  34 ++++-
 src/pages/tabbar/home.vue                     |  38 ++++-
 src/pages/tabbar/order.vue                    | 110 ++++++++++++--
 src/sheep/api/food.ts                         |  48 +++++-
 src/sheep/api/merchant.ts                     |  12 +-
 src/sheep/api/order.ts                        |  30 +++-
 src/sheep/api/product.ts                      |  10 +-
 .../base-just-flot-nav/base-just-flot-nav.vue |  35 +++--
 .../crud/crud-layout/crud-layout.vue          |   4 +-
 src/sheep/constant/index.ts                   |   2 +
 src/sheep/constant/service-enum.ts            |  29 ++++
 src/sheep/hooks/index.ts                      |   4 +
 src/sheep/hooks/use-enum.ts                   |  11 ++
 src/sheep/hooks/use-img.ts                    |   7 +
 src/sheep/scss/font/iconfont.scss             |  14 +-
 src/static/icon/guarantee.png                 | Bin 0 -> 17554 bytes
 unocss.config.ts                              |  24 ++-
 29 files changed, 913 insertions(+), 49 deletions(-)
 create mode 100644 src/pages/apply/stride-items.vue
 create mode 100644 src/pages/merchant/components/product-row.vue
 create mode 100644 src/pages/merchant/detail.vue
 create mode 100644 src/pages/merchant/index.vue
 create mode 100644 src/pages/merchant/product-detail.vue
 create mode 100644 src/pages/order/detail.vue
 create mode 100644 src/sheep/constant/service-enum.ts
 create mode 100644 src/sheep/hooks/use-enum.ts
 create mode 100644 src/sheep/hooks/use-img.ts
 create mode 100644 src/static/icon/guarantee.png

diff --git a/package.json b/package.json
index 79d41db..2fdeb7b 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "@dcloudio/uni-mp-xhs": "3.0.0-4020920240930001",
     "@dcloudio/uni-quickapp-webview": "3.0.0-4020920240930001",
     "@vue/compiler-core": "^3.5.11",
+    "@zebra-ui/swiper": "^2.2.8",
     "dayjs": "^1.11.13",
     "luch-request": "^3.1.1",
     "pinia": "^2.2.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c96ffa6..62e9f58 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -53,6 +53,9 @@ dependencies:
   '@vue/compiler-core':
     specifier: ^3.5.11
     version: 3.5.12
+  '@zebra-ui/swiper':
+    specifier: ^2.2.8
+    version: 2.2.8
   dayjs:
     specifier: ^1.11.13
     version: 1.11.13
@@ -3868,6 +3871,11 @@ packages:
     resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
     dev: true
 
+  /@zebra-ui/swiper@2.2.8:
+    resolution: {integrity: sha512-ujS0xKzEieFg59Wjz1fOtqeZthoMOgTZrFdN7c8Tq/qrIjKst6JGd35qg5/tvK4v9idtmywK4Dzp77go3LolKQ==}
+    engines: {HBuilderX: ^3.1.0}
+    dev: false
+
   /abab@2.0.6:
     resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
     deprecated: Use your platform's native atob() and btoa() methods instead
diff --git a/src/App.vue b/src/App.vue
index 1370b98..6d9ea60 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,4 +15,20 @@ onHide(() => {
 <style lang="scss">
 @import "@/sheep/scss/global.scss";
 @import url(@/uni_modules/tm-ui/css/remixicon.min.css);
+
+.prefix_title {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #333;
+
+  &::before {
+    content: '';
+    display: inline-block;
+    width: 8rpx;
+    height: 24rpx;
+    background: #0094ff;
+    border-radius: 4rpx;
+    margin-right: 10rpx;
+  }
+}
 </style>
diff --git a/src/pages.json b/src/pages.json
index 68e8ab9..1725406 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -84,6 +84,44 @@
 						"navigationBarTitleText": "",
 						"disableScroll": true
 					}
+				},
+				{
+					"path": "stride-items",
+					"style": {
+						"navigationBarTitleText": "",
+						"disableScroll": true
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/merchant",
+			"pages": [
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "",
+						"disableScroll": true
+					}
+				},
+				{
+					"path": "product-detail",
+					"style": {
+						"navigationBarTitleText": "",
+						"disableScroll": true
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/order",
+			"pages": [
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "",
+						"disableScroll": true
+					}
 				}
 			]
 		},
diff --git a/src/pages/apply/stride-apply.vue b/src/pages/apply/stride-apply.vue
index 2065365..d11afe5 100644
--- a/src/pages/apply/stride-apply.vue
+++ b/src/pages/apply/stride-apply.vue
@@ -9,9 +9,15 @@ const state = reactive<any>({
 
 })
 const applyForm = reactive<any>({
+    count: 1,
     remark: "",
 })
 const applyFormRules = reactive<any>({
+    count: [
+        { required: true, message: '请输入申请数量' },
+        { required: true, min: 1, message: '最少申请1张' },
+        { required: true, max: 20, message: '最多申请20张' },
+    ]
 })
 onLoad(() => {
 
@@ -29,6 +35,7 @@ const doSubmit = async () => {
     try {
         uni.showLoading({ title: '申请中...', mask: false });
         const _pa = {
+            count: applyForm.count,
             remark: applyForm.remark,
         }
         const { data, code }: any = await applyApi.strideApply(_pa)
@@ -49,6 +56,10 @@ const doSubmit = async () => {
     <crud-layout title="外来人员就餐" bg="/static/page/blue-bg.png">
         <view class="h-30rpx" />
         <tm-form ref="applyFormRef" v-model="applyForm" :rules="applyFormRules" direction="vertical">
+            <tm-form-item name="count" label="申请数量" :showBottom="false">
+                <tm-input v-model="applyForm.count" type="number" showClear placeholder="请输入申请数量.." />
+            </tm-form-item>
+            <view class="h-30rpx" />
             <tm-form-item name="remark" label="备注" :required="false" :showBottom="false">
                 <tm-input v-model="applyForm.remark" type="textarea" showClear placeholder="请输入备注.."></tm-input>
             </tm-form-item>
diff --git a/src/pages/apply/stride-items.vue b/src/pages/apply/stride-items.vue
new file mode 100644
index 0000000..9135b36
--- /dev/null
+++ b/src/pages/apply/stride-items.vue
@@ -0,0 +1,72 @@
+<script setup lang="ts">
+import { ref, reactive } from "vue";
+import { onLoad, onShow } from "@dcloudio/uni-app";
+import { isEmpty } from 'radash'
+
+import { hooks, router } from "@@/index"
+import { applyApi } from "@@/api"
+
+import zTabs from "@@/components/other/z-tabs/z-tabs.vue"
+
+const data = {
+    tabs: ['待审核', '已通过', '已拒绝'],
+}
+const state = reactive<any>({
+    pa: {
+        id: null,
+        pagesize: 99,
+    },
+})
+
+const pageRef = ref<any>(null)
+const pageHook = hooks.usePage(pageRef, applyApi.foreignItems, null, 'data')
+const query = (page: number, pagesize: number) => {
+    pageHook.startPage(page, pagesize, false, state.pa);
+}
+
+onLoad((options: any) => {
+    if (!isEmpty(options.id)) {
+        state.pa.id = options.id
+    }
+});
+onShow(() => {
+
+})
+
+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" />
+            </template>
+            <view class="flex-col card p-x-20rpx p-y-30rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i">
+                <view class="flex-row items-center justify-between">
+                    <view class="">
+                        <tm-tag v-if="v.status == 1" size="m" color="info">未使用</tm-tag>
+                        <tm-tag v-if="v.status == 2" size="m" color="success">已使用</tm-tag>
+                        <view class="m-t-10rpx sub-text-26">
+                            <text>{{ v.userNameStr }}</text>
+                            <text class="m-l-10rpx">{{ v.userMobile }}</text>
+                        </view>
+                    </view>
+                    <image class="w-100rpx h-100rpx" :src="v.code" mode="aspectFill" />
+                </view>
+            </view>
+        </z-paging>
+    </crud-layout>
+</template>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/pages/apply/stride-list.vue b/src/pages/apply/stride-list.vue
index f6043ff..13adf82 100644
--- a/src/pages/apply/stride-list.vue
+++ b/src/pages/apply/stride-list.vue
@@ -54,6 +54,7 @@ const doApply = async () => {
                     <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>
             <template #bottom>
diff --git a/src/pages/merchant/components/product-row.vue b/src/pages/merchant/components/product-row.vue
new file mode 100644
index 0000000..4199a25
--- /dev/null
+++ b/src/pages/merchant/components/product-row.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+import { ref, reactive } from "vue";
+import { onLoad, onShow } from "@dcloudio/uni-app";
+
+import { hooks, router } from "@@/index"
+import { merchantApi } from "@@/api"
+
+const state = reactive<any>({
+
+})
+
+onLoad(() => {
+
+});
+onShow(() => {
+
+})
+
+
+</script>
+
+
+<template>
+
+</template>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/pages/merchant/detail.vue b/src/pages/merchant/detail.vue
new file mode 100644
index 0000000..194468b
--- /dev/null
+++ b/src/pages/merchant/detail.vue
@@ -0,0 +1,132 @@
+<script setup lang="ts">
+import { ref, reactive } from "vue";
+import { onLoad, onShow } from "@dcloudio/uni-app";
+import { isEmpty } from "radash"
+
+import { hooks } from "@@/index"
+import { merchantApi, foodApi } from "@@/api"
+
+import ProductRow from './components/product-row.vue'
+
+
+const data = {
+
+}
+const state = reactive<any>({
+    detailId: null,
+    detail: {},
+})
+
+onLoad((options: any) => {
+    if (!isEmpty(options.id)) {
+        state.detailId = options.id
+        getDetail()
+    }
+});
+onShow(() => {
+
+})
+
+const getDetail = async () => {
+    const _pa = { id: state.detailId }
+    const { data } = await merchantApi.detail(_pa)
+    state.detail = data
+}
+
+const getShopCar = async () => {
+    const _pa = {}
+    const { data } = await foodApi.getShopCar(_pa)
+}
+
+const updateShopCar = async () => {
+    const _pa = {}
+    const { data } = await foodApi.updateShopCar(_pa)
+}
+
+const getClassify = async () => {
+    const _pa = {}
+    const { data } = await foodApi.classify(_pa)
+}
+
+const getPorduct = async () => {
+    const _pa = {}
+    const { data } = await foodApi.product(_pa)
+}
+
+</script>
+
+<template>
+    <crud-layout bg="/static/page/blue-bg.png">
+        <!-- start 简介 start -->
+        <view class="h-10rpx" />
+        <view flex-row card p-20rpx>
+            <image class="w-160rpx h-160rpx rounded-12rpx" :src="state.detail.logo" mode="aspectFill" />
+            <view class="flex-1 flex-col m-l-20rpx">
+                <view class="flex-row items-center justify-between">
+                    <view class="flex-row-center sub-text-36">
+                        <text>{{ state.detail.name }}</text>
+                    </view>
+                    <view>
+                        <tm-tag size="s">{{ state.detail.deptStr }}</tm-tag>
+                    </view>
+                </view>
+                <view class="m-t-10rpx second-text-28">
+                    <text>营业时间</text>
+                    <text class="m-l-10rpx">
+                        {{ hooks.useTime(state.detail.applianceStartTime, "{h}:{i}") }}
+                        ~
+                        {{ hooks.useTime(state.detail.applianceEndTime, "{h}:{i}") }}
+                    </text>
+                </view>
+                <view class="m-t-10rpx second-text-28">
+                    <text>食堂地址</text>
+                    <text class="m-l-10rpx">{{ state.detail.addressDes }}</text>
+                </view>
+            </view>
+        </view>
+        <!-- end 简介 end -->
+        <!-- start 功能 start -->
+        <view class="h-10rpx" />
+        <view class="flex-row items-center justify-between card p-y-20rpx p-x-30rpx">
+            <view class="flex-row-center">
+                <view class="flex-row-center w-50rpx h-50rpx bg-#167aff rounded-full">
+                    <text class="font-size-28rpx! color-white iconfont icon-dianhua" />
+                </view>
+                <text class="m-l-20rpx sub-text-30">联系食堂</text>
+            </view>
+            <view class="w-1px h-30rpx bg-#515151" />
+            <view class="flex-row-center">
+                <view class="flex-row-center w-50rpx h-50rpx bg-#167aff rounded-full">
+                    <text class="font-size-28rpx! color-white iconfont icon-yuding" />
+                </view>
+                <text class="m-l-20rpx sub-text-28">包厢预定</text>
+            </view>
+        </view>
+        <!-- end 功能 end -->
+
+        <!-- start 轮播 start -->
+        <!-- <view class="h-10rpx" /> -->
+        <!-- end 轮播 end -->
+
+        <!-- start 商品 start -->
+        <view class="h-10rpx" />
+
+        <view>
+            <view>
+                <view>
+
+                </view>
+            </view>
+            <view>
+
+            </view>
+        </view>
+
+        <view>
+
+        </view>
+        <!-- end 商品 end -->
+    </crud-layout>
+</template>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/pages/merchant/index.vue b/src/pages/merchant/index.vue
new file mode 100644
index 0000000..1f8b76e
--- /dev/null
+++ b/src/pages/merchant/index.vue
@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import { ref, reactive } from "vue";
+import { onLoad, onShow } from "@dcloudio/uni-app";
+
+import { hooks } from "@@/index"
+import { foodApi } from "@@/api"
+
+const data = {
+
+}
+const state = reactive<any>({
+    pa: {
+        status: 1,
+    },
+})
+
+onLoad(() => {
+
+});
+onShow(() => {
+
+})
+
+</script>
+
+
+<template>
+    <crud-layout title="订单详情" bg="/static/page/blue-bg.png">
+
+    </crud-layout>
+</template>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/pages/merchant/product-detail.vue b/src/pages/merchant/product-detail.vue
new file mode 100644
index 0000000..d0887ad
--- /dev/null
+++ b/src/pages/merchant/product-detail.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import { ref, reactive } from "vue";
+import { onLoad, onShow } from "@dcloudio/uni-app";
+import { isEmpty } from 'radash'
+
+import { hooks } from "@@/index"
+import { productApi } from "@@/api"
+
+import zSwiper from "@zebra-ui/swiper/components/z-swiper/z-swiper.vue"
+import zSwiperItem from "@zebra-ui/swiper/components/z-swiper-item/z-swiper-item.vue"
+
+const data = {
+    list: [
+        'https://cdn.zebraui.com/zebra-ui/images/swipe-demo/swipe1.jpg',
+        'https://cdn.zebraui.com/zebra-ui/images/swipe-demo/swipe2.jpg',
+        'https://cdn.zebraui.com/zebra-ui/images/swipe-demo/swipe3.jpg',
+        'https://cdn.zebraui.com/zebra-ui/images/swipe-demo/swipe4.jpg',
+        'https://cdn.zebraui.com/zebra-ui/images/swipe-demo/swipe5.jpg',
+    ]
+}
+const state = reactive<any>({
+    detailId: null,
+})
+
+onLoad((options: any) => {
+    if (!isEmpty(options.id)) {
+        state.detailId = options.id
+    }
+});
+onShow(() => {
+    getDetail()
+})
+
+const getDetail = async () => {
+    const _pa = { id: state.detailId }
+    const { data } = await productApi.get(_pa)
+}
+
+</script>
+
+<template>
+    <crud-layout title="订单详情" tabBarType="just-flot-back" bg="/static/page/blue-bg.png">
+        <z-swiper v-model="data.list">
+            <z-swiper-item v-for="(v, i) in data.list" :key="i">
+                <image class="w-100vw" :src="v" mode="aspectFill" />
+            </z-swiper-item>
+        </z-swiper>
+        <view class="p-x-15rpx">
+            <view class="flex-row items-center justify-between card p-y-20rpx p-x-30rpx">
+                <view></view>
+                <view></view>
+            </view>
+            <view class="h-15rpx" />
+            <view class="flex-row items-center justify-between card p-y-20rpx p-x-30rpx">
+                <view class="prefix_title">评价</view>
+            </view>
+            <view class="h-15rpx" />
+            <view class="flex-row items-center justify-between card p-y-20rpx p-x-30rpx">
+                <view class="prefix_title">详情</view>
+            </view>
+        </view>
+    </crud-layout>
+</template>
+
+<style lang="scss" scoped>
+:deep() {
+    .layout_main>scroll-view {
+        padding: 0 !important;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
new file mode 100644
index 0000000..f1bc8a7
--- /dev/null
+++ b/src/pages/order/detail.vue
@@ -0,0 +1,140 @@
+<script setup lang="ts">
+import { ref, reactive } from "vue";
+import { onLoad, onShow } from "@dcloudio/uni-app";
+import { isEmpty } from "radash"
+
+import { hooks, constant, router } from "@@/index"
+import { orderApi } from "@@/api"
+
+const data = {
+
+}
+const state = reactive<any>({
+    detailId: null,
+    detail: {},
+    shopCarList: [],
+})
+
+onLoad((options: any) => {
+    if (!isEmpty(options.id)) {
+        state.detailId = options.id
+    }
+});
+onShow(() => {
+    getDetail()
+    getShopCarList()
+})
+
+const getDetail = async () => {
+    if (isEmpty(state.detailId)) return
+    const _pa = { id: state.detailId };
+    const { data } = await orderApi.detail(_pa)
+    state.detail = data
+}
+
+const getShopCarList = async () => {
+    if (isEmpty(state.detailId)) return
+    const _pa = { orderId: state.detailId };
+    const { data } = await orderApi.shopCarList(_pa)
+    state.shopCarList = data
+}
+
+</script>
+
+
+<template>
+    <crud-layout title="订单详情" bg="/static/page/blue-bg.png">
+        <view class="h-30rpx" />
+        <view class="relative flex-col justify-center overflow-hidden card p-x-20rpx p-y-30rpx m-b-20rpx">
+            <image class="absolute top--20rpx right--60rpx w-160rpx h-160rpx" src="/static/icon/guarantee.png"
+                mode="widthFix" />
+            <view class="sub-text-32">订单信息</view>
+            <view class="m-t-15rpx">
+                <view class="info_cell">
+                    <view>用户</view>
+                    <view>{{ state.detail.username }}</view>
+                </view>
+                <view class="info_cell">
+                    <view>手机号</view>
+                    <view>{{ state.detail.userMobile }}</view>
+                </view>
+                <view class="info_cell">
+                    <view>商户</view>
+                    <view>{{ state.detail.merchantStr }}</view>
+                </view>
+                <view class="info_cell">
+                    <view>部门</view>
+                    <view>{{ state.detail.deptName }}</view>
+                </view>
+                <view class="m-t-15rpx h-1px bg-#515151 bg-opacity-5" />
+                <view class="info_cell">
+                    <view>订单号</view>
+                    <view>{{ state.detail.id }}</view>
+                </view>
+                <view class="info_cell">
+                    <view>下单时间</view>
+                    <view>{{ hooks.useTime(state.detail.createTime, "") }}</view>
+                </view>
+                <view class="info_cell">
+                    <view>支付方式</view>
+                    <view>
+                        {{ hooks.useEnum("hardwareOrderTypeEnum", state.detail.orderType) }}
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view class="flex-col justify-center card p-x-20rpx p-y-30rpx m-b-20rpx">
+            <view class="sub-text-32">商品费用</view>
+            <view class="m-t-15rpx">
+                <view class="flex-row items-start justify-between" v-for="(v, i) in state.shopCarList" :key="i"
+                    @tap.stop="router.jump('/pages/merchant/product-detail', { id: v.productId })">
+                    <view class="flex-row items-center">
+                        <image class="w-160rpx h-160rpx" :src="v.productPic" mode="aspectFill" />
+                        <view class="flex-col m-l-15rpx second-text-26">
+                            <view class="sub-text-28">{{ v.productName }}</view>
+                            <view class="m-t-5rpx">¥ {{ hooks.useMoney(v.productPrice) }}</view>
+                            <view class="m-t-5rpx">x {{ v.productCount }}</view>
+                        </view>
+                    </view>
+                    <view class="flex-row-center">
+                        <view class="sub-text-32">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
+                    </view>
+                </view>
+                <view class="m-y-15rpx h-1px bg-#515151 bg-opacity-5" />
+                <view class="flex-row items-center justify-between">
+                    <view class="sub-text-32">实付款</view>
+                    <view class="flex-row items-end">
+                        <view class="sub-text-28">¥</view>
+                        <view class="m-l-5rpx sub-text-32">{{ hooks.useMoney(state.detail.practicalTotalPrice) }}</view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </crud-layout>
+</template>
+
+<style lang="scss" scoped>
+.info_cell {
+    display: flex;
+    align-items: center;
+
+    &:not(:first-child) {
+        margin-top: 15rpx;
+    }
+
+    &>view {
+        color: #515151;
+        font-size: 28rpx;
+        font-weight: 500;
+        line-height: 1.4em;
+    }
+
+    &>view:nth-child(1) {
+        width: 130rpx;
+    }
+
+    &>view:nth-child(2) {
+        flex: 1;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/tabbar/food.vue b/src/pages/tabbar/food.vue
index 551dd57..deaa3cf 100644
--- a/src/pages/tabbar/food.vue
+++ b/src/pages/tabbar/food.vue
@@ -3,10 +3,17 @@ import { ref, reactive } from "vue";
 import { onLoad, onShow } from "@dcloudio/uni-app";
 
 import { hooks } from "@@/index"
-import { merchantApi } from "@@/api"
+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(() => {
@@ -17,24 +24,35 @@ onShow(() => {
 })
 
 const pageRef = ref<any>(null)
-const pageHook = hooks.usePage(pageRef, merchantApi.merchantList, null, 'data')
+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>
-
-
+    <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>
 
diff --git a/src/pages/tabbar/home.vue b/src/pages/tabbar/home.vue
index 551dd57..f06a77c 100644
--- a/src/pages/tabbar/home.vue
+++ b/src/pages/tabbar/home.vue
@@ -2,7 +2,7 @@
 import { ref, reactive } from "vue";
 import { onLoad, onShow } from "@dcloudio/uni-app";
 
-import { hooks } from "@@/index"
+import { hooks, router } from "@@/index"
 import { merchantApi } from "@@/api"
 
 const state = reactive<any>({
@@ -17,24 +17,48 @@ onShow(() => {
 })
 
 const pageRef = ref<any>(null)
-const pageHook = hooks.usePage(pageRef, merchantApi.merchantList, null, 'data')
+const pageHook = hooks.usePage(pageRef, merchantApi.page, null, 'data.list')
 const query = (page: number, pagesize: number) => {
     pageHook.startPage(page, pagesize, false, state.pa);
 }
 
-
 </script>
 
 
 <template>
-    <crud-layout>
-
-
+    <crud-layout 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>
+            </template>
+            <view class="flex-row card p-20rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i"
+                @tap="router.jump('/pages/merchant/detail', { id: v.id })">
+                <image class="w-160rpx h-160rpx rounded-12rpx" :src="v.logo" mode="aspectFill" />
+                <view class="flex-1 flex-col m-l-20rpx">
+                    <view class="flex-row items-center justify-between">
+                        <view class="flex-row-center sub-text-34">
+                            <text> {{ v.name }}</text>
+                        </view>
+                        <view>
+                            <tm-tag size="s">{{ v.deptStr }}</tm-tag>
+                        </view>
+                    </view>
+                    <view class="m-t-10rpx second-text-28">
+                        <text>营业时间</text>
+                        <text class="m-l-10rpx">
+                            {{ hooks.useTime(v.applianceStartTime, "{h}:{i}") }}
+                            ~
+                            {{ hooks.useTime(v.applianceEndTime, "{h}:{i}") }}
+                        </text>
+                    </view>
+                    <view v-if="v.addressDes" class="m-t-10rpx second-text-28">
+                        <text>食堂地址</text>
+                        <text class="m-l-10rpx">{{ v.addressDes }}</text>
+                    </view>
+                </view>
+            </view>
         </z-paging>
-
     </crud-layout>
 </template>
 
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index 551dd57..918fc2a 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -2,11 +2,24 @@
 import { ref, reactive } from "vue";
 import { onLoad, onShow } from "@dcloudio/uni-app";
 
-import { hooks } from "@@/index"
-import { merchantApi } from "@@/api"
+import { hooks, router } from "@@/index"
+import { orderApi } from "@@/api"
 
+import zTabs from "@@/components/other/z-tabs/z-tabs.vue"
+
+const data = {
+    tabs: [
+        { id: null, name: '全部', disabled: false },
+        { id: 1, name: '未支付', disabled: false },
+        { id: 5, name: '待核销', disabled: false },
+        { id: 10, name: '已核销', disabled: false },
+        { id: 15, name: '已退款', disabled: false },
+    ]
+}
 const state = reactive<any>({
-
+    pa: {
+        orderStatus: null,
+    },
 })
 
 onLoad(() => {
@@ -15,27 +28,106 @@ onLoad(() => {
 onShow(() => {
 
 })
+const doTab = (e: any) => {
+    const target = data.tabs[e];
+    state.pa.orderStatus = target.id
+    pageRef.value.reload(true)
+}
 
 const pageRef = ref<any>(null)
-const pageHook = hooks.usePage(pageRef, merchantApi.merchantList, null, 'data')
+const pageHook = hooks.usePage(pageRef, orderApi.page, null, 'data.list')
 const query = (page: number, pagesize: number) => {
     pageHook.startPage(page, pagesize, false, state.pa);
 }
 
+const doToDetail = (v: any) => {
+    router.jump("/pages/order/detail", { id: v.id })
+}
 
 </script>
 
 
 <template>
-    <crud-layout>
-
-
+    <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 justify-center card p-x-15rpx p-y-25rpx m-b-20rpx" v-for="(v, i) in pageHook.list"
+                :key="i" @tap="doToDetail(v)">
+                <view class="flex-row items-center">
+                    <image class="w-80rpx h-80rpx rounded-8rpx" :src="v.merchantLogo" mode="aspectFill" />
+                    <view class="flex-1 flex-col m-l-20rpx">
+                        <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-#515151 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>
+                            <tm-tag v-if="v.orderStatus == 10" size="xs">已核销</tm-tag>
+                            <tm-tag v-if="v.orderStatus == 15" color="error" size="xs">已退款</tm-tag>
+                        </view>
+                        <view class="m-t-5rpx">
+                            <view class="second-text-26">
+                                <text>下单时间</text>
+                                <text class="m-l-10rpx">
+                                    {{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
+                                </text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="relative h-180rpx m-t-20rpx">
+                    <view class="absolute top-0 right-0 bottom-0 left-0 h-180rpx">
+                        <scroll-view scroll-x class="flex-row-center whitespace-nowrap">
+                            <view class="flex-row items-center">
+                                <view class="inline-flex! flex-col justify-center h-180rpx m-r-20rpx"
+                                    v-for="(pV, pI) in v.shopCarList" :key="pI"
+                                    @tap.stop="router.jump('/pages/merchant/product-detail', { id: pV.productId })">
+                                    <image class="w-160rpx h-120rpx rounded-8rpx" :src="pV.productPic"
+                                        mode="aspectFill" />
+                                    <view class="w-160rpx m-t-10rpx sub-text-28 show-line">
+                                        {{ pV.productName }}
+                                    </view>
+                                </view>
+                                <view class="inline-flex! h-180rpx">
+                                    <view class="w-160rpx h-full" />
+                                </view>
+                            </view>
+                        </scroll-view>
+                    </view>
+                    <view
+                        class="absolute top-0 right-0 bottom-0 z-10 flex-col items-end w-160rpx p-x-20rpx bg-white bg-opacity-95">
+                        <view class="main-text-30">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
+                        <view class="m-t-10rpx second-text-26">共 {{ v.shopCarList.length }} 件</view>
+                    </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 == 5 && v.orderType == 2" class="m-l-20rpx botder_btn"
+                        @tap.stop="hooks.usePreviewImage(v.orderTypeExtendReserve.qrCode)">
+                        核销码
+                    </view>
+                </view>
+            </view>
         </z-paging>
-
     </crud-layout>
 </template>
 
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped>
+.botder_btn {
+    border: 1px solid #515151;
+    color: #515151;
+    font-weight: 500;
+    font-size: 28rpx;
+    border-radius: 10rpx;
+    padding: 8rpx 15rpx;
+}
+</style>
\ No newline at end of file
diff --git a/src/sheep/api/food.ts b/src/sheep/api/food.ts
index 8c60b54..e318b95 100644
--- a/src/sheep/api/food.ts
+++ b/src/sheep/api/food.ts
@@ -1,3 +1,49 @@
 import request from "@/sheep/utils/request";
 
-export default {};
+export default {
+  page: (params: any) =>
+    request({
+      url: `/food/api/selectTimeFood`,
+      method: "GET",
+      params,
+      custom: {
+        showLoading: false,
+      },
+    }),
+  classify: (params: any) =>
+    request({
+      url: `/onlinefood/category/listFood`,
+      method: "GET",
+      params,
+      custom: {
+        showLoading: false,
+      },
+    }),
+  product: (params: any) =>
+    request({
+      url: `/onlinefood/category/list`,
+      method: "GET",
+      params,
+      custom: {
+        showLoading: false,
+      },
+    }),
+  getShopCar: (params: any) =>
+    request({
+      url: `/hardware/car/get`,
+      method: "GET",
+      params,
+      custom: {
+        showLoading: false,
+      },
+    }),
+  updateShopCar: (data: any) =>
+    request({
+      url: `/hardware/car/save-or-upload`,
+      method: "POST",
+      data,
+      custom: {
+        showLoading: false,
+      },
+    }),
+};
diff --git a/src/sheep/api/merchant.ts b/src/sheep/api/merchant.ts
index 23275d2..038e94a 100644
--- a/src/sheep/api/merchant.ts
+++ b/src/sheep/api/merchant.ts
@@ -1,10 +1,20 @@
 import request from "@/sheep/utils/request";
 
 export default {
-  merchantList: () =>
+  page: (params: any) =>
     request({
       url: "/merchant/manage/page-join",
       method: "GET",
+      params,
+      custom: {
+        showLoading: false,
+      },
+    }),
+  detail: (params: any) =>
+    request({
+      url: "/merchant/manage/get",
+      method: "GET",
+      params,
       custom: {
         showLoading: false,
       },
diff --git a/src/sheep/api/order.ts b/src/sheep/api/order.ts
index 8c60b54..ca2a035 100644
--- a/src/sheep/api/order.ts
+++ b/src/sheep/api/order.ts
@@ -1,3 +1,31 @@
 import request from "@/sheep/utils/request";
 
-export default {};
+export default {
+  page: (params: any) =>
+    request({
+      url: `/hardware/order/page-join`,
+      method: "GET",
+      params,
+      custom: {
+        showLoading: false,
+      },
+    }),
+  detail: (params: any) =>
+    request({
+      url: `/hardware/order/get-join`,
+      method: "GET",
+      params,
+      custom: {
+        showLoading: false,
+      },
+    }),
+  shopCarList: (params: any) =>
+    request({
+      url: `/hardware/car/get-by-order-id`,
+      method: "GET",
+      params,
+      custom: {
+        showLoading: false,
+      },
+    }),
+};
diff --git a/src/sheep/api/product.ts b/src/sheep/api/product.ts
index 8c60b54..91c0dd2 100644
--- a/src/sheep/api/product.ts
+++ b/src/sheep/api/product.ts
@@ -1,3 +1,11 @@
 import request from "@/sheep/utils/request";
 
-export default {};
+export default {
+  get: (params) => {
+    return request({
+      url: "/product/spu/get-detail",
+      method: "GET",
+      params,
+    });
+  },
+};
diff --git a/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue b/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue
index eb3b346..cad5ec8 100644
--- a/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue
+++ b/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue
@@ -40,9 +40,11 @@ function getNavTop() {
 </script>
 
 <template>
-    <view class="navbar" :style="{ top: getNavTop() }" v-if="showLeft && !isTabbar" @tap="doBackClick">
-        <text class="sicon-back icon" v-if="isHistiry" />
-        <text class="sicon-home icon" v-else />
+    <view class="navbar" :style="{ top: getNavTop() }">
+        <view class="navbar_center" v-if="showLeft && !isTabbar" @tap="doBackClick">
+            <text class="sicon-back icon" v-if="isHistiry" />
+            <text class="sicon-home icon" v-else />
+        </view>
     </view>
 </template>
 
@@ -50,19 +52,26 @@ function getNavTop() {
 .navbar {
     position: absolute;
     left: 20rpx;
-    background: #fff;
-    box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
-    border-radius: 28rpx;
-    width: 56rpx;
-    height: 56rpx;
+    height: 44px;
     display: flex;
     justify-content: center;
     align-items: center;
-    z-index: 100;
-}
 
-.icon {
-    font-size: 32rpx;
-    color: #333;
+    &_center {
+        background: #fff;
+        box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
+        border-radius: 28rpx;
+        width: 56rpx;
+        height: 56rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        z-index: 100;
+
+        &>.icon {
+            font-size: 32rpx;
+            color: #333;
+        }
+    }
 }
 </style>
diff --git a/src/sheep/components/crud/crud-layout/crud-layout.vue b/src/sheep/components/crud/crud-layout/crud-layout.vue
index d7ec867..68d9a90 100644
--- a/src/sheep/components/crud/crud-layout/crud-layout.vue
+++ b/src/sheep/components/crud/crud-layout/crud-layout.vue
@@ -70,7 +70,7 @@ function initBackStyle() {
     case "default":
       break;
     case "just-flot-back":
-      state.visble.topSafe = false
+      state.visble.topSafe = true
       state.visble.topNav = false
       break;
     default:
@@ -135,7 +135,7 @@ page {
   }
 
   &_header {
-    z-index: 1;
+    z-index: 100;
   }
 
   &_main {
diff --git a/src/sheep/constant/index.ts b/src/sheep/constant/index.ts
index a80bc11..949adc3 100644
--- a/src/sheep/constant/index.ts
+++ b/src/sheep/constant/index.ts
@@ -1,3 +1,5 @@
 export { default as imgConstant } from "./img-constant";
 
+export { default as serviceEnum } from "./service-enum";
+
 export { default as storageConstant } from "./storage-constant";
diff --git a/src/sheep/constant/service-enum.ts b/src/sheep/constant/service-enum.ts
new file mode 100644
index 0000000..10d6e0e
--- /dev/null
+++ b/src/sheep/constant/service-enum.ts
@@ -0,0 +1,29 @@
+const hardwareOrderStatusEnum = {
+  1: "创建订单(未支付)",
+  5: "已经支付",
+  10: "退款",
+  15: "已核销",
+};
+
+const hardwareOrderTypeEnum = {
+  1: "线下购买",
+  2: "线上订餐",
+  3: "外来人员",
+  4: "跨单位",
+};
+
+const hardwarePayTypeEnum = {
+  1: "钱包支付",
+  2: "钱包二维码支付",
+  3: "钱包饭卡支付",
+  4: "人脸识别支付",
+  5: "跨单位二维码支付",
+  6: "外来人员二维码支付",
+  7: "线上订餐二维码支付",
+};
+
+export default {
+  hardwareOrderStatusEnum,
+  hardwareOrderTypeEnum,
+  hardwarePayTypeEnum,
+};
diff --git a/src/sheep/hooks/index.ts b/src/sheep/hooks/index.ts
index 0070364..810d127 100644
--- a/src/sheep/hooks/index.ts
+++ b/src/sheep/hooks/index.ts
@@ -1,3 +1,7 @@
+export * from "./use-enum";
+
+export * from "./use-img";
+
 export * from "./use-page";
 
 export * from "./use-unit";
diff --git a/src/sheep/hooks/use-enum.ts b/src/sheep/hooks/use-enum.ts
new file mode 100644
index 0000000..cb10716
--- /dev/null
+++ b/src/sheep/hooks/use-enum.ts
@@ -0,0 +1,11 @@
+import { isEmpty } from "radash";
+
+import { serviceEnum } from "../constant/index";
+
+export const useEnum = (
+  key: string | undefined,
+  value: string | number | undefined
+) => {
+  if (isEmpty(key) || isEmpty(value)) return "";
+  return serviceEnum[key!][value];
+};
diff --git a/src/sheep/hooks/use-img.ts b/src/sheep/hooks/use-img.ts
new file mode 100644
index 0000000..b62dfe9
--- /dev/null
+++ b/src/sheep/hooks/use-img.ts
@@ -0,0 +1,7 @@
+export const usePreviewImage = (str: string | undefined) => {
+  if (str == undefined) return;
+  let urlList = str.split(",");
+  uni.previewImage({
+    urls: urlList,
+  });
+};
diff --git a/src/sheep/scss/font/iconfont.scss b/src/sheep/scss/font/iconfont.scss
index cdd5fac..50639b7 100644
--- a/src/sheep/scss/font/iconfont.scss
+++ b/src/sheep/scss/font/iconfont.scss
@@ -1,9 +1,9 @@
 @font-face {
     font-family: "iconfont";
     /* Project id 4740692 */
-    src: url('//at.alicdn.com/t/c/font_4740692_ozdkialdak.woff2?t=1731275285379') format('woff2'),
-        url('//at.alicdn.com/t/c/font_4740692_ozdkialdak.woff?t=1731275285379') format('woff'),
-        url('//at.alicdn.com/t/c/font_4740692_ozdkialdak.ttf?t=1731275285379') format('truetype');
+    src: url('//at.alicdn.com/t/c/font_4740692_4h93hfstead.woff2?t=1731328362704') format('woff2'),
+        url('//at.alicdn.com/t/c/font_4740692_4h93hfstead.woff?t=1731328362704') format('woff'),
+        url('//at.alicdn.com/t/c/font_4740692_4h93hfstead.ttf?t=1731328362704') format('truetype');
 }
 
 .iconfont {
@@ -14,6 +14,14 @@
     -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-dianhua:before {
+    content: "\e614";
+}
+
+.icon-yuding:before {
+    content: "\e649";
+}
+
 .icon-xiangxiajiantouxiao:before {
     content: "\e64e";
 }
diff --git a/src/static/icon/guarantee.png b/src/static/icon/guarantee.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e16542972b258a4b586b637a2459a0148ca379c
GIT binary patch
literal 17554
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

literal 0
HcmV?d00001

diff --git a/unocss.config.ts b/unocss.config.ts
index 09fb719..9602056 100644
--- a/unocss.config.ts
+++ b/unocss.config.ts
@@ -58,6 +58,15 @@ export default {
         "line-height": `1.4em`,
       }),
     ],
+    [
+      /^second-text-(\d+)$/,
+      ([, d]) => ({
+        "font-size": `${d}rpx`,
+        "font-weight": 500,
+        color: "#515151",
+        "line-height": `1.4em`,
+      }),
+    ],
     [
       "card",
       {
@@ -72,14 +81,23 @@ export default {
         "box-shadow": "0rpx 0rpx 4rpx 0rpx rgba(0, 0, 0, 0.1)",
       },
     ],
+    [
+      /^show-line$/,
+      ([, d]) => ({
+        overflow: "hidden",
+        "white-space": "nowrap",
+        "text-overflow": "ellipsis",
+      }),
+    ],
     [
       /^show-line-(\d+)$/,
       ([, d]) => ({
-        "text-overflow": "ellipsis",
+        display: "-webkit-box !important",
         overflow: "hidden",
-        display: "-webkit-box",
-        "-webkit-box-orient": "vertical",
+        "text-overflow": "ellipsis !important",
+        "word-break": "break-all",
         "-webkit-line-clamp": d,
+        "-webkit-box-orient": "vertical !important",
       }),
     ],
   ],