zhengkaixin před 3 roky
rodič
revize
c94829f929

+ 1 - 1
.env.js

@@ -1,5 +1,5 @@
 (function() {  
-    const NODE_ENV = 'dev'; // dev:开发环境 | test:测试环境  
+    const NODE_ENV = 'test'; // dev:开发环境 | test:测试环境  
     let ENV_VAR = null;  
 	 
 	var NODE_NAME=  process.env['NODE_NAME']

+ 2 - 2
pages.json

@@ -119,7 +119,7 @@
             "style" :                                                                                    
             {
                 //"navigationBarTitleText": "消息列表",
-                "enablePullDownRefresh": true
+                "enablePullDownRefresh": false
             }
             
         }
@@ -425,7 +425,7 @@
             "style" :                                                                                    
             {
                 //"navigationBarTitleText": "消息列表",
-                "enablePullDownRefresh": true
+                "enablePullDownRefresh": false
             }
             
         }

+ 5 - 2
pages/hr/my/enroll/index.js

@@ -86,8 +86,11 @@ export default {
 						title:"加载中",mask:true,
 					})
 					var obj=this.list[this.current];
-					var data={
-						type:obj.status,
+					var data=obj.status?{
+							type:obj.status,
+						pageIndex:obj.pageIndex
+					}:{
+					
 						pageIndex:obj.pageIndex
 					};
 					API.loadJobManagement(data).then((res) => {

+ 1 - 1
pages/hr/my/look/look.vue

@@ -12,7 +12,7 @@
 			</view>
 			<view class="jp-work-list">
 				 <ResumeItem v-for="(item ,index) in list" :key="item.id" :item="item"
-				  obj="name=realName,positionName=positionCategoryName"
+				  obj="name=realName,positionName=positionCategoryName,sexN=sex"
 				 
 				  ></ResumeItem>
 				  

+ 12 - 6
pages/hr/newsIndex/newsList/index.js

@@ -8,7 +8,7 @@ export default {
 				page:{
 					classifyId:0,
 					pageIndex:1,
-					pageSize:3,
+					pageSize:10,
 				
 				},
 				result:[],
@@ -18,10 +18,15 @@ export default {
 		components: {
 		
 		},
-		onPullDownRefresh() {
-			if(this.result.length<this.recordsTotal){
-				this.myLoadmore();
-			}
+		// onPullDownRefresh() {
+		// 	if(this.result.length<this.recordsTotal){
+		// 		this.myLoadmore();
+		// 	}
+		// },
+		onReachBottom() {
+			if(this.result.length<this.recordsTotal){
+				this.myLoadmore();
+			}
 		},
 		onLoad(op){
 			this.page.classifyId=op.id;
@@ -37,8 +42,9 @@ export default {
 				 })
 				API.messageList(this.page).then((response) => {
 					this.result=[
+						
+						...this.result,
 						...response.data.data,
-						...this.result,
 						
 					];
 					this.recordsTotal=response.data.recordsTotal

+ 2 - 2
pages/hr/newsIndex/newsList/newsList.vue

@@ -2,7 +2,6 @@
 	<view>
 		<u-navbar title="消息"></u-navbar>
 		<view class="newsList">
-			<u-loadmore @loadmore="myLoadmore" :status="result.length<recordsTotal?'loadmore':'nomore'"></u-loadmore>
 
 			<template v-for="(item,i) in result">
 
@@ -12,7 +11,7 @@
 				<view class="newsList-item" @click="item.isRead=true,gotoUrl('pages/hr/newsIndex/newsEntry/newsEntry?id='+item.id)">
 					<view class="newsList-head">
 						<h3 class="u-line-1">{{item.title}}</h3>
-						<span>[{{item.isRead?'已读':'未读'}}]</span>
+						<span :style="item.isRead?'color:#0ebd5f':''" >[{{item.isRead?'已读':'未读'}}]</span>
 					</view>
 					<view class="newsList-main" v-html="item.content">
 
@@ -23,6 +22,7 @@
 					</view>
 				</view>
 			</template>
+			<u-loadmore @loadmore="myLoadmore" :status="result.length<recordsTotal?'loadmore':'nomore'"></u-loadmore>
 
 		</view>
 	</view>

+ 12 - 6
pages/job/newsIndex/newsList/index.js

@@ -8,7 +8,7 @@ export default {
 				page:{
 					classifyId:0,
 					pageIndex:1,
-					pageSize:3,
+					pageSize:10,
 				
 				},
 				result:[],
@@ -18,10 +18,15 @@ export default {
 		components: {
 		
 		},
-		onPullDownRefresh() {
-			if(this.result.length<this.recordsTotal){
-				this.myLoadmore();
-			}
+		// onPullDownRefresh() {
+		// 	if(this.result.length<this.recordsTotal){
+		// 		this.myLoadmore();
+		// 	}
+		// },
+		onReachBottom() {
+			if(this.result.length<this.recordsTotal){
+				this.myLoadmore();
+			}
 		},
 		onLoad(op){
 			this.page.classifyId=op.id;
@@ -37,8 +42,9 @@ export default {
 				 })
 				API.messageList(this.page).then((response) => {
 					this.result=[
+						
+						...this.result,
 						...response.data.data,
-						...this.result,
 						
 					];
 					this.recordsTotal=response.data.recordsTotal

+ 2 - 2
pages/job/newsIndex/newsList/newsList.vue

@@ -2,7 +2,6 @@
 	<view>
 		<u-navbar title="消息"></u-navbar>
 		<view class="newsList">
-			<u-loadmore @loadmore="myLoadmore" :status="result.length<recordsTotal?'loadmore':'nomore'"></u-loadmore>
 
 			<template v-for="(item,i) in result">
 
@@ -12,7 +11,7 @@
 				<view class="newsList-item" @click="item.isRead=true,gotoUrl('pages/job/newsIndex/newsEntry/newsEntry?id='+item.id)">
 					<view class="newsList-head">
 						<h3 class="u-line-1">{{item.title}}</h3>
-						<span>[{{item.isRead?'已读':'未读'}}]</span>
+						<span :style="item.isRead?'color:#0ebd5f':''">[{{item.isRead?'已读':'未读'}}]</span>
 					</view>
 					<view class="newsList-main" v-html="item.content">
 
@@ -23,6 +22,7 @@
 					</view>
 				</view>
 			</template>
+			<u-loadmore @loadmore="myLoadmore" :status="result.length<recordsTotal?'loadmore':'nomore'"></u-loadmore>
 
 		</view>
 	</view>