From ca7a5946afce7c8803f792b76891e991a829bffb Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Tue, 22 Aug 2023 17:36:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A9=BF=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                        |  9 ++++++
 pages/logistics/deliveryDetil.vue |  1 -
 pages/logistics/post.vue          | 48 +++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 pages/logistics/post.vue

diff --git a/pages.json b/pages.json
index 9e8874f..a7bc09e 100644
--- a/pages.json
+++ b/pages.json
@@ -118,6 +118,15 @@
 				"navigationBarTextStyle": "white"
 			}
 
+		}, {
+			"path": "pages/logistics/post",
+			"style": {
+				"navigationBarTitleText": "驿站",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
+
 		}, {
 			"path": "pages/updatePasswprd/updatePasswprd",
 			"style": {
diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue
index 7536adc..1ae824a 100644
--- a/pages/logistics/deliveryDetil.vue
+++ b/pages/logistics/deliveryDetil.vue
@@ -7,7 +7,6 @@
 			<view class="content">
 				<u-toast ref="uToast"></u-toast>
 				<view class="map">
-
 					<map :class="mapClass" id="map" @markertap='mapFun' :enable-zoom="true" :polyline="polyline"
 						:markers='markers' :scale="scale" style="width:100%;height: 70%;"
 						:latitude="markers[0].latitude" :enable-scroll="true" :longitude="markers[0].longitude">
diff --git a/pages/logistics/post.vue b/pages/logistics/post.vue
new file mode 100644
index 0000000..792ac79
--- /dev/null
+++ b/pages/logistics/post.vue
@@ -0,0 +1,48 @@
+<template>
+	<view class="content">
+		<u-search placeholder="搜索你的订单" @search="getOrderList" :show-action="false" bg-color="white"
+			v-model="keywords"></u-search>
+
+
+		<view class="cards">
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getList
+	} from "@/api/logistics.js"
+
+	export default {
+		data() {
+
+			return {}
+		}
+	}
+
+
+
+	methods: {
+		// getOrderList() {
+		// 	console.log("列表更新")
+		// 	let id = JSON.parse(uni.getStorageSync('USER_INFO')).id
+		// 	getList({
+		// 		status: 1,
+		// 		user_id: id,
+		// 		keywords: this.keywords,
+		// 		user_type: this.is_captain
+		// 	}).then(res => {
+		// 		this.orderlist = []
+		// 		this.orderlist = res.data.data
+		// 	})
+		// }
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		padding: 30rpx;
+	}
+</style>
\ No newline at end of file

From 5963b078f445c111eb67ad1ae5d29c3be0b08709 Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Wed, 23 Aug 2023 09:17:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/img/home/GDZZ.png | Bin 0 -> 778 bytes
 static/server/server.js  | 179 ++++++++++++++++++++-------------------
 2 files changed, 92 insertions(+), 87 deletions(-)
 create mode 100644 static/img/home/GDZZ.png

diff --git a/static/img/home/GDZZ.png b/static/img/home/GDZZ.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb8531a6690e67e6c452adc4f2e4541651d02358
GIT binary patch
literal 778
zcmV+l1NHogP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00004b3#c}2nYxW
zd<bNS0008PNkl<ZSV!%cKTH!*9LK-!u3%~Kyeid(f|e_b9i%L3jX@I=6P+|Vo4V;h
zqVeA#n+Y){gt)jkP#JVlgNc(aXhLdStZ`6GYRkYMQ?XE@R%!dZM<^+U`@?y6Q0$F;
zzu)hD?sLC;eeVdW>>^dhiyE-iPwYQ3+!l+=4b@?aQA*=T9_rLn%eY}vf$<*6aL8I<
zJ=HCUF>crb7(FFbfioE@{wWswDacW|m|ssplVVZ?bhw`5F1y`iro5&iFoVq%Xlm{k
zl9?=(@&yPc!DyCo@W_e+CWHpk;^awdIkY11<a8mL{fW@Gj7ckjCg#cjx2(wJq$7T>
z<8WzI5qN64m>ip;+wC-4i7cB&i-+WWJGnYNz%(&V4R|p(CEz3Q?%<Zhsu`{U8*yJV
zY{c4HayFr1e=GtH1A~15oV$`(iws?{H@hXAJl3QumIY}WmSPKQnHsR)w*{&3--?rJ
zjgJiNw-1=XBwu$T`Z$gAH<mvEaVwAh9zP;yJ!tECr+8Dg0y8y{Gad}w2`qyS?RCk&
zwIdXC;lYzMBG;AM$#&pM=vQyE3uZ-u*Mw!c>jGR3U1~@zv!yuOf#c8jp+jx~rEBQL
zcbvZXS#jKU;Ngcs966x8J%08wgHsnqHx6(m2~8XX3B1w0RM~F0>VRuKtkO)T{55aL
zmUwix9liG^@nQ6b=F4Q&OUKT1%}t=KyLheyvGRztxcRw%JAj#N9@l!u)(x1Qnw|Cd
zC^hpzO<-?R9r}9qVB%{YgHO|nrrCx^6dbC%x5_)#TGp6Z!9}pGkrs1voFqwP$(o{J
zHVK2ib#*ry8wlp}=AEFAcd74(<+<p50iTfLPL#tkCRJd~UN9Cgi!Wi(Sn6uPizg1F
z1vT<!QN$&r!cn93H`muoqZX{ps~NV^?&_<A)ieHM{i<t;zg+%aJZG%x9smFU07*qo
IM6N<$g3mi?0RR91

literal 0
HcmV?d00001

diff --git a/static/server/server.js b/static/server/server.js
index 4828e02..ab8195c 100644
--- a/static/server/server.js
+++ b/static/server/server.js
@@ -187,93 +187,98 @@ export const quickLink = [{
 ]
 
 // oaHOme快速入口数据
-export const oaHomeData = [
-  {
-    text: '公司信息',
-    icon: '../../static/img/home/GSXX.png',
-    url: '/subpkg/companyInfo/companyInfo',
-    admin: true
-  },
-  {
-    text: '人员管理',
-    icon: '../../static/img/home/RYGL.png',
-    url: '/subpkg/personnel/personnel',
-    admin: true
-  },
-  {
-    text: '固定资产',
-    icon: '../../static/img/home/GDZC.png',
-    url: '/subpkg/fixedAssets/fixedAssets',
-    admin: true
-  },
-  {
-    text: '合同管理',
-    icon: '../../static/img/home/HTGL.png',
-    url: '/subpkg/contract/contract'
-  },
-  // {
-  //   text: '公司管理',
-  //   icon: '../../static/img/home/GSXX.png',
-  //   url: '/subpkg/companyAdmin/companyAdmin',
-  //   admin: true
-  // },
-  {
-    text: '任务管理',
-    icon: '../../static/img/home/RWGL.png',
-    url: '/subpkg/taskAdmin/taskAdmin',
-  },
-  {
-    text: '档案管理',
-    icon: '../../static/img/home/DAGL.png',
-    url: '/subpkg/captain/captain',
-    admin: true
-  },
-  {
-    text: '档案管理',
-    icon: '../../static/img/home/DAGL.png',
-    url: '/subpkg/archives/archives',
-    captain: true
-  },
-  // {
-  //   text: '片区经理',
-  //   icon: '../../static/img/home/GRCW.png',
-  //   url: '/pages/oaManager/oaManager',
-  //   admin: true
-  // },
-  {
-    text: '个人财务',
-    icon: '../../static/img/home/GRCW.png',
-    url: '/subpkg/finance/finance'
-  },
-  // {
-  //   text: '出差申请',
-  //   icon: prefix + 'oa/ccsq@2x.png'
-  // },
-  // {
-  //   text: '外出申请',
-  //   icon: prefix + 'oa/wcsq@2x.png'
-  // },
-  // {
-  //   text: '采购申请',
-  //   icon: prefix + 'oa/cgsq@2x.png'
-  // },
-  // {
-  //   text: '物品维修',
-  //   icon: prefix + 'oa/bxsq@2x.png'
-  // },
-  // {
-  //   text: '用章申请',
-  //   icon: prefix + 'oa/yzsq@2x.png'
-  // },
-  // {
-  //   text: '报销申请',
-  //   icon: prefix + 'oa/gengduo@2x.png'
-  // },
-  {
-    text: '更多',
-    icon: prefix + 'oa/wpwx@2x.png',
-    url: '/pages/views/application'
-  }
+export const oaHomeData = [{
+		text: '公司信息',
+		icon: '../../static/img/home/GSXX.png',
+		url: '/subpkg/companyInfo/companyInfo',
+		admin: true
+	},
+	{
+		text: '人员管理',
+		icon: '../../static/img/home/RYGL.png',
+		url: '/subpkg/personnel/personnel',
+		admin: true
+	},
+	{
+		text: '固定资产',
+		icon: '../../static/img/home/GDZZ.png',
+		url: '/subpkg/property/index',
+		admin: true
+	},
+	{
+		text: '合同管理',
+		icon: '../../static/img/home/HTGL.png',
+		url: '/subpkg/contract/contract'
+	},
+	// {
+	//   text: '公司管理',
+	//   icon: '../../static/img/home/GSXX.png',
+	//   url: '/subpkg/companyAdmin/companyAdmin',
+	//   admin: true
+	// },
+	{
+		text: '任务管理',
+		icon: '../../static/img/home/RWGL.png',
+		url: '/subpkg/taskAdmin/taskAdmin',
+	},
+	{
+		text: '档案管理',
+		icon: '../../static/img/home/DAGL.png',
+		url: '/subpkg/captain/captain',
+		admin: true
+	},
+	{
+		text: '档案管理',
+		icon: '../../static/img/home/DAGL.png',
+		url: '/subpkg/archives/archives',
+		captain: true
+	},
+	// {
+	//   text: '片区经理',
+	//   icon: '../../static/img/home/GRCW.png',
+	//   url: '/pages/oaManager/oaManager',
+	//   admin: true
+	// },
+	{
+		text: '个人财务',
+		icon: '../../static/img/home/GRCW.png',
+		url: '/subpkg/finance/finance'
+	},
+	{
+		text: '驿站',
+		icon: '../../static/img/home/GRCW.png',
+		url: '/subpkg/finance/finance',
+		// captain: true
+	},
+	// {
+	//   text: '出差申请',
+	//   icon: prefix + 'oa/ccsq@2x.png'
+	// },
+	// {
+	//   text: '外出申请',
+	//   icon: prefix + 'oa/wcsq@2x.png'
+	// },
+	// {
+	//   text: '采购申请',
+	//   icon: prefix + 'oa/cgsq@2x.png'
+	// },
+	// {
+	//   text: '物品维修',
+	//   icon: prefix + 'oa/bxsq@2x.png'
+	// },
+	// {
+	//   text: '用章申请',
+	//   icon: prefix + 'oa/yzsq@2x.png'
+	// },
+	// {
+	//   text: '报销申请',
+	//   icon: prefix + 'oa/gengduo@2x.png'
+	// },
+	{
+		text: '更多',
+		icon: prefix + 'oa/wpwx@2x.png',
+		url: '/pages/views/application'
+	}
 ]
 
 /**