Merge branch 'main' of http://git.excellentkk.cn/mkm/OfficeApp

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": {

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">

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>

static/server/server.js

@@ -187,8 +187,7 @@ export const quickLink = [{
 ]
 
 // oaHOme快速入口数据
-export const oaHomeData = [
+export const oaHomeData = [{
-  {
 		text: '公司信息',
 		icon: '../../static/img/home/GSXX.png',
 		url: '/subpkg/companyInfo/companyInfo',
@@ -202,8 +201,8 @@ export const oaHomeData = [
 	},
 	{
 		text: '固定资产',
-    icon: '../../static/img/home/GDZC.png',
+		icon: '../../static/img/home/GDZZ.png',
-    url: '/subpkg/fixedAssets/fixedAssets',
+		url: '/subpkg/property/index',
 		admin: true
 	},
 	{
@@ -245,6 +244,12 @@ export const oaHomeData = [
 		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'