diff --git a/App.vue b/App.vue
index 398f6af..ced6a94 100644
--- a/App.vue
+++ b/App.vue
@@ -1,46 +1,60 @@
 <script>
-	// var jpushModule = uni.requireNativePlugin("JG-JPush");
-	var jpushModule = uni.requireNativePlugin("JG-JPush");
+//#ifdef APP-PLUS
+const jpushModule = uni.requireNativePlugin("JG-JPush");
+// #endif
+export default {
+  onLaunch: async function () {
 
-	export default {
-		onLaunch: function() {
-			console.log('App Launch')
-			try {
-				if (!this.$store.state.app.token) uni.redirectTo({
-					url: '/pages/oaLogin/oaLogin'
-				})
-			} catch (e) {
-				uni.redirectTo({
-					url: '/pages/oaLogin/oaLogin'
-				})
-			}
+    console.log('App Launch')
+    try {
+      if (!this.$store.state.app.token) uni.redirectTo({
+        url: '/pages/oaLogin/oaLogin'
+      })
+    } catch (e) {
+      uni.redirectTo({
+        url: '/pages/oaLogin/oaLogin'
+      })
+    }
 
-			// jpushModule.initJPushService()
-			// const audioContext = uni.createInnerAudioContext()
-			// audioContext.src = './static/mp3/order.mp3'
-			// let ida = [0]
-			// jpushModule.addNotificationListener(function (result) {
-			//   if (!ida.includes(result.messageID)) {
-			//     audioContext.play()
-			//   }
-			//   ida.push(result.messageID)
-			// })
-		},
-		onShow: function() {
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
-		}
-	}
+    // jpushModule.initJPushService()
+    // const audioContext = uni.createInnerAudioContext()
+    // audioContext.src = './static/mp3/order.mp3'
+    // let ida = [0]
+    // jpushModule.addNotificationListener(function (result) {
+    //   if (!ida.includes(result.messageID)) {
+    //     audioContext.play()
+    //   }
+    //   ida.push(result.messageID)
+    // })
+  },
+  onShow: function () {
+    console.log('App Show')
+    // 创建内部音频对象
+    const audioContext = uni.createInnerAudioContext()
+
+    // 设置音频文件地址
+    audioContext.src = './static/mp3/order.mp3'
+
+    // 播放音频
+    //#ifdef APP-PLUS
+    jpushModule.addNotificationListener(res => {
+      console.log("监听成功")
+      audioContext.play()
+    })
+    // #endif
+  },
+  onHide: function () {
+    console.log('App Hide')
+  }
+}
 </script>
 
 <style>
-	/*每个页面公共css */
-	@import "static/css/base.css";
-	@import "static/css/style.scss";
+/*每个页面公共css */
+@import "static/css/base.css";
+@import "static/css/style.scss";
 
-	view {
-		box-sizing: border-box;
-	}
+view {
+  box-sizing: border-box;
+}
 </style>
