Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

pages/my/attachment.vue

@@ -32,7 +32,9 @@
 				<empty :isShow="false" v-if="content.length == 0" />
 			</scroll-view>
 		</view>
+		<!-- #ifdef APP-PLUS -->
 		<view class="white-btn" @click="handleWeChatUpload">微信上传</view>
+		<!-- #endif -->
 		<view class="buttons flex align-center">
 			<view class="button pain" @click="showTipPopup = true">Ai一键解析简历</view>
 			<view class="button primary">

pages/my/myCompany.vue

@@ -439,8 +439,8 @@ export default {
 			setTimeout(() => {
 				// 退出极光推送
 				logoutJP(() => {
-					this.$queue.toLogin()
 					this.$queue.logout()
+					this.$queue.toLogin()
 				})
 			}, 1500)
 		}