diff --git a/config/host.js b/config/host.js index 2562311..d2472af 100644 --- a/config/host.js +++ b/config/host.js @@ -8,9 +8,9 @@ // lmy // const devhost = 'http://192.168.10.123:8889/' // zhy -const devhost = 'http://192.168.10.48:13000/' +// const devhost = 'http://192.168.10.48:13000/' // tjj -// const devhost = 'http://192.168.10.25:13000/' +const devhost = 'http://192.168.10.25:13000/' // cyz // const devhost = 'http://192.168.10.75:8777/' // const devhost = 'http://192.168.6.141:8777/' diff --git a/pages/index/index.vue b/pages/index/index.vue index 30f66e2..5a2b286 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -34,157 +34,157 @@ import { inject, reactive, toRefs, watchEffect, ref } from "vue"; import utils from '../../utils/utils'; const tip = ref(null) - let details = reactive({ tablist: [] }); - // let details = reactive({ - // tablist: [ - // { - // type: 1, - // name: '工作台', - // minilist: [ - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '订单查询', - // router: '/pagesHome/pages/orderInquiry/orderInquiry', - // }, - // ] - // }, - // { - // type: 1, - // name: '入库', - // minilist: [ - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '码板打托', - // router: '/pagesHome/pages/codePlateBracket/codePlateBracket', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '入库扫描', - // router: '/pagesHome/pages/orderInquiry/orderInquiry', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '到车入库', - // router: '/pagesHome/pages/ArrivalList/ArrivalList', - // }, - // ] - // }, - // { - // type: 1, - // name: '库内', - // minilist: [ - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '分拣打托', - // router: '/pagesHome/pages/scansorting/scansorting', - // }, - // // { - // // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // // name: '订单分拣', - // // router: '/pagesHome/pages/ordersorting/ordersorting', - // // }, - // // { - // // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // // name: '库存品分拣', - // // router: '/pagesHome/pages/lnventorysorting/lnventorysorting', - // // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '扫码上架', - // router: '/pagesHome/pages/ScanUpType/ScanUpType', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '手动上架', - // router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '移库', - // router: '/pagesHome/pages/RelocationType/RelocationType', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '滞留', - // router: '/pagesHome/pages/Retention/Retention', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '合托', - // router: '/pagesHome/pages/MergeTray/MergeTray', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '下架', - // router: '/pagesHome/pages/DownGoodsType/DownGoodsType', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '空置托盘', - // router: '/pagesHome/pages/RemoveTray/RemoveTray', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '复核', - // router: '/pagesHome/pages/Check/Check', - // }, - // ] - // }, - // { - // type: 1, - // name: '出库', - // minilist: [ - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '拣货扫描', - // router: '/pagesHome/pages/pickingScan/pickingScan', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '自提扫描', - // router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '配载装车', - // router: '/pagesHome/pages/StowageList/StowageList', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '中转装车', - // router: '/pagesHome/pages/RelayScanList/RelayScanList', - // }, - // ] - // }, - // { - // type: 1, - // name: '配送', - // minilist: [ - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '装车扫描', - // router: '/pagesHome/pages/LoadingScan/LoadingScan', - // }, - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '签收扫描', - // router: '/pagesHome/pages/signinScan/signinScan', - // }, - // ] - // }, - // { - // type: 1, - // name: '离线上传', - // minilist: [ - // { - // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name: '离线上传', - // router: '/pagesHome/pages/OfflineUpload/OfflineUpload', - // }, - // ] - // }, - // ] - // }) + // let details = reactive({ tablist: [] }); + let details = reactive({ + tablist: [ + { + type: 1, + name: '工作台', + minilist: [ + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '订单查询', + router: '/pagesHome/pages/orderInquiry/orderInquiry', + }, + ] + }, + { + type: 1, + name: '入库', + minilist: [ + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '码板打托', + router: '/pagesHome/pages/codePlateBracket/codePlateBracket', + }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '入库扫描', + router: '/pagesHome/pages/orderInquiry/orderInquiry', + }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '到车入库', + router: '/pagesHome/pages/ArrivalList/ArrivalList', + }, + ] + }, + { + type: 1, + name: '库内', + minilist: [ + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '分拣打托', + router: '/pagesHome/pages/scansorting/scansorting', + }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '订单分拣', + // router: '/pagesHome/pages/ordersorting/ordersorting', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '库存品分拣', + // router: '/pagesHome/pages/lnventorysorting/lnventorysorting', + // }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '扫码上架', + router: '/pagesHome/pages/ScanUpType/ScanUpType', + }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '手动上架', + router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType', + }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '移库', + router: '/pagesHome/pages/RelocationType/RelocationType', + }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '滞留', + router: '/pagesHome/pages/Retention/Retention', + }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '合托', + router: '/pagesHome/pages/MergeTray/MergeTray', + }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '下架', + router: '/pagesHome/pages/DownGoodsType/DownGoodsType', + }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '空置托盘', + router: '/pagesHome/pages/RemoveTray/RemoveTray', + }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '复核', + router: '/pagesHome/pages/Check/Check', + }, + ] + }, + { + type: 1, + name: '出库', + minilist: [ + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '拣货扫描', + router: '/pagesHome/pages/pickingScan/pickingScan', + }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '自提扫描', + router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan', + }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '配载装车', + router: '/pagesHome/pages/StowageList/StowageList', + }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '中转装车', + router: '/pagesHome/pages/RelayScanList/RelayScanList', + }, + ] + }, + { + type: 1, + name: '配送', + minilist: [ + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '装车扫描', + router: '/pagesHome/pages/LoadingScan/LoadingScan', + }, + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '签收扫描', + router: '/pagesHome/pages/signinScan/signinScan', + }, + ] + }, + { + type: 1, + name: '离线上传', + minilist: [ + { + icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + name: '离线上传', + router: '/pagesHome/pages/OfflineUpload/OfflineUpload', + }, + ] + }, + ] + }) function gopathpage(path : string) { uni.navigateTo({ diff --git a/pages/user/user.vue b/pages/user/user.vue index da490fb..863353d 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -173,9 +173,9 @@ } // 关于我们 else if (item.type == 5) { - // uni.navigateTo({ - // url: '/pagesUser/pages/about/about' - // }) + uni.navigateTo({ + url: '/pagesUser/pages/about/about' + }) } else if (item.type == 6) { updateApp() } else if (item.type == 8) { diff --git a/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue b/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue index dbdd95b..3c5fdb1 100644 --- a/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue +++ b/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue @@ -65,6 +65,7 @@