update

update

pages/index/activity/activity.vue

@@ -52,7 +52,8 @@
 				<view class="active-content" >
 					<view style="margin-right:10rpx;">{{item.branch}}</view>
 					<view class="author-box">{{item.author}}</view>
-					<view style="margin-left:10rpx;">记录数:({{item.process_count}}/<text style="color:red;">{{item.process_unread_count}}</text>)</view>
+					<view style="margin-left:10rpx;">记录数:({{item.process_count}}/
+					<text :class="{fontRed:item.process_unread_count!=0}">{{item.process_unread_count}}</text>)</view>
 				</view>
 				<view class="active-content" style="justify-content: space-between;">
 					<view class="active-date">{{item.start_time}}</view>
@@ -560,5 +561,8 @@ export default {
 	.bg-blue {
 		background-color: #81d3f8;
 	}
+	.fontRed {
+		color: red;
+	}
 }
 </style>

pages/index/activity/record.vue

@@ -44,6 +44,11 @@
 			<!-- <button type="primary" class="submit-bth" style="background-color: #aaaaaa;" @click="goStep()">清空</button> -->
 			<button type="primary" class="submit-bth" style="background-color: #169bd5;" @click="goStep()">提交</button>
 		</view>
+		<view class="mask-share-box" v-if="isShowShare">
+			<image src="/static/share-arrow.png" mode="aspectFit"></image>
+			<view>点击右上角分享</view>
+			<button @click="closeShare">关闭</button>
+		</view>
 	</view>
 </template>
 
@@ -66,6 +71,7 @@
 				contentDesc:'',
 				contentLink:'',
 				type:'add',
+				isShowShare:false,
 			}
 		},
 		onLoad(option) {
@@ -79,10 +85,25 @@
 		},
 		onShow() {
 		},
+		onShareAppMessage() {
+			  return {
+			      title: '农工笔记',
+			      path:'/pages/index/index'
+			    }
+		},
 		methods: {
 			goStep(){
 				 this.addOrEditActiveRecord();
 			},
+			closeShare(){
+				this.isShowShare = false;
+				uni.showToast({
+				  title: "上传成功",
+				  icon: "none", 
+				  duration: 2500,
+				});
+				setTimeout(()=>{uni.navigateBack({})},500)
+			},
 			getInfos(id){
 				let md5Sign = md5(
 					"method=" +"activity" + "&timestamp=" + getApp().globalData.globalTimestamp +
@@ -162,12 +183,7 @@
 							});
 							setTimeout(()=>{uni.navigateBack({})},500)
 						}else {
-							uni.showToast({
-							  title: "上传成功",
-							  icon: "none", 
-							  duration: 2500,
-							});
-							setTimeout(()=>{uni.navigateBack({})},500)
+							this.isShowShare = true
 						}
 				    }
 				  },
@@ -503,4 +519,34 @@
 		margin: 3% auto;
 		padding: 4%;
 	}
+	.mask-share-box{
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		z-index: 999;
+		background-color: rgba(0,0,0,.7);
+		  image {
+			width: 100rpx;
+			height: 100rpx;
+			float: right;
+			margin-right: 15%;
+		  }
+		  view {
+			color: #fff;
+			font-size: 32rpx;
+			text-align: center;
+			margin: 15% 0 70% 15%;
+			font-weight: bold;
+		  }
+		  button {
+			  width: 200rpx;
+			  font-size: 26rpx;
+			  position: fixed;
+			  bottom: 35%;
+			  left: 37%;
+			  background: transparent;
+			  color: #fff;
+			  border: 1px solid #fff;
+		  }
+	}
 </style>

pages/index/honor/honor.vue

@@ -27,7 +27,7 @@
 				 <mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback">
 				 <view class="honor-box" v-for="(item,index) in honorList" :key="index" style="position: relative;">
 					    <view class="honor-name">{{item.name}}</view>
-						<image :src="item.pic_url" mode="aspectFill" @click="showLarge(item.pic_url_resize)"></image>
+						<image :src="item.pic_url_resize" mode="aspectFill" @click="showLarge(item.pic_url)"></image>
 						<view style="display: flex;">
 							<view class="honor-award" style="width:120rpx;">获奖人：</view>
 							<view class="honor-award">{{item.for_branch}} {{item.for_names}}</view>
