From 099d1b03771a96168a03564604f92e15ae844dc4 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期日, 02 四月 2023 18:36:48 +0800
Subject: [PATCH] #

---
 pages/home/home.vue    |    4 ++--
 pages/login/logOut.vue |   21 +++++++++++++++++++++
 pages/mat/matQuery.vue |   13 ++++++-------
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 7ed25f1..fedc777 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -23,14 +23,14 @@
 						title: '缁勬墭鍏ュ簱',
 						name: 'pakin',
 						color: 'purple',
-						cuIcon: 'vipcard',
+						cuIcon: 'list',
 						url: '/pakin/pakin'
 					},
 					{
 						title: '閫�鍑虹櫥褰�',
 						name: 'logOut',
 						color: 'grey',
-						cuIcon: 'vipcard',
+						cuIcon: 'exit',
 						url: '/login/logOut'
 					},
 					
diff --git a/pages/login/logOut.vue b/pages/login/logOut.vue
new file mode 100644
index 0000000..b2dc7e6
--- /dev/null
+++ b/pages/login/logOut.vue
@@ -0,0 +1,21 @@
+<template>
+	<view></view>
+</template>
+<script>
+	export default {
+		mounted() {
+			uni.showToast({
+				title: '娉ㄩ攢鎴愬姛',
+				duration: 1000
+			})
+			setTimeout(() => {
+				uni.removeStorageSync('token');
+				uni.reLaunch({
+				    url:"/pages/login/login"
+				});
+			}, 1000);
+		},
+		
+	}
+	
+</script>
\ No newline at end of file
diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index e542f37..57f5626 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -22,8 +22,8 @@
 					</view>
 				</view>
 				<view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matnr}}</view>
-				<view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx}}</view>
-				<view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs}}</view>
+				<view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx  ? item.maktx : '--'}}</view>
+				<view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs  ? item.specs : '--'}}</view>
 			</view>
 		</view>
 		<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
@@ -119,7 +119,6 @@
 				if (tagId == null || tagId == '' || tagId == undefined) {
 					return;
 				}
-				console.log(tagId);
 				uni.request({
 				    url: that.baseUrl + '/mat/list/pda/page/auth',
 				    data: {
@@ -139,11 +138,11 @@
 								let list = res.data.records
 								that.matList = that.reload ? list : that.matList.concat(list);
 								that.curr = that.curr + 1
-								if (res.data.records.length == 0) {
-									that.status = 'noMore'
-								}
-								that.baColor = "background-color: #1cbbb4;"
 							}
+							if (res.data.records.length == 0) {
+								that.status = 'noMore'
+							}
+							that.baColor = "background-color: #1cbbb4;"
 						} else if (res.code === 403 ) {
 							uni.showToast({title: res.msg, icon: "none", position: 'top'})
 							setTimeout(() => {

--
Gitblit v1.9.1