From c8d12c37b3f78e41aafef1ccb3e380573308c34a Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期二, 04 八月 2026 17:41:46 +0800
Subject: [PATCH] feat(admin): 添加商户登录密码修改功能并完善优惠券金额验证
---
rencaika_merchant/pages/orders/orders.uvue | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/rencaika_merchant/pages/orders/orders.uvue b/rencaika_merchant/pages/orders/orders.uvue
index c9c7912..db08743 100644
--- a/rencaika_merchant/pages/orders/orders.uvue
+++ b/rencaika_merchant/pages/orders/orders.uvue
@@ -2,7 +2,7 @@
<view class="page">
<view class="header">
<view class="status-safe-space"></view>
- <view class="title-row"><text class="page-title">订单管理</text><view v-if="isDevelopment" class="demo-control"><text class="demo-control-text">演示数据</text><switch class="demo-switch" :checked="demoDataEnabled" color="#FF7924" @change="toggleDemoData"></switch></view></view>
+ <view class="title-row"><text class="page-title">订单管理</text></view>
<view class="category-tabs">
<view class="category-tab" :class="activeCategory == 'group' ? 'active' : ''" @tap="selectCategory('group')"><text>团购</text></view>
<view class="category-tab" :class="activeCategory == 'store' ? 'active' : ''" @tap="selectCategory('store')"><text>到店消费</text></view>
@@ -146,8 +146,7 @@
<script setup lang="uts">
import { getOrderStatusText, getPendingStatusByCategory } from '../../config/order.uts'
- import { loadDemoMerchantOrders, loadMerchantBusinessDate, loadMerchantOrders, MerchantOrder, MerchantOrderPage, MerchantOrderQuery } from '../../services/orders.uts'
- import { apiEnvironment } from '../../config/api.uts'
+ import { loadMerchantBusinessDate, loadMerchantOrders, MerchantOrder, MerchantOrderPage, MerchantOrderQuery } from '../../services/orders.uts'
import { hasActiveSession } from '../../services/session.uts'
const activeCategory = ref('group')
@@ -164,8 +163,6 @@
const currentPage = ref(1)
const loadMoreStep = ref(0)
const orders = ref<Array<MerchantOrder>>([])
- const isDevelopment = apiEnvironment == 'development'
- const demoDataEnabled = ref(isDevelopment && uni.getStorageSync('merchant-orders-demo-data') != false)
const dateFilterApplied = ref(false)
const pageSize = 3
let cancelOrderRequest: (() => void) | null = null
@@ -262,12 +259,6 @@
loadMoreState.value = 'loading'
}
const query = buildOrderQuery(page)
- if (demoDataEnabled.value) {
- setTimeout(() => {
- applyOrderPage(loadDemoMerchantOrders(query), append)
- }, 180)
- return
- }
if (!hasActiveSession()) {
showOrderError('请登录后加载真实订单', '', append)
return
@@ -282,12 +273,6 @@
}
const reloadOrders = () => requestOrders(1, false)
-
- const toggleDemoData = (event: any) => {
- demoDataEnabled.value = event.detail != null && event.detail.value == true
- uni.setStorageSync('merchant-orders-demo-data', demoDataEnabled.value)
- reloadOrders()
- }
const formatAmount = (amount: number): string => (amount / 100).toFixed(2)
const formatDateTime = (value: string): string => value.length > 0 ? value.replace('T', ' ') : '—'
@@ -503,7 +488,7 @@
}
onLoad(() => {
- if (!demoDataEnabled.value && hasActiveSession()) loadMerchantBusinessDate((value: string) => applyBusinessDate(value), () => {})
+ if (hasActiveSession()) loadMerchantBusinessDate((value: string) => applyBusinessDate(value), () => {})
reloadOrders()
})
--
Gitblit v1.7.1