From 248ef3ba3de9994dc83d2b36690542893f9fb6e6 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 28 十一月 2024 16:26:06 +0800
Subject: [PATCH] #
---
pages/home/wrkMastManage.vue | 26 ++++++++
pages/home/locMastManage.vue | 24 +++++++
pages/login/login.vue | 38 ++++++++++++
pages/home/orderManage.vue | 26 ++++++++
manifest.json | 4
pages/home/menuHome.vue | 26 ++++++++
6 files changed, 134 insertions(+), 10 deletions(-)
diff --git a/manifest.json b/manifest.json
index aa02bfb..71139a3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "涓壃WMS",
"appid" : "__UNI__DA5854D",
"description" : "",
- "versionName" : "20241113A",
- "versionCode" : 135,
+ "versionName" : "20241128A",
+ "versionCode" : 136,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/home/locMastManage.vue b/pages/home/locMastManage.vue
index 6f95c52..f70a723 100644
--- a/pages/home/locMastManage.vue
+++ b/pages/home/locMastManage.vue
@@ -11,6 +11,7 @@
</navigator>
</view>
<view class="cu-tabbar-height"></view>
+ <view style="height: 50rpx;"></view>
</scroll-view>
</view>
</template>
@@ -48,6 +49,7 @@
},
],
+ menu: [],
colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
};
},
@@ -62,7 +64,8 @@
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
this.project = uni.getStorageSync('project')
- this.getAuth(option.id)
+ this.menu = uni.getStorageSync('menu');
+ this.getAuth2(option.id)
this.backGroundRepeat()
},
methods: {
@@ -77,6 +80,25 @@
i++
}
},
+ getAuth2(id) {
+ let secMenu = []
+ for (let k of this.menu) {
+ if (id == k.id) {
+ secMenu = k.children
+ }
+ }
+ for (let i in secMenu) {
+ this.getIcon(secMenu[i].title)
+ this.elements.unshift({
+ title: secMenu[i].name,
+ name: secMenu[i].title,
+ color: this.colorList[i],
+ cuIcon: this.icon,
+ id: secMenu[i].id,
+ url: `${secMenu[i].code}`
+ })
+ }
+ },
getAuth(id) {
let that = this
uni.request({
diff --git a/pages/home/menuHome.vue b/pages/home/menuHome.vue
index 3ef7711..4a94b2d 100644
--- a/pages/home/menuHome.vue
+++ b/pages/home/menuHome.vue
@@ -90,13 +90,16 @@
},
],
+ menu: [],
colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
};
},
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
- this.getAuth()
+ this.menu = uni.getStorageSync('menu');
+ // console.log(this.menu);
+ this.getAuth2()
// this.backGroundRepeat()
},
methods: {
@@ -111,6 +114,27 @@
i++
}
},
+ getAuth2() {
+ this.elements = []
+ for (let i in this.menu) {
+ this.getIcon(this.menu[i].title)
+ this.elements.unshift({
+ title: this.menu[i].name,
+ name: this.menu[i].title,
+ color: this.colorList[i],
+ cuIcon: this.icon,
+ id: this.menu[i].id,
+ url: `${this.menu[i].code}`
+ })
+ }
+ this.elements.push({
+ title: '閫�鍑虹櫥褰�',
+ name: 'logOut',
+ color: 'grey',
+ cuIcon: 'exit',
+ url: '/login/logOut'
+ })
+ },
getAuth() {
let that = this
uni.request({
diff --git a/pages/home/orderManage.vue b/pages/home/orderManage.vue
index 01069e6..7b7957c 100644
--- a/pages/home/orderManage.vue
+++ b/pages/home/orderManage.vue
@@ -12,6 +12,7 @@
</view>
<view class="cu-tabbar-height"></view>
</scroll-view>
+ <view style="height: 50rpx;"></view>
</view>
</template>
@@ -116,6 +117,7 @@
},
],
+ menu: [],
colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
};
},
@@ -129,8 +131,9 @@
onLoad(option) {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
- this.project = uni.getStorageSync('project')
- this.getAuth(option.id)
+ this.project = uni.getStorageSync('project');
+ this.menu = uni.getStorageSync('menu');
+ this.getAuth2(option.id)
this.backGroundRepeat()
},
methods: {
@@ -145,6 +148,25 @@
i++
}
},
+ getAuth2(id) {
+ let secMenu = []
+ for (let k of this.menu) {
+ if (id == k.id) {
+ secMenu = k.children
+ }
+ }
+ for (let i in secMenu) {
+ this.getIcon(secMenu[i].title)
+ this.elements.unshift({
+ title: secMenu[i].name,
+ name: secMenu[i].title,
+ color: this.colorList[i],
+ cuIcon: this.icon,
+ id: secMenu[i].id,
+ url: `${secMenu[i].code}`
+ })
+ }
+ },
getAuth(id) {
let that = this
uni.request({
diff --git a/pages/home/wrkMastManage.vue b/pages/home/wrkMastManage.vue
index 3e1c41a..8607849 100644
--- a/pages/home/wrkMastManage.vue
+++ b/pages/home/wrkMastManage.vue
@@ -11,6 +11,7 @@
</navigator>
</view>
<view class="cu-tabbar-height"></view>
+ <view style="height: 50rpx;"></view>
</scroll-view>
</view>
</template>
@@ -61,6 +62,7 @@
// url: `/phyz/wrkMast/waitPakinLog`
// },
],
+ menu: [],
colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
};
},
@@ -74,8 +76,9 @@
onLoad(option) {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
- this.project = uni.getStorageSync('project')
- this.getAuth(option.id)
+ this.project = uni.getStorageSync('project');
+ this.menu = uni.getStorageSync('menu');
+ this.getAuth2(option.id)
this.backGroundRepeat()
},
methods: {
@@ -90,6 +93,25 @@
i++
}
},
+ getAuth2(id) {
+ let secMenu = []
+ for (let k of this.menu) {
+ if (id == k.id) {
+ secMenu = k.children
+ }
+ }
+ for (let i in secMenu) {
+ this.getIcon(secMenu[i].title)
+ this.elements.unshift({
+ title: secMenu[i].name,
+ name: secMenu[i].title,
+ color: this.colorList[i],
+ cuIcon: this.icon,
+ id: secMenu[i].id,
+ url: `${secMenu[i].code}`
+ })
+ }
+ },
getAuth(id) {
let that = this
uni.request({
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 588654c..619bde9 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -126,7 +126,9 @@
},
msgType: 'success',
filename: '',
- dialogContent: ''
+ dialogContent: '',
+ elements: [],
+ colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
}
},
onLoad() {
@@ -210,6 +212,7 @@
uni.removeStorageSync('user');
}
setTimeout(() => {
+ that.getAuth2()
uni.showToast({
title: '鐧诲綍鎴愬姛'
})
@@ -225,6 +228,38 @@
})
}
},
+ })
+ },
+ getIcon(e) {
+ const ways = ['pakin','orderPakin','orderPutOn']
+ if (ways.includes(e)) {
+ this.icon = 'pullup'
+ }
+ },
+ getAuth2() {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/menu/pdaAll/auth',
+ data: {level:1,id: '0'},
+ header: { 'token': uni.getStorageSync('token') },
+ method: 'POST',
+ success(res) {
+ res = res.data
+ that.elements = []
+ if (res.code === 200) {
+ uni.setStorageSync('menu', res.data);
+ } else if (res.code === 403) {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' })
+ setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ } else if(res.status === 404) {
+ that.elements = that.elements2
+ } else {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' })
+ }
+ },
+ fail(err) {
+ console.log(err);
+ }
})
},
//妫�娴嬪綋鍓嶅钩鍙帮紝濡傛灉鏄畨鍗撳垯鍚姩瀹夊崜鏇存柊
@@ -261,7 +296,6 @@
url: url,
method: 'GET',
success(res) {
- console.log(res);
var res = res.data
if (res.data) {
that.filename = res.data.path
--
Gitblit v1.9.1