diff --git a/App.vue b/App.vue index 49aa7ad..cb5955e 100644 --- a/App.vue +++ b/App.vue @@ -37,7 +37,15 @@ @import '@/uni_modules/fant-mini-plus/libs/iconfont/iconfont.css'; @import "@/uni_modules/uview-plus/index.scss"; /*每个页面公共css */ + // page{ + // // background-image: url('/static/bg.png'); + // background-repeat: no-repeat; + // background-size: 100% 100%; + // } page{ background-color: #F5F5F6; + background-image: url('/static/bg.png'); + background-repeat: no-repeat; + background-size: 100% 100%; } diff --git a/config/host.js b/config/host.js index 4f9cfc1..e9f7c22 100644 --- a/config/host.js +++ b/config/host.js @@ -3,8 +3,8 @@ /** * 测试域名 * */ -// const devhost='http://192.168.10.51:8888/' -const devhost='http://192.168.10.126:8889/' +const devhost='http://test.api.huitongys.com/' +// const devhost='http://192.168.10.126:8889/' // const devhost='http://192.168.10.73:8777/' // const devhost='http://192.168.10.200:9999/' // const devhost='http://192.168.10.200:9999/' @@ -12,7 +12,7 @@ const devhost='http://192.168.10.126:8889/' /** * 正式域名 * */ -const prohost='http://192.168.10.200:9999/' +const prohost='http://test.api.huitongys.com/' /** * 图片域名 * */ diff --git a/interfaces/compoment/tiplist.ts b/interfaces/compoment/tiplist.ts index fd94025..badb67c 100644 --- a/interfaces/compoment/tiplist.ts +++ b/interfaces/compoment/tiplist.ts @@ -2,6 +2,7 @@ export interface tiplistType{ /** 弹窗的类型 * 1.文本输入框类型 * 2.数组列表展示类型 + * 3.上传图片+输入框 * */ tipstate:number; /** 标题 diff --git a/manifest.json b/manifest.json index 4090463..8c8bd78 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "货无忧", + "name" : "货无忧测试版", "appid" : "__UNI__EBBABA3", "description" : "", "versionName" : "1.0.0", diff --git a/pages.json b/pages.json index fbf9452..6b942a3 100644 --- a/pages.json +++ b/pages.json @@ -192,6 +192,30 @@ "navigationStyle": "custom" } + }, { + "path": "pages/createTask/createTask", + "style": { + "navigationBarTitleText": "创建任务", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + }, { + "path": "pages/ordersorting/ordersorting", + "style": { + "navigationBarTitleText": "订单分拣", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + }, { + "path": "pages/lnventorysorting/lnventorysorting", + "style": { + "navigationBarTitleText": "库存品分拣", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + } ] }], diff --git a/pages/index/index.vue b/pages/index/index.vue index 0da22dc..a7a5fb0 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -39,60 +39,65 @@ import { inject, reactive, toRefs, watchEffect } from "vue"; let details = reactive({ tablist: [ - // { - // type:1, - // name:'库内', - // minilist:[ - // { - // icon:'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - // name:'下架扫描', - // router:'/pagesHome/pages/DownScan/DownScan', - // }, - // ] - // }, - // { - // 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', - // }, - // ] - // }, - // { - // 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', - // }, - // ] - // }, + { + type:1, + name:'库内', + minilist:[ + { + 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', + }, + ] + }, + { + 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', + }, + ] + }, + { + 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) { @@ -135,7 +140,7 @@ onShow(()=>{ init() initbuts() - print() + // print() }) function print(){ // #ifdef APP diff --git a/pages/login/login.vue b/pages/login/login.vue index 4c678c0..dbadea3 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -141,6 +141,8 @@ uni.setStorageSync('access_token',userinfo.access_token) uni.setStorageSync('refresh_token',userinfo.refresh_token) uni.setStorageSync('userinfo',userinfo) + uni.removeStorageSync('authbuts') + uni.removeStorageSync('homerouter') if(details.isremember){ let user={ tenantId:details.tenantId, diff --git a/pagesHome/pages/LoadingScan/LoadingScan.vue b/pagesHome/pages/LoadingScan/LoadingScan.vue index d3e032a..565d71b 100644 --- a/pagesHome/pages/LoadingScan/LoadingScan.vue +++ b/pagesHome/pages/LoadingScan/LoadingScan.vue @@ -273,6 +273,7 @@ // console.log(cleartime); details.datatime='' date.value=[] + init() } const { datatime, recordsList, show } = toRefs(details) diff --git a/pagesHome/pages/OfflineUpload/OfflineUpload.vue b/pagesHome/pages/OfflineUpload/OfflineUpload.vue index 7ed8743..a9a1221 100644 --- a/pagesHome/pages/OfflineUpload/OfflineUpload.vue +++ b/pagesHome/pages/OfflineUpload/OfflineUpload.vue @@ -1,30 +1,162 @@ + \ No newline at end of file diff --git a/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue b/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue index 7f1310a..59edf7d 100644 --- a/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue +++ b/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue @@ -166,6 +166,7 @@ // console.log(1231211); details.datatime='' date.value=[] + init() } const { datatime, dataList, show,recordsList } = toRefs(details) diff --git a/pagesHome/pages/createTask/createTask.vue b/pagesHome/pages/createTask/createTask.vue new file mode 100644 index 0000000..fd44a4d --- /dev/null +++ b/pagesHome/pages/createTask/createTask.vue @@ -0,0 +1,207 @@ + + + + + \ No newline at end of file diff --git a/pagesHome/pages/lnventorysorting/lnventorysorting.vue b/pagesHome/pages/lnventorysorting/lnventorysorting.vue new file mode 100644 index 0000000..3bf8480 --- /dev/null +++ b/pagesHome/pages/lnventorysorting/lnventorysorting.vue @@ -0,0 +1,12 @@ + + + + + diff --git a/pagesHome/pages/ordersorting/ordersorting.vue b/pagesHome/pages/ordersorting/ordersorting.vue new file mode 100644 index 0000000..a3d62b3 --- /dev/null +++ b/pagesHome/pages/ordersorting/ordersorting.vue @@ -0,0 +1,12 @@ + + + + + diff --git a/pagesHome/pages/pickingScan/pickingScan.vue b/pagesHome/pages/pickingScan/pickingScan.vue index c96cedc..b3b42cf 100644 --- a/pagesHome/pages/pickingScan/pickingScan.vue +++ b/pagesHome/pages/pickingScan/pickingScan.vue @@ -177,6 +177,7 @@ // console.log(1231211); details.datatime='' date.value=[] + init() } function setstate(state:number){ details.status=state diff --git a/pagesHome/pages/setbarcode/setbarcode.vue b/pagesHome/pages/setbarcode/setbarcode.vue index 65caa52..6dfd95c 100644 --- a/pagesHome/pages/setbarcode/setbarcode.vue +++ b/pagesHome/pages/setbarcode/setbarcode.vue @@ -239,6 +239,7 @@