From 67652e6b27e9d1a154aba482d953a2bb9d72339e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 24 Jun 2021 18:15:23 +0800
Subject: [PATCH] 登录模式修改
---
manifest.json | 2 +-
pages.json | 2 +-
pages/loging/loging.vue | 10 +++++-----
pages/myself/myself.vue | 6 +++---
store/mutations.js | 2 +-
pages/index/index.vue | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/manifest.json b/manifest.json
index aed7ceb..e1ec915 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "jfpt",
+ "name" : "群防群控",
"appid" : "__UNI__1A57486",
"description" : "",
"versionName" : "1.0.0",
diff --git a/pages.json b/pages.json
index 7b3d4d9..7deb6ba 100644
--- a/pages.json
+++ b/pages.json
@@ -4,7 +4,7 @@
"path": "pages/loging/loging",
"name": "loging",
"style": {
- "navigationBarTitleText": "请登入"
+ "navigationBarTitleText": "请登录"
// "app-plus": {
// "animationType": "fade-in",
// "animationDuration": 300
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 23b0c82..f985cd7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -20,7 +20,7 @@
},
methods: {
cc() {
- this.$store.commit('loginReset', this); //重置登入
+ this.$store.commit('loginReset', this); //重置登录
console.log('清空')
}
},
diff --git a/pages/loging/loging.vue b/pages/loging/loging.vue
index fca8f73..e535600 100644
--- a/pages/loging/loging.vue
+++ b/pages/loging/loging.vue
@@ -17,7 +17,7 @@
<input type="password" v-model="passwords" placeholder="请输入密码" />
</view>
<view class="loging">
- <button class="confirm bubble" @click="longing(names,passwords)" type="default">登入</button>
+ <button class="confirm bubble" @click="longing(names,passwords)" type="default">登录</button>
</view>
<view class="msg">
<span>{{msg}}</span>
@@ -46,7 +46,7 @@
},
methods: {
judgeUse() {
- var login = WxStorage.get("init") //重复登入
+ var login = WxStorage.get("init") //重复登录
var name = WxStorage.get("name")
var userID = WxStorage.get("ids")
var accounts = WxStorage.get("accounts");
@@ -107,14 +107,14 @@
uni.reLaunch({
url: '../alarm_list/alarm_list'
})
- return '成功登入'
+ return '成功登录'
} else {
this.icons = 'warn';
this.colors = '#d53c00';
this.msg = '账号密码错误';
- this.$store.commit('loginReset', this); //重置登入
+ this.$store.commit('loginReset', this); //重置登录
uni.hideNavigationBarLoading();
- return '未成功登入'
+ return '未成功登录'
}
}
}
diff --git a/pages/myself/myself.vue b/pages/myself/myself.vue
index 5f65ced..c7ccec5 100644
--- a/pages/myself/myself.vue
+++ b/pages/myself/myself.vue
@@ -53,7 +53,7 @@
showTextmsg: false,
textmsg: {
title: '提示',
- content: '您已登入，确认登出？',
+ content: '您已登录，确认登出？',
contentTwo: '',
cancel: '取消',
confirm: '登出'
@@ -100,7 +100,7 @@
return this.$store.state.puserName;
},
butTitle() {
- return this.$store.state.loging == true ? '登出' : '登入'
+ return this.$store.state.loging == true ? '登出' : '登录'
}
},
onLoad() {
@@ -150,7 +150,7 @@
}
},
goToLoging() {
- this.$store.commit('loginReset'); //重置登入
+ this.$store.commit('loginReset'); //重置登录
uni.redirectTo({ //关闭并打开
url: '../loging/loging',
animationType: 'slide-in-top',
diff --git a/store/mutations.js b/store/mutations.js
index db2212c..f3ed1b9 100644
--- a/store/mutations.js
+++ b/store/mutations.js
@@ -3,7 +3,7 @@
const mutations = {
login(state, data) {
// console.log(data);
- state.loging = data.isit; //登入状态
+ state.loging = data.isit; //登录状态
if (data.isit) { //写入用户数据
state.message.useName = data.userName;
state.puserName = data.userName;
--
Gitblit v1.9.3