From 9b283de926f548c1c48d3a27ab8bfeeed28d0158 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Fri, 26 Jan 2024 18:13:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/test.js | 6 + .../logistiCard/logistiBriefCard.vue | 9 +- config/app.js | 6 +- manifest.json | 4 +- pages.json | 4 +- pages/logistics/deliveryDetil.vue | 3 +- pages/oaHome/FirstOrderLog.vue | 63 +--------- pages/oaHome/accountLog.vue | 13 +- pages/oaHome/oaHome.vue | 37 +++--- pages/otherSetting/otherSetting.vue | 2 +- pages/test/{index.vue => Information.vue} | 87 +++++--------- pages/test/{main.vue => choseIdentity.vue} | 35 +++--- static/test/NM.png | Bin 0 -> 124506 bytes static/test/SYBJ.png | Bin 0 -> 306902 bytes test.vue | 111 ------------------ 15 files changed, 99 insertions(+), 281 deletions(-) create mode 100644 api/test.js rename pages/test/{index.vue => Information.vue} (97%) rename pages/test/{main.vue => choseIdentity.vue} (65%) create mode 100644 static/test/NM.png create mode 100644 static/test/SYBJ.png delete mode 100644 test.vue diff --git a/api/test.js b/api/test.js new file mode 100644 index 0000000..4c01f95 --- /dev/null +++ b/api/test.js @@ -0,0 +1,6 @@ +import oahttp from "@/utils/oahttp.js"; + +/** + * 任务列表 + */ +export const addUserInfo = (data) => oahttp.post('/index/addVillagerInfo', data) \ No newline at end of file diff --git a/components/logistiComptent/logistiCard/logistiBriefCard.vue b/components/logistiComptent/logistiCard/logistiBriefCard.vue index f4c5796..0dee9bb 100644 --- a/components/logistiComptent/logistiCard/logistiBriefCard.vue +++ b/components/logistiComptent/logistiCard/logistiBriefCard.vue @@ -7,8 +7,8 @@ --> 订单编号:  {{goodsInfo.order_sn}} - - {{goodsInfo.status==0?"待取货":"待配送"}} + + {{goodsInfo.status==0?"待取货":goodsInfo.status==2? "已完成": "待配送"}} @@ -97,11 +97,12 @@ }, goDetil(id) { uni.navigateTo({ - url: `/pages/logistics/${this.goodsInfo.status==1?"logisticDetil":"deliveryDetil"}?id=${id}`, + url: `/pages/logistics/${this.goodsInfo.status==0?"deliveryDetil":"logisticDetil"}?id=${id}`, }) } + }, } @@ -147,6 +148,8 @@ color: white; border-radius: 10rpx; font-size: 22rpx; + width: 30rpx; + text-align: center; } diff --git a/config/app.js b/config/app.js index df36642..ebe8d1b 100644 --- a/config/app.js +++ b/config/app.js @@ -10,7 +10,7 @@ const env = 'dev'; // 开发 switch (env) { case 'prod': httpApi = 'https://new-worker.lihaink.cn/' //正式 - httpApiTwo = 'https://new-worker.lihaink.cn/' //正式环境 + httpApiTwo = 'https://logistics.lihaink.cn/' //正式环境 httpApiThree = 'https://new-worker.lihaink.cn/' //正式 break; case 'prew': @@ -19,8 +19,8 @@ switch (env) { httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线 break; case 'local': - httpApi = 'http://192.168.1.23:8083' //预上线 - httpApiThree = 'http://192.168.1.23:8083' //预上线 + httpApi = 'http://192.168.1.13:8083' //预上线 + httpApiThree = 'http://192.168.1.13:8083' //预上线 httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境 break; default: diff --git a/manifest.json b/manifest.json index c40472b..ffb6269 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ // "appid" : "__UNI__3A527D1", "appid": "__UNI__A495155", "description": "", - "versionName": "1.0.6", - "versionCode": 106, + "versionName": "1.1.1", + "versionCode": 111, "transformPx": false, /* 5+App特有相关 */ "app-plus": { diff --git a/pages.json b/pages.json index a65077c..c469122 100644 --- a/pages.json +++ b/pages.json @@ -13,13 +13,13 @@ } }, { - "path": "pages/test/index", + "path": "pages/test/Information", "style": { "navigationStyle": "custom" } }, { - "path": "pages/test/main", + "path": "pages/test/choseIdentity", "style": { "navigationStyle": "custom" } diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue index 46093b7..84e258e 100644 --- a/pages/logistics/deliveryDetil.vue +++ b/pages/logistics/deliveryDetil.vue @@ -95,7 +95,6 @@ - @@ -109,7 +108,7 @@ - 骑手送货完成 + 骑手取货完成 diff --git a/pages/oaHome/FirstOrderLog.vue b/pages/oaHome/FirstOrderLog.vue index eabc9c3..dec18d2 100644 --- a/pages/oaHome/FirstOrderLog.vue +++ b/pages/oaHome/FirstOrderLog.vue @@ -1,19 +1,6 @@ @@ -90,47 +69,17 @@ }, methods: { async getFirstOrderLogList() { + let res = await getFirstOrderLog() - // for (let key in res.data.lists) { - // this.orderList.push(res.data.lists[key]) - // } this.orderList = res.data.lists - console.log(this.orderList) - // res.data.lists.forEach(item => { - // console.log(item) - // }) } }, onLoad(option) { this.getFirstOrderLogList() this.money = Number(option.money) - // setTimeout(() => { - // this.show = true - // }, 3000) } - // onReachBottom() { - // if (this.flag) return - // let { - // page_no, - // page_size - // } = this - // let that = this - // this.status = "loading" - // page_no += 1 - // this.flag = true - // getFirstOrderLog({ - // page_no, - // page_size - // }).then(res => { - // that.orderList = that.orderList.concat(res.data) - // this.flag = false - // if (!res.data.data.length) { - // this.status = "nomore" - // this.flag = true - // } - // }) - // }, + } diff --git a/pages/oaHome/accountLog.vue b/pages/oaHome/accountLog.vue index d828190..e0d5df8 100644 --- a/pages/oaHome/accountLog.vue +++ b/pages/oaHome/accountLog.vue @@ -11,9 +11,6 @@ - - - 收益明细 @@ -39,8 +36,12 @@ + - + + + @@ -102,10 +103,6 @@ \ No newline at end of file