优化vuex

App.vue

@@ -1,34 +1,31 @@
 <script>
-// import { mapActions } from "vuex";
-export default {
-  methods: {
-    // ...mapActions("demo", ["getData"]),
-  },
-  onLaunch: function () {
-    console.log("App Launch");
-  },
-  onShow: function () {
-    console.log("App Show");
-  },
-  onHide: function () {
-    console.log("App Hide");
-  },
-  mounted() {
-    // this.getData().then((res) => {
-    //   console.log(res);
-    // });
-  },
-};
+	export default {
+		onLaunch: function() {
+			console.log("App Launch");
+		},
+		onShow: function() {
+			console.log("App Show");
+		},
+		onHide: function() {
+			console.log("App Hide");
+		},
+		onPageNotFound(res) {
+			wx.reLaunch({
+				url: '/pages/login/login',
+			})
+		},
+	};
 </script>
 
 <style lang="scss">
-/*每个页面公共css */
-// @import "@/uni_modules/uni-scss/index.scss";
-// 设置整个项目的样式
-page {
-  background-color: #f9fafb;
-  * {
-    box-sizing: border-box;
-  }
-}
+	/*每个页面公共css */
+	// @import "@/uni_modules/uni-scss/index.scss";
+	// 设置整个项目的样式
+	page {
+		background-color: #f9fafb;
+
+		* {
+			box-sizing: border-box;
+		}
+	}
 </style>

components/seiminModel/seiminModel.vue

