diff --git a/src/manifest.json b/src/manifest.json index cb0cfc1..e73b15e 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -74,8 +74,10 @@ "vueVersion": "3", "h5": { "router": { - "base": "./", - "mode": "hash" + // "base": "./", + // "mode": "hash" + "base": "/iws/h5portal", + "mode": "history" }, "title": "安徽机具租赁商城" } diff --git a/src/pages/order-list/index.vue b/src/pages/order-list/index.vue index 1581881..abf523d 100644 --- a/src/pages/order-list/index.vue +++ b/src/pages/order-list/index.vue @@ -735,7 +735,7 @@ const statusList = [ { id: '2', name: '待出库' }, { id: '3', name: '待收货' }, { id: '4', name: '租赁中' }, - { id: '5', name: '已退租' }, + // { id: '5', name: '已退租' }, { id: '10', name: '已检修待结算' }, { id: '15', name: '结算待确认' }, { id: '20', name: '已完成' }, @@ -755,7 +755,7 @@ const orderType = (status) => { const tabList = ref([ { tab_name: '全部', order_status: 0 }, { tab_name: '租赁中', order_status: 4 }, - { tab_name: '已退租', order_status: 5 }, + // { tab_name: '已退租', order_status: 5 }, { tab_name: '已完成', order_status: 20 }, { tab_name: '已取消', order_status: 99 }, // { tab_name: '待出库', order_status: 2 }, @@ -922,7 +922,7 @@ const onEditOrderStatus = (item, status) => { tipText = '确认收货' break case 4: - editParams.orderStatus = 5 + editParams.orderStatus = 20 tipText = '申请全部退租' break } @@ -1021,7 +1021,7 @@ const onReturnGoods = (items, goods) => { }) .then(async () => { const res = await editOrderStatusAPI({ - orderStatus: 5, + orderStatus: 20, orderId: items.orderId, maIds: [goods.maId], })