From 08430d7dfaa2db53abc03cab8a0a6bd539e63b88 Mon Sep 17 00:00:00 2001
From: JING <leirance@live.com>
Date: Thu, 1 Aug 2024 18:42:06 +0800
Subject: [PATCH] 111

---
 pages/index/index.vue        |   8 ++++++++
 pages/user/index.vue         |   3 +++
 pagesA/merge/index.vue       |  14 ++++++++++++--
 static/img/index/waiting.png | Bin 0 -> 3030 bytes
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 static/img/index/waiting.png

diff --git a/pages/index/index.vue b/pages/index/index.vue
index accaf9d..40d7a11 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -258,6 +258,14 @@
 				}
 			}
 		},
+		//首页跳转到列表页
+		merge(item)
+		{
+			var _this =this;
+			uni.navigateTo({
+				url:'/pagesA/merge/index?id='+item.id+'&type='+item.type+'&ilk='+item.ilk,
+			})
+		},
 		
     }
   }
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 2ae46ef..d71ab02 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -232,6 +232,7 @@ export default {
 		//_this.getSceneMenu();
 		//面部档案
 		_this.getPortraitList();
+		_this.tabChange({index:0});
 		
 	},
 	onReachBottom () {
@@ -314,6 +315,8 @@ export default {
 			console.log(e);
 			_this.current = e.index;
 			var type = _this.tabList[_this.current].type;
+			_this.dataList = [];
+			_this.page = 1;
 			switch(type)
 			{
 				case 1:
diff --git a/pagesA/merge/index.vue b/pagesA/merge/index.vue
index cd9acf8..9783de3 100644
--- a/pagesA/merge/index.vue
+++ b/pagesA/merge/index.vue
@@ -149,7 +149,8 @@
 							<scroll-view class="scrollBox" scroll-x="true" @scroll="scroll" scroll-left="0">
 									
 									<view class="imgBox"  v-for="(item,index) in selectList" :key="index" @click="selectPortrait(index)">
-										<image class="imgBg" :src="item.model_image_thumbnail  || '/static/img/user/user.png'" mode="widthFix"></image>
+										<image class="imgBg" :src="item.model_image_thumbnail  || '/static/img/user/user.png'" mode="widthFix" v-if="item.status == 3"></image>
+										<image class="imgBg" src="/static/img/index/waiting.png" mode="widthFix" v-if="item.status != 3"></image>
 										<image class="imgSelect" v-if="index == selectIndex" src="/static/img/index/select.png" mode="widthFix"></image>
 									</view>
 									
@@ -266,7 +267,16 @@
 				},
 			}
 		},
-		onLoad(){
+		onLoad(options){
+			var _this =this;
+			if(!_this.$com.isNull(options.id))
+			{
+				var tabList = 	_this.tabList;
+				var this_tab =  tabList.findIndex(item => item.type == options.type);
+				_this.this_tab = this_tab;
+				_this.checkHave({id:options.id,type:options.type,ilk:options.ilk},options.ilk);
+			}
+			console.log('onLoad 参数',options);
 			this.getList();
 		},
 	
diff --git a/static/img/index/waiting.png b/static/img/index/waiting.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0b900264272801a68f164c287e08ba336694d71
GIT binary patch
literal 3030
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

literal 0
HcmV?d00001