From 84c9fee1e1caa03eeb784d1774a1c31c82dfb35a Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Wed, 9 Aug 2023 09:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E6=9D=BF=E5=9D=97=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/logistics.js                              |   16 +
 .../logistiCard/logistiBriefCard.vue          |   72 ++
 .../logistiCard/logistiCard.vue               |  264 ++++
 manifest.json                                 |  302 +++--
 pages.json                                    |  925 ++++++-------
 pages/logistics/deliveryDetil.vue             |  352 +++++
 pages/logistics/index.vue                     |   78 ++
 pages/logistics/logisticDetil.vue             |  299 +++++
 pages/logistics/t.vue                         |  311 +++++
 pages/oaHome/oaHome.vue                       | 1146 +++++++++--------
 static/img/logistics/more.png                 |  Bin 0 -> 2390 bytes
 utils/logistics.js                            |  112 ++
 12 files changed, 2738 insertions(+), 1139 deletions(-)
 create mode 100644 api/logistics.js
 create mode 100644 components/logistiComptent/logistiCard/logistiBriefCard.vue
 create mode 100644 components/logistiComptent/logistiCard/logistiCard.vue
 create mode 100644 pages/logistics/deliveryDetil.vue
 create mode 100644 pages/logistics/index.vue
 create mode 100644 pages/logistics/logisticDetil.vue
 create mode 100644 pages/logistics/t.vue
 create mode 100644 static/img/logistics/more.png
 create mode 100644 utils/logistics.js

