fix:系统版本读取manifest.json;孔夫子登录失败显示errInfo
This commit is contained in:
parent
2d16446dd7
commit
34220db758
@ -53,7 +53,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="user-info">
|
<view class="user-info">
|
||||||
<text class="user-name">用户名</text>
|
<text class="user-name">用户名</text>
|
||||||
<text class="version-text">系统版本:v1.0.0</text>
|
<text class="version-text">系统版本:v{{ appVersion }}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
@ -130,10 +130,19 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
// 读取 manifest.json 中的版本号(uni-app 编译时自动去除注释)
|
||||||
|
var manifestData = {}
|
||||||
|
try {
|
||||||
|
manifestData = require('../../manifest.json')
|
||||||
|
} catch (e) {
|
||||||
|
manifestData = { versionName: '1.0.0' }
|
||||||
|
}
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
currentTab: 'home'
|
currentTab: 'home',
|
||||||
|
appVersion: manifestData.versionName || '1.0.0'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -141,6 +150,12 @@ export default {
|
|||||||
uni.setNavigationBarTitle({
|
uni.setNavigationBarTitle({
|
||||||
title: '入库助手'
|
title: '入库助手'
|
||||||
})
|
})
|
||||||
|
// App 原生模式优先使用 plus.runtime.version
|
||||||
|
try {
|
||||||
|
if (typeof plus !== 'undefined' && plus.runtime && plus.runtime.version) {
|
||||||
|
this.appVersion = plus.runtime.version
|
||||||
|
}
|
||||||
|
} catch (e) {}
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
|||||||
@ -54,13 +54,13 @@ export function login(username, password) {
|
|||||||
try {
|
try {
|
||||||
const json = typeof res.data === 'string' ? JSON.parse(res.data) : res.data
|
const json = typeof res.data === 'string' ? JSON.parse(res.data) : res.data
|
||||||
if (json.errCode === 1001) {
|
if (json.errCode === 1001) {
|
||||||
resolve({ success: false, token: '', message: '账号或密码错误' })
|
resolve({ success: false, token: '', message: json.errInfo || '账号或密码错误' })
|
||||||
} else if (json.errCode === 1005) {
|
} else if (json.errCode === 1005) {
|
||||||
resolve({ success: false, token: '', message: '密码错误' })
|
resolve({ success: false, token: '', message: json.errInfo || '密码错误' })
|
||||||
} else if (json.errCode === 1009) {
|
} else if (json.errCode === 1009) {
|
||||||
resolve({ success: false, token: '', message: '调用次数已达上限,请稍后再试' })
|
resolve({ success: false, token: '', message: json.errInfo || '调用次数已达上限,请稍后再试' })
|
||||||
} else {
|
} else {
|
||||||
resolve({ success: false, token: '', message: json.msg || '登录失败' })
|
resolve({ success: false, token: '', message: json.errInfo || '登录失败' })
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
resolve({ success: false, token: '', message: '登录失败,请检查账号密码' })
|
resolve({ success: false, token: '', message: '登录失败,请检查账号密码' })
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user