From 5937dc9402da359a6117f9aace1fc0635237cb75 Mon Sep 17 00:00:00 2001
From: lxz <lxz15516116653@163.com>
Date: Fri, 5 Jan 2024 17:46:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/own-share/own-share.vue           | 167 +++++++++++
 components/own-share/readme.md               |  59 ++++
 components/return/index.vue                  | 134 +++++++++
 components/uni-popup/uni-popup.vue           | 264 ++++++++++++++++++
 components/uni-transition/uni-transition.vue | 278 +++++++++++++++++++
 manifest.json                                |   4 +-
 pages.json                                   |  10 +-
 pages/oaHome/oaHome.vue                      |  60 ++--
 pages/oaMy/oaMy.vue                          |  28 +-
 pages/oaTask/oaTask.vue                      |   3 +
 static/img/fb1.png                           | Bin 0 -> 446 bytes
 static/img/fb2.png                           | Bin 0 -> 1119 bytes
 static/newWork/tabbar/index.png              | Bin 3031 -> 3028 bytes
 static/newWork/tabbar/indexAct.png           | Bin 0 -> 3173 bytes
 static/newWork/tabbar/mine.png               | Bin 3584 -> 3562 bytes
 static/newWork/tabbar/mineAct.png            | Bin 0 -> 3922 bytes
 16 files changed, 961 insertions(+), 46 deletions(-)
 create mode 100644 components/own-share/own-share.vue
 create mode 100644 components/own-share/readme.md
 create mode 100644 components/return/index.vue
 create mode 100644 components/uni-popup/uni-popup.vue
 create mode 100644 components/uni-transition/uni-transition.vue
 create mode 100644 static/img/fb1.png
 create mode 100644 static/img/fb2.png
 create mode 100644 static/newWork/tabbar/indexAct.png
 create mode 100644 static/newWork/tabbar/mineAct.png

