master #1

Open
gxwebsoft wants to merge 108 commits from developer/template-10584:master into master
5 changed files with 5 additions and 5 deletions
Showing only changes of commit fc3b32215e - Show all commits

View File

@@ -26,7 +26,7 @@ function UserOrder() {
}}
>
<View className={'title-bar flex justify-between pt-2'}>
<Text className={'title font-medium px-4'}></Text>
<Text className={'title font-medium px-4'}></Text>
<View
className={'more flex items-center px-2'}
onClick={() => navTo('/user/order/order', true)}

View File

@@ -1,4 +1,4 @@
export default {
navigationBarTitleText: '送订单',
navigationBarTitleText: '送订单',
navigationBarTextStyle: 'black'
}

View File

@@ -388,7 +388,7 @@ export default function RiderOrders() {
<View className="w-full">
<View className="flex justify-between items-center">
<Text className="text-gray-800 font-bold text-sm">
{o.id ? `送水订单#${o.id}` : '送水订单'}
{o.userTicketId ? `票号#${o.userTicketId}` : '送水订单'}
</Text>
<Text className={`${getOrderStatusColor(o)} text-sm font-medium`}>{getOrderStatusText(o)}</Text>
</View>

View File

@@ -104,7 +104,7 @@ function Order() {
</>
}
>
<span></span>
<span></span>
</NavBar>
{/* 搜索和筛选工具栏 */}
<View className="bg-white px-4 py-3 flex justify-between items-center border-gray-100">

View File

@@ -1,5 +1,5 @@
export default definePageConfig({
navigationBarTitleText: '送订单',
navigationBarTitleText: '送订单',
navigationBarTextStyle: 'black',
navigationBarBackgroundColor: '#ffffff'
})