zianxin/pj_h5_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
weiwei committed 2025-05-13 16:27:36 +08:00
1 parent e7bc044830
commit b30a0d5366
2 files changed
+15 -85
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/pages/tabbar/canteen.vue
+3 -23
View File
@@ -53,41 +53,21 @@ const toDetail = async (v: any) => {
@scroll="pageHook.scroll"
>
<view class="h-20rpx" />
<tm-input placeholder="请输入关键字" leftIcon="search-2-line" />
<view class="h-20rpx" />
<view class="flex-row items-center justify-between mb-20rpx">
<view class="flex-row-center sub-text-28">附近店铺</view>
<view class="sub-text-22 color-#00a624!">
查看全部
</view>
</view>
<view class="flex-col card p-20rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i" @tap="toDetail(v)">
<image class="w-100% h-300rpx rounded-12rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
<view class="flex-row card p-20rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i" @tap="toDetail(v)">
<image class="w-180rpx h-180rpx rounded-12rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
<view class="flex-1 flex-col m-l-20rpx">
<view class="flex-row items-center justify-between mt-20rpx">
<view class="flex-row items-center justify-between">
<view class="flex-row-center sub-text-34">{{ v.name }}</view>
<view>
<tm-tag size="s">{{ v.deptName }}</tm-tag>
</view>
</view>
<view class="flex-row-center m-t-5rpx justify-left mb-5rpx">
<tm-icon name="map-pin-2-line" color="#999"></tm-icon>
<view class="second-text-22 m-l-10rpx">
地址详情信息示意
</view>
</view>
<view class="second-text-24">
<view class="second-text-28">营业时间：</view>
<view>{{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }}</view>
<view>{{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }}</view>
<view>{{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }}</view>
</view>
<view class="">
<tm-tag bgColor="#fff6e0" borderColor="#fff6e0"
fontColor="#FFBE4C" size="xs" class="mr-10rpx">折扣</tm-tag>
<tm-tag bgColor="#effefa" borderColor="#effefa" fontColor="#00a624" size="xs">送货</tm-tag>
</view>
<view v-if="v.addressDes" class="m-t-10rpx second-text-28">
<text>食堂地址</text>
<text class="m-l-10rpx">{{ v.addressDes }}</text>
src/pages/tabbar/individualOrder.vue
+12 -62
View File
@@ -13,7 +13,7 @@
:auto-scroll-to-top-when-reload="false"
@scroll="pageHook.scroll"
>
<template #top v-if="false">
<template #top>
<view class="h-30rpx" />
<view class="flex justify-between items-center bg-white rounded-16rpx px-20rpx">
<z-tabs :list="tabs" @change="tabChange" />
@@ -31,67 +31,32 @@
</tm-between-time>
</view>
</template>
<template #top>
<view>
<view class="h-20rpx" />
<tm-input placeholder="请输入关键字" leftIcon="search-2-line" />
<view class="h-20rpx" />
<tabSearch />
</view>
</template>
<view class="h-20rpx" />
<view class="flex-col justify-center card p-3 m-b-20rpx border-2rpx border-solid border-color-#eeeeee" v-for="(v, i) in pageHook.list" :key="i">
<view class="flex-row">
<image class="w-160rpx h-212rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
<view class="flex-col justify-center card p-3 m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i">
<view class="flex-row items-center">
<image class="w-110rpx h-110rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
<view class="flex-1 m-l-20rpx">
<view class="flex-row items-center justify-between">
<view class="flex-row items-center">
<view class="main-text-28">{{ v.merchantName }}</view>
<view v-if="false" class="m-l-15rpx color-#999 font-size-26rpx! iconfont icon-youjiantou" />
</view>
<template v-if="false">
<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" color="error" size="xs">售后</tm-tag>
<tm-tag v-if="v.orderStatus == 20" size="xs">已核销</tm-tag>
<tm-tag v-if="v.orderStatus == 30" color="info" size="xs">已取消(智能柜)</tm-tag>
</template>
<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" color="error" size="xs">售后</tm-tag>
<tm-tag v-if="v.orderStatus == 20" size="xs">已核销</tm-tag>
<tm-tag v-if="v.orderStatus == 30" color="info" size="xs">已取消(智能柜)</tm-tag>
</view>
<view class="flex-row-center m-t-10rpx justify-left">
<tm-icon name="map-pin-2-line" color="#999"></tm-icon>
<view class="second-text-22 m-l-10rpx">
地址详情信息示意
</view>
</view>
<view class="m-t-15rpx m-b-15rpx h-1rpx bg-#eeeeee "></view>
<view class="flex justify-between items-center m-b-10rpx" v-if="false">
<view class="flex justify-between items-center m-t-5rpx">
<view class="second-text-22">
<text>{{ v.username }}</text>
<text class="m-l-10rpx">{{ v.userMobile }}</text>
</view>
<view class="second-text-22 h-30rpx">{{ hooks.useEnum("hardwareRefundStatusEnum", v.refundStatus) }}</view>
</view>
<view class="flex justify-between items-center m-b-10rpx">
<view class="second-text-22">
<text>商品</text>
</view>
<view class="second-text-22 color-#000! h-30rpx">3物品</view>
</view>
<view class="flex justify-between items-center m-b-10rpx">
<view class="second-text-22">
<text>日期</text>
</view>
<view class="second-text-22 color-#000! h-30rpx">{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</view>
</view>
<view class="flex justify-between items-center" v-if="false">
<view class="flex justify-between items-center">
<view class="second-text-22">
<text>下单时间</text>
<text class="m-l-10rpx">{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</text>
@@ -102,20 +67,6 @@
<view v-if="v.payType == '9'" class="sub-text-24">{{ v.productDesc }}</view>
</view>
</view>
<view class="m-t-15rpx m-b-15rpx h-1rpx bg-#eeeeee "></view>
<view class="flex justify-between items-center m-b-10rpx">
<view class="second-text-22">
<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" color="error" size="xs">售后</tm-tag>
<tm-tag v-if="v.orderStatus == 20" size="xs">已核销</tm-tag>
<tm-tag v-if="v.orderStatus == 30" color="info" size="xs">已取消(智能柜)</tm-tag>
</view>
<view class="main-text-30 color-red! min-w-140rpx text-right">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
</view>
<view class="flex justify-end items-center mt-1">
<view v-if="v.orderType == '1' && v.refundStatus" class="ml-1 botder_btn" @tap.stop="refundDetail(v)">售后详情</view>
<view
@@ -287,8 +238,7 @@ import { onLoad, onShow } from "@dcloudio/uni-app"
import { hooks, router } from "@@/index"
import { filePath } from "@@/utils/file"
import zTabs from "@@/components/other/z-tabs/z-tabs.vue"
import { individualOrderApi, refundApi } from "@@/api";
import tabSearch from "./tabSearch.vue"
import { individualOrderApi, refundApi } from "@@/api"
const pageRef = ref<any>(null)
// 选项卡