From 776f2140e49d2db9ba7187eced1feec6ff085698 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Mon, 29 Jul 2024 16:24:12 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E6=95=B4=E5=90=88=E6=9D=90?=
 =?UTF-8?q?=E6=96=99=E8=BF=9B=E5=87=BA=E5=9C=BA=20=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E8=B6=85=E8=BF=87=E4=B8=89=E4=B8=AA=E6=9C=88=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |   4 +-
 pages.json                                    |   7 +
 pages/login/compatibleLogin.vue               |  24 ++++
 pages/my/changePassword/changePassword.vue    |  12 +-
 .../materialsManage/materialsManage.vue       | 135 ++++++++++++++++++
 .../projectEnd/projectIndex/projectIndex.vue  |  10 +-
 static/ekashManage.png                        | Bin 0 -> 3857 bytes
 static/ukashManage.png                        | Bin 0 -> 3418 bytes
 8 files changed, 185 insertions(+), 7 deletions(-)
 create mode 100644 pages/projectEnd/materialsManage/materialsManage.vue
 create mode 100644 static/ekashManage.png
 create mode 100644 static/ukashManage.png

diff --git a/manifest.json b/manifest.json
index 1df34a1b..37ed648e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "智慧安全", //中建四局
     "appid" : "__UNI__4AA4101",
     "description" : "",
-    "versionName" : "1.6.7",
-    "versionCode" : 167,
+    "versionName" : "1.6.8",
+    "versionCode" : 168,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index bcdb2e5a..09d80a07 100644
--- a/pages.json
+++ b/pages.json
@@ -2764,6 +2764,13 @@
 			{
 				"navigationBarTitleText" : ""
 			}
+	},
+	{
+		"path" : "pages/projectEnd/materialsManage/materialsManage",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
 	}
 	],
 	// "subPackages":[{
diff --git a/pages/login/compatibleLogin.vue b/pages/login/compatibleLogin.vue
index dfc4786c..03ec17e8 100644
--- a/pages/login/compatibleLogin.vue
+++ b/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") {
diff --git a/pages/my/changePassword/changePassword.vue b/pages/my/changePassword/changePassword.vue
index 77ae42d1..9f1d4e20 100644
--- a/pages/my/changePassword/changePassword.vue
+++ b/pages/my/changePassword/changePassword.vue
@@ -119,8 +119,9 @@
 				}
 			};
 		},
-		onLoad() {
-			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+		onLoad(option) {
+			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)
 								}
 							}
 						})
diff --git a/pages/projectEnd/materialsManage/materialsManage.vue b/pages/projectEnd/materialsManage/materialsManage.vue
new file mode 100644
index 00000000..ea02c1c4
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/pages/projectEnd/projectIndex/projectIndex.vue b/pages/projectEnd/projectIndex/projectIndex.vue
index fca35fb5..c05e48b8 100644
--- a/pages/projectEnd/projectIndex/projectIndex.vue
+++ b/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
diff --git a/static/ekashManage.png b/static/ekashManage.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca52050bbd7c67df48c4df685776760607746da7
GIT binary patch
literal 3857
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
L!5}HxcS8RGS1$>)

literal 0
HcmV?d00001

diff --git a/static/ukashManage.png b/static/ukashManage.png
new file mode 100644
index 0000000000000000000000000000000000000000..b023cbbf37367b87d9d63617af28ab863377e91a
GIT binary patch
literal 3418
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
M*gFGNc7DnK0pveDRsaA1

literal 0
HcmV?d00001