111

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,
+			})
+		},
 		
     }
   }

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:

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();
 		},