@@ -75,7 +75,7 @@
     },
     computed: {
       ...mapState('other', ["nurseDeptSwitchTip"]),
-      ...mapState("user", ["loginInfo"]),
+      ...mapState("login", ["loginInfo"]),
     },
     methods: {
       // 显示弹窗

pages/index/index.vue

@@ -112,7 +112,7 @@
       };
     },
     computed: {
-      ...mapState("user", ["loginInfo"]),
+      ...mapState("login", ["loginInfo"]),
       ...mapState('other', [
         "isShowSeiminModel",
         "deptDisplay",

pages/login/login.vue

@@ -1,212 +1,212 @@
 <template>
-  <view class="login">
-    <view class="login_title"> 医疗服务中心转运系统 </view>
-    <form @submit="login" class="form">
-      <view class="form_item">
-        <view class="form_title">用户名：</view>
-        <input class="form_input" name="username" :value="username" placeholder="请输入用户名" />
-      </view>
-      <view class="form_item">
-        <view class="form_title">密<text class="placeholder"></text>码：</view>
-        <input class="form_input" name="password" :value="password" password placeholder="请输入密码" />
-      </view>
-      <view class="form_item">
-        <checkbox-group name="savePassword">
-          <label>
-            <checkbox value="true" :checked="savePassword" /><text>记住密码</text>
-          </label>
-        </checkbox-group>
-      </view>
-      <view class="form_submit">
-        <button form-type="submit">登录</button>
-      </view>
-    </form>
-    <view class="tips red">
-      (此系统为护士人员使用，其他科室人员请勿进行操作)
-    </view>
-  </view>
+	<view class="login">
+		<view class="login_title"> 医疗服务中心转运系统 </view>
+		<form @submit="login" class="form">
+			<view class="form_item">
+				<view class="form_title">用户名：</view>
+				<input class="form_input" name="username" :value="username" placeholder="请输入用户名" />
+			</view>
+			<view class="form_item">
+				<view class="form_title">密<text class="placeholder"></text>码：</view>
+				<input class="form_input" name="password" :value="password" password placeholder="请输入密码" />
+			</view>
+			<view class="form_item">
+				<checkbox-group name="savePassword">
+					<label>
+						<checkbox value="true" :checked="savePassword" /><text>记住密码</text>
+					</label>
+				</checkbox-group>
+			</view>
+			<view class="form_submit">
+				<button form-type="submit">登录</button>
+			</view>
+		</form>
+		<view class="tips red">
+			(此系统为护士人员使用，其他科室人员请勿进行操作)
+		</view>
+	</view>
 </template>
 
 <script>
-  import {
-    encryptByEnAES,
-    encryptByDeAES
-  } from "../../utils/index.js";
-  import {
-    mapActions,
-    mapMutations
-  } from "vuex";
-  export default {
-    data() {
-      return {
-        username: "", //用户名
-        password: "", //密码
-        savePassword: false, //是否记住密码
-      };
-    },
-    methods: {
-      ...mapActions("user", ["vxLogin"]),
-      ...mapMutations('other', ["changeSeiminModel", 'resetVxOther']),
-      ...mapMutations('dictionary', ["resetVxDictionary"]),
-      ...mapMutations('user', ["resetVxLogin"]),
-      ...mapMutations('system', ["resetVxSystem"]),
-      // 重置vuex数据
-      resetVuex() {
-        this.resetVxOther();
-        this.resetVxDictionary();
-        this.resetVxLogin();
-        this.resetVxSystem();
-      },
-      // 登录
-      login(e) {
-        let {
-          username, //账号
-          password, //密码
-          savePassword, //是否记住密码
-        } = e.detail.value;
-
-        savePassword = savePassword.length > 0;
-        username = username.trim();
-        password = password.trim();
-
-        // 用户名，密码,域名(ip)不能为空
-        if (username === "" || password === "") {
-          uni.showToast({
-            icon: "none",
-            title: "账号或密码错误",
-          });
-          return;
-        }
-
-        uni.showLoading({
-          title: "登录中",
-          mask: true,
-        });
-
-        let postData = {
-          username,
-          password,
-          type: "APP",
-        };
-
-        this.vxLogin(postData).then((res) => {
-          uni.hideLoading();
-
-          if (res.status == 200) {
-            //获取角色信息
-            res.user = res.user || {};
-            res.user.user = res.user.user || {};
-            let role = res.user.user.role || [];
-            // 护士角色才能登录
-            let nurseRole = role.some((item) => item.rolecode === "nurse");
-            if (!nurseRole) {
-              uni.showToast({
-                icon: "none",
-                title: "暂无护士角色权限！",
-              });
-              return;
-            }
-
-            // 如果记住密码,则缓存到本地
-            if (savePassword) {
-              //记住密码
-              uni.setStorageSync("savePasswordObj", {
-                username: encryptByEnAES(username), //用户名
-                password: encryptByEnAES(password), //密码
-                effectiveDuration: Date.now(), //当前时间戳
-              });
-            } else {
-              uni.removeStorageSync("savePasswordObj");
-            }
-            // 跳转到首页(isShowSeiminModel,是否显示切换科室弹窗)
-            uni.redirectTo({
-              url: "/pages/index/index",
-            });
-            this.changeSeiminModel(true);
-          } else {
-            this.$refs.seiminModel.showChangeDept({
-              skin: "toast",
-              icon: "error",
-              content: res.remarks || "登录失败",
-            });
-            throw new Error(res.remarks || "登录失败");
-          }
-        });
-      },
-    },
-    onLoad() {
-      // 清除缓存vuexStorage
-      uni.removeStorageSync('vuexStorage');
-      // 是否记住密码
-      let savePasswordObj = uni.getStorageSync("savePasswordObj");
-      if (savePasswordObj) {
-        let {
-          username,
-          password,
-          effectiveDuration
-        } = savePasswordObj;
-        if (Date.now() - effectiveDuration < 10 * 24 * 60 * 60 * 1000) {
-          //记住密码,10天内有效
-          this.username = encryptByDeAES(username);
-          this.password = encryptByDeAES(password);
-          this.savePassword = true;
-        }
-      }
-    },
-  };
+	import {
+		encryptByEnAES,
+		encryptByDeAES
+	} from "../../utils/index.js";
+	import {
+		mapActions,
+		mapMutations
+	} from "vuex";
+	export default {
+		data() {
+			return {
+				username: "", //用户名
+				password: "", //密码
+				savePassword: false, //是否记住密码
+			};
+		},
+		methods: {
+			...mapActions("login", ["vxLogin"]),
+			...mapMutations("other", ["changeSeiminModel", "resetVxOther"]),
+			...mapMutations("dictionary", ["resetVxDictionary"]),
+			...mapMutations("login", ["resetVxLogin"]),
+			...mapMutations("system", ["resetVxSystem"]),
+			// 重置vuex数据
+			resetVuex() {
+				this.resetVxOther();
+				this.resetVxDictionary();
+				this.resetVxLogin();
+				this.resetVxSystem();
+			},
+			// 登录
+			login(e) {
+				let {
+					username, //账号
+					password, //密码
+					savePassword, //是否记住密码
+				} = e.detail.value;
+
+				savePassword = savePassword.length > 0;
+				username = username.trim();
+				password = password.trim();
+
+				// 用户名，密码,域名(ip)不能为空
+				if (username === "" || password === "") {
+					uni.showToast({
+						icon: "none",
+						title: "账号或密码错误",
+					});
+					return;
+				}
+
+				uni.showLoading({
+					title: "登录中",
+					mask: true,
+				});
+
+				let postData = {
+					username,
+					password,
+					type: "APP",
+				};
+
+				this.vxLogin(postData).then((res) => {
+					uni.hideLoading();
+
+					if (res.status == 200) {
+						//获取角色信息
+						res.user = res.user || {};
+						res.user.user = res.user.user || {};
+						let role = res.user.user.role || [];
+						// 护士角色才能登录
+						let nurseRole = role.some((item) => item.rolecode === "nurse");
+						if (!nurseRole) {
+							uni.showToast({
+								icon: "none",
+								title: "暂无护士角色权限！",
+							});
+							return;
+						}
+
+						// 如果记住密码,则缓存到本地
+						if (savePassword) {
+							//记住密码
+							uni.setStorageSync("savePasswordObj", {
+								username: encryptByEnAES(username), //用户名
+								password: encryptByEnAES(password), //密码
+								effectiveDuration: Date.now(), //当前时间戳
+							});
+						} else {
+							uni.removeStorageSync("savePasswordObj");
+						}
+						// 跳转到首页(isShowSeiminModel,是否显示切换科室弹窗)
+						uni.redirectTo({
+							url: "/pages/index/index",
+						});
+						this.changeSeiminModel(true);
+					} else {
+						this.$refs.seiminModel.showChangeDept({
+							skin: "toast",
+							icon: "error",
+							content: res.remarks || "登录失败",
+						});
+						throw new Error(res.remarks || "登录失败");
+					}
+				});
+			},
+		},
+		onLoad() {
+			// 清除vuex
+			this.resetVuex();
+			// 是否记住密码
+			let savePasswordObj = uni.getStorageSync("savePasswordObj");
+			if (savePasswordObj) {
+				let {
+					username,
+					password,
+					effectiveDuration
+				} = savePasswordObj;
+				if (Date.now() - effectiveDuration < 10 * 24 * 60 * 60 * 1000) {
+					//记住密码,10天内有效
+					this.username = encryptByDeAES(username);
+					this.password = encryptByDeAES(password);
+					this.savePassword = true;
+				}
+			}
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-  .login {
-    padding: 180rpx 32rpx 32rpx;
-    height: 100vh;
-    background: url("../../static/imgs/background.png") no-repeat center bottom;
-    background-size: contain;
-
-    .login_title {
-      text-align: center;
-      color: $defaultColor;
-      font-weight: bold;
-    }
-
-    .form {
-      .form_item {
-        margin-top: 32rpx;
-        @include flex;
-
-        .form_title {
-          @include flex(flex-start, center);
-          width: 140rpx;
-
-          .placeholder {
-            display: inline-block;
-            width: 1em;
-          }
-        }
-
-        .form_input {
-          box-sizing: content-box;
-          flex: 1;
-          padding: 16rpx;
-          background-color: #fff;
-        }
-      }
-
-      .form_submit {
-        margin-top: 60rpx;
-        border-radius: 16rpx;
-
-        uni-button {
-          @include btn_background;
-          color: #fff;
-          font-weight: bold;
-        }
-      }
-    }
-
-    .tips {
-      font-size: 28rpx;
-      margin-top: 16rpx;
-    }
-  }
+	.login {
+		padding: 180rpx 32rpx 32rpx;
+		height: 100vh;
+		background: url("../../static/imgs/background.png") no-repeat center bottom;
+		background-size: contain;
+
+		.login_title {
+			text-align: center;
+			color: $defaultColor;
+			font-weight: bold;
+		}
+
+		.form {
+			.form_item {
+				margin-top: 32rpx;
+				@include flex;
+
+				.form_title {
+					@include flex(flex-start, center);
+					width: 140rpx;
+
+					.placeholder {
+						display: inline-block;
+						width: 1em;
+					}
+				}
+
+				.form_input {
+					box-sizing: content-box;
+					flex: 1;
+					padding: 16rpx;
+					background-color: #fff;
+				}
+			}
+
+			.form_submit {
+				margin-top: 60rpx;
+				border-radius: 16rpx;
+
+				uni-button {
+					@include btn_background;
+					color: #fff;
+					font-weight: bold;
+				}
+			}
+		}
+
+		.tips {
+			font-size: 28rpx;
+			margin-top: 16rpx;
+		}
+	}
 </style>

pages/orderList/orderList.vue

@@ -102,7 +102,7 @@
       };
     },
     computed: {
-      ...mapState("user", ["loginInfo"]),
+      ...mapState("login", ["loginInfo"]),
     },
     methods: {
       ...mapActions("dictionary", ["vxDictionary"]),

pages/quickCreateOrder/quickCreateOrder.vue

@@ -133,7 +133,7 @@
       };
     },
     computed: {
-      ...mapState('user', ['loginInfo']),
+      ...mapState('login', ['loginInfo']),
       ...mapState('other', [
         "qucikCreateOrderType",
         "qucikCreateOrderTypeId",

pages/searchDept/searchDept.vue

@@ -61,7 +61,7 @@
       };
     },
     computed: {
-      ...mapState("user", ["loginInfo"]),
+      ...mapState("login", ["loginInfo"]),
       ...mapState('other', [
         "deptDisplay",
         "searchDeptParams",
@@ -84,7 +84,7 @@
         "changeSeiminModel",
         "changeSearchDeptResultList",
       ]),
-      ...mapMutations("user", ["changeLoginInfo"]),
+      ...mapMutations("login", ["changeLoginInfo"]),
       init() {
         this.loadOldKeyword();
       },

request/auth.js

@@ -1,45 +1,32 @@
 // 引入vuex配置
 import store from '../store'
 // 页面白名单
-const whiteList = []
-
+const whiteList = ['/pages/login/login']
+const funs = ['navigateTo', 'redirectTo', 'reLaunch', 'switchTab'];
 
 function hasPermission(url) {
-  // 在白名单中或有token，直接跳转
-  if (whiteList.indexOf(url) !== -1 || store.state.user.loginInfo) {
-    return true
-  }
-  return false
+	console.log('跳转', url);
+	// 在白名单中或有token，直接跳转
+	if (whiteList.indexOf(url) !== -1 || store.state.login.loginInfo.user) {
+		return true
+	}
+	return false
 }
 
-uni.addInterceptor('navigateTo', {
-  // 页面跳转前进行拦截, invoke根据返回值进行判断是否继续执行跳转
-  invoke(e) {
-    if (!hasPermission(e.url)) {
-      uni.reLaunch({
-        url: '/pages/login/login'
-      })
-      return false
-    }
-    return true
-  },
-  success(e) {
-    // console.log(e)
-  }
-})
-
-uni.addInterceptor('switchTab', {
-  // tabbar页面跳转前进行拦截
-  invoke(e) {
-    if (!hasPermission(e.url)) {
-      uni.reLaunch({
-        url: '/pages/login/login'
-      })
-      return false
-    }
-    return true
-  },
-  success(e) {
-    // console.log(e)
-  }
+funs.forEach(v => {
+	uni.addInterceptor(v, {
+		// 页面跳转前进行拦截, invoke根据返回值进行判断是否继续执行跳转
+		invoke(e) {
+			if (!hasPermission(e.url)) {
+				uni.reLaunch({
+					url: '/pages/login/login'
+				})
+				return false
+			}
+			return true
+		},
+		success(e) {
+			// console.log(e)
+		}
+	})
 })

request/config.js

@@ -11,7 +11,7 @@ const config = {
 };
 // 后端服务地址
 const baseUrls = {
-  development: "http://localhost/service", //开发环境
+  development: "http://192.168.3.108/service", //开发环境
   production: "http://192.168.3.108/service", //生产环境
 };
 config.baseUrl = baseUrls[process.env.NODE_ENV];

store/index.js

@@ -9,35 +9,66 @@ import Vue from "vue";
 import Vuex from "vuex";
 
 import other from "./modules/other";
-import user from "./modules/user";
+import login from "./modules/login";
 import dictionary from "./modules/dictionary";
 import system from "./modules/system";
 
 Vue.use(Vuex);
 
 const myPlugin = (store) => {
-  // 当 store 初始化后调用
-  let vuexStorage = uni.getStorageSync("vuexStorage");
-  if (
-    vuexStorage &&
-    vuexStorage.user &&
-    vuexStorage.dictionary &&
-    vuexStorage.system &&
-    vuexStorage.other
-  ) {
-    store.replaceState(vuexStorage);
-  }
-  store.subscribe((mutation, state) => {
-    uni.setStorageSync("vuexStorage", state);
-  });
+	// 所有的模块配置(新增模块需要手动添加进去)
+	const customModules = [{
+			name: 'other',
+			aliasName: 'Other',
+			isLocalstorage: true
+		},
+		{
+			name: 'login',
+			aliasName: 'Login',
+			isLocalstorage: true
+		},
+		{
+			name: 'dictionary',
+			aliasName: 'Dictionary',
+			isLocalstorage: false
+		},
+		{
+			name: 'system',
+			aliasName: 'System',
+			isLocalstorage: false
+		},
+	];
+	// 需要缓存的模块
+	const localstorageModules = customModules.filter(v => v.isLocalstorage);
+	// 当 store 初始化后调用
+	let vuexStorage = uni.getStorageSync("vuexStorage");
+	if (vuexStorage) {
+		customModules.forEach(v => {
+			if (v.isLocalstorage) {
+				store.commit(`${v.name}/resetVx${v.aliasName}`, vuexStorage[v.name]);
+			} else {
+				store.commit(`${v.name}/resetVx${v.aliasName}`);
+			}
+		})
+	}
+	store.subscribe((mutation, state) => {
+		const isLocalstorageFlag = localstorageModules.some(v => mutation.type.startsWith(`${v.name}/`));
+		if (isLocalstorageFlag) {
+			const obj = {};
+			localstorageModules.forEach(v => {
+				obj[v.name] = state[v.name];
+			})
+			uni.setStorageSync("vuexStorage", obj);
+		}
+	});
 };
 
 export default new Vuex.Store({
-  modules: {
-    user,
-    dictionary,
-    system,
-    other,
-  },
-  plugins: [myPlugin],
+	modules: {
+		login,
+		dictionary,
+		system,
+		other,
+	},
+	plugins: [myPlugin],
 });

store/modules/user.js

@@ -2,6 +2,7 @@ import {
   reqLogin
 } from "@/request/api.js";
 import cloneDeep from 'lodash/cloneDeep'
+import pick from 'lodash/pick'
 const stateReset = {
   loginInfo: {}, //当前登录用户信息
 };
@@ -9,8 +10,8 @@ const state = cloneDeep(stateReset);
 const getters = {};
 const mutations = {
   // 重置数据
-  resetVxLogin(state) {
-    Object.assign(state, cloneDeep(stateReset))
+  resetVxLogin(state,args={}) {
+	  Object.assign(state, cloneDeep(stateReset),pick(args,Object.keys(cloneDeep(stateReset))));
   },
   // 登录
   vxLogin(state, args) {

store/modules/other.js

@@ -1,4 +1,5 @@
 import cloneDeep from 'lodash/cloneDeep'
+import pick from 'lodash/pick'
 const stateReset = {
   isShowSeiminModel: false, //是否显示切换科室弹窗
   qucikCreateOrderType: "", //快捷建单类型
@@ -22,8 +23,8 @@ const state = cloneDeep(stateReset);
 const getters = {};
 const mutations = {
   // 重置数据
-  resetVxOther(state) {
-    Object.assign(state, cloneDeep(stateReset));
+  resetVxOther(state,args = {}) {
+    Object.assign(state, cloneDeep(stateReset),pick(args,Object.keys(cloneDeep(stateReset))));
   },
   //是否显示切换科室弹窗
   changeSeiminModel(state, args) {