From 73aa7f8c19472974f8fb88944b6d6828f586cc4d Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Tue, 7 Nov 2023 09:21:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=95=87=E5=85=AC=E5=8F=B8=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/oaHome/oaHome.vue | 1893 +++++++++++++++--------------- pages/oaTask/oaTask.vue | 150 +-- subpkg/property/index.vue | 4 +- subpkg/townTask/serviceTask4.vue | 527 +++++---- 4 files changed, 1280 insertions(+), 1294 deletions(-) diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index 2053cfe..f5ecb88 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -1,189 +1,145 @@ \ No newline at end of file diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue index a26c769..964f6bb 100644 --- a/pages/oaTask/oaTask.vue +++ b/pages/oaTask/oaTask.vue @@ -1,77 +1,89 @@ + .task_list { + padding-top: 28rpx; + } + + .loading { + padding: 28rpx; + margin-top: 28rpx; + } + \ No newline at end of file diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue index d3b5f19..dc9adc1 100644 --- a/subpkg/property/index.vue +++ b/subpkg/property/index.vue @@ -172,7 +172,7 @@ - + 可监管车辆数量 {{datas.monitor_num}} @@ -397,6 +397,8 @@ res.data.apply.length >= 2 ? this.applicationList = res.data.apply : this.applicationList = res.data.apply.slice(0, 2) this.dataList = res.data.car_list + + this.showLoading = false }) } diff --git a/subpkg/townTask/serviceTask4.vue b/subpkg/townTask/serviceTask4.vue index dd59cc5..f8857a3 100644 --- a/subpkg/townTask/serviceTask4.vue +++ b/subpkg/townTask/serviceTask4.vue @@ -1,275 +1,286 @@ \ No newline at end of file From fb84d0a7cedba205763e306f76e72425f548bb5b Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Tue, 7 Nov 2023 16:17:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/App.vue b/App.vue index 7c487f2..a6bcbcc 100644 --- a/App.vue +++ b/App.vue @@ -37,7 +37,7 @@ shop_token: info.referrerInfo?.extraData?.token }); this.$store.commit('SET_USERINFO', { - user: data, + user: {}, token: res.data.token }) this.$store.dispatch('initConfig'); From 4192e6cbfd657860d2b9a62b4ecea9da2b60cf55 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Tue, 7 Nov 2023 18:55:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=89=A9=E6=B5=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/task.js | 11 + components/task/taskItem.vue | 640 ++++++++++++++------------- pages.json | 18 + pages/logistics/deliveryDetil.vue | 19 +- pages/logistics/logisticDetil.vue | 15 +- subpkg/topUpDeposit/topUpDeposit.vue | 507 +++++++++++---------- subpkg/townTask/gatherRecords.vue | 216 +++++++++ subpkg/townTask/townGather.vue | 638 ++++++++++++++++++++++++++ 8 files changed, 1495 insertions(+), 569 deletions(-) create mode 100644 subpkg/townTask/gatherRecords.vue create mode 100644 subpkg/townTask/townGather.vue diff --git a/api/task.js b/api/task.js index 284cf17..a113762 100644 --- a/api/task.js +++ b/api/task.js @@ -65,3 +65,14 @@ export const marketTask10Commit = (data) => oahttp.post('/task/commit_town_task_ * 任务:提交村公司任务-信息平台铺设任务接口 */ export const villageTask6Commit = (data) => oahttp.post('/task/commit_village_task_type_6', data) + + +/** + * 任务:提交村镇公司收集任务列表 + */ +export const townMasterTask3List = (data) => oahttp.get('/task/service_task_detail', data) + +/** + * 任务:提交村镇公司收集任务提交 + */ +export const townMasterTask3Commit = (data) => oahttp.post('/task/commit_town_master_task_type_3', data) \ No newline at end of file diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue index 2812b14..3bdd7e8 100644 --- a/components/task/taskItem.vue +++ b/components/task/taskItem.vue @@ -1,30 +1,30 @@ \ No newline at end of file diff --git a/pages.json b/pages.json index 1f489ac..80f514f 100644 --- a/pages.json +++ b/pages.json @@ -886,6 +886,24 @@ "navigationBarTextStyle": "white" } + }, { + "path": "townTask/townGather", + "style": { + "navigationBarTitleText": "养殖信息收集", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "townTask/gatherRecords", + "style": { + "navigationBarTitleText": "养殖信息收集", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + }, { "path": "complaint/complaint", "style": { diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue index 2a8d537..747817c 100644 --- a/pages/logistics/deliveryDetil.vue +++ b/pages/logistics/deliveryDetil.vue @@ -62,12 +62,16 @@ 通知时间:  {{goodsDetil.logistics.create_time}} - - 商品信息 - + - - {{item.goods_name}} + + 商品信息 + + + {{item.goods_name}} + X{{item.product_num}}{{item.goods_unit}} @@ -78,6 +82,8 @@ 请详细核对订单信息 共计{{goodsDetil.product_count}}件商品 + + @@ -443,9 +449,10 @@ flex: 8; margin: 0; - .goods_tit { + .goods-tit { margin: 0; display: flex; + justify-content: space-around; } diff --git a/pages/logistics/logisticDetil.vue b/pages/logistics/logisticDetil.vue index b97bd63..8a34fe6 100644 --- a/pages/logistics/logisticDetil.vue +++ b/pages/logistics/logisticDetil.vue @@ -79,6 +79,9 @@ {{item.goods_name}} + + X{{item.product_num}}{{item.goods_unit}} @@ -204,12 +207,16 @@ - - 商品信息 - + - + + 商品信息 + + {{item.goods_name}} + X{{item.product_num}}{{item.goods_unit}} diff --git a/subpkg/topUpDeposit/topUpDeposit.vue b/subpkg/topUpDeposit/topUpDeposit.vue index 69c4d8d..a104dd3 100644 --- a/subpkg/topUpDeposit/topUpDeposit.vue +++ b/subpkg/topUpDeposit/topUpDeposit.vue @@ -1,259 +1,276 @@ \ No newline at end of file diff --git a/subpkg/townTask/gatherRecords.vue b/subpkg/townTask/gatherRecords.vue new file mode 100644 index 0000000..1fd8cbc --- /dev/null +++ b/subpkg/townTask/gatherRecords.vue @@ -0,0 +1,216 @@ + + + + + + \ No newline at end of file diff --git a/subpkg/townTask/townGather.vue b/subpkg/townTask/townGather.vue new file mode 100644 index 0000000..726ca8c --- /dev/null +++ b/subpkg/townTask/townGather.vue @@ -0,0 +1,638 @@ + + + + + \ No newline at end of file From 28729caa81bbb1ef62819018f79068da34ae145d Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Tue, 7 Nov 2023 23:41:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=95=87=E5=85=AC=E5=8F=B8=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpkg/townTask/gatherRecords.vue | 23 ++++-- subpkg/townTask/townGather.vue | 131 +++++++++++++++++++++--------- 2 files changed, 106 insertions(+), 48 deletions(-) diff --git a/subpkg/townTask/gatherRecords.vue b/subpkg/townTask/gatherRecords.vue index 1fd8cbc..6479b8d 100644 --- a/subpkg/townTask/gatherRecords.vue +++ b/subpkg/townTask/gatherRecords.vue @@ -1,12 +1,13 @@