diff --git a/api/appUser.js b/api/appUser.js index e9f7715..b8525dd 100755 --- a/api/appUser.js +++ b/api/appUser.js @@ -154,6 +154,10 @@ export function requestShipping(user_id, ids, address_id) { return authRequest({ url: `/api/app/users/${user_id}/inventory/request-shipping`, method: 'POST', data }) } +export function checkShippingFee(user_id, ids) { + return authRequest({ url: `/api/app/users/${user_id}/inventory/shipping-fee/check`, method: 'POST', data: { inventory_ids: ids } }) +} + export function createShippingFeeOrder(user_id, ids) { return authRequest({ url: `/api/app/users/${user_id}/inventory/shipping-fee/preorder`, method: 'POST', data: { inventory_ids: ids } }) } diff --git a/api/synthesis.js b/api/synthesis.js index 0ba3f93..f6e08c2 100644 --- a/api/synthesis.js +++ b/api/synthesis.js @@ -8,6 +8,10 @@ export function doSynthesis(userId, recipeId) { return authRequest({ url: `/api/app/users/${userId}/synthesis/do`, method: 'POST', data: { recipe_id: recipeId } }) } +export function doBatchSynthesis(userId, recipeId) { + return authRequest({ url: `/api/app/users/${userId}/synthesis/do-batch`, method: 'POST', data: { recipe_id: recipeId } }) +} + export function getSynthesisLogs(userId, page = 1, pageSize = 20) { return authRequest({ url: `/api/app/users/${userId}/synthesis/logs`, method: 'GET', data: { page, page_size: pageSize } }) } diff --git a/pages-user/synthesis/index.vue b/pages-user/synthesis/index.vue index ba2062e..448655d 100644 --- a/pages-user/synthesis/index.vue +++ b/pages-user/synthesis/index.vue @@ -93,16 +93,30 @@ - - {{ getReadyCount(recipe) }}/{{ recipe.materials?.length || 0 }} 材料就绪 - - - {{ synthesizing ? '合成中' : (recipe.can_synthesize ? '合成' : '不足') }} - + + + {{ getReadyCount(recipe) }}/{{ recipe.materials?.length || 0 }} 材料就绪 + + + 最多可合成 {{ getMaxSynthesizeCount(recipe) }} 次 + + + + + {{ synthesizing ? '合成中' : (recipe.can_synthesize ? '单次合成' : '不足') }} + + + {{ batchSynthesizing ? '批量中' : (getMaxSynthesizeCount(recipe) > 0 ? '一键合成' : '不足') }} + + @@ -115,10 +129,11 @@