From 991ab7f18de0216666c99fb4219102c565dc554a Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 8 Sep 2023 13:15:03 +0800
Subject: [PATCH] vuex

---
 pages/home/home.vue                   | 14 +++++++++-----
 pages/login/login.vue                 |  2 +-
 pages/modules/SemifinishedInStore.vue |  4 ++--
 utils/getData2.js                     |  4 +---
 vuex/store.js                         |  4 +++-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 4d16b5c..53d4ee1 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -4,7 +4,7 @@
 		<view class="userInfo-wrap">
 			<view class="userInfo">
 				<text class="p1">{{userName}}</text>
-				<text class="p2">欢迎进入海亮手持系统！</text>
+				<text class="p2">欢迎进入海亮三线手持LMS系统！</text>
 			</view>
 			<view class="exit" @tap="Quit">
 				<view class="icon-exit"></view>
@@ -35,19 +35,23 @@
 </template>
 
 <script>
-	import {authority} from '@/utils/getData2.js'
 	export default {
 		data() {
 			return {
 				userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : '',
-				menuList: [],
+				menuList: [
+			{menu_id: '1', icon: 'RF06', name: '仓储管理', sonTree: [
+				{menu_id: '1', name: '半成品入库', path: '/pages/modules/SemifinishedInStore'},
+				{menu_id: '2', name: '半成品出库', path: '/pages/modules/SemifinishedOutStore'},
+				{menu_id: '3', name: '空箱出库', path: '/pages/modules/EmptyOutStore'}
+				]}
+		],
 				show: false,
 				secM: []
 			};
 		},
 		created () {
-			this._authority()
-			this.$store.dispatch('publicObj', '')
+			this.$store.dispatch('setPublicObj', '')
 		},
 		methods: {
 			async _authority () {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 653983d..327c686 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="zd_content bg">
 		<view class="p1">欢迎来到</view>
-		<view class="p2">海亮手持系统！</view>
+		<view class="p2">海亮三线手持LMS系统！</view>
 		<view class="input-box">
 			<input class="large-input" type="text" placeholder="请输入用户名" v-model="user">
 		</view>
diff --git a/pages/modules/SemifinishedInStore.vue b/pages/modules/SemifinishedInStore.vue
index fcb540a..c14b85f 100644
--- a/pages/modules/SemifinishedInStore.vue
+++ b/pages/modules/SemifinishedInStore.vue
@@ -92,7 +92,7 @@
 			}
 		},
 		destroyed () {
-			this.$store.dispatch('publicObj', '')
+			this.$store.dispatch('setPublicObj', '')
 		},
 		created () {
 			this._getWork()
@@ -150,7 +150,7 @@
 				this.sale_id = ''
 				this.index = ''
 				this.bar_code = ''
-				this.$store.dispatch('publicObj', '')
+				this.$store.dispatch('setPublicObj', '')
 			}
 		}
 	}
diff --git a/utils/getData2.js b/utils/getData2.js
index 12cd192..3501c4c 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -64,13 +64,11 @@ export const handRequest = () => request({
 export const authority = () => {
 	let res = {
 		sonTree: [
-			// {menu_id: '5', icon: 'RF04', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []}
 			{menu_id: '1', icon: 'RF06', name: '仓储管理', sonTree: [
 				{menu_id: '1', name: '半成品入库', path: '/pages/modules/SemifinishedInStore'},
 				{menu_id: '2', name: '半成品出库', path: '/pages/modules/SemifinishedOutStore'},
 				{menu_id: '3', name: '空箱出库', path: '/pages/modules/EmptyOutStore'}
-				]},
-			{menu_id: '2', icon: 'RF01', name: '生产管理', path: '', sonTree: []}
+				]}
 		]
 	}
 	return res
diff --git a/vuex/store.js b/vuex/store.js
index 095161f..f8cd813 100644
--- a/vuex/store.js
+++ b/vuex/store.js
@@ -2,11 +2,13 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 
 import user from './modules/user'
+import data from './modules/data'
 
 Vue.use(Vuex)
 
 export default new Vuex.Store({
   modules: {
-    user
+    user,
+	data
   }
 })