diff --git a/components/own-share/own-share.vue b/components/own-share/own-share.vue
new file mode 100644
index 0000000..6213042
--- /dev/null
+++ b/components/own-share/own-share.vue
@@ -0,0 +1,167 @@
+<template>
+	<uni-popup ref="showshare" type="bottom" @change="change">
+		<view class="uni-share">
+			<!-- <text class="uni-share-title">分享到</text> -->
+			<view class="uni-share-content">
+				<view v-for="(item, index) in bottomData" :key="index" @tap="shareItems(item.name)"
+					class="uni-share-content-box">
+					<view class="uni-share-content-image">
+						<image :src="item.icon" class="content-image" mode="widthFix" />
+					</view>
+					<text class="uni-share-content-text">{{ item.text }}</text>
+				</view>
+			</view>
+			<text class="uni-share-btn" @click="cancel('share')">取消</text>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	export default {
+		props: {
+			shareurl: {
+				type: String,
+				default: ''
+			},
+		},
+		components: {
+			uniPopup
+		},
+
+		data() {
+			return {
+				bottomData: [{
+						text: '刷新',
+						icon: '/static/img/miniProgram.png',
+						name: 'miniProgram'
+					}
+
+				],
+			}
+		},
+		mounted() {
+			// console.log(this.shareurl)
+		},
+		methods: {
+			open() {
+				this.$nextTick(() => {
+					this.$refs['showshare'].open()
+				})
+			},
+			change(e) {
+				// console.log('是否打开:' + e.show)
+			},
+			shareItems(provider) {
+
+
+				switch (provider) {
+
+					case 'miniProgram':
+						
+						uni.reLaunch({
+							url: this.shareurl,
+							success: (res) => {
+								this.$nextTick(() => {
+									this.$refs['showshare'].close
+								})
+							},
+							fail: (res) => {
+								console.log(res)
+							}
+						})
+
+						break;
+
+					case 'more':
+						plus.share.sendWithSystem({
+							type: "web",
+							title: shareOPtions.shareTitle,
+							thumbs: [shareOPtions.shareImage],
+							href: shareOPtions.shareHref,
+							content: shareOPtions.summary,
+						})
+					default:
+						break;
+				}
+
+			},
+			cancel() {
+				this.$refs['showshare'].close()
+			}
+		}
+	}
+</script>
+
+<style>
+	/* 底部分享 */
+	.uni-share {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+		background-color: #fff;
+	}
+
+	.uni-share-title {
+		line-height: 60rpx;
+		font-size: 24rpx;
+		padding: 15rpx 0;
+		text-align: center;
+	}
+
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: center;
+		padding: 15px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		width: 200rpx;
+	}
+
+	.uni-share-content-image {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		width: 60rpx;
+		height: 60rpx;
+		overflow: hidden;
+		border-radius: 10rpx;
+	}
+
+	.content-image {
+		width: 60rpx;
+		height: 60rpx;
+	}
+
+	.uni-share-content-text {
+		font-size: 26rpx;
+		color: #333;
+		padding-top: 5px;
+		padding-bottom: 10px;
+	}
+
+	.uni-share-btn {
+		height: 90rpx;
+		line-height: 90rpx;
+		font-size: 14px;
+		border-top-color: #f5f5f5;
+		border-top-width: 1px;
+		border-top-style: solid;
+		text-align: center;
+		color: #666;
+	}
+</style>
\ No newline at end of file
diff --git a/components/own-share/readme.md b/components/own-share/readme.md
new file mode 100644
index 0000000..efe51da
--- /dev/null
+++ b/components/own-share/readme.md
@@ -0,0 +1,59 @@
+### 使用方法
+ 本组件依赖于 uni-popup 组件 跟 uni-transtion 组件 
+
+ 
+``` js
+	
+	<own-share ref="share" :shareSummary="shareSummary" :shareImage="image"
+	:shareTitle="title" :shareHref="href"
+	:miniProgram="miniProgram" :webUrl="webUrl"
+	@shareSuccess="shareSuccess" @shareFail="shareFail"></own-share>
+
+	//先引入组件
+	import ownShare from '@/components/own-share/own-share.vue'
+	//然后使用
+	components:{
+		ownShare
+	}
+	
+	//打开分享
+	this.$nextTick(()=>{
+		this.$refs.share.open()
+	})
+	//关闭分享
+	this.$nextTick(()=>{
+		this.$refs.share.close()
+	})
+	//当然也可以用 easycom 直接使用
+```
+参数		<sub>分享只用于app</sub>
+
+|  参数   | 类型  | 是否必填 |
+|  ----  | ----  | ---- |
+| shareSummary | String | 只分享内容时必填 |
+| shareImage  | String | 只分享图片时必填 |
+| shareTitle | String | 否 |
+| shareHref | String | 分享图文时必填 |
+| miniProgram | Object | 分享小程序必填 |
+
+miniProgram参数  [详情](https://uniapp.dcloud.io/api/plugins/share?id=share)
+
+|  参数   | 类型  | 是否必填 |
+|  ----  | ----  | ---- |
+| id | String | 微信小程序原始id |
+| path  | String | 点击链接进入的页面 |
+| type | Number | 微信小程序版本类型 |
+| webUrl | String | 兼容低版本的网页链接 |
+
+|  事件   | 说明  | 
+|  ----  | ----  |
+| shareSuccess | 成功回调 |
+| shareFail | 失败回调 | 
+
+----
+**图标链接写在组件里面请自行修改(请看示例项目)**
+
+
+[了解更多uniapp分享,请参考官网](https://uniapp.dcloud.io/api/plugins/share)
+
+
diff --git a/components/return/index.vue b/components/return/index.vue
new file mode 100644
index 0000000..f4ea37d
--- /dev/null
+++ b/components/return/index.vue
@@ -0,0 +1,134 @@
+<template>
+	<view class="">
+		<view class="contentgb">
+			<view class="iconfont icon-xiangzuo" v-if="isshow" style="margin-top: 10rpx;color: #fff;margin-left: 30rpx;"
+				@click="close">
+			</view>
+			<view class="name" v-if="isshow">
+				{{name}}
+			</view>
+			<view class="return_top">
+				<view class="z-bootm-img1" @click="close()">
+					<image src="@/static/img/fb1.png" mode="aspectFit"></image>
+				</view>
+				<view class="z-bootm-l"></view>
+				<view class="z-bootm-img2" @click="returnbom()">
+					<image src="@/static/img/fb2.png" mode="aspectFit"></image>
+				</view>
+			</view>
+		</view>
+
+
+		<own-share ref="share"  :shareurl="url"></own-share><strong></strong>
+	</view>
+
+</template>
+
+<script>
+	import ownShare from '@/components/own-share/own-share.vue'
+	export default {
+		name: 'retuntop',
+		comments: {
+			ownShare
+		},
+		props: {
+			isshow: {
+				type: Boolean
+			},
+			name: {
+				type: String
+			},
+			url: {
+				type: String
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		mounted() {
+			
+		},
+		methods: {
+			close() {
+				
+				this.$nextTick(() => {
+					this.$refs.share.open()
+				})
+			},
+			returnbom() {
+				uni.sendHostEvent('closeApp', (ret) => {
+					//发送消息成功回调
+					//console.log('关闭应用' + JSON.stringify(ret));
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.contentgb {
+		display: flex;
+		justify-content: space-between;
+
+		.name {
+			font-size: 35rpx;
+			font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin-top: 5rpx;
+		}
+
+		.return_top {
+			width: 166rpx;
+			height: 56rpx;
+			background: rgba(255, 255, 255, 0.6);
+			border-radius: 44rpx 44rpx;
+			margin-right: 30rpx;
+
+			position: relative;
+
+			.z-bootm-img1 {
+				width: 41rpx;
+				height: 13rpx;
+
+				position: absolute;
+				top: 5rpx;
+				left: 25rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.z-bootm-l {
+				width: 1px;
+				height: 32rpx;
+				background: rgba(0, 0, 0, 0.2);
+				margin: auto 0;
+
+				position: absolute;
+				top: 10rpx;
+				left: 85rpx;
+			}
+
+			.z-bootm-img2 {
+				width: 38rpx;
+				height: 34rpx;
+				margin-top: -15rpx;
+				margin-left: -15rpx;
+				position: absolute;
+				right: 25rpx;
+				top: 25rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/uni-popup/uni-popup.vue b/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..2b764a9
--- /dev/null
+++ b/components/uni-popup/uni-popup.vue
@@ -0,0 +1,264 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" @touchmove.stop.prevent="clear">
+		<uni-transition :mode-class="['fade']" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
+		<uni-transition :mode-class="ani" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
+			<view class="uni-popup__wrapper-box" @click.stop="clear">
+				<slot />
+			</view>
+		</uni-transition>
+	</view>
+</template>
+
+<script>
+	import uniTransition from '../uni-transition/uni-transition.vue'
+
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * @property {Boolean} animation = [ture|false] 是否开启动画
+	 * @property {Boolean} maskClick = [ture|false] 蒙版点击是否关闭弹窗
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 */
+
+	export default {
+		name: 'UniPopup',
+		components: {
+			uniTransition
+		},
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			maskClick: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				maskClass: {
+					'position': 'fixed',
+					'bottom': 0,
+					'top': 0,
+					'left': 0,
+					'right': 0,
+					'backgroundColor': 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					'position': 'fixed',
+					'left': 0,
+					'right': 0,
+				}
+			}
+		},
+		watch: {
+			type: {
+				handler: function(newVal) {
+					switch (this.type) {
+						case 'top':
+							this.ani = ['slide-top']
+							this.transClass = {
+								'position': 'fixed',
+								'left': 0,
+								'right': 0,
+							}
+							break
+						case 'bottom':
+							this.ani = ['slide-bottom']
+							this.transClass = {
+								'position': 'fixed',
+								'left': 0,
+								'right': 0,
+								'bottom': 0
+							}
+							break
+						case 'center':
+							this.ani = ['zoom-out', 'fade']
+							this.transClass = {
+								'position': 'fixed',
+								/* #ifndef APP-NVUE */
+								'display': 'flex',
+								'flexDirection': 'column',
+								/* #endif */
+								'bottom': 0,
+								'left': 0,
+								'right': 0,
+								'top': 0,
+								'justifyContent': 'center',
+								'alignItems': 'center'
+							}
+
+							break
+					}
+				},
+				immediate: true
+			}
+		},
+		created() {
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+		},
+		methods: {
+			clear(e) {
+				// TODO nvue 取消冒泡
+				e.stopPropagation()
+			},
+			open() {
+				this.showPopup = true
+				this.$nextTick(() => {
+					clearTimeout(this.timer)
+					this.timer = setTimeout(() => {
+						this.showTrans = true
+					}, 50);
+				})
+				this.$emit('change', {
+					show: true
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$nextTick(() => {
+					clearTimeout(this.timer)
+					this.timer = setTimeout(() => {
+						this.$emit('change', {
+							show: false
+						})
+						this.showPopup = false
+					}, 300)
+				})
+			},
+			onTap() {
+				if (!this.maskClick) return
+				this.close()
+			}
+		}
+	}
+</script>
+<style scoped>
+	.uni-popup {
+		position: fixed;
+		/* #ifdef H5 */
+		top: var(--window-top);
+		/* #endif */
+		/* #ifndef H5 */
+		top: 0;
+		/* #endif */
+		bottom: 0;
+		left: 0;
+		right: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-popup__mask {
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		opacity: 0;
+	}
+
+	.mask-ani {
+		transition-property: opacity;
+		transition-duration: 0.2s;
+	}
+
+	.uni-top-mask {
+		opacity: 1;
+	}
+
+	.uni-bottom-mask {
+		opacity: 1;
+	}
+
+	.uni-center-mask {
+		opacity: 1;
+	}
+
+	.uni-popup__wrapper {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: absolute;
+	}
+
+	.top {
+		top: 0;
+		left: 0;
+		right: 0;
+		transform: translateY(-500px);
+	}
+
+	.bottom {
+		bottom: 0;
+		left: 0;
+		right: 0;
+		transform: translateY(500px);
+	}
+
+	.center {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+		bottom: 0;
+		left: 0;
+		right: 0;
+		top: 0;
+		justify-content: center;
+		align-items: center;
+		transform: scale(1.2);
+		opacity: 0;
+	}
+
+	.uni-popup__wrapper-box {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: relative;
+	}
+
+	.content-ani {
+		/* transition: transform 0.3s;
+ */
+		transition-property: transform, opacity;
+		transition-duration: 0.2s;
+	}
+
+
+	.uni-top-content {
+		transform: translateY(0);
+	}
+
+	.uni-bottom-content {
+		transform: translateY(0);
+	}
+
+	.uni-center-content {
+		transform: scale(1);
+		opacity: 1;
+	}
+</style>
\ No newline at end of file
diff --git a/components/uni-transition/uni-transition.vue b/components/uni-transition/uni-transition.vue
new file mode 100644
index 0000000..0543b44
--- /dev/null
+++ b/components/uni-transition/uni-transition.vue
@@ -0,0 +1,278 @@
+<template>
+	<view v-if="isShow" ref="ani" class="uni-transition" :class="[ani.in]" :style="'transform:' +transform+';'+stylesObject" @click="change">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const animation = uni.requireNativePlugin('animation');
+	// #endif
+	/**
+	 * Transition 过渡动画
+	 * @description 简单过渡动画组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+	 * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+	 * @property {Array} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+	 *  @value fade 渐隐渐出过渡
+	 *  @value slide-top 由上至下过渡
+	 *  @value slide-right 由右至左过渡
+	 *  @value slide-bottom 由下至上过渡
+	 *  @value slide-left 由左至右过渡
+	 *  @value zoom-in 由小到大过渡
+	 *  @value zoom-out 由大到小过渡
+	 * @property {Number} duration 过渡动画持续时间
+	 * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+	 */
+	export default {
+		name: 'uniTransition',
+		props: {
+			show: {
+				type: Boolean,
+				default: false
+			},
+			modeClass: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			duration: {
+				type: Number,
+				default: 300
+			},
+			styles: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				isShow: false,
+				transform: '',
+				ani: {
+					in: '',
+					active: ''
+				}
+			};
+		},
+		watch: {
+			show: {
+				handler(newVal) {
+					if (newVal) {
+						this.open()
+					} else {
+						this.close()
+					}
+				},
+				immediate: true
+			}
+		},
+		computed: {
+			stylesObject() {
+				let styles = {
+					...this.styles,
+					'transition-duration': this.duration / 1000 + 's'
+				}
+				let transfrom = ''
+				for (let i in styles) {
+					let line = this.toLine(i)
+					transfrom += line + ':' + styles[i] + ';'
+				}
+				return transfrom
+			}
+		},
+		created() {
+			// this.timer = null
+			// this.nextTick = (time = 50) => new Promise(resolve => {
+			// 	clearTimeout(this.timer)
+			// 	this.timer = setTimeout(resolve, time)
+			// 	return this.timer
+			// });
+		},
+		methods: {
+			change() {
+				this.$emit('click', {
+					detail: this.isShow
+				})
+			},
+			open() {
+				this.isShow = true
+				this.transform = ''
+				this.ani.in = ''
+				for (let i in this.getTranfrom(false)) {
+					if (i === 'opacity') {
+						this.ani.in = 'fade-in'
+					} else {
+						this.transform += `${this.getTranfrom(false)[i]} `
+					}
+				}
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this._animation(true)
+					}, 50)
+				})
+
+			},
+			close(type) {
+				this._animation(false)
+			},
+			_animation(type) {
+				let styles = this.getTranfrom(type)
+				// #ifdef APP-NVUE
+				if (!this.$refs['ani']) return
+				animation.transition(this.$refs['ani'].ref, {
+					styles,
+					duration: this.duration, //ms
+					timingFunction: 'ease',
+					needLayout: false,
+					delay: 0 //ms
+				}, () => {
+					if (!type) {
+						this.isShow = false
+					}
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+				// #endif
+				// #ifndef APP-NVUE
+				this.transform = ''
+				for (let i in styles) {
+					if (i === 'opacity') {
+						this.ani.in = `fade-${type?'out':'in'}`
+					} else {
+						this.transform += `${styles[i]} `
+					}
+				}
+				clearTimeout(this.timer)
+				this.timer = setTimeout(() => {
+					if (!type) {
+						this.isShow = false
+					}
+					this.$emit('change', {
+						detail: this.isShow
+					})
+
+				}, this.duration)
+				// #endif
+
+			},
+			getTranfrom(type) {
+				let styles = {
+					transform: ''
+				}
+				this.modeClass.forEach((mode) => {
+					switch (mode) {
+						case 'fade':
+							styles.opacity = type ? 1 : 0
+							break;
+						case 'slide-top':
+							styles.transform += `translateY(${type?'0':'-100%'}) `
+							break;
+						case 'slide-right':
+							styles.transform += `translateX(${type?'0':'100%'}) `
+							break;
+						case 'slide-bottom':
+							styles.transform += `translateY(${type?'0':'100%'}) `
+							break;
+						case 'slide-left':
+							styles.transform += `translateX(${type?'0':'-100%'}) `
+							break;
+						case 'zoom-in':
+							styles.transform += `scale(${type?1:0.8}) `
+							break;
+						case 'zoom-out':
+							styles.transform += `scale(${type?1:1.2}) `
+							break;
+					}
+				})
+				return styles
+			},
+			_modeClassArr(type) {
+				let mode = this.modeClass
+				if (typeof(mode) !== "string") {
+					let modestr = ''
+					mode.forEach((item) => {
+						modestr += (item + '-' + type + ',')
+					})
+					return modestr.substr(0, modestr.length - 1)
+				} else {
+					return mode + '-' + type
+				}
+			},
+			// getEl(el) {
+			// 	console.log(el || el.ref || null);
+			// 	return el || el.ref || null
+			// },
+			toLine(name) {
+				return name.replace(/([A-Z])/g, "-$1").toLowerCase();
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-transition {
+		transition-timing-function: ease;
+		transition-duration: 0.3s;
+		transition-property: transform, opacity;
+	}
+
+	.fade-in {
+		opacity: 0;
+	}
+
+	.fade-active {
+		opacity: 1;
+	}
+
+	.slide-top-in {
+		/* transition-property: transform, opacity; */
+		transform: translateY(-100%);
+	}
+
+	.slide-top-active {
+		transform: translateY(0);
+		/* opacity: 1; */
+	}
+
+	.slide-right-in {
+		transform: translateX(100%);
+	}
+
+	.slide-right-active {
+		transform: translateX(0);
+	}
+
+	.slide-bottom-in {
+		transform: translateY(100%);
+	}
+
+	.slide-bottom-active {
+		transform: translateY(0);
+	}
+
+	.slide-left-in {
+		transform: translateX(-100%);
+	}
+
+	.slide-left-active {
+		transform: translateX(0);
+		opacity: 1;
+	}
+
+	.zoom-in-in {
+		transform: scale(0.8);
+	}
+
+	.zoom-out-active {
+		transform: scale(1);
+	}
+
+	.zoom-out-in {
+		transform: scale(1.2);
+	}
+</style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index c5d9afc..6f5950b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,8 +3,8 @@
 	// "appid" : "__UNI__3A527D1",
 	"appid": "__UNI__A495155",
 	"description": "",
-	"versionName": "1.3.1",
-	"versionCode": 131,
+	"versionName": "1.0.2",
+	"versionCode": 102,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {
diff --git a/pages.json b/pages.json
index 1226132..7762837 100644
--- a/pages.json
+++ b/pages.json
@@ -953,22 +953,22 @@
 	},
 	"tabBar": {
 		"color": "#282828",
-		"selectedColor": "#0122C7",
+		"selectedColor": "#2B63E3",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"list": [{
 				"pagePath": "pages/oaHome/oaHome",
 				"text": "首页",
-				"iconPath": "static/tabs-icon/home.png",
-				"selectedIconPath": "static/tabs-icon/home-a.png"
+				"iconPath": "static/newWork/tabbar/index.png",
+				"selectedIconPath": "static/newWork/tabbar/indexAct.png"
 			},
 
 
 			{
 				"pagePath": "pages/oaMy/oaMy",
 				"text": "我的",
-				"iconPath": "static/tabs-icon/my.png",
-				"selectedIconPath": "static/tabs-icon/my-a.png"
+				"iconPath": "static/newWork/tabbar/mine.png",
+				"selectedIconPath": "static/newWork/tabbar/mineAct.png"
 			}
 		]
 	},
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 6213cea..a3f0f87 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -1,12 +1,10 @@
 <template>
-
-
-
 	<view class="box">
-
 		<view class="" style="background-color: #2B63E3;height: var(--status-bar-height);" />
 		<view class="head">
-
+			<view class="" style="float: right;margin-top: 20rpx;">
+				<Myindex url='/pages/index/index' />
+			</view>
 
 			<view class="head-content ">
 				<view class="">
@@ -21,52 +19,37 @@
 				</view>
 
 			</view>
-
-
-
 		</view>
-
 		<view class="deposit">
-
-
 			<view class="deposit-l">
-
 				<u--image :showLoading="true" width="81rpx" height="78rpx" :src="'../../static/newWork/index/YJ.png'"
 					shape="circle"></u--image>
-				<view class="">
+				<view class="" style="margin-left:20rpx ;">
 					<view class="">
 						押金
 					</view>
 					<view class="deposit-value">
-						1000
+						{{myOaInfo.deposit}}
 					</view>
 				</view>
-
 			</view>
-
-
 			<view class="deposit-l">
-
 				<u--image :showLoading="true" width="81rpx" height="78rpx" :src="'../../static/newWork/index/GLHS.png'"
 					shape="circle"></u--image>
-				<view class="">
+				<view class="" style="margin-left:20rpx ;">
 					<view class="">
-						押金
+						管理户数
 					</view>
 					<view class="deposit-value">
-						1000
+						{{myOaInfo.user_information_count}}户
 					</view>
 				</view>
-
-
 			</view>
-
-
 		</view>
 		<!--追加功能 -->
 		<view class="">
-			<u-empty icon="/static/newWork/index/empty.png" iconSize='200' width='300' height="300" marginTop='150'
-				text="等待任务下发"></u-empty>
+			<u-empty icon="/static/newWork/index/empty.png" iconSize='200' width='300' height="300" marginTop='130'
+				textColor='#BFD7FF' text="等待任务下发"></u-empty>
 
 		</view>
 
@@ -159,6 +142,7 @@
 </template>
 
 <script>
+	import Myindex from '@/components/return/index.vue';
 	import {
 		getList
 	} from "@/api/logistics.js";
@@ -197,7 +181,9 @@
 	var jpushModule = uni.requireNativePlugin("JG-JPush");
 	// #endif
 	export default {
-
+		components: {
+			Myindex
+		},
 		data() {
 			return {
 
@@ -508,7 +494,7 @@
 			padding: 0 30rpx;
 			box-sizing: border-box;
 			align-items: center;
-			height: 137rpx;
+			height: 128rpx;
 			background-image: linear-gradient(to bottom, #D8EAFF 30%, #FFFFFF 100%);
 			border-radius: 64rpx 64rpx 64rpx 64rpx;
 
@@ -524,26 +510,30 @@
 	}
 
 	.deposit {
-		margin-top: 30rpx;
+		margin-top: 40rpx;
 		display: flex;
 		width: 750rpx;
 		justify-content: space-between;
 
 		box-sizing: border-box;
-		padding: 0 20rpx;
+		padding: 0 30rpx;
+
 
 		.deposit-l {
-			width: 300rpx;
-			height: 120rpx;
+			width: 335rpx;
+			height: 128rpx;
 			background-color: white;
-			margin: 0 20rpx;
-			border-radius: 10rpx;
+			border-radius: 20rpx;
 			display: flex;
 			font-size: 30rpx;
 			box-shadow: 0.5rpx 0.5rpx 200rpx 0.5rpx rgba(0, 0, 0, 0.1);
+			box-sizing: border-box;
+			padding: 30rpx 29rpx;
+			font-weight: 500;
 
 			.deposit-value {
 				color: #336AE7;
+				margin-top: 5rpx;
 			}
 		}
 
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index 3bec3b3..b700b7c 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -1,20 +1,26 @@
 <template>
 	<view class="my">
+
 		<view class="head_box" style="position: relative;">
 			<!-- <image class="head_img" src="../../static/img/home/head-bg.png"></image> -->
 			<view style="position: absolute;bottom: 0;left: 0;overflow: hidden;border-radius: 0;">
 				<hx-lottie :options="options" ref="lottie"
-					style="width: 100vw;height: 460rpx;transform: scale(1.2);background-color: #0122c7;" />
+					style="width: 100vw;height: 460rpx;transform: scale(1.2);background-color: #2B63E3;" />
 			</view>
 			<!-- <u-navbar v-if="uniMP" @leftClick="leftClick" bgColor="rgba(0,0,0,0)"
           leftIconColor=" #fff" :autoBack="false">
       </u-navbar> -->
 			<!-- #ifdef APP-PLUS||H5 -->
 			<view style="height: var(--status-bar-height)"></view>
+			<view class="" style="float: right;">
+				<Myindex url='/pages/index/index' />
+			</view>
+
 			<view v-if="uniMP" style="height: 44px;">
 				<u-icon name="arrow-left" color="#fff" size="20" @click="leftClick"></u-icon>
 			</view>
 			<view v-else style="height: 30rpx"></view>
+
 			<!-- <view style="height: 100rpx"></view> -->
 			<!-- <view v-if="uniMP" style="height: 44px"></view> -->
 			<!-- #endif -->
@@ -35,6 +41,7 @@
 						<view v-else class="name_work">
 							<view class="name">
 								<text class="nickname">姓名:{{ oaUserInfo.nickname }}</text>
+								<!-- 	（{{ oaUserInfo.admin_id?'超级管理员':'普通用户'}}） -->
 								<!-- <text class="omit" v-if="oaUserInfo.admin.company">所属公司:{{ oaUserInfo.admin.company.company_name }}</text> -->
 							</view>
 							<view class="work">
@@ -42,10 +49,16 @@
 									<view class="wr_t_left">电话:</view>
 									<view class="wr_t_right">{{oaUserInfo.account}}</view>
 								</view>
-
+								<!-- <view class="wr_item">
+									<view class="wr_t_left">名称:</view>
+									<view class="wr_t_right" v-if="oaUserInfo.company">
+										{{oaUserInfo.company.company_name}}</view>
+								</view> -->
 								<view class="wr_item">
 									<view class="wr_t_left">类型:</view>
 									<view class="wr_t_right">
+
+
 										{{oaUserInfo.user_role_name}}
 									</view>
 								</view>
@@ -84,6 +97,7 @@
 </template>
 
 <script>
+	import Myindex from '@/components/return/index.vue';
 	import {
 		mapActions
 	} from 'vuex'
@@ -101,9 +115,10 @@
 	} from '@/static/server/server.js'
 	import bj from "@/static/animation/home.json"
 	// import tabbar from '../components/tabbar'
+
 	export default {
 		components: {
-			// tabbar
+			Myindex
 		},
 		data() {
 			return {
@@ -142,8 +157,12 @@
 			},
 			myOaData() {
 				const route = 'pages/oaMy/oaMy';
+
 				let arr = [];
 				this.$store.state.config?.config?.menu?.forEach((item) => {
+
+
+
 					if (item.paths.includes(route)) {
 						arr = item.children;
 					}
@@ -227,6 +246,7 @@
 		.head_box {
 			position: relative;
 			padding: 28rpx;
+			padding-right: 0;
 			width: 100vw;
 			margin-bottom: 30rpx;
 			// background-image: url('../../static/img/home/my_bg.png');
@@ -388,7 +408,7 @@
 		margin-top: 84.21rpx;
 		width: 694rpx;
 		height: 84.21rpx;
-		background: $theme-oa-color;
+		background: #2B63E3;
 		box-shadow: 0px 9px 26px 1px #E9EFF5;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue
index 0e62a13..7bacb47 100644
--- a/pages/oaTask/oaTask.vue
+++ b/pages/oaTask/oaTask.vue
@@ -22,6 +22,9 @@
 					<u-empty icon="/static/img/empty/data.png" text="没有任务"></u-empty>
 				</view>
 
+
+
+
 			</view>
 		</block>
 		<!-- <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
diff --git a/static/img/fb1.png b/static/img/fb1.png
new file mode 100644
index 0000000000000000000000000000000000000000..786e3f31f35939f0542352f9846ea2b19a60fce6
GIT binary patch
literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq001cf000dL1^@s6G+js500001b5ch_0Itp)
z=>Px$cu7P-R7gw3)jvyIQ4j_2--3mO5DU8~u`oo-6oO3(L5PK*Mba6PPCvpz0%-(4
zKq@O2)J{;rU;-9)QLs=DOsZG}B4}ZmLWqpqh3CV4`%l)}J>JYY=g!PMQ_}wF#T;fZ
zjQIY8eXL@uU5Zkh0I!pfz5<+Gyu*2`Tv?INFoAyj#CKd308e8bT@8>2-YZ-d#J<2J
zdT^5X|3!RN<Y#=!5r)87e7y%aTKYS+wgHW|A<_D%X#T_{zhFN1BSz*84npL6RBA9?
zV-!cZ{~xi?sJcwtK$_QV>LSWDu%b}UL*!{1_*$IzRbVHzrdgd)$-t|gXzkzB;#yec
z5c$6j(;miiF+VWYtisgNrA*#n8k-`h%41iu8yAgK@&lF&X7XivZP}1c&1AU2NWIq`
zGqnAPulsE*g{)78KZZ{|#V>rT<C9a^ctD?wZ52NK1jmRaaK|TGcmua7aj6w_Y~!>l
oG`qWplHfBOVhx+E0$1~H05~#E!`+b`&j0`b07*qoM6N<$g2)HOl>h($

literal 0
HcmV?d00001

diff --git a/static/img/fb2.png b/static/img/fb2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9534065e79c604528fc2cdb79dba242eae84170
GIT binary patch
literal 1119
zcmV-l1fctgP)<h;3K|Lk000e1NJLTq001Tc001Hg1^@s6Gpwt)00001b5ch_0Itp)
z=>Px(8A(JzR9Hv7m|Lh-RTPFlGo&IdE7G#aO3fY&GKn(s5@l9|X^7^d<%?ZJp$F5n
zjKmviA_VpzLWx8{C1QeNX{9JZT82eh5N2gw$h?=ycbHRVleO1gOSg@;bN0CWYmI;0
zRy*oTJKzrBUf?d^R-ij@6>tS`0QeR70oV>~0@ea2>x42$RWbMrz*9iiszyQY6tEJQ
z3v8}pTLoBOU<xpzio*&z0-O}yXhZcfV3z?ife96Y)m8Zim=8<`juja<0@e-q2=Hwc
z$=|^Gz#UWbJFpMfAJW_f=m87?9s~4OBwK-Dz~21FB4D=w8-eQ!JRJmP1B)6xX#)VG
z!rRw(E<XYTfuGYKa$pkt^8!$kSK`h9PSnj?qCXXQ1!$l7u!61fKjQyWV3z}1fZH=8
z%YQhq;XDAPrXzu6z@?c#v-AKUO-O;6p64^=Ux538-7NwY-3$&K_GP4EwJu13^#QhJ
zK#v0V0bjKkRCG5ESd#hv3%J>o#y7SCkf5o&4#<fMDXV}-vjDb`83MZj_$ec#Wb6g}
z+XR(5&jAksy@BJvcOgv{%i$*WwiRPvlIZ;=CV@Q*EY2K^2i`1ks-1k8SE6I}J`KFn
z1f2cy@l0oc0X_&#F8+2T4CJz*`x0QPtB6GZq(sqFn$lEW7T7KzZG4vPfD%VG-aS<i
z1s&hqHGsq}l8XTwcUqy#1!nc7J!L5{wj}V2z?>SuRP{l9;6~zlWM_!7L0}Hli;{n~
zRYi#t=Ucy;z+MBUmDsEab2X}L6WE_X#~Q#s3;nGQwr0TI1D;GAZWfqb-KG|0Au#cO
zPG#QDRtju2Ff;-3A@D>Au<HOvRaLRNuP!0Kew;e4>rv(kOinrRqxc5h<IAL#?V?lI
z<vJt*M+xkna4@7mB=?sk$XeN8^D4I(yTn=fJ<u}&VtVr#R)jN-BsbOD!mhS693Hlm
zW+TaN;P^{9?j#r%fqDJBkwiWXJQ&vJs$4o3JzL1DnW21N6M@-vU2*NuQQX5N<k_wA
zTq2j)+#N<$+T1?{25FNnif)$gW{$oA`d3IvUCb8O7r?cNq1?I?_&NvX-){lWWKo=@
zwhuwJLM%3K%QQRsoea#10rF$Sy~uOk%{3MGEZa)m8JRzb>y)cfzVF-lT~y_En-raI
zoq=`XwdRgp>O9}xZqhJQJ7ajoOZ2pfMjelwN5V33)~?aPdnK?u7!;+?bME~>UODkC
za41ofL!M&~hb7RDEk)ue8WZOAe||6fMBtv}=K((xq+PicJTqldLr%4wYq?bUsB%+q
zFuE0p0!@729cBKi0E_l^cDD}Oir>QO%EzI2T(g@UIfdkJ7SJ(bb96FzIs5VC#>~id
l+BV~5FOLM(XtgekcLr(s%Yx}q$(aBE002ovPDHLkV1kui{;B`~

literal 0
HcmV?d00001

diff --git a/static/newWork/tabbar/index.png b/static/newWork/tabbar/index.png
index 598ff6ed923f41403735741b2fce2a7e923f3391..ba1cf88bc6649ba09f95d11bed41635ba2c6d3aa 100644
GIT binary patch
delta 3009
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
D{uQ@K

delta 3012
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
GLSTYWNy)na

diff --git a/static/newWork/tabbar/indexAct.png b/static/newWork/tabbar/indexAct.png
new file mode 100644
index 0000000000000000000000000000000000000000..414664f100aceafbf57fc815bf387db3bbd98870
GIT binary patch
literal 3173
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
LNkvXXu0mjfi!|tH

literal 0
HcmV?d00001

diff --git a/static/newWork/tabbar/mine.png b/static/newWork/tabbar/mine.png
index 80ca6cd1c441c0419e2219020d1fc6f79bd4e1df..05d902865d03e9c3a374f0a554c765e65c550b33 100644
GIT binary patch
delta 3547
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
VVhR@%ricIl002ovPDHLkV1lD>s|Nr8

delta 3569
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

diff --git a/static/newWork/tabbar/mineAct.png b/static/newWork/tabbar/mineAct.png
new file mode 100644
index 0000000000000000000000000000000000000000..842e70976a87420fbde5753f4837abc79e74f862
GIT binary patch
literal 3922
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

literal 0
HcmV?d00001