添加福利报名截至日期，联动消息列表跳转，采购页面跳转部门字段，隐藏俩个app图标

pageA/club/apply.vue

@@ -16,7 +16,8 @@
 			<view>
 				<u-row>
 					<u-col span="11">
-						<u-button :disabled="isDisabled" class="btnDoPay" shape="circle" @click="submit" color="rgb(55,186,189)" text="报名">
+						<u-button :disabled="isDisabled" class="btnDoPay" shape="circle" @click="submit"
+							color="rgb(55,186,189)" text="报名">
 						</u-button>
 					</u-col>
 				</u-row>
@@ -53,6 +54,11 @@
 		},
 		methods: {
 			async submit() {
+				if (!this.form.address) {
+					this.$showModal("请选择一个地点")
+					return
+				}
+				this.isDisabled = true
 				const {
 					data: res
 				} = await this.$httpRequest({
@@ -62,8 +68,16 @@
 					urlType: this.$getUrlType()
 				});
 				if (res.code === 200) {
-					this.$showModal("报名成功")
+					uni.showModal({
+						title: "报名成功",
+						icon: "OK",
+						showCancel: false,
+						success() {
+							uni.navigateBack()
+						}
+					})
 				} else {
+					this.isDisabled = false
 					this.$showModal(res.msg)
 				}
 			},
@@ -77,13 +91,10 @@
 					if (res.code === 200) {
 						if (res.data.nowStatus === '2') {
 							this.form.address = res.data.address
-							this.isDisabled = true
 							this.$showModal("您已完成报名")
 						}
-					} else {
-
 					}
-				});
+				})
 			}
 		}
 	}
@@ -116,4 +127,4 @@
 		height: 40px;
 		background-color: #ffffff;
 	}
-</style>
+</style>

pageA/club/welfareList.vue

@@ -3,13 +3,15 @@
 		<scroll-list ref="list" :option="option" @load="load" @refresh="refresh" @loadSuccess="loadSuccess"
 			@scrolltolower="scrolltolower">
 			<view v-for="(item, index) in list" :key="index">
-				<view
-					style="border: 1rpx solid #cecece;color: #747474;padding: 20rpx ;font-size: 50rpx;">
+				<view style="border: 1rpx solid #cecece;color: #747474;padding: 20rpx ;font-size: 50rpx;">
 					<uni-row>
 						<uni-col :span="20">
 							<view @click="handleTest(item)">
 								{{item.source}}
 							</view>
+							<view v-if="item.endTime">
+								{{"截止时间："+$dateResult(item.endTime,'datetime')}}
+							</view>
 						</uni-col>
 						<!-- <uni-col :span="4">
 							<view class="yyButton" style="margin:20rpx 5rpx 0;border: 1rpx solid rgb(10, 185, 156);
@@ -110,4 +112,4 @@
 			}
 		}
 	}
-</script>
+</script>

pageA/components/dictSelect.vue

@@ -58,12 +58,19 @@
 		},
 		mounted() {
 			this.data = uni.getStorageSync(this.dictKey)
+			if (this.value) {
+				for (var i = 0; i < this.data.length; i++) {
+					if (this.data[i].dictValue === this.value) {
+						this.index = i
+					}
+				}
+			}
 		},
 		methods: {
 			bindPickerChange: function(e) {
 				this.index = e.detail.value
 				this.$emit('input', this.data[this.index].dictValue)
-			},
+			}
 		}
 	}
 </script>
@@ -85,4 +92,4 @@
 		font-size: 26rpx;
 		color: #b1b1b1;
 	}
-</style>
+</style>

pageA/msg/userMsgList.vue

@@ -270,6 +270,11 @@
 						if (item.msgType === '7') {
 							this.gtdToId(item.remark, 3, '7')
 						}
+						if (item.msgType === '8') {
+							uni.navigateTo({
+								url: "../club/welfareList"
+							})
+						}
 					}
 				}
 			},
@@ -423,4 +428,4 @@
 			}
 		}
 	}
-</script>
+</script>

pageApp/other/purchase.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view>
 			<hs-input label="申请人" v-model="form.applyUserName" disabled></hs-input>
-			<hs-dept-select label="归属部门" v-model="form.deptId" :autofill="true"></hs-dept-select>
+			<hs-dept-select label="申请部门" v-model="form.deptId" :autofill="true"></hs-dept-select>
 			<hs-dict-select label="物资属性" dictKey="goods_property_type" v-model="form.purchaseType" />
 			<hs-input label="申请原因" v-model="form.remark" model="textarea"></hs-input>
 			<hs-input label="用途" v-model="form.whatUse" model="textarea"></hs-input>

pages/app/index.vue

@@ -154,11 +154,13 @@
 						text: '物资领用',
 						imgPath: '../../static/img/app/wupinglinyong.png',
 						link: "../../pageApp/administration/reserve?pageType=ly"
-					}, {
-						text: '物资归还',
-						imgPath: '../../static/img/app/wpgh.png',
-						link: "../../pageApp/administration/reserve?pageType=gh"
-					}, {
+					}, 
+					// {
+					// 	text: '物资归还',
+					// 	imgPath: '../../static/img/app/wpgh.png',
+					// 	link: "../../pageApp/administration/reserve?pageType=gh"
+					// },
+					{
 						text: '用章申请',
 						imgPath: '../../static/img/app/yzsq.png',
 						link: "../../pageApp/administration/useSeal"
@@ -186,11 +188,13 @@
 					text: '采购申请',
 					imgPath: '../../static/img/app/cgsq.png',
 					link: "../../pageApp/other/purchase"
-				}, {
-					text: '设备报废',
-					imgPath: '../../static/img/app/devicebaofei.png',
-					link: "../../pageApp/other/scrap"
-				}, {
+				}, 
+				// {
+				// 	text: '设备报废',
+				// 	imgPath: '../../static/img/app/devicebaofei.png',
+				// 	link: "../../pageApp/other/scrap"
+				// }, 
+				{
 					text: '报修申请',
 					imgPath: '../../static/img/app/devicebaoxiu.png',
 					link: "../../pageApp/other/repairs"