gxwebsoft/mp-10550
Template
1
1
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

master #1

Open
gxwebsoft wants to merge 108 commits from developer/template-10584:master into master
pull from: developer/template-10584:master
merge into: gxwebsoft:master
Conversation 0 Commits 108 Files Changed 154 +5 -4
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit afe8f93c32 - Show all commits

7
config/env.ts
View File

@@ -2,8 +2,8 @@
export const ENV_CONFIG = {
// 开发环境
development: {
// API_BASE_URL: 'http://127.0.0.1:9200/api',
API_BASE_URL: 'https://mp-api.websoft.top/api',
API_BASE_URL: 'http://127.0.0.1:9200/api',
// API_BASE_URL: 'https://mp-api.websoft.top/api',
APP_NAME: '开发环境',
DEBUG: 'true',
},
@@ -15,7 +15,8 @@ export const ENV_CONFIG = {
},
// 测试环境
test: {
API_BASE_URL: 'https://mp-api.websoft.top/api',
API_BASE_URL: 'http://127.0.0.1:9200/api',
// API_BASE_URL: 'https://mp-api.websoft.top/api',
APP_NAME: '测试环境',
DEBUG: 'true',
}

2
src/user/order/components/OrderList.tsx
View File

@@ -785,7 +785,7 @@ function OrderList(props: OrderListProps) {
)}
{/* 待收货状态：显示查看物流和确认收货 */}
{item.deliveryStatus === 20 && (!item.riderId || !!item.sendEndTime) && item.orderStatus !== 2 && (
{item.deliveryStatus === 20 && (!item.riderId || !!item.sendEndTime) && item.orderStatus !== 2 && item.orderStatus !== 6 && (
<Space>
<Button size={'small'} onClick={(e) => {
e.stopPropagation();