From 760ab655eb05ec11aaa62a49908ce95dc029eb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Sun, 26 Sep 2021 10:04:30 +0800
Subject: [PATCH] merge

---
 pages.json             | 7 +++++++
 pages/user/partner.vue | 2 +-
 pages/vip/vip.vue      | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pages.json b/pages.json
index 2cfab87..05e3b75 100644
--- a/pages.json
+++ b/pages.json
@@ -238,6 +238,13 @@
 		"style": {
 			"navigationBarTitleText": "营销推广码"
 		}
+	},{
+		"path": "pages/instrument/basics",
+		"name": "instrumentBasics",
+		"auth": true,
+		"style": {
+			"navigationBarTitleText": "基础信息"
+		}
 	}, {
 		"path": "pages/wallet/fragment",
 		"style": {
diff --git a/pages/user/partner.vue b/pages/user/partner.vue
index bcf430e..6b482f4 100644
--- a/pages/user/partner.vue
+++ b/pages/user/partner.vue
@@ -8,7 +8,7 @@
         </view>
         
         <view class="partner-list">
-            <view class="partner-label" v-for="(item, index) in lists" :larer='larer'>
+            <view class="partner-label" v-for="(item, index) in lists" :key="index" :larer='larer'>
                 <image class="partner-avatar" :src="item.avatar ? item.avatar : '/static/user/user-portrait.png'" mode="aspectFill"></image>
                 <view class="partner-cont">
                     <view class="partner-name">
diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue
index 152d203..f7ee67b 100644
--- a/pages/vip/vip.vue
+++ b/pages/vip/vip.vue
@@ -59,7 +59,7 @@
                     <view class="privilege-name">
                         升级条件
                     </view>
-                    <view class="privilege-label" :class="{'active' : item.finish == true}" v-for="(item, index) in identitie[tabsIndex].get_condition">
+                    <view class="privilege-label" :class="{'active' : item.finish == true}" v-for="(item, index) in identitie[tabsIndex].get_condition" :key="index">
                         &{{item.message}}
                     </view>
                 </view>
@@ -70,7 +70,7 @@
                     <view class="privilege-name">
                         节点权益
                     </view>
-                    <view class="privilege-label privilege-right" v-for="(item, index) in identitie[tabsIndex].rights">
+                    <view class="privilege-label privilege-right" v-for="(item, index) in identitie[tabsIndex].rights" :key="index">
                         &{{item.remark}}
                    </view>
                 </view>
             </view>