diff --git a/api/logistics.js b/api/logistics.js
new file mode 100644
index 0000000..7bb5c59
--- /dev/null
+++ b/api/logistics.js
@@ -0,0 +1,16 @@
+import oahttp from "@/utils/logistics.js";
+
+/**
+ * 订单列表
+ */
+export const getList = (data) => oahttp.get('/courierLstData', data)
+// 订单详情
+export const getDetil = (data) => oahttp.get('/lstDetail', data)
+// 取货 
+export const takeGoods = (data) => oahttp.post('/takeGoods', data)
+// 送达
+export const doneDelivery = (data) => oahttp.post('/doneDelivery', data)
+/**
+ * 更新商机
+ */
+export const informationOpportunityUpdate = (data) => oahttp.post('/information/opportunity_update', data)
\ No newline at end of file
diff --git a/components/logistiComptent/logistiCard/logistiBriefCard.vue b/components/logistiComptent/logistiCard/logistiBriefCard.vue
new file mode 100644
index 0000000..f5a567f
--- /dev/null
+++ b/components/logistiComptent/logistiCard/logistiBriefCard.vue
@@ -0,0 +1,72 @@
+<template>
+	<view class="card" @click="goDetil(goodsInfo.id)">
+		<u-button type="primary" class="custom-style" style="background-color: #34A853;"
+			v-if='goodsInfo.status==0'>待取货</u-button>
+		<u-button type="primary" class="custom-style" v-if='goodsInfo.status==1'>待送货</u-button>
+		<p>{{goodsInfo.shop_name}}</p>
+		<view class="address">地址:&nbsp;&nbsp;{{goodsInfo.shop_address}}</view>
+		<view class="date">日期:&nbsp;&nbsp;{{goodsInfo.create_time}}</view>
+	</view>
+</template>
+<script>
+	import {
+		navigateTo
+	} from '../../../libs/uniApi'
+	export default {
+		props: ['goodsInfo'],
+		data() {
+			return {
+
+			}
+		},
+		mounted() {
+			console.log(this.goodsInfo)
+		},
+
+		methods: {
+			goDetil(id) {
+				uni.navigateTo({
+					url: `/pages/logistics/deliveryDetil?id=${id}`,
+
+				})
+			}
+
+		},
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.card {
+		width: 92vw;
+		height: AUTO;
+		background-color: #fff;
+		border-radius: 1vw;
+		position: relative;
+		padding: 2vh 2vw;
+		margin: 0 0 20rpx 0;
+
+		.custom-style {
+			border: 0;
+			width: 20vw;
+			position: absolute;
+			top: 0;
+			right: 0;
+			height: 4vh;
+			border-radius: 0 7px 0 7px;
+		}
+
+		P {
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+
+		.address {
+			font-weight: bold;
+			margin: 15rpx 0;
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/components/logistiComptent/logistiCard/logistiCard.vue b/components/logistiComptent/logistiCard/logistiCard.vue
new file mode 100644
index 0000000..465dde9
--- /dev/null
+++ b/components/logistiComptent/logistiCard/logistiCard.vue
@@ -0,0 +1,264 @@
+<template>
+
+	<view class="order">
+		<!-- <u-notify message="成功" duration="2000" show="true"></u-notify> -->
+		<view v-if='goodsInfo.status !==2'>
+			<view class="" @click="goDetil">
+				<p>{{goodsInfo.shop_name}}</p>
+				<view class='phone'>联系方式 :{{goodsInfo.shop_phone}} </view>
+				<view class="content_box">
+					<view class="left">
+						<view class="">
+							商家地址
+						</view>
+						<view style="margin: 20rpx 0;">
+							订单编号
+						</view>
+						<view class="">
+							采购商品
+						</view>
+					</view>
+					<view class="right">
+						<view class="goods_tit">
+							{{goodsInfo.shop_address}}
+						</view>
+						<view style="margin: 20rpx 0;">
+							{{goodsInfo.order_sn}}
+						</view>
+						<view class='product' v-for="(item,index) in list" :key="index">
+							<text class="goods_tit">{{item.goods_name}}</text>
+							<text>X{{item.product_num}}{{item.goods_unit}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="icon" @click='getMore' v-if="flag">
+				<image style="width: 70rpx;height: 70rpx;text-align: center;" src="@/static/img/logistics/more.png"
+					alt="">
+			</view>
+		</view>
+
+		<view v-else class='finishOrder' @click="goDetil">
+			<view>
+				<text style="color:#999">订单编号</text> <text> {{goodsInfo.order_sn}}</text>
+			</view>
+			<view class="phone">
+				<text style="color:#999">联系方式</text> {{goodsInfo.user_phone}}
+			</view>
+			<view style="margin: 20rpx 0;">
+				<text style="color:#999">收货时间</text> {{goodsInfo.xd_time||"无"}}
+			</view>
+			<view style="margin: 20rpx 0;">
+				<text style="color:#999">送达时间</text> {{goodsInfo.pc_time||"无"}}
+			</view>
+			<view style="margin: 20rpx 0;">
+				<text style="color:#999">取货时间</text> {{goodsInfo.qh_time||"无"}}
+			</view>
+
+		</view>
+		<view class="total">
+			共计{{goodsInfo.product_count}}件商品
+		</view>
+		<view class="cil_left">
+		</view>
+		<view class="cil_right">
+		</view>
+		<u-modal :show="showPop" @confirm="confirm" :content="popContent[goodsInfo.status]" @close="showPop=false"
+			:closeOnClickOverlay="true"></u-modal>
+		<u-button type="primary" @click="showPop = true" v-if='goodsInfo.status==0'>已取货</u-button>
+		<u-button type="primary" @click="showPop = true" style="background-color: #34A853;border: none;"
+			v-if='goodsInfo.status==1'>已送达</u-button>
+		<u-button type="primary" @click="goDetil" style="background-color: red;border:none"
+			v-if='goodsInfo.status==2'>查看详情</u-button>
+	</view>
+
+
+</template>
+
+<script scoped>
+	import {
+		takeGoods,
+		doneDelivery
+	} from "@/api/logistics.js"
+	export default {
+		props: ['goodsInfo'],
+		data() {
+			return {
+				tost: 0,
+				list: [],
+				flag: undefined,
+				showPop: false,
+				popContent: ["请确认已经收到货", "请确认已送达"]
+			}
+		},
+		methods: {
+			goDetil() {
+				let status = this.goodsInfo.status
+				uni.navigateTo({
+					url: `/pages/logistics/${status==0?"deliveryDetil":"logisticDetil"}?id=${this.goodsInfo.id}`
+				})
+			},
+			// 取货
+			takeGood() {
+
+				takeGoods({
+					user_id: this.goodsInfo.courier_id,
+					logistics_id: this.goodsInfo.id
+				})
+
+			},
+			async confirm() {
+				await this.goodsInfo.status == 0 ? this.takeGood() : this.doneGood()
+				this.showPop = false
+				this.tost = true
+				this.$emit('getlist')
+			},
+			// 送达
+			doneGood() {
+				doneDelivery({
+					user_id: this.goodsInfo.courier_id,
+					// user_id: 167,
+					logistics_id: this.goodsInfo.id
+				})
+			},
+			showMore() {
+				if (this.goodsInfo.products.length <= 3) {
+					this.list = this.goodsInfo.products
+				} else {
+					this.flag = true
+					for (let i = 0; i < 3; i++) {
+						this.list.push(this.goodsInfo.products[i])
+					}
+				}
+			},
+			getMore() {
+				if (this.flag) {
+					for (let i = 3; i < this.goodsInfo.products.length; i++) {
+						this.list.push(this.goodsInfo.products[i])
+					}
+					this.flag = false
+				}
+			}
+		},
+
+		mounted() {
+			this.showMore()
+
+		}
+	}
+</script>
+
+<style lang='scss' scoped>
+	.order {
+		position: relative;
+		background-color: white;
+		margin: 20rpx 0;
+		border-radius: 15rpx;
+		height: auto;
+		padding: 2vh 3vw;
+		box-sizing: border-box;
+
+		.custom-style {
+			border: 0;
+			width: 25vw;
+			position: absolute;
+			top: 0;
+			right: 0;
+			height: 4vh;
+			border-radius: 0 7px 0 7px;
+		}
+
+		.goods_tit {
+			width: 60vw;
+			color: red;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			word-break: break-all;
+			white-space: nowrap;
+		}
+
+		p {
+			font-family: "PingFang SC-Medium";
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+
+		.phone {
+			color: #999999;
+			padding: 10rpx 0;
+			border-bottom: 1px dashed blue;
+		}
+
+		.content_box {
+			display: flex;
+			justify-content: space-between;
+			margin: 15rpx 0;
+
+			.left {
+				flex: 1;
+				color: #999999;
+			}
+
+			.right {
+				flex: 4;
+
+				.product {
+					margin: 10rpx 0;
+					display: flex;
+					justify-content: space-between;
+				}
+
+				.icon_a {
+					/* transform: translateX(180deg); */
+					transform: rotate(90deg);
+					display: inline-block;
+					/* font-family: ; */
+				}
+
+
+			}
+		}
+
+		.cil_left {
+			width: 30rpx;
+			height: 30rpx;
+			background-color: #F5F5F5;
+			border-radius: 30rpx;
+			position: absolute;
+			top: 110rpx;
+			left: -15rpx;
+
+		}
+
+		.cil_right {
+			width: 30rpx;
+			height: 30rpx;
+			background-color: #F5F5F5;
+			border-radius: 30rpx;
+			position: absolute;
+			top: 110rpx;
+			right: -15rpx;
+
+		}
+
+		.total {
+			text-align: right;
+			color: #3274F9;
+			font-weight: bold;
+			font-size: 32rpx;
+			margin: 20rpx 0;
+		}
+
+		.icon {
+			text-align: center;
+
+		}
+	}
+
+	.finishOrder {
+		text {
+			display: inline-block;
+			margin-right: 30rpx
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 401e118..96c4c88 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,144 +1,160 @@
 {
-    "name" : "供销综合平台",
-    "appid" : "__UNI__B5B1EDD",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {
-            "Payment" : {},
-            "Barcode" : {},
-            "Camera" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "payment" : {
-                    "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx4789d9f1b50390ba",
-                        "UniversalLinks" : ""
-                    }
-                },
-                "ad" : {}
-            },
-            "splashscreen" : {
-                "useOriginalMsgbox" : true
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    "h5" : {
-        "devServer" : {
-            "proxy" : {
-                "baseUrlTest/adminapi" : {
-                    "target" : "https://worker-task.lihaink.cn",
-                    "changeOrigin" : true,
-                    "pathRewrite" : {
-                        "^/baseUrlTest/adminapi" : "/adminapi"
-                    }
-                },
-                "baseUrlTest/api" : {
-                    "target" : "https://worker-task.lihaink.cn",
-                    "changeOrigin" : true,
-                    "pathRewrite" : {
-                        "^/baseUrlTest/api" : "/api"
-                    }
-                }
-            }
-        }
-    },
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx6e14cb98394e36bc",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "2"
-}
+	"name": "供销综合平台",
+	"appid": "__UNI__B5B1EDD",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"Payment": {},
+			"Barcode": {},
+			"Camera": {},
+			"Maps": {}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {
+				"dSYMs": false
+			},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"payment": {
+					"weixin": {
+						"__platform__": ["ios", "android"],
+						"appid": "wx4789d9f1b50390ba",
+						"UniversalLinks": ""
+					}
+				},
+				"ad": {},
+				"maps": {
+					"amap": {
+						"appkey_ios": "0799f37420c0784f1e6cba230a68bdb1",
+						"appkey_android": "0799f37420c0784f1e6cba230a68bdb1"
+					}
+				}
+			},
+			"splashscreen": {
+				"useOriginalMsgbox": true
+			},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					},
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					}
+				}
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	"h5": {
+		"devServer": {
+			"proxy": {
+				"baseUrlTest/adminapi": {
+					"target": "https://worker-task.lihaink.cn",
+					"changeOrigin": true,
+					"pathRewrite": {
+						"^/baseUrlTest/adminapi": "/adminapi"
+					}
+				},
+				"baseUrlTest/api": {
+					"target": "https://worker-task.lihaink.cn",
+					"changeOrigin": true,
+					"pathRewrite": {
+						"^/baseUrlTest/api": "/api"
+					}
+				}
+			}
+		},
+		"sdkConfigs": {
+			"maps": {
+				"amap": {
+					"key": "275cd3601b1b2d6414f6c988e7911664",
+					"securityJsCode": "d2d7c56801819e8bdf71b8a71846f235",
+					"serviceHost": ""
+				}
+			}
+		}
+	},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "wx6e14cb98394e36bc",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "2"
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 209decf..188b20b 100644
--- a/pages.json
+++ b/pages.json
@@ -1,484 +1,521 @@
 {
-  "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 
-    {
-      "path": "pages/oaHome/oaHome",
-      "style": {
-        "navigationBarTitleText": "首页",
-        "enablePullDownRefresh": true,
-        "app-plus": {
-          "titleNView": false
-        }
-      }
-    },
-    {
-      "path": "pages/oaLogin/oaLogin",
-      "style": {
-        "navigationBarTitleText": "登录",
-        "app-plus": {
-          "titleNView": false
-        }
-      }
+		{
+			"path": "pages/oaHome/oaHome",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"enablePullDownRefresh": true,
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/oaLogin/oaLogin",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
 
-    },
-    {
-      "path": "pages/business/business",
-      "style": {
-        "navigationBarTitleText": "商机信息",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		},
+		{
+			"path": "pages/business/business",
+			"style": {
+				"navigationBarTitleText": "商机信息",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    },
-    {
-      "path": "pages/index/index",
-      "style": {
-        "navigationBarTitleText": "uni-app",
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/oaExamine/oaExamine",
-      "style": {
-        "navigationBarTitleText": "审批",
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/oaTask/oaTask",
-      "style": {
-        "navigationBarTitleText": "今日任务",
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/oaMy/oaMy",
-      "style": {
-        "navigationBarTitleText": "我的",
-        "app-plus": {
-          "titleNView": false
-        }
-      }
-    }, {
-      "path": "pages/oaManager/oaManager",
-      "style": {
-        "navigationBarTitleText": "片区经理",
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "uni-app",
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/oaExamine/oaExamine",
+			"style": {
+				"navigationBarTitleText": "审批",
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/oaTask/oaTask",
+			"style": {
+				"navigationBarTitleText": "今日任务",
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/oaMy/oaMy",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		}, {
+			"path": "pages/oaManager/oaManager",
+			"style": {
+				"navigationBarTitleText": "片区经理",
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/oaNews/oaNews",
-      "style": {
-        "navigationBarTitleText": "公告详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/oaNews/oaNews",
+			"style": {
+				"navigationBarTitleText": "公告详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }
-  ],
-  "subPackages": [{
-    "root": "pages/views",
-    "name": "views",
-    "pages": [{
-        "path": "application",
-        "style": {
-          "navigationBarTitleText": "地图首页",
-          "enablePullDownRefresh": false
-        }
-      },
-      {
-        "path": "new_task",
-        "style": {
-          "navigationBarTitleText": "新建任务",
-          "enablePullDownRefresh": false
-        }
-      },
-      {
-        "path": "com_approve",
-        "style": {
-          "navigationBarTitleText": "通用审批",
-          "enablePullDownRefresh": false
-        }
-      }, {
-        "path": "personal_center",
-        "style": {
-          "navigationBarTitleText": "个人中心1",
-          "enablePullDownRefresh": false
-        }
+		}, {
+			"path": "pages/logistics/index",
+			"style": {
+				"navigationBarTitleText": "订单列表",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-      }, {
-        "path": "task_details",
-        "style": {
-          "navigationBarTitleText": "",
-          "enablePullDownRefresh": false
-        }
+		}, {
+			"path": "pages/logistics/logisticDetil",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-      }, {
-        "path": "personal_center_two",
-        "style": {
-          "navigationBarTitleText": "个人中心2",
-          "enablePullDownRefresh": false
-        }
+		}, {
+			"path": "pages/logistics/t",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-      }, {
-        "path": "public_document",
-        "style": {
-          "navigationBarTitleText": "公司公示文档",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#3175f9",
-          "navigationBarTextStyle": "white"
-        }
+		}, {
+			"path": "pages/logistics/deliveryDetil",
+			"style": {
+				"navigationBarTitleText": "配送信息",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-      }, {
-        "path": "leave_request",
-        "style": {
-          "navigationBarTitleText": "请假申请",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#3175f9",
-          "navigationBarTextStyle": "white"
-        }
+		}
 
-      }
-    ]
-  }, {
-    "root": "subpkg",
-    "name": "subpkg",
-    "pages": [{
-      "path": "personnel/personnel",
-      "style": {
-        "navigationBarTitleText": "人员管理",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+	],
+	"subPackages": [{
+		"root": "pages/views",
+		"name": "views",
+		"pages": [{
+				"path": "application",
+				"style": {
+					"navigationBarTitleText": "地图首页",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "new_task",
+				"style": {
+					"navigationBarTitleText": "新建任务",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "com_approve",
+				"style": {
+					"navigationBarTitleText": "通用审批",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "personal_center",
+				"style": {
+					"navigationBarTitleText": "个人中心1",
+					"enablePullDownRefresh": false
+				}
 
-    }, {
-      "path": "finance/finance",
-      "style": {
-        "navigationBarTitleText": "财务管理",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+			}, {
+				"path": "task_details",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
 
-    }, {
-      "path": "topUp/topUp",
-      "style": {
-        "navigationBarTitleText": "账户充值",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white",
-        "app-plus": {
-          "titleNView": {
-            "buttons": [{
-              "color": "#fff",
-              "text": "充值记录",
-              "fontSize": "15",
-              "width": "90"
-            }]
-          }
-        }
-      }
+			}, {
+				"path": "personal_center_two",
+				"style": {
+					"navigationBarTitleText": "个人中心2",
+					"enablePullDownRefresh": false
+				}
 
-    }, {
-      "path": "contract/contract",
-      "style": {
-        "navigationBarTitleText": "合同管理",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+			}, {
+				"path": "public_document",
+				"style": {
+					"navigationBarTitleText": "公司公示文档",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#3175f9",
+					"navigationBarTextStyle": "white"
+				}
 
-    }, {
-      "path": "contractDetail/contractDetail",
-      "style": {
-        "navigationBarTitleText": "合同详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+			}, {
+				"path": "leave_request",
+				"style": {
+					"navigationBarTitleText": "请假申请",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#3175f9",
+					"navigationBarTextStyle": "white"
+				}
 
-    }, {
-      "path": "pdfView/pdfView",
-      "style": {
-        "navigationBarTitleText": "合同内容",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+			}
+		]
+	}, {
+		"root": "subpkg",
+		"name": "subpkg",
+		"pages": [{
+			"path": "personnel/personnel",
+			"style": {
+				"navigationBarTitleText": "人员管理",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companyInfo/companyInfo",
-      "style": {
-        "navigationBarTitleText": "公司信息",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "finance/finance",
+			"style": {
+				"navigationBarTitleText": "财务管理",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companySign/companySign",
-      "style": {
-        "navigationBarTitleText": "签约公司详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "topUp/topUp",
+			"style": {
+				"navigationBarTitleText": "账户充值",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"color": "#fff",
+							"text": "充值记录",
+							"fontSize": "15",
+							"width": "90"
+						}]
+					}
+				}
+			}
 
-    }, {
-      "path": "personnelDetails/personnelDetails",
-      "style": {
-        "navigationBarTitleText": "人员详细信息",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "contract/contract",
+			"style": {
+				"navigationBarTitleText": "合同管理",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "orderDetail/orderDetail",
-      "style": {
-        "navigationBarTitleText": "流水详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "contractDetail/contractDetail",
+			"style": {
+				"navigationBarTitleText": "合同详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "withdrawDeposit/withdrawDeposit",
-      "style": {
-        "navigationBarTitleText": "提现余额",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white",
-        "app-plus": {
-          "titleNView": {
-            "buttons": [{
-              "color": "#fff",
-              "text": "提现记录",
-              "fontSize": "15",
-              "width": "90"
-            }]
-          }
-        }
-      }
-    }, {
-      "path": "withdrawList/withdrawList",
-      "style": {
-        "navigationBarTitleText": "提现记录",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pdfView/pdfView",
+			"style": {
+				"navigationBarTitleText": "合同内容",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "noticeList/noticeList",
-      "style": {
-        "navigationBarTitleText": "公告列表",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companyInfo/companyInfo",
+			"style": {
+				"navigationBarTitleText": "公司信息",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "topUpList/topUpList",
-      "style": {
-        "navigationBarTitleText": "充值记录",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companySign/companySign",
+			"style": {
+				"navigationBarTitleText": "签约公司详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companyAdmin/companyAdmin",
-      "style": {
-        "navigationBarTitleText": "公司管理",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "personnelDetails/personnelDetails",
+			"style": {
+				"navigationBarTitleText": "人员详细信息",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "newPersonnel/newPersonnel",
-      "style": {
-        "navigationBarTitleText": "新增人员",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "orderDetail/orderDetail",
+			"style": {
+				"navigationBarTitleText": "流水详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "archives/archives",
-      "style": {
-        "navigationBarTitleText": "档案管理",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "withdrawDeposit/withdrawDeposit",
+			"style": {
+				"navigationBarTitleText": "提现余额",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"color": "#fff",
+							"text": "提现记录",
+							"fontSize": "15",
+							"width": "90"
+						}]
+					}
+				}
+			}
+		}, {
+			"path": "withdrawList/withdrawList",
+			"style": {
+				"navigationBarTitleText": "提现记录",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "newArchives/newArchives",
-      "style": {
-        "navigationBarTitleText": "信息登记",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "noticeList/noticeList",
+			"style": {
+				"navigationBarTitleText": "公告列表",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "updateArchives/updateArchives",
-      "style": {
-        "navigationBarTitleText": "信息更新",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "topUpList/topUpList",
+			"style": {
+				"navigationBarTitleText": "充值记录",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "fixedAssets/fixedAssets",
-      "style": {
-        "navigationBarTitleText": "固定资产",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companyAdmin/companyAdmin",
+			"style": {
+				"navigationBarTitleText": "公司管理",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "taskAdmin/taskAdmin",
-      "style": {
-        "navigationBarTitleText": "任务管理",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "newPersonnel/newPersonnel",
+			"style": {
+				"navigationBarTitleText": "新增人员",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "archivesDetail/archivesDetail",
-      "style": {
-        "navigationBarTitleText": "档案详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "archives/archives",
+			"style": {
+				"navigationBarTitleText": "档案管理",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "captain/captain",
-      "style": {
-        "navigationBarTitleText": "队长列表",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "newArchives/newArchives",
+			"style": {
+				"navigationBarTitleText": "信息登记",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companyFinance/companyFinance",
-      "style": {
-        "navigationBarTitleText": "公司财务",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "updateArchives/updateArchives",
+			"style": {
+				"navigationBarTitleText": "信息更新",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companyUnsign/companyUnsign",
-      "style": {
-        "navigationBarTitleText": "未签约公司列表",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "fixedAssets/fixedAssets",
+			"style": {
+				"navigationBarTitleText": "固定资产",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "submit/submit",
-      "style": {
-        "navigationBarTitleText": "提交审核",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "taskAdmin/taskAdmin",
+			"style": {
+				"navigationBarTitleText": "任务管理",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "dispatching/dispatching",
-      "style": {
-        "navigationBarTitleText": "任务:宣传配送",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "archivesDetail/archivesDetail",
+			"style": {
+				"navigationBarTitleText": "档案详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "blockTransaction/blockTransaction",
-      "style": {
-        "navigationBarTitleText": "任务:片区交易",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "captain/captain",
+			"style": {
+				"navigationBarTitleText": "队长列表",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "fileTask/fileTask",
-      "style": {
-        "navigationBarTitleText": "任务:档案更新",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3175f9",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companyFinance/companyFinance",
+			"style": {
+				"navigationBarTitleText": "公司财务",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
 
-    }]
-  }],
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
-  },
-  "tabBar": {
-    "color": "#282828",
-    "selectedColor": "#3175f9",
-    "borderStyle": "white",
-    "backgroundColor": "#ffffff",
-    "list": [{
-        "pagePath": "pages/oaHome/oaHome",
-        "text": "首页",
-        "iconPath": "/static/tabs-icon/home.png",
-        "selectedIconPath": "/static/tabs-icon/home-a.png"
-      },
-      {
-        "pagePath": "pages/oaExamine/oaExamine",
-        "text": "审批",
-        "iconPath": "/static/tabs-icon/Task.png",
-        "selectedIconPath": "/static/tabs-icon/Task-a.png"
-      },
-      {
-        "pagePath": "pages/oaTask/oaTask",
-        "text": "任务",
-        "iconPath": "/static/tabs-icon/approval.png",
-        "selectedIconPath": "/static/tabs-icon/approval-a.png"
-      },
-      // {
-      //   "pagePath": "pages/oaManager/oaManager",
-      //   "text": "片区经理",
-      //   "iconPath": "/static/tabs-icon/manager.png",
-      //   "selectedIconPath": "/static/tabs-icon/manager-a.png"
-      // },
-      {
-        "pagePath": "pages/business/business",
-        "text": "商机",
-        "iconPath": "/static/tabs-icon/manager.png",
-        "selectedIconPath": "/static/tabs-icon/manager-a.png"
-      },
-      {
-        "pagePath": "pages/oaMy/oaMy",
-        "text": "我的",
-        "iconPath": "/static/tabs-icon/my.png",
-        "selectedIconPath": "/static/tabs-icon/my-a.png"
-      }
-    ]
-  },
-  "uniIdRouter": {}
+		}, {
+			"path": "companyUnsign/companyUnsign",
+			"style": {
+				"navigationBarTitleText": "未签约公司列表",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "submit/submit",
+			"style": {
+				"navigationBarTitleText": "提交审核",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "dispatching/dispatching",
+			"style": {
+				"navigationBarTitleText": "任务:宣传配送",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "blockTransaction/blockTransaction",
+			"style": {
+				"navigationBarTitleText": "任务:片区交易",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "fileTask/fileTask",
+			"style": {
+				"navigationBarTitleText": "任务:档案更新",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3175f9",
+				"navigationBarTextStyle": "white"
+			}
+
+		}]
+	}],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8"
+	},
+	"tabBar": {
+		"color": "#282828",
+		"selectedColor": "#3175f9",
+		"borderStyle": "white",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/oaHome/oaHome",
+				"text": "首页",
+				"iconPath": "/static/tabs-icon/home.png",
+				"selectedIconPath": "/static/tabs-icon/home-a.png"
+			},
+			{
+				"pagePath": "pages/oaExamine/oaExamine",
+				"text": "审批",
+				"iconPath": "/static/tabs-icon/Task.png",
+				"selectedIconPath": "/static/tabs-icon/Task-a.png"
+			},
+			{
+				"pagePath": "pages/oaTask/oaTask",
+				"text": "任务",
+				"iconPath": "/static/tabs-icon/approval.png",
+				"selectedIconPath": "/static/tabs-icon/approval-a.png"
+			},
+			// {
+			//   "pagePath": "pages/oaManager/oaManager",
+			//   "text": "片区经理",
+			//   "iconPath": "/static/tabs-icon/manager.png",
+			//   "selectedIconPath": "/static/tabs-icon/manager-a.png"
+			// },
+			{
+				"pagePath": "pages/business/business",
+				"text": "商机",
+				"iconPath": "/static/tabs-icon/manager.png",
+				"selectedIconPath": "/static/tabs-icon/manager-a.png"
+			},
+			{
+				"pagePath": "pages/oaMy/oaMy",
+				"text": "我的",
+				"iconPath": "/static/tabs-icon/my.png",
+				"selectedIconPath": "/static/tabs-icon/my-a.png"
+			}
+		]
+	},
+	"uniIdRouter": {}
 }
\ No newline at end of file
diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue
new file mode 100644
index 0000000..ccadc5a
--- /dev/null
+++ b/pages/logistics/deliveryDetil.vue
@@ -0,0 +1,352 @@
+<template>
+	<view class="content">
+		<view class="map">
+			<map id="map" :markers='markers' :scale="scale" :enable-zoom="true" :polyline="polyline"
+				style="width:100%;height: 100%;" :latitude="latitude" :enable-scroll="false"
+				:longitude="longitude"></map>
+		</view>
+		<view class="order_info">
+			<u-modal :show="showPop" @confirm="confirm" content="56565撒大苏打撒旦" @close="showPop=false"
+				:closeOnClickOverlay="true"></u-modal>
+			<button @click="getDriverLine">线路规划</button>
+			<p class='tit'>订单号: {{goodsDetil.logistics.order_sn}}</p>
+			<view class="store_name">
+				商户名称 {{goodsDetil.logistics.shop_name}}
+			</view>
+			<view class="store_time">
+				{{goodsDetil.logistics.shop_address}}
+			</view>
+			<view class="tit_a">
+				<text>物流信息</text>
+			</view>
+			<view class="info" v-for="(item,index) in goodsDetil.record">
+				<view style="margin: 20rpx 0;">
+					{{item.content }}
+				</view>
+				<view style="margin: 20rpx 0;">
+					{{item.create_time }}
+				</view>
+			</view>
+			<view class="pro_info">
+				<view style="color: #999; flex:1">
+					商品信息
+				</view>
+				<view style="flex:4">
+					<view v-for="(item,index) in goodsDetil.product" class="goods_tit">
+						<text style="width: 60vw;">{{item.goods_name}}</text>
+						<text style="float: right;">X{{item.product_num}}{{item.goods_unit}}</text>
+					</view>
+
+				</view>
+
+			</view>
+
+			<view class="total">
+				共计{{goodsDetil.product_count}}件商品
+			</view>
+			<u-button type="primary" v-if='goodsDetil.logistics.status==0' @click="showPop=true"
+				class="custom-style">已取货</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getDetil
+	} from "@/api/logistics.js"
+	import {
+		takeGoods
+	} from "@/api/logistics.js"
+	export default {
+		data() {
+			return {
+				showPop: false,
+				goodsDetil: undefined,
+				scale: 17,
+				latitude: 28.908854,
+				longitude: 105.43639400000002,
+				markers: [],
+				polyline: [],
+				// https://p4.itc.cn/images03/20200518/90137c12bbac485dbc5bb0fe9d8cf4bd.jpeg
+				// https://t9.baidu.com/it/u=414099140,1072313909&fm=193
+				// mark: [{
+				// 		id: 0,
+				// 		latitude: 28.908854,
+				// 		longitude: 105.43639400000002,
+				// 		iconPath: 'https://img2.baidu.com/it/u=3116155797,2219949885&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', //显示的图标        
+
+				// 		width: 40, //宽
+				// 		height: 40, //高
+				// 		title: '我在这里', //标注点名
+				// 		alpha: 0.5, //透明度
+				// 		callout: { //自定义标记点上方的气泡窗口 点击有效  
+				// 			content: '我的位置', //文本
+				// 			color: '#ffffff', //文字颜色
+				// 			fontSize: 14, //文本大小
+				// 			borderRadius: 15, //边框圆角
+				// 			borderWidth: '10',
+				// 			bgColor: '#3274F9', //背景颜色
+				// 			display: 'ALWAYS', //常显
+				// 		},
+				// 	},
+				// 	{
+				// 		id: 2,
+
+				// 		latitude: 28.908447, //纬度
+				// 		longitude: 105.439304,
+				// 		//经度
+				// 		iconPath: '../../static/img/contract/company.png', //显示的图标        
+				// 		rotate: 0, // 旋转度数
+				// 		width: 20, //宽
+				// 		height: 30, //高
+				// 		alpha: 0.5, //透明度
+				// 		callout: { //自定义标记点上方的气泡窗口 点击有效  
+				// 			content: '商家', //文本
+				// 			color: 'white', //文字颜色
+				// 			fontSize: 14, //文本大小
+				// 			borderRadius: 15, //边框圆角
+				// 			borderWidth: '10',
+				// 			bgColor: '#3274F9', //背景颜色
+				// 			display: 'ALWAYS', //常显
+				// 		},
+				// 	},
+
+
+
+				// ],
+
+				// polyline: [{
+				// 		points: [{
+				// 			latitude: 28.908854,
+				// 			longitude: 105.43639400000002,
+				// 		}, {
+				// 			latitude: 28.908447, //纬度
+				// 			longitude: 105.439304,
+				// 		}],
+				// 		color: "#0091ff",
+				// 		// dottedLine: true,
+				// 		// colorList: true,
+				// 		// dottedLine: true,
+				// 		width: 15,
+				// 		// arrowLine: true,
+				// 		// colorList: true,
+				// 		// colorList: true
+
+				// 	}
+
+				// ]
+
+
+			}
+		},
+		methods: {
+			confirm() {
+				let id = JSON.parse(uni.getStorageSync('USER_INFO')).id
+				takeGoods({
+					user_id: id,
+					logistics_id: this.goodsDetil.logistics.id
+				})
+				this.showPop = false
+				uni.navigateBack()
+			},
+			/*
+			地图相关
+			*/
+			// 路线规划
+			getDriverLine() {
+				const that = this;
+				const key = "997c9a3d88154fa78f4d28bebc1dd84f";
+				//起点坐标
+				const origin = "28.908854,105.43639400000002,";
+				//给起点坐标一个图标
+				this.startingPoint()
+				//给终点坐标一个图标
+				this.endPoint()
+				//终点坐标
+				const destination = "28.908447,105.439304,";
+				uni.request({
+					// url: `https://restapi.amap.com/v3/direction/walking?key=${key}&origin=105.43639400000002,28.908854&destination=105.439304,28.908447`,
+					url: `https:restapi.amap.com/v4/direction/bicycling?key=${key}&origin=105.43639400000002,28.908854&destination=105.439304,28.908447`,
+					success: (res) => {
+						const data = res.data.data;
+						var points = [];
+						if (data.paths && data.paths[0] && data.paths[0].steps) {
+							var steps = data.paths[0].steps;
+							for (var i = 0; i < steps.length; i++) {
+								//将每一步的数据放到points数组中
+								var poLen = steps[i].polyline.split(";");
+								for (var j = 0; j < poLen.length; j++) {
+									points.push({
+										longitude: parseFloat(poLen[j].split(",")[0]),
+										latitude: parseFloat(poLen[j].split(",")[1]),
+									});
+								}
+							}
+							console.log(data.paths[0].steps[0].instruction)
+							that.runningRoute = data.paths[0].steps[0].instruction;
+							console.log('行驶路线-----------', that.runningRoute)
+						}
+						that.polyline = [{
+							points: points,
+							color: "#0091ff",
+							dottedLine: true,
+							width: 15,
+							arrowLine: true,
+							colorList: true,
+						}, ];
+					},
+					fail: function(res) {
+						console.log("获取路线失败", res);
+					},
+				});
+			},
+			// 规划路线的时候给起点一个marker，
+			startingPoint() {
+				let point = [{
+					id: 1,
+					width: 40,
+					height: 40,
+					latitude: 28.908854,
+					longitude: 105.43639400000002,
+					iconPath: "https://p4.itc.cn/images03/20200518/90137c12bbac485dbc5bb0fe9d8cf4bd.jpeg",
+					anchor: {
+						x: 0.5,
+						y: 1,
+					},
+				}, ];
+				this.markers = this.markers.concat(point);
+			},
+			// 规划路线的时候给终点一个marker，
+			endPoint() {
+				let point = [{
+					id: 2,
+					width: 40,
+					height: 40,
+					latitude: 28.908447, //纬度
+					longitude: 105.439304,
+					//经度
+					iconPath: 'https://t9.baidu.com/it/u=414099140,1072313909&fm=193',
+					anchor: {
+						x: 0.5,
+						y: 1,
+					},
+				}, ];
+				this.markers = this.markers.concat(point);
+			},
+
+			// 地图结束
+
+
+
+
+		},
+		onLoad(options) {
+			getDetil({
+				logistics_id: options.id
+			}).then(res => {
+				this.goodsDetil = res.data
+				console.log(this.goodsDetil)
+			})
+		},
+		// onShow() {
+		// 	let that = this
+		// 	// uni.getLocation({
+		// 	// 	type: 'wgs84',
+		// 	// 	success: function(res) {
+		// 	// 		that.mark[0].latitude = res.latitude
+		// 	// 		that.mark[0].longitude = res.longitude
+		// 	// 		console.log(that.mark[0])
+		// 	// 		console.log(res)
+
+		// 	// 	}
+		// 	// });
+		// }
+	}
+</script>
+
+<style lang='scss' scoped>
+	.map {
+		height: 40vh;
+		width: 100vw;
+
+	}
+
+	.custom-style {
+		width: 100%;
+		background-color: red;
+		border: none;
+		color: white;
+		height: 90rpx;
+		line-height: 90rpx;
+	}
+
+	.order_info {
+		height: auto;
+		background-color: white;
+		border-radius: 6vw 6vw 0 0;
+		transform: translateY(-5vh);
+		padding: 5vh 3vw;
+		box-sizing: border-box;
+
+		.tit {
+			font-weight: bold;
+			font-size: 35rpx
+		}
+
+		.tit_a {
+
+			display: flex;
+			justify-content: space-between;
+			font-weight: bold;
+			font-size: 35rpx
+		}
+
+		.total {
+			text-align: right;
+			color: #3274F9;
+			font-weight: bold;
+			font-size: 32rpx;
+			margin: 20rpx 0;
+		}
+
+		.store_name {
+			color: #999999;
+			margin: 18rpx 0;
+		}
+
+		.store_time {
+			color: #999999;
+			padding: 0 0 20rpx 0;
+			border-bottom: 1px solid #999999;
+			margin-bottom: 20rpx;
+		}
+
+		.info {
+			margin: 10rpx 0;
+
+		}
+
+		.pro_info {
+			display: flex;
+			justify-content: space-between;
+		}
+
+
+	}
+
+	.goods_tit {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.icon {
+
+		text-align: center;
+		font-size: 50rpx;
+
+		text {
+			display: block;
+			transform: rotate(90deg);
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/logistics/index.vue b/pages/logistics/index.vue
new file mode 100644
index 0000000..dbfbff9
--- /dev/null
+++ b/pages/logistics/index.vue
@@ -0,0 +1,78 @@
+<template>
+	<view class="content">
+		<u-search placeholder="搜索你的订单" @search="getOrderList" :show-action='false' bg-color='white'
+			v-model="keywords"></u-search>
+		<view style="margin: 10rpx 0 0 0;">
+		</view>
+		<u-sticky bgColor="#F5F5F5">
+			<u-subsection :list="list" :current="curNow" @change="sectionChange"></u-subsection>
+		</u-sticky>
+		<view v-if="!orderlist.length">
+			<u-empty mode="data" icon="../../static/img/empty/data.png">
+			</u-empty>
+		</view>
+		<view v-else>
+			<logistiCard v-for='(item,index) in orderlist' @getlist="getOrderList" :goodsInfo="item" :key="index">
+			</logistiCard>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getList
+	} from "@/api/logistics.js"
+	import {
+		informationAdd
+	} from "@/api/logistics.js"
+	import logistiCard from "@/components/logistiComptent/logistiCard/logistiCard.vue"
+	export default {
+		components: {
+			logistiCard
+		},
+		data() {
+			return {
+				keywords: "",
+				list: ['待取货', '已取货', '已送达'],
+				curNow: 0,
+				orderlist: []
+			}
+		},
+		methods: {
+			sectionChange(index) {
+				this.curNow = index;
+				this.getOrderList()
+				// console.log(this.curNow)
+			},
+
+			getOrderList() {
+				// console.log(9999)
+				// return
+				let id = JSON.parse(uni.getStorageSync('USER_INFO')).id
+				getList({
+					status: this.curNow,
+					// courier_id: id,
+					courier_id: id,
+					keywords: this.keywords
+				}).then(res => {
+					this.orderlist = res.data.data
+					console.log(this.orderlist)
+				})
+			}
+
+		},
+		onShow() {
+			// this.curNow = 1
+			this.getOrderList()
+
+		}
+
+	}
+</script>
+
+<style lang='scss'>
+	.content {
+		background-color: #F5F5F5;
+		padding: 1vh 2vw;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/logistics/logisticDetil.vue b/pages/logistics/logisticDetil.vue
new file mode 100644
index 0000000..6830f26
--- /dev/null
+++ b/pages/logistics/logisticDetil.vue
@@ -0,0 +1,299 @@
+<template>
+	<view class="content">
+		<view v-if='showLoading'>
+			<u-loading-page :loading="showLoading"></u-loading-page>
+		</view>
+		<view v-else>
+			<view class="order">
+				<u-loading-page :loading="showLoading"></u-loading-page>
+				<p>订单号:{{goodsDetil.logistics.order_sn}}</p>
+				<view class='phone'>收货时间 : &nbsp;{{goodsDetil.record[0].create_time}} </view>
+
+				<!-- 已送达 -->
+				<view class="left" v-if="goodsDetil.logistics.status>=2">
+					<view class="list">
+						<text>
+							收货时间
+						</text>
+						<view>
+							{{goodsDetil.record[0].create_time}}
+						</view>
+					</view>
+					<view class="list">
+						<text>
+							收获详情
+						</text>
+						<view>
+							<view>
+								{{goodsDetil.logistics.user_address}}
+							</view>
+							<view>
+								{{goodsDetil.logistics.user_name||"顾客电话"}}
+							</view>
+							<view>
+								{{goodsDetil.record[0].create_time}}
+							</view>
+						</view>
+
+					</view>
+					<view class="list">
+						<text>
+							取货详情
+						</text>
+						<view>
+							<view>
+								{{goodsDetil.logistics.shop_address||"商家地址"}}
+							</view>
+							<view>
+								{{goodsDetil.logistics.shop_phone||"商家电话"}}
+							</view>
+							<view>
+								{{goodsDetil.record[1].create_time}}
+							</view>
+						</view>
+					</view>
+					<view class="list">
+						<text>
+							订单详情
+						</text>
+						<view>
+							<view v-for="(item,index) in goodsDetil.record" :key="item.create_time">
+								<view>
+									{{item.content}}
+								</view>
+								<view>
+									{{item.create_time}}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="pro_list">
+						<text style="color: #999;width: 15vw;">
+							商品信息
+						</text>
+						<view>
+							<view class="goods_tit" v-for="(item,index) in goodsDetil.product">
+								<text style="width: 60vw;margin: 0;padding: 0;">{{item.goods_name}}</text>
+								<text>X{{item.product_num}}{{item.goods_unit}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- 已取货 -->
+				<view class="left" v-else>
+					<view class="list">
+						<text>
+							用户名称
+						</text>
+						<view>
+							{{goodsDetil.logistics.user_name}}
+						</view>
+					</view>
+					<view class="list" style="margin: 10rpx 0;">
+						<text style="width: 16vw;">
+							收货地址
+						</text>
+						<view>
+							<view>
+								{{goodsDetil.logistics.user_address}}
+							</view>
+						</view>
+					</view>
+					<view class="list">
+						<text>
+							物流信息
+						</text>
+						<view>
+							<view v-for="(item,index) in goodsDetil.record">
+								{{item.content}}
+								<view>
+									{{item.create_time}}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="pro_list">
+						<text style="color: #999;width: 15vw;">
+							商品信息
+						</text>
+						<view>
+							<view class="goods_tit" v-for="(item,index) in goodsDetil.product">
+								<text style="width: 60vw;margin: 0;padding: 0;">{{item.goods_name}}</text>
+								<text>X{{item.product_num}}{{item.goods_unit}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+
+
+
+				<view class="total">
+					<text>共计{{goodsDetil.product_count}}件商品 </text>
+				</view>
+				<u-button v-if='goodsDetil.logistics.status==1' @click="showPop=true" type="primary"
+					style="background-color: #34A853;border: none;">已送达</u-button>
+			</view>
+			<view class="cil_left">
+			</view>
+			<view class="cil_right">
+			</view>
+			<u-modal :show="showPop" @confirm="confirm" content="56565撒大苏打撒旦" @close="showPop=false"
+				:closeOnClickOverlay="true"></u-modal>
+		</view>
+
+	</view>
+
+
+	</view>
+
+</template>
+
+<script>
+	import {
+		doneDelivery
+	} from "@/api/logistics.js"
+	import {
+		getDetil
+	} from "@/api/logistics.js"
+	export default {
+		data() {
+			return {
+				showPop: false,
+				showLoading: true,
+				goodsDetil: undefined,
+				flag: 0,
+			}
+		},
+		methods: {
+			confirm() {
+				let id = JSON.parse(uni.getStorageSync('USER_INFO')).id
+				doneDelivery({
+					user_id: id,
+					// user_id: id,
+					logistics_id: this.goodsDetil.logistics.id
+				})
+				this.showPop = false
+				uni.navigateBack()
+			},
+		},
+		onLoad(options) {
+			// console.log(options.id)
+			getDetil({
+				logistics_id: options.id
+			}).then(res => {
+				this.showLoading = false
+				this.goodsDetil = res.data
+				console.log(this.goodsDetil)
+			})
+
+		},
+	}
+</script>
+
+<style lang='scss' scoped>
+	.content {
+		background-color: #F5F5F5;
+		padding: 2vh 2vw;
+	}
+
+	.order {
+		position: relative;
+		background-color: white;
+		margin: 20rpx 0;
+		border-radius: 15rpx;
+		height: auto;
+		padding: 2vh 3vw;
+		box-sizing: border-box;
+
+
+
+		p {
+			font-family: "PingFang SC-Medium";
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+
+		.phone {
+			color: #999999;
+			padding: 10rpx 0;
+			border-bottom: 1px dashed blue;
+			font-size: 20rpx;
+		}
+
+		.left {
+			.list {
+				display: flex;
+
+				view {
+					flex: 8;
+
+					view {
+						margin-bottom: 10rpx;
+					}
+				}
+
+				text {
+					flex: 2;
+				}
+
+				/* 	view {
+					view {
+						margin-bottom: 10rpx;
+					}
+				}
+
+				text {
+					margin-right: 20rpx;
+					width: 30vw;
+					color: #999;
+				} */
+			}
+		}
+
+		.pro_list {
+			display: flex;
+
+			text {
+				margin-right: 20rpx;
+			}
+		}
+
+		.total {
+			/* font-family: "宋体"; */
+			margin: 20rpx 0;
+			color: #3274F9;
+			font-weight: bold;
+			font-size: 32rpx;
+			text-align: right;
+		}
+
+		.cil_left {
+			width: 30rpx;
+			height: 30rpx;
+			background-color: #F5F5F5;
+			border-radius: 30rpx;
+			position: absolute;
+			top: 110rpx;
+			left: -15rpx;
+
+		}
+
+		.cil_right {
+			width: 30rpx;
+			height: 30rpx;
+			background-color: #F5F5F5;
+			border-radius: 30rpx;
+			position: absolute;
+			top: 110rpx;
+			right: -15rpx;
+
+		}
+
+		.goods_tit {
+			display: flex;
+			justify-content: space-between;
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/logistics/t.vue b/pages/logistics/t.vue
new file mode 100644
index 0000000..1d6def0
--- /dev/null
+++ b/pages/logistics/t.vue
@@ -0,0 +1,311 @@
+<template>
+	<view class="content">
+		<view class="map">
+			<map id="map" :markers='markers' :scale="scale" :enable-zoom="true" :polyline="polyline"
+				style="width:100%;height: 100%;" :latitude="latitude" :enable-scroll="false"
+				:longitude="longitude"></map>
+		</view>
+		<button @click="getDriverLine">叫我按钮</button>
+	</view>
+</template>
+
+<script>
+	import {
+		getDetil
+	} from "@/api/logistics.js"
+	import {
+		takeGoods
+	} from "@/api/logistics.js"
+	export default {
+		data() {
+			return {
+				showPop: false,
+				goodsDetil: undefined,
+				scale: 17,
+				latitude: 28.908854,
+				longitude: 105.43639400000002,
+				markers: [],
+				polyline: [],
+				// https://p4.itc.cn/images03/20200518/90137c12bbac485dbc5bb0fe9d8cf4bd.jpeg
+				// https://t9.baidu.com/it/u=414099140,1072313909&fm=193
+				// mark: [{
+				// 		id: 0,
+				// 		latitude: 28.908854,
+				// 		longitude: 105.43639400000002,
+				// 		iconPath: 'https://img2.baidu.com/it/u=3116155797,2219949885&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', //显示的图标        
+
+				// 		width: 40, //宽
+				// 		height: 40, //高
+				// 		title: '我在这里', //标注点名
+				// 		alpha: 0.5, //透明度
+				// 		callout: { //自定义标记点上方的气泡窗口 点击有效  
+				// 			content: '我的位置', //文本
+				// 			color: '#ffffff', //文字颜色
+				// 			fontSize: 14, //文本大小
+				// 			borderRadius: 15, //边框圆角
+				// 			borderWidth: '10',
+				// 			bgColor: '#3274F9', //背景颜色
+				// 			display: 'ALWAYS', //常显
+				// 		},
+				// 	},
+				// 	{
+				// 		id: 2,
+
+				// 		latitude: 28.908447, //纬度
+				// 		longitude: 105.439304,
+				// 		//经度
+				// 		iconPath: '../../static/img/contract/company.png', //显示的图标        
+				// 		rotate: 0, // 旋转度数
+				// 		width: 20, //宽
+				// 		height: 30, //高
+				// 		alpha: 0.5, //透明度
+				// 		callout: { //自定义标记点上方的气泡窗口 点击有效  
+				// 			content: '商家', //文本
+				// 			color: 'white', //文字颜色
+				// 			fontSize: 14, //文本大小
+				// 			borderRadius: 15, //边框圆角
+				// 			borderWidth: '10',
+				// 			bgColor: '#3274F9', //背景颜色
+				// 			display: 'ALWAYS', //常显
+				// 		},
+				// 	},
+
+
+
+				// ],
+
+				// polyline: [{
+				// 		points: [{
+				// 			latitude: 28.908854,
+				// 			longitude: 105.43639400000002,
+				// 		}, {
+				// 			latitude: 28.908447, //纬度
+				// 			longitude: 105.439304,
+				// 		}],
+				// 		color: "#0091ff",
+				// 		// dottedLine: true,
+				// 		// colorList: true,
+				// 		// dottedLine: true,
+				// 		width: 15,
+				// 		// arrowLine: true,
+				// 		// colorList: true,
+				// 		// colorList: true
+
+				// 	}
+
+				// ]
+
+
+			}
+		},
+		methods: {
+			confirm() {
+				let id = JSON.parse(uni.getStorageSync('USER_INFO')).id
+				takeGoods({
+					user_id: id,
+					logistics_id: this.goodsDetil.logistics.id
+				})
+				this.showPop = false
+			},
+			/*
+			地图相关
+			*/
+			// 路线规划
+			getDriverLine() {
+				const that = this;
+				const key = "997c9a3d88154fa78f4d28bebc1dd84f";
+				//起点坐标
+				const origin = "105.43639400000002,28.908854";
+				//给起点坐标一个图标
+				this.startingPoint()
+				//给终点坐标一个图标
+				this.endPoint()
+				//终点坐标
+				const destination = "105.439304,28.908447";
+				uni.request({
+					// url: `https://restapi.amap.com/v3/direction/walking?key=${key}&origin=105.43639400000002,28.908854&destination=105.439304,28.908447`,
+					url: `https:restapi.amap.com/v4/direction/bicycling?key=${key}&origin=${origin}&destination=${destination}`,
+					success: (res) => {
+						const data = res.data.data;
+						var points = [];
+						if (data.paths && data.paths[0] && data.paths[0].steps) {
+							var steps = data.paths[0].steps;
+							for (var i = 0; i < steps.length; i++) {
+								//将每一步的数据放到points数组中
+								var poLen = steps[i].polyline.split(";");
+								for (var j = 0; j < poLen.length; j++) {
+									points.push({
+										longitude: parseFloat(poLen[j].split(",")[0]),
+										latitude: parseFloat(poLen[j].split(",")[1]),
+									});
+								}
+							}
+							console.log(data.paths[0].steps[0].instruction)
+							that.runningRoute = data.paths[0].steps[0].instruction;
+							console.log('行驶路线-----------', that.runningRoute)
+						}
+
+						that.polyline = [{
+							points: points,
+							color: "#0091ff",
+							dottedLine: true,
+							width: 15,
+							arrowLine: true,
+							colorList: true,
+						}, ];
+					},
+					fail: function(res) {
+						console.log("获取路线失败", res);
+					},
+				});
+			},
+			// 规划路线的时候给起点一个marker，
+			startingPoint() {
+				let point = [{
+					id: 1,
+					width: 40,
+					height: 40,
+					latitude: 28.908854,
+					longitude: 105.43639400000002,
+					iconPath: "https://p4.itc.cn/images03/20200518/90137c12bbac485dbc5bb0fe9d8cf4bd.jpeg",
+					anchor: {
+						x: 0.5,
+						y: 1,
+					},
+				}, ];
+				this.markers = this.markers.concat(point);
+			},
+			// 规划路线的时候给终点一个marker，
+			endPoint() {
+				let point = [{
+					id: 2,
+					width: 40,
+					height: 40,
+					latitude: 28.908447, //纬度
+					longitude: 105.439304,
+					//经度
+					iconPath: 'https://t9.baidu.com/it/u=414099140,1072313909&fm=193',
+					anchor: {
+						x: 0.5,
+						y: 1,
+					},
+				}, ];
+				this.markers = this.markers.concat(point);
+			},
+
+			// 地图结束
+
+
+
+
+		},
+		onLoad(options) {
+			// getDetil({
+			// 	logistics_id: options.id
+			// }).then(res => {
+			// 	this.goodsDetil = res.data
+			// 	console.log(this.goodsDetil)
+			// })
+		},
+		// onShow() {
+		// 	let that = this
+		// 	// uni.getLocation({
+		// 	// 	type: 'wgs84',
+		// 	// 	success: function(res) {
+		// 	// 		that.mark[0].latitude = res.latitude
+		// 	// 		that.mark[0].longitude = res.longitude
+		// 	// 		console.log(that.mark[0])
+		// 	// 		console.log(res)
+
+		// 	// 	}
+		// 	// });
+		// }
+	}
+</script>
+
+<style lang='scss' scoped>
+	.map {
+		height: 40vh;
+		width: 100vw;
+
+	}
+
+	.custom-style {
+		width: 100%;
+		background-color: red;
+		border: none;
+		color: white;
+		height: 90rpx;
+		line-height: 90rpx;
+	}
+
+	.order_info {
+		height: auto;
+		background-color: white;
+		border-radius: 6vw 6vw 0 0;
+		transform: translateY(-5vh);
+		padding: 5vh 3vw;
+		box-sizing: border-box;
+
+		.tit {
+			font-weight: bold;
+			font-size: 35rpx
+		}
+
+		.tit_a {
+
+			display: flex;
+			justify-content: space-between;
+			font-weight: bold;
+			font-size: 35rpx
+		}
+
+		.total {
+			text-align: right;
+			color: #3274F9;
+			font-weight: bold;
+			font-size: 32rpx;
+			margin: 20rpx 0;
+		}
+
+		.store_name {
+			color: #999999;
+			margin: 18rpx 0;
+		}
+
+		.store_time {
+			color: #999999;
+			padding: 0 0 20rpx 0;
+			border-bottom: 1px solid #999999;
+			margin-bottom: 20rpx;
+		}
+
+		.info {
+			margin: 10rpx 0;
+
+		}
+
+		.pro_info {
+			display: flex;
+			justify-content: space-between;
+		}
+
+
+	}
+
+	.goods_tit {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.icon {
+
+		text-align: center;
+		font-size: 50rpx;
+
+		text {
+			display: block;
+			transform: rotate(90deg);
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index d7a2b22..195e696 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -1,43 +1,43 @@
 <template>
-  <view class="oa_home" style="oaColor">
-    <!-- <image class="header_bg" src="../../static/img/home/head-bg.png"></image> -->
+	<view class="oa_home" style="oaColor">
+		<!-- <image class="header_bg" src="../../static/img/home/head-bg.png"></image> -->
 
-    <view class="home_header" :class="!ApproveList.length>0?'home_header_no_data':''">
-      <!-- #ifdef APP-PLUS||H5 -->
-      <view style="height: var(--status-bar-height);"></view>
-      <view style="height: 100rpx"></view>
-      <!-- #endif -->
-      <view class="my_info flex_a_c">
-        <view class="">
-          <u--image :showLoading="true" :src="myOaInfo.avatar||'../../static/img/public/avatar.png'" width="130.28rpx"
-            height="130.28rpx" shape="circle"></u--image>
-        </view>
-        <view v-if="!$store.state.app.token" @click="login" class="mesg_box">
-          <view class="name">
-            <text class="nickname">立即登录</text>
-          </view>
-          <view class="duty">
-            登录后可查看更多
-          </view>
-        </view>
-        <view v-else class="mesg_box">
-          <view class="name">
-            <text class="nickname">姓名:{{ myOaInfo.nickname }}</text>
-			<text>（{{ myOaInfo.admin_id?'超级管理员':'普通用户'}}）</text>
-          </view>
-          <view class="duty">
-            <!-- ({{ myOaInfo.did_name }}){{myOaInfo.label_name}} -->
-            电话:{{myOaInfo.account}}<br />
-            公司:<text v-if="myOaInfo.company">{{ myOaInfo.company.company_name }}</text><br/>
-			公司类型:<text v-if="myOaInfo.company">{{ myOaInfo.company.company_type_name }}</text><br/>
-          </view>
-        </view>
-      </view>
+		<view class="home_header" :class="!ApproveList.length>0?'home_header_no_data':''">
+			<!-- #ifdef APP-PLUS||H5 -->
+			<view style="height: var(--status-bar-height);"></view>
+			<view style="height: 100rpx"></view>
+			<!-- #endif -->
+			<view class="my_info flex_a_c">
+				<view class="">
+					<u--image :showLoading="true" :src="myOaInfo.avatar||'../../static/img/public/avatar.png'"
+						width="130.28rpx" height="130.28rpx" shape="circle"></u--image>
+				</view>
+				<view v-if="!$store.state.app.token" @click="login" class="mesg_box">
+					<view class="name">
+						<text class="nickname">立即登录</text>
+					</view>
+					<view class="duty">
+						登录后可查看更多
+					</view>
+				</view>
+				<view v-else class="mesg_box">
+					<view class="name">
+						<text class="nickname">姓名:{{ myOaInfo.nickname }}</text>
+						<text>（{{ myOaInfo.admin_id?'超级管理员':'普通用户'}}）</text>
+					</view>
+					<view class="duty">
+						<!-- ({{ myOaInfo.did_name }}){{myOaInfo.label_name}} -->
+						电话:{{myOaInfo.account}}<br />
+						公司:<text v-if="myOaInfo.company">{{ myOaInfo.company.company_name }}</text><br />
+						公司类型:<text v-if="myOaInfo.company">{{ myOaInfo.company.company_type_name }}</text><br />
+					</view>
+				</view>
+			</view>
 
-      <!-- 占位 -->
-      <view style="height: 130rpx;"></view>
-      <!-- 任务状态 -->
-      <!-- <view class="task_panel">
+			<!-- 占位 -->
+			<view style="height: 130rpx;"></view>
+			<!-- 任务状态 -->
+			<!-- <view class="task_panel">
         <block v-for="(item,index) in assessData" :key="index">
           <view class="task_item">
             <view class="plan">{{ item.num }}</view>
@@ -46,54 +46,61 @@
         </block>
       </view> -->
 
-      <view class="backlog" :class="!ApproveList.length>0?'backlog_no_data':''">
-        <view class="head_title flex_a_c_j_sb">
-          <view class="title">公告列表</view>
-          <view class="flex_a_c" @click="navTo('/subpkg/noticeList/noticeList')">更多 <view class="iconfont icon-you">
-              <uni-icons type="forward"></uni-icons>
-            </view>
-          </view>
-        </view>
-        <block v-if="ApproveList.length>0">
-          <view class="backlog_item flex_a_c_j_sb" v-for="(item,index) in ApproveList.slice(0,2)" :key="index"
-            @click="clickNotice(item.id)">
-            <view class="text">{{ item.title }}</view>
-            <i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
-          </view>
-        </block>
-        <view v-else class="backlog_no flex_a_c_j_sb">
-          <view class="text">暂无更多消息</view>
-          <i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
-        </view>
-      </view>
-    </view>
+			<view class="backlog" :class="!ApproveList.length>0?'backlog_no_data':''">
+				<view class="head_title flex_a_c_j_sb">
+					<view class="title">公告列表</view>
+					<view class="flex_a_c" @click="navTo('/subpkg/noticeList/noticeList')">更多 <view
+							class="iconfont icon-you">
+							<uni-icons type="forward"></uni-icons>
+						</view>
+					</view>
+				</view>
+				<block v-if="ApproveList.length>0">
+					<view class="backlog_item flex_a_c_j_sb" v-for="(item,index) in ApproveList.slice(0,2)" :key="index"
+						@click="clickNotice(item.id)">
+						<view class="text">{{ item.title }}</view>
+						<i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
+					</view>
+				</block>
+				<view v-else class="backlog_no flex_a_c_j_sb">
+					<view class="text">暂无更多消息</view>
+					<i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
+				</view>
+			</view>
+		</view>
 
-    <view class="fast_track">
-      <block v-for="(item,index) in oaHomeData" :key="index">
-        <view class="track_item" @click="navTwo(item.url,index)">
-          <u--image :showLoading="true" :src="item.icon" width="77.19rpx" height="77.19rpx"></u--image>
-          <view class="title">{{ item.text }}</view>
-        </view>
-      </block>
-    </view>
+		<view class="fast_track">
+			<block v-for="(item,index) in oaHomeData" :key="index">
+				<view class="track_item" @click="navTwo(item.url,index)">
+					<u--image :showLoading="true" :src="item.icon" width="77.19rpx" height="77.19rpx"></u--image>
+					<view class="title">{{ item.text }}</view>
+				</view>
+			</block>
+		</view>
 
-    <view class="my_task">
-      <view class="task_title flex_a_c_j_sb">
-        <view class="title">配送信息</view>
-        <view class="flex_a_c" @click="navTo('')">更多 <view class="iconfont icon-you">
-            <uni-icons type="forward"></uni-icons>
-          </view>
-        </view>
-      </view>
+		<view class="my_task">
+			<view class="task_title flex_a_c_j_sb">
+				<view class="title">配送信息</view>
+				<view class="flex_a_c" @click='goOrderList'>更多 <view class="iconfont icon-you">
+						<uni-icons type="forward"></uni-icons>
+					</view>
+				</view>
+			</view>
 
-      <block v-if="myTaskList.length>0">
-        <taskCard></taskCard>
-      </block>
-      <view v-else class="no_task">
-        <view class="title">暂无配送信息</view>
-        <view class="tips" v-if="!$store.state.app.token">登录后查看配送信息详情</view>
-      </view>
-      <!-- <view class="head_title flex_a_c_j_sb">
+			<!-- <block v-if="myTaskList.length>0">
+   		<taskCard></taskCard>
+   	</block> -->
+			<view v-if="orderList.length>0">
+				<logistiBriefCard v-for="(item,index) in orderList" :key="index" :goodsInfo='item'>
+				</logistiBriefCard>
+
+			</view>
+
+			<view v-else class="no_task">
+				<view class="title">暂无配送信息</view>
+				<view class="tips" v-if="!$store.state.app.token">登录后查看配送信息详情</view>
+			</view>
+			<!-- <view class="head_title flex_a_c_j_sb">
         <view class="">我的任务</view>
         <view class="flex_a_c" @click="test">更多 <view class="iconfont icon-you"></view>
         </view>
@@ -117,526 +124,561 @@
           </view>
         </view>
       </block> -->
-    </view>
+		</view>
 
-    <view class="no_login" @click="login" v-if="!$store.state.app.token">
-      <view class="view">
-        <view class="text">登录里海OA,开启线上便捷办公</view>
-        <button class="btn">立即登录</button>
-      </view>
-    </view>
-    <!-- <tabbar></tabbar> -->
-  </view>
+		<view class="no_login" @click="login" v-if="!$store.state.app.token">
+			<view class="view">
+				<view class="text">登录里海OA,开启线上便捷办公</view>
+				<button class="btn">立即登录</button>
+			</view>
+		</view>
+		<!-- <tabbar></tabbar> -->
+	</view>
 </template>
 
 <script>
-  import { Toast } from '@/libs/uniApi.js'
-  import { oaHomeData } from '@/static/server/server.js'
-  import { noticeList } from "@/api/notice.js"
-  // import tabbar from '../components/tabbar'
-  import { getIndexListAPI, getTaskListAPI, getMyTaskListAPI, getApproveListAPI, getUserIndexAPI } from '@/api/oaApi.js'
-  export default {
-    components: {
-      // tabbar
-    },
-    data() {
-      return {
-        oaHomeData: [],
-        src: 'https://cdn.uviewui.com/uview/album/1.jpg',
-        assessData: [{
-            num: '0',
-            name: '任务'
-          },
-          {
-            num: '0',
-            name: '已完成'
-          },
-          {
-            num: '0',
-            name: '未完成'
-          },
-          {
-            num: '0%',
-            name: '完成率'
-          },
-        ],
-        project: {},
-        task: {},
-        page: 1,
-        myTaskList: [],
-        flowState: '#47B347', // 任务状态
-        priority: '', // 任务紧急度
-        myOaInfo: {
-          avatar: '',
-          nickname: '',
-          mobile: '',
-          did_name: '',
-          label_name: '',
-        },
-        ApproveList: []
-      }
-    },
-    onReady() {
-      uni.setNavigationBarColor({
-        frontColor: '#ffffff',
-        backgroundColor: '#3175f9'
-      })
-    },
-    onLoad() {},
-    onShow() {
-      // this.getUserIndex()
-      // this.getIndexList()
-      this.getApproveList()
-      this.initUserInfo()
-      this.showToask()
-      this.initOaHomeDada()
-    },
-    computed: {},
-    methods: {
-      // test() {
-      //   wx.chooseMessageFile({
-      //     count: 1, //限制选择的文件数量
-      //     type: 'all', //非图片和视频的文件,不选默认为all
-      //     //type:'video',//视频
-      //     //type:'image',//图片
-      //     success(res) {
-      //       const tempFilePaths = res.tempFiles
-      //       console.log(res);
-      //     }
-      //   })
-      // },
-      initUserInfo() {
-        this.$store.state.app.userInfo ? this.myOaInfo = this.$store.state.app.userInfo : this.myOaInfo.avatar = '';
-      },
-      initOaHomeDada() {
-        if (this.$store.state.app.userInfo.admin_id == 0) { // 如果用户不是管理员
-          let arr = oaHomeData.filter(item => !item.admin); //过滤掉管理员专属页面
-          this.oaHomeData = arr;
-        } else {
-          // this.oaHomeData = oaHomeData;
-          let arr = oaHomeData.filter(item=>!item.captain);//过滤掉普通用户专属页面
-          this.oaHomeData = arr;
-        }
-        // 判断是否需要显示更多按钮
-        if(this.oaHomeData>=8){
-          this.oaHomeData[7] = this.oaHomeData[this.oaHomeData.length-1];
-        }else {
-          this.oaHomeData.splice(this.oaHomeData.length-1,1)
-        }
-      },
-      async getApproveList() {
-        const res = await noticeList({
-          keyword: '',
-          page_no: 1,
-          page_size: 2
-        })
-        this.ApproveList = res.data.lists
-      },
-      async getIndexList() {
-        const { project, task } = await getIndexListAPI()
-        console.log(task, '222');
-        this.assessData[0].num = project.count
-        this.assessData[1].num = project.count_ok
-        this.assessData[2].num = project.count_no
-        this.assessData[3].num = project.count_lv + '%'
-        this.assessData[4].num = task.count
-        this.assessData[5].num = task.count_ok
-        this.assessData[6].num = task.count_no
-        this.assessData[7].num = task.count_lv + '%'
-        this.myTaskList = task.list
-      },
-      async getMyTask() {
-        let data = {
-          page: this.page,
-          limit: 10
-        }
-        const res = getMyTaskListAPI(data)
-      },
-      naviTaskDetails(id) {
-        uni.navigateTo({
-          url: `/pages/views/task_details?id=${id}`
-        })
-      },
-      navTo(url) {
-        url ?
-          uni.navigateTo({
-            url: url,
-            fail() {
-              uni.switchTab({
-                url: url
-              })
-            }
-          }) : Toast('暂未开放')
-      },
-      navTwo(url, key) {
-        let role_id = this.$store.state.app?.userInfo?.admin?.role_id || null;
-        var arr = [3, 6];
+	import {
+		getList
+	} from "@/api/logistics.js"
+	import {
+		Toast
+	} from '@/libs/uniApi.js'
+	import {
+		oaHomeData
+	} from '@/static/server/server.js'
+	import {
+		noticeList
+	} from "@/api/notice.js"
+	// import tabbar from '../components/tabbar'
+	import {
+		getIndexListAPI,
+		getTaskListAPI,
+		getMyTaskListAPI,
+		getApproveListAPI,
+		getUserIndexAPI
+	} from '@/api/oaApi.js'
+	export default {
+		components: {
+			// tabbar
+		},
+		data() {
+			return {
+				orderList: [],
+				oaHomeData: [],
+				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
+				assessData: [{
+						num: '0',
+						name: '任务'
+					},
+					{
+						num: '0',
+						name: '已完成'
+					},
+					{
+						num: '0',
+						name: '未完成'
+					},
+					{
+						num: '0%',
+						name: '完成率'
+					},
+				],
+				project: {},
+				task: {},
+				page: 1,
+				myTaskList: [],
+				flowState: '#47B347', // 任务状态
+				priority: '', // 任务紧急度
+				myOaInfo: {
+					avatar: '',
+					nickname: '',
+					mobile: '',
+					did_name: '',
+					label_name: '',
+				},
+				ApproveList: []
+			}
+		},
+		onReady() {
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: '#3175f9'
+			})
+		},
+		onLoad() {},
+		onShow() {
+			// this.getUserIndex()
+			// this.getIndexList()
+			this.getApproveList()
+			this.initUserInfo()
+			this.showToask()
+			this.initOaHomeDada()
+		},
+		computed: {},
+		methods: {
+			// test() {
+			//   wx.chooseMessageFile({
+			//     count: 1, //限制选择的文件数量
+			//     type: 'all', //非图片和视频的文件,不选默认为all
+			//     //type:'video',//视频
+			//     //type:'image',//图片
+			//     success(res) {
+			//       const tempFilePaths = res.tempFiles
+			//       console.log(res);
+			//     }
+			//   })
+			// },
+			async getOrderList() {
+				let id = JSON.parse(uni.getStorageSync('USER_INFO')).id
+				console.log(id)
+				let res = await getList({
+					courier_id: id
+					// courier_id: 167
+				})
+				this.orderList = res.data.data
 
-        if (role_id && role_id[0] == 9) {
-          if (arr.indexOf(key) == -1) {
-            Toast('请先成立公司后开放')
-            return false
-          }
-        }
-        this.navTo(url);
-      },
-      // 点击公告
-      clickNotice(e) {
-        uni.navigateTo({
-          url: `/pages/oaNews/oaNews?id=${e}`
-        })
-      },
-      // 判断当前是否登录,显示任务及完成率
-      showToask() {
-        if (!this.$store.state.app.token) {
-          this.assessData = this.assessData.map(item => {
-            item.num = '*';
-            return item;
-          })
-        } else {
-          // 新增接口后要替换为接口
-          this.assessData = this.assessData.map(item => {
-            item.num = '0';
-            return item;
-          })
-        }
-      },
-      login() {
-        uni.navigateTo({
-          url: '/pages/oaLogin/oaLogin'
-        })
-      },
-      async getUserIndex() {
-        const res = await getUserIndexAPI()
-        this.myOaInfo = res
-      }
-    },
-    onPullDownRefresh() {
-      // this.getIndexList()
-      uni.stopPullDownRefresh()
-    }
-  }
+			},
+			goOrderList() {
+				uni.navigateTo({
+					url: "/pages/logistics/index"
+				})
+			},
+			initUserInfo() {
+				this.$store.state.app.userInfo ? this.myOaInfo = this.$store.state.app.userInfo : this.myOaInfo.avatar =
+					'';
+			},
+			initOaHomeDada() {
+				if (this.$store.state.app.userInfo.admin_id == 0) { // 如果用户不是管理员
+					let arr = oaHomeData.filter(item => !item.admin); //过滤掉管理员专属页面
+					this.oaHomeData = arr;
+				} else {
+					// this.oaHomeData = oaHomeData;
+					let arr = oaHomeData.filter(item => !item.captain); //过滤掉普通用户专属页面
+					this.oaHomeData = arr;
+				}
+				// 判断是否需要显示更多按钮
+				if (this.oaHomeData >= 8) {
+					this.oaHomeData[7] = this.oaHomeData[this.oaHomeData.length - 1];
+				} else {
+					this.oaHomeData.splice(this.oaHomeData.length - 1, 1)
+				}
+			},
+			async getApproveList() {
+				const res = await noticeList({
+					keyword: '',
+					page_no: 1,
+					page_size: 2
+				})
+				this.ApproveList = res.data.lists
+			},
+			async getIndexList() {
+				const {
+					project,
+					task
+				} = await getIndexListAPI()
+				console.log(task, '222');
+				this.assessData[0].num = project.count
+				this.assessData[1].num = project.count_ok
+				this.assessData[2].num = project.count_no
+				this.assessData[3].num = project.count_lv + '%'
+				this.assessData[4].num = task.count
+				this.assessData[5].num = task.count_ok
+				this.assessData[6].num = task.count_no
+				this.assessData[7].num = task.count_lv + '%'
+				this.myTaskList = task.list
+			},
+			async getMyTask() {
+				let data = {
+					page: this.page,
+					limit: 10
+				}
+				const res = getMyTaskListAPI(data)
+			},
+			naviTaskDetails(id) {
+				uni.navigateTo({
+					url: `/pages/views/task_details?id=${id}`
+				})
+			},
+			navTo(url) {
+				url ?
+					uni.navigateTo({
+						url: url,
+						fail() {
+							uni.switchTab({
+								url: url
+							})
+						}
+					}) : Toast('暂未开放')
+			},
+			navTwo(url, key) {
+				let role_id = this.$store.state.app?.userInfo?.admin?.role_id || null;
+				var arr = [3, 6];
+
+				if (role_id && role_id[0] == 9) {
+					if (arr.indexOf(key) == -1) {
+						Toast('请先成立公司后开放')
+						return false
+					}
+				}
+				this.navTo(url);
+			},
+			// 点击公告
+			clickNotice(e) {
+				uni.navigateTo({
+					url: `/pages/oaNews/oaNews?id=${e}`
+				})
+			},
+			// 判断当前是否登录,显示任务及完成率
+			showToask() {
+				if (!this.$store.state.app.token) {
+					this.assessData = this.assessData.map(item => {
+						item.num = '*';
+						return item;
+					})
+				} else {
+					// 新增接口后要替换为接口
+					this.assessData = this.assessData.map(item => {
+						item.num = '0';
+						return item;
+					})
+				}
+			},
+			login() {
+				uni.navigateTo({
+					url: '/pages/oaLogin/oaLogin'
+				})
+			},
+			async getUserIndex() {
+				const res = await getUserIndexAPI()
+				this.myOaInfo = res
+			}
+		},
+		onPullDownRefresh() {
+			// this.getIndexList()
+			uni.stopPullDownRefresh()
+		}
+	}
 </script>
 
 <style lang="scss">
-  .oa_home {
-    padding-bottom: 120rpx;
-  }
+	.oa_home {
+		padding-bottom: 120rpx;
+	}
 
-  .header_bg {
-    position: absolute;
-    width: 100%;
-    // z-index: -1;
-  }
+	.header_bg {
+		position: absolute;
+		width: 100%;
+		// z-index: -1;
+	}
 
-  .home_header {
-    position: relative;
-    padding: 28rpx;
-    // height: 607.02rpx;
-    // height: 480.02rpx;
-    width: 100%;
-    // background-color: $theme-oa-color;
-    margin-bottom: 133.33rpx;
-    background-image: url('../../static/img/home/home_bg.png');
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
+	.home_header {
+		position: relative;
+		padding: 28rpx;
+		// height: 607.02rpx;
+		// height: 480.02rpx;
+		width: 100%;
+		// background-color: $theme-oa-color;
+		margin-bottom: 133.33rpx;
+		background-image: url('../../static/img/home/home_bg.png');
+		background-repeat: no-repeat;
+		background-size: 100% 100%;
 
-    .my_info {
-      .mesg_box {
-        color: #fff;
-        margin-left: 31.58rpx;
+		.my_info {
+			.mesg_box {
+				color: #fff;
+				margin-left: 31.58rpx;
 
-        .nickname {
-          font-size: 32rpx;
-          font-weight: 500;
-          margin-right: 30rpx;
-        }
+				.nickname {
+					font-size: 32rpx;
+					font-weight: 500;
+					margin-right: 30rpx;
+				}
 
-        .duty {
-          margin-top: 10.53rpx;
-        }
-      }
-    }
+				.duty {
+					margin-top: 10.53rpx;
+				}
+			}
+		}
 
-    .task_panel {
-      color: #fff;
-      display: flex;
-      justify-content: space-between;
-      flex-wrap: wrap;
-      align-content: space-between;
-      text-align: center;
-      padding-bottom: 110rpx;
+		.task_panel {
+			color: #fff;
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			align-content: space-between;
+			text-align: center;
+			padding-bottom: 110rpx;
 
-      .task_item {
-        margin-top: 42.11rpx;
+			.task_item {
+				margin-top: 42.11rpx;
 
-        .plan {
-          width: 173.68rpx;
-          font-size: 38.6rpx;
-          margin-bottom: 21.05rpx;
-        }
-      }
-    }
+				.plan {
+					width: 173.68rpx;
+					font-size: 38.6rpx;
+					margin-bottom: 21.05rpx;
+				}
+			}
+		}
 
-    .backlog {
-      position: absolute;
-      left: 50%;
-      bottom: -101.75rpx;
-      transform: translate(-50%);
-      width: 694.74rpx;
-      background: #FFFFFF;
-      border-radius: 12px;
-      padding: 28.07rpx;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      font-size: 25rpx;
-      font-weight: 400;
+		.backlog {
+			position: absolute;
+			left: 50%;
+			bottom: -101.75rpx;
+			transform: translate(-50%);
+			width: 694.74rpx;
+			background: #FFFFFF;
+			border-radius: 12px;
+			padding: 28.07rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			font-size: 25rpx;
+			font-weight: 400;
 
-      .title {
-        font-size: 32rpx;
-        font-weight: 500;
-      }
+			.title {
+				font-size: 32rpx;
+				font-weight: 500;
+			}
 
-      &_item {
-        margin-top: 19.3rpx;
-        color: #666666;
+			&_item {
+				margin-top: 19.3rpx;
+				color: #666666;
 
-        .text {
-          font-size: 28.04rpx;
-          white-space: nowrap;
-          /* 禁止换行 */
-          overflow: hidden;
-          /* 溢出隐藏 */
-          text-overflow: ellipsis;
-          /* 使用省略号代表被截断的文本 */
-          width: 580rpx;
-          /* 设置元素宽度，根据需要进行调整 */
+				.text {
+					font-size: 28.04rpx;
+					white-space: nowrap;
+					/* 禁止换行 */
+					overflow: hidden;
+					/* 溢出隐藏 */
+					text-overflow: ellipsis;
+					/* 使用省略号代表被截断的文本 */
+					width: 580rpx;
+					/* 设置元素宽度，根据需要进行调整 */
 
-          &::before {
-            content: '公告';
-            display: inline-block;
-            color: #FF8C1A;
-            padding: 2px 8px;
-            border-radius: 4px;
-            border: 1px solid #FF8C1A;
-            margin-right: 14.04rpx;
-          }
-        }
-      }
+					&::before {
+						content: '公告';
+						display: inline-block;
+						color: #FF8C1A;
+						padding: 2px 8px;
+						border-radius: 4px;
+						border: 1px solid #FF8C1A;
+						margin-right: 14.04rpx;
+					}
+				}
+			}
 
-      &_no {
-        margin-top: 19.3rpx;
-        color: #666666;
+			&_no {
+				margin-top: 19.3rpx;
+				color: #666666;
 
-        .text {
-          font-size: 28.04rpx;
-          white-space: nowrap;
-          /* 禁止换行 */
-          overflow: hidden;
-          /* 溢出隐藏 */
-          text-overflow: ellipsis;
-          /* 使用省略号代表被截断的文本 */
-          width: 580rpx;
-          /* 设置元素宽度，根据需要进行调整 */
+				.text {
+					font-size: 28.04rpx;
+					white-space: nowrap;
+					/* 禁止换行 */
+					overflow: hidden;
+					/* 溢出隐藏 */
+					text-overflow: ellipsis;
+					/* 使用省略号代表被截断的文本 */
+					width: 580rpx;
+					/* 设置元素宽度，根据需要进行调整 */
 
-          &::before {
-            content: none;
-          }
-        }
-      }
-    }
+					&::before {
+						content: none;
+					}
+				}
+			}
+		}
 
-    .backlog_no_data {
-      bottom: -70rpx;
-    }
-  }
+		.backlog_no_data {
+			bottom: -70rpx;
+		}
+	}
 
-  .home_header_no_data {
-    margin-bottom: 93.33rpx;
-  }
+	.home_header_no_data {
+		margin-bottom: 93.33rpx;
+	}
 
-  .fast_track {
-    width: 694rpx;
-    // height: 331rpx;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: left;
-    align-content: space-between;
-    margin: 0 auto;
-    padding: 15rpx 38.6rpx;
-    background-color: #fff;
-    border-radius: 12px;
+	.fast_track {
+		width: 694rpx;
+		// height: 331rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: left;
+		align-content: space-between;
+		margin: 0 auto;
+		padding: 15rpx 38.6rpx;
+		background-color: #fff;
+		border-radius: 12px;
 
-    .track_item {
-      width: 154.39rpx;
-      font-size: 24.56rpx;
-      margin: 25rpx 0;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
+		.track_item {
+			width: 154.39rpx;
+			font-size: 24.56rpx;
+			margin: 25rpx 0;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
 
-      .title {
-        margin-top: 14.04rpx;
-      }
-    }
-  }
+			.title {
+				margin-top: 14.04rpx;
+			}
+		}
+	}
 
-  .my_task {
-    width: 694.74rpx;
-    margin: 0 auto;
-    // margin-top: 31.58rpx;
-    // background-color: #fff;
-    border-radius: 12px;
-    // padding: 28.07rpx;
+	.my_task {
+		width: 694.74rpx;
+		margin: 0 auto;
+		// margin-top: 31.58rpx;
+		// background-color: #fff;
+		border-radius: 12px;
+		// padding: 28.07rpx;
 
-    .no_task {
-      width: 694rpx;
-      height: 140rpx;
-      padding: 28rpx;
-      background: #FFFFFF;
-      border-radius: 21rpx 21rpx 21rpx 21rpx;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-evenly;
+		.no_task {
+			width: 694rpx;
+			height: 140rpx;
+			padding: 28rpx;
+			background: #FFFFFF;
+			border-radius: 21rpx 21rpx 21rpx 21rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-evenly;
 
-      .title {
-        font-size: 28rpx;
-        font-weight: 500;
-        color: #000000CC;
-        line-height: 35rpx;
-      }
+			.title {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #000000CC;
+				line-height: 35rpx;
+			}
 
-      .tips {
-        font-size: 25rpx;
-        font-weight: 400;
-        color: #333333FF;
-        line-height: 35rpx;
-      }
-    }
+			.tips {
+				font-size: 25rpx;
+				font-weight: 400;
+				color: #333333FF;
+				line-height: 35rpx;
+			}
+		}
 
 
-    .task_title {
-      font-size: 25rpx;
-      font-weight: 400;
-      padding: 28rpx;
+		.task_title {
+			font-size: 25rpx;
+			font-weight: 400;
+			padding: 28rpx;
 
-      .title {
-        font-size: 32rpx;
-        font-weight: 500;
-      }
-    }
+			.title {
+				font-size: 32rpx;
+				font-weight: 500;
+			}
+		}
 
 
 
-    .task_list {
-      height: 196.49rpx;
-      border-bottom: 1px solid #CCCCCC;
-      padding: 21.05rpx 0;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
+		.task_list {
+			height: 196.49rpx;
+			border-bottom: 1px solid #CCCCCC;
+			padding: 21.05rpx 0;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
 
-      .title {
-        .tag {
-          color: #F24848;
-          font-size: 24.56rpx;
-          padding: 0 7.02rpx;
-          margin-right: 14.04rpx;
-          background: #FFE4E4;
-          border-radius: 4px;
-        }
+			.title {
+				.tag {
+					color: #F24848;
+					font-size: 24.56rpx;
+					padding: 0 7.02rpx;
+					margin-right: 14.04rpx;
+					background: #FFE4E4;
+					border-radius: 4px;
+				}
 
-        .tag1 {
-          color: #3274F9;
-          font-size: 24.56rpx;
-          padding: 0 7.02rpx;
-          margin-right: 14.04rpx;
-          background: #E4EDFF;
-          border-radius: 4px;
-        }
+				.tag1 {
+					color: #3274F9;
+					font-size: 24.56rpx;
+					padding: 0 7.02rpx;
+					margin-right: 14.04rpx;
+					background: #E4EDFF;
+					border-radius: 4px;
+				}
 
-        .text {
-          font-size: 28.07rpx;
-          width: 403.51rpx;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
+				.text {
+					font-size: 28.07rpx;
+					width: 403.51rpx;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
 
-        .if_take {
-          font-size: 28.07rpx;
-          text-align: center;
-          line-height: 49.12rpx;
-          width: 115.79rpx;
-          height: 49.12rpx;
-          border-radius: 100px;
-        }
+				.if_take {
+					font-size: 28.07rpx;
+					text-align: center;
+					line-height: 49.12rpx;
+					width: 115.79rpx;
+					height: 49.12rpx;
+					border-radius: 100px;
+				}
 
-        .take1 {
-          color: #47B347;
-          background: #DFFCDF;
-        }
+				.take1 {
+					color: #47B347;
+					background: #DFFCDF;
+				}
 
-        .take2 {
-          color: #3274F9;
-          background: #E4EDFF;
-        }
+				.take2 {
+					color: #3274F9;
+					background: #E4EDFF;
+				}
 
-        .take3 {
-          color: #999999;
-          background: #F5F5F5;
-        }
-      }
+				.take3 {
+					color: #999999;
+					background: #F5F5F5;
+				}
+			}
 
-      .describe {
-        font-size: 24.56rpx;
-      }
+			.describe {
+				font-size: 24.56rpx;
+			}
 
-      .task_deta {
-        color: #999;
-        font-size: 24.56rpx;
-      }
-    }
-  }
+			.task_deta {
+				color: #999;
+				font-size: 24.56rpx;
+			}
+		}
+	}
 
-  .no_login {
-    position: fixed;
-    left: 0;
-    bottom: 0;
-    width: 100vw;
-    height: 112rpx;
-    /* #ifdef H5 */
-    height: 212rpx;
-    /* #endif */
-    background: rgba(#333333, 0.4);
-    border-radius: 14rpx 14rpx 0rpx 0rpx;
-    padding: 28rpx 28rpx;
+	.no_login {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100vw;
+		height: 112rpx;
+		/* #ifdef H5 */
+		height: 212rpx;
+		/* #endif */
+		background: rgba(#333333, 0.4);
+		border-radius: 14rpx 14rpx 0rpx 0rpx;
+		padding: 28rpx 28rpx;
 
-    .view {
-      width: 100%;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
+		.view {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
 
-      .text {
-        font-size: 28rpx;
-        font-weight: 500;
-        color: #FFFFFF;
-      }
+			.text {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
 
-      .btn {
-        width: 158rpx;
-        height: 60rpx;
-        background: #3274F9;
-        border-radius: 30rpx 30rpx 30rpx 30rpx;
-        font-size: 28rpx;
-        font-weight: 500;
-        color: #FFFFFF;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
-    }
-  }
+			.btn {
+				width: 158rpx;
+				height: 60rpx;
+				background: #3274F9;
+				border-radius: 30rpx 30rpx 30rpx 30rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/static/img/logistics/more.png b/static/img/logistics/more.png
new file mode 100644
index 0000000000000000000000000000000000000000..d704897ed27280a2d63f710c187ded0494f4dcb4
GIT binary patch
literal 2390
zcmeHJYdBl!7EU!Kp(=4}rSnW9A~>aJ>2ZlvauV68Mk_6&3|f+^P(^W!8a1hVsZCQY
zN{41#Lg+l0)}<GvCQ~hQ61PY(F0H0TFJr>E)cMTc^ZWdpANyPDUC&zUTkp5u{d_z7
zm={x58>fvxAaq#}odc|N^Fe8XRpQrB4$PJd93~CX(D#K3fk0zebn1!3p!qUt>=cAy
znBPZTFjyLoT}F*rm@Kh+nE2H7WzzH&r<?HBGhAy^p6_*$cw^)zj%D!B^o{R3<DYKT
z!0aL(>(T^<l!~w4fqH40inrE7;ZYF?4T=UaD}T2S0g0h=e{EKorQ#`3C$cf_m;$Q2
zDjy+OzVB^LLs03O>{5ybYHHf!I%*3NYvOQj1%>~+@P7~IySZ)Oq@;|uG>yJrdQUhI
z5Ln8VuaUpZZ>(#-i`prCfCuon&tOBtyNS{luZ_G3^*PzqiOI>yHSbp5t3S*qtTMCb
znv7>uD%GoG%7&tNR+-Sg?lbj0sX?LG5m8cQG+hy=R%pwjBoqo|ba7dYXUo2kvGbH+
z;jMdiWZsDDr)(5A8O^k{v|Y}1$nGdl;!G<K2!9%U#(~QvgTHa`>?by@H*juYwr|s|
zT&WA^B+#{Jlc;_>bH~Hue4d3gO=1+T-)RuaH*6n#b{Nw;l;iL*V2YK;x#zDyO}+Fl
zAZZ?@9lz5p@jWPL{!m)==etkitFzU!*e@Al$1*--32|edmV$G>g62ir##o8vkHlKx
zges>DH=o-#`+L4zwP;M3^XE4i%xGVAKnK%AJx*Pb+f3O#nXYljTKlrVApuO1YmJ?b
zU%gZ_XYr@MclU!HOd0_RQih#s?fYupXN3Teu@kX`qd1R>rvUgIyj_$LoEyO_0L8a&
zo5VC?7nsFp*{e!*E4mijnbT*L;|1^gM|wXS%DW$Hcu{Zvr_YySZa=w(`}h>TuVwPY
zms0}cR5P$AT(|&onnNH9Xkm#Y>LJGh?`k-W|J*_oE$d2pu^C*8h4F6Bhc}!5n7fN8
zMJ+jsfLs3sa5sLCr49H6ZP)L%yX-7a8?f7cCgWec&vh)z-T}}i&C8PQCfL<l1zqbk
zkGo_wmgqCF!*(Sgr6St;4^&7+yz@auiPOG2_e7##!|bQT88S-W-IiK{{F=?+r~SIS
zh5@_RL_h`{v*@gUKf@CBmFZx=EQd!Gay&$Te4z^Pjfo~o$##wXg-(Eq$<HhSQBXzz
zF1?FDeXX_I8Mx^lkl;CjLflNyqzkNd6vcp-c8`bPIXTU0lP=j%pX>IRxk*M*1Hs$0
zWNZUYXeU*8Yg5Jb?~?8*B7>Gz*H>NaCmxB_dcxO9^O6}L>&a-Rju~mnTuGA`T>2=v
zSIvzaE!bFp-5dDm>d(^=Gu3`;aVK?TOY^R;4oRJd`MAV8li#+FeU>_+Ge>xPq4pNB
zSiD{~_E0OlP+D{`7#$US>#&l~vy#3T;zwJ-q>t9cpVW)56gi_HnDsGJ7rN$tG`Hgl
zfEH3I5G-0)5fBCC+4lR(eE069Rz*n`>aj9zrF+l78`lVIfTSLoZP(mSjXl3VGW(y7
zNqv6ZzI%65_1B^d!(*Gop$`!8UZvmWaLphcx2Zbir2|B^EXHQiW}+V1+VHmbD}QA_
zHN=f8CsO$xW&N`g)pC{1P;?RbXc3U#q$kM-cLT-+wkfn}CClcfj#W*)K^Pf#<t{5v
zRo}ogHbsT+rzCPhZ+TB(8E9Hb@*exzNrO95q^k0_vIa51@yX2Dx+|XWzQPlY<q;d|
z5b;CLi<$f!3PYzd@jQ)x<fK}jUx1-cj;9UWeE7zO`3%L01@bL2Kkw@61s8%>cGo7M
z|38HSAxsiwgtaOoMB9F`XG6NH1ie~#C$ZYW)R9)y)@V$1dC7U;l9>`!__odP(C}Tp
z0Pog4v}i@HJsl{E$!Ee_%4>sKs;gMySqsNV4O1zq(fqIOQ$nVh6xmiA^y0jnIQTn^
zGsqxEqXfG~emG*l>9Wf*(PLoD<_sG@`S`S48s>&|2s^txS9o21M>=My7>ib9_*6%s
zEswEY32nz$%(}w}LAI<ro*~N6QJ%#LatXLYrzXLaJ<J)32KD8ehsOH~NFoo><e0Or
zfPRL29MCP8Js9VLWFcI50H8I2a&`V#i7Wu0oZqQjA{6q*9*hc+iTYgU$KL@(Ta#V%
zxjkF_K=fve9Z~9X>L?gClrc@98sj{IK@%O_%gB>^mP;KJ*B8Gk9`aPC@Q7JuCPp-H
zKb{?F=3AuV6V9AKVcjtmr{&@@gkYrD+mw!=re(0}5;RaDVIJuia6jS>N=DK6zYG5l
bhqI=$RcBp&B_FB*KS~G|!;9WPJ0<upNQeuU

literal 0
HcmV?d00001

diff --git a/utils/logistics.js b/utils/logistics.js
new file mode 100644
index 0000000..637af8f
--- /dev/null
+++ b/utils/logistics.js
@@ -0,0 +1,112 @@
+import {
+	HTTP_REQUEST_URL_THREE,
+	HEADER,
+	TOKENNAME,
+} from '@/config/app';
+import {
+	Toast
+} from '../libs/uniApi';
+// import { checkLogin } from '../libs/login';
+import store from '../store';
+
+function toLogin() {
+	uni.showToast({
+		title: '请先登录',
+		icon: 'none',
+		duration: 1000
+	});
+}
+
+function baseRequestTwo(url, method, data, {
+	noAuth = false,
+	noVerify = false
+}) {
+	let Url = "http://logistics.lihaink.cn",
+		header = HEADER;
+	if (!noAuth) {
+		// 已经未登录了,禁止请求
+		if (!store.state.config.request) return Promise.reject({
+			msg: '未登录'
+		});
+		//登录过期自动登录 
+		if (!store.state.app.token) {
+			toLogin();
+			store.commit("SET_REQUEST", false);
+			return Promise.reject({
+				msg: '未登录'
+			});
+		}
+	}
+
+	// if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token;
+	if (store.state.app.token) header[TOKENNAME] = store.state.app.token;
+	// header[TOKENNAME] = 'Bearer sdjflidshjgfkbdasgjmasbgvhauuiavhkesvndkaesbvkjsdbv';
+	return new Promise((reslove, reject) => {
+		// uni.showLoading({
+		//   title: '加载中'
+		// })
+		uni.request({
+			// url: Url + '/api/v1' + url,
+			url: Url + '/api' + url,
+			method: method || 'GET',
+			header: header,
+			data: method != 'GET' ? data || {} : {},
+			params: method == 'GET' ? data : {},
+			success: (res) => {
+				// uni.hideLoading()
+				if (noVerify)
+					// reslove(res.data, res);
+					reslove(res.data);
+				else if (res.data.code == -1) {
+					store.commit("LOGOUT");
+					store.commit("SET_REQUEST", false);
+					reject(res.data);
+				} else if (res.data.code == 0) {
+					// uni.hideLoading();
+					uni.showToast({
+						title: res.data.msg || '请检查网络',
+						icon: 'none'
+					})
+					reject(res.data);
+				} else if (res.data.code == 1) {
+					store.commit("SET_REQUEST");
+					reslove(res.data);
+				} else if (res.data.code == 200) {
+					store.commit("SET_REQUEST");
+					reslove(res.data.data);
+				} else if ([410000, 410001, 410002, 40000].indexOf(res.data.code) !== -1) {
+					toLogin();
+					reject(res.data);
+				} else if (res.data.code == 501) {
+					// uni.reLaunch({
+					//   url: '/pages/error/index'
+					// })
+					reject(res.data);
+				} else {
+					// uni.hideLoading();
+					uni.showToast({
+						title: res.data.msg || '请检查网络',
+						icon: 'none'
+					})
+					reject(res.data.msg || '请检查网络');
+				}
+			},
+			fail: (message) => {
+				// uni.hideLoading()
+				uni.showToast({
+					title: '网络错误',
+					icon: 'none'
+				})
+				reject('请求失败');
+			}
+		})
+	});
+}
+
+const oahttp = {};
+
+['options', 'get', 'post', 'put', 'head', 'delete', 'trace', 'connect'].forEach((method) => {
+	oahttp[method] = (api, data, opt) => baseRequestTwo(api, method, data, opt || {})
+});
+
+export default oahttp;
\ No newline at end of file