\ No newline at end of file
diff --git a/components/GlobalPopup/GlobalPopup.vue b/components/GlobalPopup/GlobalPopup.vue
new file mode 100644
index 0000000..04a82ca
--- /dev/null
+++ b/components/GlobalPopup/GlobalPopup.vue
@@ -0,0 +1,59 @@
+<template>
+	<view class="box" v-show="flag">
+		<p>提示</p>
+		你有新的订单,请注意查收!
+		<view class="off" @click="flag=false ">
+			<u-icon name="close" color="black" size="22"></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "GlobalPopup",
+		data() {
+			return {
+				flag: false
+			};
+		},
+		methods: {
+			showPopu() {
+				this.flag = true
+				setTimeout(() => {
+					this.flag = false
+				}, 3000)
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss">
+	.box {
+		z-index: 99999999999;
+		position: absolute;
+		top: 80rpx;
+		width: 90vw;
+		text-align: center;
+		box-sizing: border-box;
+		padding: 10rpx 20rpx;
+		font-size: 30rpx;
+		height: 10vh;
+		background-color: white;
+		border-radius: 5rpx;
+		left: 50%;
+		transform: translateX(-50%);
+
+		p {
+			text-align: left;
+			font-weight: bold;
+			font-size: 30rpx
+		}
+
+		.off {
+			position: absolute;
+			right: 20rpx;
+			top: 10rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/logistiComptent/logistiCard/logistiCard.vue b/components/logistiComptent/logistiCard/logistiCard.vue
index b95c2bc..82363bb 100644
--- a/components/logistiComptent/logistiCard/logistiCard.vue
+++ b/components/logistiComptent/logistiCard/logistiCard.vue
@@ -12,6 +12,8 @@
 
 				<p class="tit" v-if="goodsInfo.status==2" style="background-color: #47BE62;">
 					收货人姓名:&nbsp;&nbsp;{{fuzzyName(goodsInfo.receiver_name)}}</p>
+				<p class="tit" v-if="goodsInfo.status==3" style="background-color: red;">
+					收货人姓名:&nbsp;&nbsp;{{fuzzyName(goodsInfo.receiver_name)}}</p>
 				<view class="contents">
 					<!-- 已取货 -->
 					<view class="left" v-if='goodsInfo.status==0'>
@@ -215,6 +217,60 @@
 
 					</view>
 
+					<!-- 已取消 -->
+					<view class="left" @click="goDetil" v-if='goodsInfo.status==3'>
+						<view style="margin: 0;padding:0">
+							<view class="list">
+								<text>
+									联系电话
+								</text>
+								<view @click.stop="callFn(goodsInfo.receiver_phone)">
+									<u-icon style="display: inline-block;margin-left: 5rpx;" name="phone"
+										color="#47BE62" size="22"></u-icon> {{goodsInfo.receiver_phone}}
+
+								</view>
+							</view>
+							<view class="list">
+								<text>
+									用户地址
+								</text>
+								<view>
+									<view class="address">
+										{{goodsInfo.receiver_address}}
+									</view>
+								</view>
+							</view>
+
+
+
+							<view class="hr">
+							</view>
+							<view class="pro_list">
+								<text style="color: #999;width: 15vw;">
+									商品信息
+								</text>
+								<view>
+									<view class="goods_tit" v-for="(item,index) in goodsInfo.products">
+										<text class="goods_detil">{{item.goods_name}}</text>
+										<text>X{{item.product_num}}{{item.goods_unit}}</text>
+									</view>
+								</view>
+							</view>
+
+						</view>
+						<view class="total">
+							共计{{goodsInfo.product_count}}件商品
+						</view>
+
+						<u-button type="primary" class="custom-style" style="background-color: red;border: 0;">
+							<u-icon name="eye-fill" color="white" size="25" style="margin-right: 10rpx;"></u-icon>
+							查看详情</u-button>
+
+
+					</view>
+
+
+
 				</view>
 
 
diff --git a/components/mybtn/mybtn.vue b/components/mybtn/mybtn.vue
index 59f57b8..126b30c 100644
--- a/components/mybtn/mybtn.vue
+++ b/components/mybtn/mybtn.vue
@@ -1,62 +1,65 @@
 <template>
-  <view>
-    <button @click.stop="click" :class="{'my_btn_new_btn': position, 'my_btn_no_positon': !position, 'my_btn_disabled': my_btn_disabled}">{{text}}</button>
-  </view>
+	<view>
+		<button @click.stop="click"
+			:class="{'my_btn_new_btn': position, 'my_btn_no_positon': !position, 'my_btn_disabled': my_btn_disabled}">{{text}}</button>
+	</view>
 </template>
 
 <script>
-  export default {
-    props: {
-      text: {
-        type: String,
-        default: '新增'
-      },
-      position:{
-        type: Boolean,
-        default: true
-      },
-      my_btn_disabled:{
-        type: Boolean,
-        default: false
-      }
-    },
-    data(){
-      return{
-        
-      }
-    },
-    methods:{
-      click(){
-        this.$emit('click')
-      }
-    }
-  }
+	export default {
+		props: {
+			text: {
+				type: String,
+				default: '新增'
+			},
+			position: {
+				type: Boolean,
+				default: true
+			},
+			my_btn_disabled: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			click() {
+				this.$emit('click')
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-  .my_btn_new_btn{
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    // z-index: 9999999;
-    z-index: 1;
-    width: 100%;
-    border-radius: 0;
-    color: #fff;
-    height: 90rpx;
-    line-height: 90rpx;
-    background-color: $theme-oa-color;
-  }
-  .my_btn_no_positon{
-    width: 100%;
-    border-radius: 0;
-    color: #fff;
-    height: 90rpx;
-    line-height: 90rpx;
-    background-color: $theme-oa-color;
-  }
-  .my_btn_disabled{
-    background-color: #666;
-    color: #eee;
-  }
+	.my_btn_new_btn {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		// z-index: 9999999;
+		z-index: 1;
+		width: 100%;
+		border-radius: 0;
+		color: #fff;
+		height: 90rpx;
+		line-height: 90rpx;
+		background-color: $theme-oa-color;
+	}
+
+	.my_btn_no_positon {
+		width: 100%;
+		border-radius: 0;
+		color: #fff;
+		height: 90rpx;
+		line-height: 90rpx;
+		background-color: $theme-oa-color;
+	}
+
+	.my_btn_disabled {
+		background-color: #666;
+		color: #eee;
+	}
 </style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 9d03a7f..e600185 100644
--- a/manifest.json
+++ b/manifest.json
@@ -107,13 +107,13 @@
         "nativePlugins" : {
             "JG-JCore" : {
                 "JPUSH_APPKEY_ANDROID" : "5ced5ec5fa7bb86302944f0f",
-                "JPUSH_APPKEY_IOS" : "",
+                "JPUSH_APPKEY_IOS" : "5ced5ec5fa7bb86302944f0f",
                 "JPUSH_CHANNEL_ANDROID" : "",
                 "JPUSH_CHANNEL_IOS" : "",
                 "__plugin_info__" : {
                     "name" : "极光推送 JCore 官方 SDK",
                     "description" : "极光推送 JCore 官方 SDK HBuilder 插件版本",
-                    "platforms" : "Android,iOS",
+                    "platforms" : "All,Android,iOS",
                     "url" : "https://ext.dcloud.net.cn/plugin?id=4028",
                     "android_package_name" : "uni.UNIB5B1EDD",
                     "ios_bundle_id" : "uni.UNIB5B1EDD",
@@ -167,7 +167,7 @@
                 "__plugin_info__" : {
                     "name" : "极光推送 JPush 官方 SDK",
                     "description" : "极光推送JPush官方SDK HBuilder插件版本",
-                    "platforms" : "Android,iOS",
+                    "platforms" : "All,Android,iOS",
                     "url" : "https://ext.dcloud.net.cn/plugin?id=4035",
                     "android_package_name" : "uni.UNIB5B1EDD",
                     "ios_bundle_id" : "uni.UNIB5B1EDD",
diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue
index 2f2763b..ba5d398 100644
--- a/pages/logistics/deliveryDetil.vue
+++ b/pages/logistics/deliveryDetil.vue
@@ -8,9 +8,9 @@
 				<u-toast ref="uToast"></u-toast>
 				<view class="map">
 
-					<map 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">
+					<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">
 						<cover-image class="map_btn" @tap="test" src="../../static/img/logistics/DH.png">
 						</cover-image>
 					</map>
@@ -80,10 +80,12 @@
 
 				</view>
 
+				<view style="margin-top: 200rpx;height: 1px;">
+					<!-- 565 -->
+				</view>
 				<view class="btn">
-					<u-button @click="qrqodeFn" type="primary" class="custom-style"
-						style="background-color: #0122C7;border: 0;">
-						<u-icon name="scan" color="white" size="25" style="margin-right: 10rpx;"></u-icon>
+					<u-button @click="qrqodeFn" type="primary" style="background-color: #0122C7;border: 0;">
+						<u-icon name="scan" color="white" size="30" style="margin-right: 10rpx;"></u-icon>
 						扫码取货</u-button>
 				</view>
 			</view>
@@ -103,7 +105,7 @@
 	export default {
 		data() {
 			return {
-
+				mapClass: 'custom-map',
 				showLoading: true,
 				showPop: false,
 				goodsDetil: undefined,
@@ -152,7 +154,7 @@
 					success: function async (res) {
 						that.nowAddress = res.address.city + res.address.district + res.address.street + res
 							.address.streetNum + res.address.poiName
-						console.log(that.nowAddress)
+
 						that.markers[1].latitude = res.latitude
 						that.markers[1].longitude = res.longitude
 						that.getDriverLine()
@@ -250,7 +252,7 @@
 							points: points,
 							color: "#0091ff",
 							dottedLine: true,
-							width: 10,
+							width: 30,
 
 						}, ];
 					},
@@ -286,8 +288,6 @@
 				})
 
 			},
-
-
 		},
 		onLoad(options) {
 			getDetil({
@@ -306,6 +306,10 @@
 </script>
 
 <style lang='scss' scoped>
+	.custom-map /deep/ .polyline {
+		stroke-width: 20px;
+	}
+
 	.content {
 		padding: 2vh 3vw;
 		background-color: #F6F7FC;
@@ -392,6 +396,12 @@
 	}
 
 	.btn {
-		margin-top: 200rpx;
+
+		position: fixed;
+		bottom: 20rpx;
+		width: 90vw;
+		left: 50%;
+		transform: translateX(-50%);
+
 	}
 </style>
\ No newline at end of file
diff --git a/pages/logistics/index.vue b/pages/logistics/index.vue
index 43949d7..46accaa 100644
--- a/pages/logistics/index.vue
+++ b/pages/logistics/index.vue
@@ -1,132 +1,147 @@
 <template>
-	<view>
-		<!-- <globalPopup ref="globalPopup"></globalPopup> -->
-		<u-sticky bgColor="#0122C7" style="width: 100vw;">
-			<u-tabs :list="tabLists" @change="sectionChange" lineColor='#fff' :scrollable="false" lineWidth='40'
-				inactiveStyle='color:#fff' activeStyle="color:#fff"></u-tabs>
-		</u-sticky>
-		<view class="content">
-			<u-search placeholder="搜索你的订单" @search="getOrderList" :show-action='false' bg-color='white'
-				v-model="keywords"></u-search>
-			<view v-if="!orderlist.length">
-				<u-empty mode="data" icon="../../static/img/empty/data.png">
-				</u-empty>
-			</view>
-			<view v-else>
-				<logistiCard ref="logistiCards" v-for='(item,index) in orderlist' @getlist="getOrderList"
-					@showTost='showToast' @showToast2="showToast2" :goodsInfo="item" :key="index">
-				</logistiCard>
-			</view>
-			<!--  -->
-			<u-toast ref="uToast"></u-toast>
-		</view>
-
-
-	</view>
-
+  <view>
+    <globalPopup ref="globalPopup"></globalPopup>
+    <u-sticky bgColor="#0122C7" style="width: 100vw">
+      <u-tabs
+        :list="tabLists"
+        @change="sectionChange"
+        lineColor="#fff"
+        :scrollable="false"
+        lineWidth="40"
+        inactiveStyle="color:#fff"
+        activeStyle="color:#fff"
+      ></u-tabs>
+    </u-sticky>
+    <view class="content">
+      <u-search
+        placeholder="搜索你的订单"
+        @search="getOrderList"
+        :show-action="false"
+        bg-color="white"
+        v-model="keywords"
+      ></u-search>
+      <view v-if="!orderlist.length">
+        <u-empty mode="data" icon="../../static/img/empty/data.png"> </u-empty>
+      </view>
+      <view v-else>
+        <logistiCard
+          ref="logistiCards"
+          v-for="(item, index) in orderlist"
+          @getlist="getOrderList"
+          @showTost="showToast"
+          @showToast2="showToast2"
+          :goodsInfo="item"
+          :key="index"
+        >
+        </logistiCard>
+      </view>
+      <!--  -->
+      <u-toast ref="uToast"></u-toast>
+    </view>
+  </view>
 </template>
 
 <script>
-	import {
-		getList
-	} from "@/api/logistics.js"
-	// import globalPopup from "@/components/GlobalPopup/GlobalPopup.vue"
-	import {
-		informationAdd
-	} from "@/api/logistics.js"
-	import logistiCard from "@/components/logistiComptent/logistiCard/logistiCard.vue"
-	//#ifdef APP-PLUS
-	var jpushModule = uni.requireNativePlugin("JG-JPush");
-	// #endif	
-	export default {
-		components: {
-			logistiCard,
-			// globalPopup
-		},
-		data() {
-			return {
-				notArr: [],
-				keywords: "",
-				tabLists: [{
-					name: '待配送',
-				}, {
-					name: '待送达'
-				}, {
-					name: '已送达'
-				}],
-				curNow: 0,
-				orderlist: []
-			}
-		},
-		methods: {
-			go() {
-				uni.navigateTo({
-					url: "/pages/logistics/te"
-				})
-			},
-			sectionChange(index) {
+import {
+  getList
+} from "@/api/logistics.js"
+import globalPopup from "@/components/GlobalPopup/GlobalPopup.vue"
+import {
+  informationAdd
+} from "@/api/logistics.js"
+import logistiCard from "@/components/logistiComptent/logistiCard/logistiCard.vue"
+//#ifdef APP-PLUS
+var jpushModule = uni.requireNativePlugin("JG-JPush");
+// #endif	
+export default {
+  components: {
+    logistiCard,
+    globalPopup
+  },
+  data () {
+    return {
+      notArr: [],
+      keywords: "",
+      tabLists: [{
+        name: '待配送',
+      }, {
+        name: '待送达'
+      }, {
+        name: '已送达'
+      }],
+      curNow: 0,
+      orderlist: []
+    }
+  },
+  methods: {
+    go () {
+      uni.navigateTo({
+        url: "/pages/logistics/te"
+      })
+    },
+    sectionChange (index) {
 
-				this.curNow = index.index;
-				this.getOrderList()
-			},
+      this.curNow = index.index;
+      this.getOrderList()
+    },
 
-			showToast() {
-				// 6
-				this.$refs.uToast.show({
-					type: 'success',
-					title: '成功主题(带图标)',
-					message: "操作成功",
-					iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
-				})
-			},
-			showToast2() {
-				// 6
+    showToast () {
+      // 6
+      this.$refs.uToast.show({
+        type: 'success',
+        title: '成功主题(带图标)',
+        message: "操作成功",
+        iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
+      })
+    },
+    showToast2 () {
+      // 6
 
-				this.$refs.uToast.show({
-					type: 'error',
-					message: "取件码不能为空",
-					iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
-				}, )
-			},
-			getOrderList() {
-				console.log("列表更新")
-				let id = JSON.parse(uni.getStorageSync('USER_INFO')).id
-				getList({
-					status: this.curNow,
-					courier_id: id,
-					keywords: this.keywords
-				}).then(res => {
-					this.orderlist = []
-					this.orderlist = res.data.data
-				})
-			}
+      this.$refs.uToast.show({
+        type: 'error',
+        message: "取件码不能为空",
+        iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
+      },)
+    },
+    getOrderList () {
+      console.log("列表更新")
+      let id = JSON.parse(uni.getStorageSync('USER_INFO')).id
+      getList({
+        status: this.curNow,
+        courier_id: id,
+        keywords: this.keywords
+      }).then(res => {
+        this.orderlist = []
+        this.orderlist = res.data.data
+      })
+    }
 
-		},
-		onLoad() {
-			let that = this
-			//#ifdef APP-PLUS
-			jpushModule.addNotificationListener(function(result) {
-				if (!that.notArr.includes(result.messageID)) {
-					that.$refs.globalPopup.showPopu();
-					that.getOrderList()
+  },
+  onLoad () {
+    let that = this
+    //#ifdef APP-PLUS
+    jpushModule.addNotificationListener(function (result) {
+      if (!that.notArr.includes(result.messageID)) {
+        that.$refs.globalPopup.showPopu();
+        that.getOrderList()
 
-				}
-				that.notArr.push(result.messageID)
-			})
-			// #endif	
-		},
-		onShow() {
-			this.getOrderList()
+      }
+      that.notArr.push(result.messageID)
+    })
+    // #endif	
+  },
+  onShow () {
+    this.getOrderList()
 
-		}
+  }
 
-	}
+}
 </script>
 
 <style lang='scss'>
-	.content {
-		margin-top: 2vh;
-		background-color: #F5F5F5;
-		padding: 0vh 2vw;
-	}
+.content {
+  margin-top: 2vh;
+  background-color: #f5f5f5;
+  padding: 0vh 2vw;
+}
 </style>
\ No newline at end of file
diff --git a/pages/logistics/logisticDetil.vue b/pages/logistics/logisticDetil.vue
index 3bb2157..cb035b5 100644
--- a/pages/logistics/logisticDetil.vue
+++ b/pages/logistics/logisticDetil.vue
@@ -11,7 +11,83 @@
 				</p>
 				<p class="tit" v-if="goodsDetil.logistics.status==2" style="background-color: #47BE62;">
 					订单编号:&nbsp;&nbsp;{{goodsDetil.logistics.order_sn}}</p>
+				<p class="tit" v-if="goodsDetil.logistics.status==3" style="background-color: red;">
+					订单编号:&nbsp;&nbsp;{{goodsDetil.logistics.order_sn}}</p>
 				<view class="contents">
+
+					<!-- 已取消 -->
+					<view class="left" v-if="goodsDetil.logistics.status==3">
+						<view class="list">
+							<text>
+								取消时间
+							</text>
+							<view>
+								{{goodsDetil.record[1].create_time}}
+							</view>
+						</view>
+						<view class="list">
+							<text>
+								收货详情
+							</text>
+							<view>
+								<view>
+									{{goodsDetil.logistics.receiver_address}}
+								</view>
+								<view>
+									{{ fuzzyName(goodsDetil.logistics.receiver_name) ||"顾客姓名"}}:&nbsp;&nbsp;{{goodsDetil.logistics.receiver_phone||"顾客电话"}}
+								</view>
+								<view>
+									{{goodsDetil.create_time}}
+								</view>
+							</view>
+
+						</view>
+
+						<view class="list">
+							<text>
+								取货详情
+							</text>
+							<view>
+								<view>
+									{{goodsDetil.logistics.shop_address||"商家地址"}}
+								</view>
+								<view>
+									{{goodsDetil.logistics.shop_name||"商家电话"}}
+									:&nbsp;&nbsp;{{goodsDetil.logistics.shop_phone||"商家电话"}}
+								</view>
+
+							</view>
+						</view>
+
+						<view class="hr">
+
+						</view>
+						<view>
+							<view>
+								物流信息
+							</view>
+							<view style="margin: 10rpx 0;">
+								<u-steps :current="record.length" direction="column">
+									<u-steps-item :title="item.content" :desc="item.create_time"
+										v-for="(item,index) in goodsDetil.record">
+									</u-steps-item>
+								</u-steps>
+							</view>
+						</view>
+						<view class="pro_list">
+							<text style="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-if="goodsDetil.logistics.status==2">
 						<view class="list">
@@ -86,8 +162,8 @@
 					</view>
 
 					<!-- 已取货 -->
-					<view class="left" v-else>
-						<view class="list">
+					<view class="left" v-if="goodsDetil.logistics.status==1">
+						<view class=" list">
 							<text>
 								用户名称
 							</text>
@@ -145,12 +221,10 @@
 
 					</view>
 
-
-
-					<view class="total" v-if="goodsDetil.logistics.status==2">
+					<view class="total" v-if="goodsDetil.logistics.status==2||goodsDetil.logistics.status==3">
 						<text>共计{{goodsDetil.product_count}}件 </text>
 					</view>
-					<view style="margin-top: 600rpx;" v-if="goodsDetil.logistics.status==1">
+					<view class="btn" v-if="goodsDetil.logistics.status==1">
 						<u-button type="primary" style="background-color: #FF7C32;border: 0; border-radius: 2vw;"
 							@click="showPop=true"><u-icon name="car-fill" color="white" size="25"
 								style="margin-right: 10rpx;;"></u-icon>
@@ -254,6 +328,15 @@
 		background-color: #F5F5F5;
 	}
 
+	.btn {
+		position: fixed;
+		bottom: 20rpx;
+		width: 90vw;
+		left: 50%;
+		transform: translateX(-50%);
+
+	}
+
 	.order {
 		position: relative;
 		background-color: white;
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index b327ce7..2516261 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -1,30 +1,37 @@
 <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 ">
-				<view class="head_img">
-					<view class="img_box">
-						<u--image :showLoading="true" width="150.28rpx" height="150.28rpx"
-							:src="myOaInfo.avatar || '../../static/img/public/avatar.png'" shape="circle"></u--image>
-					</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">
+        <view class="head_img">
+          <view class="img_box">
+            <u--image
+              :showLoading="true"
+              width="150.28rpx"
+              height="150.28rpx"
+              :src="myOaInfo.avatar || '../../static/img/public/avatar.png'"
+              shape="circle"
+            ></u--image>
+          </view>
 
-
-					<text class="nickname">工作证: {{ myOaInfo.nickname }}</text>
-					<text>身份: {{ myOaInfo.admin_id ? "超级管理员" : "普通用户" }}</text>
-				</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">
+          <text class="nickname">工作证: {{ myOaInfo.nickname }}</text>
+          <text>身份: {{ myOaInfo.admin_id ? "超级管理员" : "普通用户" }}</text>
+        </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>
@@ -40,12 +47,12 @@
             }}</text><br />
 					</view>
 				</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>
@@ -54,77 +61,103 @@
         </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"
+        :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">
+              <text class="text_time">{{
+                item.create_time.substring(0, 10)
+              }}</text>
+              {{ item.title }}
+            </view>
 
-					<view class="backlog_item flex_a_c_j_sb" v-for="(item, index) in ApproveList.slice(0, 2)"
-						:key="index" @click="clickNotice(item.id)">
+            <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="my_task">
+      <view class="task_title flex_a_c_j_sb">
+        <view class="title">工作管理</view>
+        <view class="flex_a_c"
+          >更多
+          <view class="iconfont icon-you">
+            <uni-icons type="forward"></uni-icons>
+          </view>
+        </view>
+      </view>
+    </view>
 
-						<view class="text"> <text class="text_time">{{item.create_time.substring(0, 10)}}</text>
-							{{ item.title }}
-						</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>
 
-						<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="my_task">
-			<view class="task_title flex_a_c_j_sb">
-				<view class="title">工作管理</view>
-				<view class="flex_a_c">更多
-					<view class="iconfont icon-you">
-						<uni-icons type="forward"></uni-icons>
-					</view>
-				</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>
 
-
-		<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="goOrderList">更多
-					<view class="iconfont icon-you">
-						<uni-icons type="forward"></uni-icons>
-					</view>
-				</view>
-			</view>
-
-			<!-- <block v-if="myTaskList.length>0">
+      <!-- <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-if="orderList.length > 0">
+        <globalPopup ref="globalPopup"></globalPopup>
+        <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 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>
@@ -148,595 +181,622 @@
           </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 logistiBriefCard from "@/components/logistiComptent/logistiCard/logistiBriefCard.vue"
-	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
-			logistiBriefCard
-		},
-		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()
-			this.getOrderList()
-		},
-		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 || ""
-				let res = await getList({
-					courier_id: id
-					// courier_id: 167
-				})
-				this.orderList = res.data.data
+import logistiBriefCard from "@/components/logistiComptent/logistiCard/logistiBriefCard.vue"
+import globalPopup from "@/components/GlobalPopup/GlobalPopup.vue"
+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'
+//#ifdef APP-PLUS
+var jpushModule = uni.requireNativePlugin("JG-JPush");
+// #endif	
+export default {
+  components: {
+    // tabbar
+    logistiBriefCard,
+    globalPopup
+  },
+  data () {
+    return {
+      notArr: [],
+      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 () {
+    //#ifdef APP-PLUS
+    const audioContext = uni.createInnerAudioContext()
+    audioContext.volume = 1
+    audioContext.src = '../../static/mp3/order.mp3'
+    let that = this
+    jpushModule.addNotificationListener(function (result) {
+      if (!that.notArr.includes(result.messageID)) {
+        that.$refs.globalPopup.showPopu();
+        that.getOrderList()
+        console.log("idnex的")
+        audioContext.play()
 
-			},
-			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.$store.state.app.userInfo?.company?.company_type_name == '平台公司') {
-					this.oaHomeData = this.oaHomeData.filter(item => {
-						return item.text == '人员管理' ? false : true;
-					})
-				}
-				// 判断是否需要显示更多按钮
-				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];
+      }
+      that.notArr.push(result.messageID)
+    })
+    // #endif	
 
-				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()
-		}
-	}
+  },
+  onShow () {
+    // this.getUserIndex()
+    // this.getIndexList()
+    this.getApproveList()
+    this.initUserInfo()
+    this.showToask()
+    this.initOaHomeDada()
+    this.getOrderList()
+  },
+  computed: {},
+  methods: {
+    test () {
+      this.$refs.globalPopup.showPopu();
+    },
+    // 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 || ""
+      let res = await getList({
+        courier_id: id
+        // courier_id: 167
+      })
+      this.orderList = res.data.data
+
+    },
+    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.$store.state.app.userInfo?.company?.company_type_name == '平台公司') {
+        this.oaHomeData = this.oaHomeData.filter(item => {
+          return item.text == '人员管理' ? false : true;
+        })
+      }
+      // 判断是否需要显示更多按钮
+      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-color: $theme-oa-color;
-		border-radius: 0 0 30rpx 30rpx;
+.home_header {
+  position: relative;
+  padding: 28rpx;
+  // height: 607.02rpx;
+  // height: 480.02rpx;
+  width: 100%;
+  // background-color: $theme-oa-color;
+  margin-bottom: 133.33rpx;
+  background-color: $theme-oa-color;
+  border-radius: 0 0 30rpx 30rpx;
 
-		.head_img {
-			background-color: #FF7C32;
-			width: 100%;
-			border-radius: 70rpx 50rpx 50rpx 70rpx;
-			height: 130.28rpx;
-			display: flex;
-			justify-content: space-between;
-			padding-right: 50rpx;
-			line-height: 130rpx;
-			color: white;
-			font-size: 34rpx;
+  .head_img {
+    background-color: #ff7c32;
+    width: 100%;
+    border-radius: 70rpx 50rpx 50rpx 70rpx;
+    height: 130.28rpx;
+    display: flex;
+    justify-content: space-between;
+    padding-right: 50rpx;
+    line-height: 130rpx;
+    color: white;
+    font-size: 34rpx;
 
-			.img_box {
-				width: 150.28rpx;
-				height: 150.28rpx;
-				translate: -10rpx -10rpx;
-				border: 1px dashed #707070;
-			}
+    .img_box {
+      width: 150.28rpx;
+      height: 150.28rpx;
+      translate: -10rpx -10rpx;
+      border: 1px dashed #707070;
+    }
 
-			// font-we
-		}
+    // font-we
+  }
 
-		.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;
 
-					/* 设置元素宽度，根据需要进行调整 */
-					.text_time {
-						display: inline-block;
-						background-color: #ff8c1a;
-						color: white;
-						padding: 5rpx 10rpx;
-						margin-right: 10rpx;
-						border-radius: 15rpx;
-					}
+        /* 设置元素宽度，根据需要进行调整 */
+        .text_time {
+          display: inline-block;
+          background-color: #ff8c1a;
+          color: white;
+          padding: 5rpx 10rpx;
+          margin-right: 10rpx;
+          border-radius: 15rpx;
+        }
 
-					// &::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/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue
index af45f4a..9d124ec 100644
--- a/pages/oaLogin/oaLogin.vue
+++ b/pages/oaLogin/oaLogin.vue
@@ -21,12 +21,14 @@
           </view>
           <input
             v-if="current == 0"
+            @click="getId"
             class="mobile item"
             v-model="formData.account"
             placeholder="输入账号"
           />
           <input
             v-if="current == 0"
+            @click="getId"
             class="mobile item"
             v-model="formData.password"
             maxlength="26"
@@ -108,6 +110,19 @@ export default {
       this.current = e.index;
       this.formData.scene = e.index + 1;
     },
+    // 获取设备id
+    getId () {
+      // #ifdef APP-PLUS
+      if (this.formData.register_id) return
+      jpushModule.initJPushService()
+      jpushModule.getRegistrationID(result => {
+        // 绑定极光设备id
+        this.formData.register_id = result.registerID || 0
+
+        console.log("设备----", this.formData)
+      })
+      // #endif
+    },
     async login () {
       if (!this.formData.account) return Toast('账号不能为空');
       if (this.formData.scene == 1 && !this.formData.password) return Toast('密码不能为空');
@@ -124,25 +139,14 @@ export default {
         user: data,
         token: res.data.token
       })
-      let { data } = await userInfo();
+      let {
+        data
+      } = await userInfo();
       this.$store.commit('setUserInfo', data);
       uni.hideLoading()
-      if (data.is_new_user) {
-        uni.showLoading({
-          mask: true,
-          title: '加载中'
-        })
-        uni.switchTab({
-          url: '/pages/oaHome/oaHome',
-          success: () => {
-            uni.$emit('initOaTask'); // 更新任务
-            uni.hideLoading()
-          }
-        })
-      } else uni.navigateTo({
-        url: '/pages/updatePasswprd/updatePasswprd'
-      });
-
+      uni.switchTab({
+        url: '/pages/oaHome/oaHome'
+      })
     },
     initTerminal () {
       // #ifndef APP-PLUS
@@ -199,14 +203,7 @@ export default {
     }
   },
   mounted () {
-    // // #ifdef APP-PLUS
-    // jpushModule.initJPushService()
-    // jpushModule.getRegistrationID(result => {
-    //   // 绑定极光设备id
-    //   this.formData.register_id = result.registerID
-    //   console.log("设备----", this.formData)
-    // })
-    // // #endif
+
     this.initTerminal();
 
   }
diff --git a/utils/jpush.js b/utils/jpush.js
index 3a6c069..42266d4 100644
--- a/utils/jpush.js
+++ b/utils/jpush.js
@@ -1,6 +1,6 @@
 // 引用方式
 var jpushModule = uni.requireNativePlugin("JG-JPush");
-console.log('【sk】【引用方式】【jpushModule】【requireNativePlugin】')
+// console.log('【sk】【引用方式】【jpushModule】【requireNativePlugin】')
 
 // 开启 debug 模式，默认是关闭
 function openDebug() {