@@ -67,7 +67,7 @@
 				 </view>
 				 <view class="honor-box" v-for="(item,index) in myHonorList" :key="index" style="position: relative;">
 					    <view class="honor-name">{{item.name}}</view>
-						<image :src="item.pic_url" mode="aspectFit" @click="showLarge(item.pic_url_resize)"></image>
+						<image :src="item.pic_url_resize" mode="aspectFill" @click="showLarge(item.pic_url)"></image>
 						<view style="display: flex;">
 							<view class="honor-award" style="width:120rpx;">获奖人：</view>
 							<view class="honor-award">{{item.for_branch}} {{item.for_names}}</view>
@@ -134,9 +134,21 @@ export default {
   },
   methods: {
 	pageRefreshHonor(object) {
-	        if (object) {
-	            this.getHonorList(this.dateYear,this.dateMonth,this.index)
-	        } else {
+	        if (object === 'add') {
+				if(this.current){
+					this.getMyHonor(this.dateYearSelf,this.dateMonthSelf)
+				}else {
+					this.getHonorList(this.dateYear,this.dateMonth,this.index)
+				}
+	        }else if (object === 'edit'){
+				if(this.current){
+					this.getMyHonor(this.dateYearSelf,this.dateMonthSelf)
+				}else {
+					return
+					//this.getHonorList(this.dateYear,this.dateMonth,this.index)
+				}
+			}
+			 else {
 	            return
 	        }
 	},
@@ -144,7 +156,7 @@ export default {
 		 this.current = e.currentIndex
 		 this.current ? 
 		 this.getMyHonor(this.dateYearSelf,this.dateMonthSelf) : 
-		 false 
+		 this.getHonorList(this.dateYear,this.dateMonth,this.index) 
 	},
 	 bindDateChange(e){
 	 	this.dateYear = e.target.value;
@@ -262,7 +274,11 @@ export default {
 				  icon: "none", 
 				  duration: 2500,
 				  success:()=>{
-					 this.getHonorList(this.dateYear,this.dateMonth,this.index)
+					 if(this.current){
+					 	this.getMyHonor(this.dateYearSelf,this.dateMonthSelf)
+					 }else {
+					 	this.getHonorList(this.dateYear,this.dateMonth,this.index)
+					 }
 				  }
 				});
 		     }

pages/index/honor/record.vue

@@ -517,12 +517,17 @@
 				  success: (res) => {
 					if (res.data.code === 200) {
 						if(this.editId){
+							let types = 'edit';
+							let pages = getCurrentPages(); // 获取当前页面栈的实例，以数组形式按栈的顺序给出，第一个元素为首页，最后一个元素为当前页面。
+							let nowPage = pages[pages.length - 1]; //当前页页面实例
+							let prevPage = pages[pages.length - 2]; //上一页页面实例
+							prevPage.$vm.pageRefreshHonor(types)
 							uni.showToast({
 							  title: "修改成功",
 							  icon: "none", 
 							  duration: 2500,
 							});
-							setTimeout(()=>{uni.navigateBack({})},500)
+							setTimeout(()=>{uni.navigateBack({delta:1})},500)
 						}else {
 							let types = 'add';
 							let pages = getCurrentPages(); // 获取当前页面栈的实例，以数组形式按栈的顺序给出，第一个元素为首页，最后一个元素为当前页面。

pages/index/self_info.vue

@@ -104,6 +104,7 @@
 					:value="userBorn"
 					@change="change"
 					:clear-icon="false"
+					@maskClick="dateMask"
 				/>
 			</view>		
 		</view>
@@ -280,8 +281,15 @@
 				this.dateMonth = this.arrayMonth[e.target.value]
 			},
 			change(e) {
+			  console.log('show')
 			  this.userBorn = e;
-			 },
+			},
+			dateMask(param){
+				console.log(param)
+			},
+			showDateModal(){
+				console.log('show')
+			},
 			getImage(type) {
 			  let that = this;
 			  if (that.uploadList.length === 1) {

uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue

@@ -499,7 +499,6 @@
 
 				}, 50)
 			},
-
 			close() {
 				setTimeout(() => {
 					this.popup = false