From e6f79ef61d4e3cd64884dce9d3917311759dc8a8 Mon Sep 17 00:00:00 2001
From: zhangmanman <994797151@qq.com>
Date: Thu, 30 Sep 2021 16:12:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/index.vue      |  2 +-
 pages/wallet/property.vue | 15 ++++++++++++---
 router/index.js           | 10 +++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pages/user/index.vue b/pages/user/index.vue
index adfa73e..e5923be 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -82,7 +82,7 @@
 				    <view class="userVip-rights">
 				        <view class="userVip-rightst-title">
 				            <view class="userVip-rightst-title-name">查看会员专属权益</view>
-				            <view class="userVip-rightst-more" @click="$Router.push({name: 'vipIndex'})">全部更多 <image class="userVip-rightst-more-img" src="/static/user/userVip_more_arrow.png"></image></view>
+				            <view class="userVip-rightst-more" @click="$Router.push({name: 'vipIndex', params:{identity_id: userIdentity.right.identity_id}})">全部更多 <image class="userVip-rightst-more-img" src="/static/user/userVip_more_arrow.png"></image></view>
 				        </view>
 				        <view class="userVip-rightst-list" v-if="userIdentity.right">
 				            <view v-for="(item, index) in userIdentity.right.rights" :key="index" class="userVip-rightst-label">
diff --git a/pages/wallet/property.vue b/pages/wallet/property.vue
index b540762..0827231 100644
--- a/pages/wallet/property.vue
+++ b/pages/wallet/property.vue
@@ -46,6 +46,7 @@
 
 <script>
 	import record from '@/components/property/record'
+    import h5Copy from '@/js_sdk/junyi-h5-copy/junyi-h5-copy/junyi-h5-copy'
 	import {
 		sum,
 		price,
@@ -161,9 +162,17 @@
 					showCancel:false,
 					success: (res) => {
 						if (res.confirm) {
-							uni.setClipboardData({
-								data: this.balance.address
-							})
+                            const result = h5Copy(this.balance.address)
+                                if (result === false) {
+                                uni.showToast({
+                                    title:'不支持',
+                                })
+                            } else {
+                                uni.showToast({
+                                    title:'复制成功',
+                                    icon:'none'
+                                })
+                            }
 						}
 					}
 				})
diff --git a/router/index.js b/router/index.js
index d04e494..ca262ed 100644
--- a/router/index.js
+++ b/router/index.js
@@ -24,11 +24,11 @@ const router = createRouter({
 router.beforeEach((to, from, next) => {
 	const token  = store.getters.getToken || uni.getStorageSync('token')
 	// 检查是否需要微信授权
-	if(store.getters.getCode === '' && to.name != 'wxAuth'){
-		next({
-			name: 'wxAuth'
-		})
-	}
+	// if(store.getters.getCode === '' && to.name != 'wxAuth'){
+	// 	next({
+	// 		name: 'wxAuth'
+	// 	})
+	// }
 	// 检查是否需要登录
 	if(to.auth && token === ''){
 		next({