diff --git a/.env b/.env index f529f27..e1dcaf4 100644 --- a/.env +++ b/.env @@ -17,15 +17,15 @@ VITE_PWD_ENC_KEY='pigxpigxpigxpigx' VITE_OAUTH2_APP_CLIENT='mini:mini' # --------------------------- 开发环境 api地址 ---------------------------------- -VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api # 域名线上 +# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api # 域名线上 #VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 -# VITE_APP_DEV_SERVICE = http://192.168.101.107:9999 # 邓-本地 +VITE_APP_DEV_SERVICE = http://192.168.101.107:9999 # 邓-本地 # VITE_APP_DEV_SERVICE = http://47.96.250.9:8089/api # 测试线上 # --------------------------- 开发环境 图片访问基础地址 --------------------------- -VITE_IMAGE_DEV_PATH = https://stgl.pj.gov.cn/api # 域名线上 +# VITE_IMAGE_DEV_PATH = https://stgl.pj.gov.cn/api # 域名线上 #VITE_IMAGE_DEV_PATH = http://59.202.170.152:81/api # 信创线上 -# VITE_IMAGE_DEV_PATH = http://192.168.101.107:9999 # 邓-本地 +VITE_IMAGE_DEV_PATH = http://192.168.101.107:9999 # 邓-本地 # VITE_IMAGE_DEV_PATH = http://47.96.250.9:8089/api # 测试线上 # VITE_IMAGE_DEV_PATH = http://pjcloud.center.takin.cc # 张-本地 diff --git a/src/pages.json b/src/pages.json index a46dbbc..76ce0a5 100644 --- a/src/pages.json +++ b/src/pages.json @@ -336,6 +336,13 @@ "disableScroll": true } }, + { + "path": "cabinetDetail", + "style": { + "navigationBarTitleText": "智能柜详情", + "disableScroll": true + } + }, { "path": "replenishment", "style": { diff --git a/src/pages/cabinet/cabinetDetail.vue b/src/pages/cabinet/cabinetDetail.vue new file mode 100644 index 0000000..d0d3756 --- /dev/null +++ b/src/pages/cabinet/cabinetDetail.vue @@ -0,0 +1,146 @@ + + + diff --git a/src/pages/cabinet/cabinetList.vue b/src/pages/cabinet/cabinetList.vue index f91ecf9..eea25e3 100644 --- a/src/pages/cabinet/cabinetList.vue +++ b/src/pages/cabinet/cabinetList.vue @@ -4,52 +4,66 @@ ref="pageRef" height="100%" :fixed="false" + v-model="pageHook.list" + :default-page-size="10" safe-area-inset-bottom :loading-more-enabled="true" :show-scrollbar="false" + @query="query" :auto-clean-list-when-reload="false" :auto-scroll-to-top-when-reload="false" + @scroll="pageHook.scroll" > - - - 地址：123 - - - - 货柜详情 - - - - 货柜补货 - - - - 商品上架 - + + {{ item.hardName }} {{ item.deviceCode }} + + + + 货柜详情 - - + + + 货柜补货 + + + + 商品上架 + + + diff --git a/src/sheep/api/door.ts b/src/sheep/api/door.ts index 40c20a7..79025a1 100644 --- a/src/sheep/api/door.ts +++ b/src/sheep/api/door.ts @@ -5,7 +5,6 @@ export default { * app获取智能柜授权信息 * @param doorHardId 智能柜设备id * @param cabinetNo 货柜编号 - * @returns */ appGetAuthHardDoor: (data: { doorHardId: any; cabinetNo: any }) => request({ @@ -20,7 +19,6 @@ export default { * app获取智能柜授权信息 * @param authId 授权id * @param authStatus 是否授权 - * @returns */ appAuthHardDoor: (data: { authId: any; authStatus: any }) => request({ @@ -31,4 +29,119 @@ export default { showLoading: false, }, }), + /** + * app查询智能柜列表(有分页) + */ + hardDoorPage: (params: any) => + request({ + url: "hard/hard-door-manager/app/page", + method: "GET", + params, + custom: { + showLoading: false, + }, + }), + + /** + * app查询智能柜详情 + * @param hardDoorId 智能柜id + */ + hardDoorDetail: (params: { hardDoorId: any }): Promise => + request({ + url: "hard/hard-door-manager/app/detail", + method: "GET", + params, + custom: { + showLoading: false, + }, + }), + + /** + * 上架 + * @param id 绑定id + * @param hardSpuId 商品id + */ + putaway: (data: { hardDoorId: any }) => + request({ + url: "hard/hard-spu/app/putaway", + method: "POST", + data, + custom: { + showLoading: false, + }, + }), + + /** + * 下架 + * @param id 绑定id + * @param hardSpuId 商品id + */ + unPutaway: (data: { hardDoorId: { id: any; hardSpuId: any } }) => + request({ + url: "hard/hard-spu/app/un-putaway", + method: "POST", + data, + custom: { + showLoading: false, + }, + }), + /** + * app查询货柜补货商品列表 + * @param hardDoorId 智能柜编号 + * @param cabinetNo 货柜编号 + */ + cabinetPutawayList: (params: { hardDoorId: any; cabinetNo: any }): Promise => + request({ + url: "hard/hard-spu/app/cabinet-putaway-list", + method: "GET", + params, + custom: { + showLoading: false, + }, + }), + + /** + * app查询货柜商品列表 + * @param hardId 智能柜编号 + * @param cabinetNo 货柜编号 + */ + cabinetList: (params: { hardId: any; cabinetNo: any }): Promise => + request({ + url: "hard/hard-spu/app/cabinet-list", + method: "GET", + params, + custom: { + showLoading: false, + }, + }), + + /** + * app上架完成 + * @param flowId + * @param list + */ + repertoryDone: (data: { flowId: any; list: Array<{ hardSpuId: any; plusCount: any }> }): Promise => + request({ + url: "hard/hard-spu-repertory/app/repertory-done", + method: "POST", + data, + custom: { + showLoading: false, + }, + }), + + /** + * 上架开门 + * @param hardDoorId 智能柜编号 + * @param cabinetNo 货柜编号 + */ + openRepertory: (data: { hardDoorId: string; cabinetNo: string }): Promise => + request({ + url: "hard/hard-door-flow/app/open-repertory", + method: "POST", + data, + custom: { + showLoading: false, + }, + }), } diff --git a/src/static/page/货柜上架.svg b/src/static/page/货柜上架.svg new file mode 100644 index 0000000..dfa53eb --- /dev/null +++ b/src/static/page/货柜上架.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/static/page/货柜详情.svg b/src/static/page/货柜详情.svg new file mode 100644 index 0000000..c071f4f --- /dev/null +++ b/src/static/page/货柜详情.svg @@ -0,0 +1 @@ + \ No newline at end of file