diff --git a/api/task.js b/api/task.js index a113762..3f20661 100644 --- a/api/task.js +++ b/api/task.js @@ -75,4 +75,8 @@ export const townMasterTask3List = (data) => oahttp.get('/task/service_task_deta /** * 任务:提交村镇公司收集任务提交 */ -export const townMasterTask3Commit = (data) => oahttp.post('/task/commit_town_master_task_type_3', data) \ No newline at end of file +export const townMasterTask3Commit = (data) => oahttp.post('/task/commit_town_master_task_type_3', data) +/** + * 入股任务提交 + */ +export const commit_service_group_taskAPI = (data) => oahttp.post('/task/commit_service_group_task', data) \ No newline at end of file diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue index d0f98b4..9ce36b4 100644 --- a/pages/logistics/deliveryDetil.vue +++ b/pages/logistics/deliveryDetil.vue @@ -103,7 +103,17 @@ + + + + + + 骑手取货完成 + + + + @@ -120,6 +130,7 @@ export default { data() { return { + showToast: false, is_captain: 0, mapClass: 'custom-map', showLoading: true, @@ -262,14 +273,7 @@ } }) }, - showToast() { - this.$refs.uToast.show({ - type: 'success', - title: '成功主题(带图标)', - message: "操作成功", - iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png' - }) - }, + mapFun() { uni.openLocation({ latitude: Number(this.goodsDetil.logistics.shop_lat), @@ -279,14 +283,7 @@ scale: 15, }); }, - showToast() { - this.$refs.uToast.show({ - type: 'success', - title: '成功主题(带图标)', - message: "操作成功", - iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png' - }) - }, + getDriverLine() { const that = this; const key = "997c9a3d88154fa78f4d28bebc1dd84f"; @@ -329,13 +326,8 @@ }, }); }, - - - - qrqodeFn() { let that = this - console.log(6666) uni.scanCode({ onlyFromCamera: true, success: function(res) { @@ -345,15 +337,14 @@ }, // 取货{} takeGood(sn) { - console.log(takeGoods) takeGoods({ logistics_id: this.goodsDetil.logistics.id, order_id: this.goodsDetil.logistics.order_id, order_sn: sn }).then((res, err) => { - console.log(545454, err) - this.showToast() + this.showToast = true setTimeout(() => { + this.showToast = false uni.navigateBack() }, 1000) }).catch(err => { @@ -482,4 +473,24 @@ transform: translateX(-50%); } + + .rect { + width: 455.61rpx; + height: 210.28rpx; + background-color: white; + border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + + .cont { + color: #0022C7; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + font-size: 35.05rpx; + } + } \ No newline at end of file diff --git a/subpkg/buyShare/buyShare.vue b/subpkg/buyShare/buyShare.vue index ecb4349..08c96bf 100644 --- a/subpkg/buyShare/buyShare.vue +++ b/subpkg/buyShare/buyShare.vue @@ -1,90 +1,271 @@ + + + 任务名称: {{task.title}} + + + 入股金额: + {{task.extend.shareholder.money}}元 + + + + 任务描述 + + {{task.content||'暂无任务描述'}} + + + 事件记录 + + + + + + + + 附件上传 + + + 金额: + + + + + + + + 请选择PDF类型的发票 + + + + + + + + + + {{fileTit}} + + + 查看 + + + + + + + + + + + + + + + + + \ No newline at end of file