flx：整合材料进出场 密码超过三个月弹窗修改密码

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智慧安全", //中建四局
     "appid" : "__UNI__4AA4101",
     "description" : "",
-    "versionName" : "1.6.7",
+    "versionName" : "1.6.8",
-    "versionCode" : 167,
+    "versionCode" : 168,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -2764,6 +2764,13 @@
 			{
 				"navigationBarTitleText" : ""
 			}
+	},
+	{
+		"path" : "pages/projectEnd/materialsManage/materialsManage",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
 	}
 	],
 	// "subPackages":[{

pages/login/compatibleLogin.vue

@@ -148,6 +148,30 @@
 								let {
 									accountType
 								} = res.result;
+								if(res.result.expire){
+									this.userInfo = {
+										userId: res.result.userId,
+										account: res.result.account,
+										token: res.result.token,
+									};
+									let that = this;
+								   	
+									uni.showModal({
+										title: '提示',
+										content: '密码有效期已超过90天，为确保您的账号安全，请重新修改密码！',
+										success: function(res) {
+											if (res.confirm) {
+												uni.navigateTo({
+													url: `/pages/my/changePassword/changePassword?userInfo=${JSON.stringify(that.userInfo)}`,
+												});
+									
+											} else if (res.cancel) {
+												console.log('用户点击取消');
+											}
+										}
+									});
+									return
+								}
 					
 								if (accountType == 5 || accountType == 6 || accountType == 10) {
 									if (this.type == "user") {

pages/my/changePassword/changePassword.vue

@@ -119,8 +119,9 @@
 				}
 			};
 		},
-		onLoad() {
+		onLoad(option) {
-			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			console.log(option)
+			this.userInfo = option.userInfo ? JSON.parse(option.userInfo) : JSON.parse(uni.getStorageSync('userInfo'));
 		},
 		onReady() {
 			this.$refs.uForm.setRules(this.rules);
@@ -133,6 +134,9 @@
 						// 修改密码
 						this.sendRequest({
 							url: "xmgl/systemUser/xz/updatePw",
+							header: {
+								Authorization: "Bearer " + this.userInfo.token
+							},
 							data: {
 								userId:this.userInfo.userId,
 								oldPassword:this.formData.pw,
@@ -146,7 +150,9 @@
 									uni.showToast({
 										title:'修改成功！'
 									})
-									this.logout();
+									setTimeout(() => {
+										this.logout();
+									}, 1000)
 								}
 							}
 						})

pages/projectEnd/materialsManage/materialsManage.vue

@@ -0,0 +1,135 @@
+<template>
+	<view class="specialOperations">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				材料管理
+			</view>
+		</headers>
+		<view class="sp-menu">
+			<view class="menu-item" @click="handleNavigateTo(1)">
+				<view class="item-icon">
+					<image src="@/static/ekashManage.png"></image>
+				</view>
+				<view class="item-text">
+					<text>材料入场管理</text>
+				</view>
+			</view>
+			<view class="menu-item" @click="handleNavigateTo(2)">
+				<view class="item-icon">
+					<image src="@/static/ukashManage.png"></image>
+				</view>
+				<view class="item-text">
+					<text>材料出场管理</text>
+				</view>
+			</view>
+		</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
+	</view>
+</template>
+
+<script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
+	import headers from '../../../components/headers/headers.vue'
+	export default {
+		navigationBarTitleText: '页面标题',
+		data() {
+			return {
+				userInfo: {},
+				moduleList: [],
+				menuList: [],
+			};
+		},
+		onReady() {
+
+		},
+		created() {
+
+		},
+		mounted() {
+
+		},
+		onLoad() {
+
+		},
+		methods: {
+			handleNavigateTo(val) {
+				if (val === 1) {
+					uni.navigateTo({
+						url: "/pages/projectEnd/ukashManage/ukashManage"
+					})
+				} else if (val === 2) {
+					uni.navigateTo({
+						url: "/pages/projectEnd/ekashManage/ekashManage"
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.specialOperations {
+		.fixedheader {
+			position: fixed;
+			top: 0;
+			left: 0;
+			width: 100%;
+			z-index: 2;
+		}
+
+		.sp-menu {
+			margin: 0 38rpx;
+			padding-top: 200rpx;
+			// height: 1200rpx;
+			// height: 1000rpx;
+			// background-color: darkred;
+			display: grid;
+			grid-gap: 24rpx;
+			grid-template-columns: repeat(2, 1fr);
+
+			// grid-template-columns: repeat(auto-fill, 220rpx);
+			// place-items: center;
+			// justify-content: center;
+			.menu-item {
+				// width: 220rpx;
+				height: 274rpx;
+				// background-color: darkblue;
+				box-shadow: 0px 8rpx 15rpx 0px rgba(219, 229, 255, 0.6);
+				border-radius: 10rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex-direction: column;
+
+				.item-icon {
+					// width: 220rpx;
+					// height: 220rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin-bottom: 14rpx;
+
+					image {
+						width: 66rpx;
+						height: 86rpx;
+					}
+				}
+
+				.item-text {
+					align-items: center;
+					width: 220rpx;
+					height: 54rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+
+					text {
+						text-align: center;
+						display: flex;
+						justify-content: center;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/projectEnd/projectIndex/projectIndex.vue

@@ -135,7 +135,8 @@
 				<view class="position"> 巡检点位置：{{ qrCode.position }}</view>
 			</view>
 		</uni-popup>
-		<footers :activeTab="'projectEnd'" v-if="(accountType == 5 || accountType == 6 || accountType == 10) && projectDetail.projectSn"></footers>
+		<footers :activeTab="'projectEnd'"
+			v-if="(accountType == 5 || accountType == 6 || accountType == 10) && projectDetail.projectSn"></footers>
 		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
@@ -695,6 +696,11 @@
 							url: '../../fileManage/fileManage'
 						})
 						break
+					case 'materialsManage':
+						uni.navigateTo({
+							url: '../../projectEnd/materialsManage/materialsManage'
+						})
+						break
 					case 'ukashManage':
 						uni.navigateTo({
 							url: '../../projectEnd/ukashManage/ukashManage'
@@ -821,7 +827,7 @@
 			getAllModule(arr) {
 				console.log('获取的模块', arr)
 				const find = arr.find(item => item.plugin == "emergencyDisposal");
-				if(find){
+				if (find) {
 					uni.setStorageSync('moduleInfo', JSON.stringify(find))
 				}
 				var that = this