|
@@ -20,7 +20,7 @@
|
|
|
</label>
|
|
|
</checkbox-group>
|
|
|
</view>
|
|
|
- <view class="forget-pass" @click="forgetPass">忘记密码</view>
|
|
|
+ <!-- <view class="forget-pass" @click="forgetPass">忘记密码</view> -->
|
|
|
</view>
|
|
|
<view class="form-btn-con">
|
|
|
<button class="form-btn" :disabled="isDisabled" :style="{'background':isDisabled?'#e5e5e5':$config('primaryColor')}" form-type="submit">登录</button>
|
|
@@ -88,18 +88,22 @@ export default {
|
|
|
methods: {
|
|
|
// 版本更新
|
|
|
AndroidCheckUpdate(){
|
|
|
- // let _this = this
|
|
|
- // let version = getApp().globalData.version
|
|
|
- // uni.showLoading({
|
|
|
- // title: '正在登录...'
|
|
|
- // });
|
|
|
- // getSysVersion({versionType:version.platform=='android'?'ANDROID':'IOS'}).then(ret => {
|
|
|
- // if(ret.status == 200){
|
|
|
- // this.$store.state.vuex_versionInfo = ret.data
|
|
|
- // checkVersionToLoadUpdate(ret.data,0,_this.formSubmit);
|
|
|
- // }
|
|
|
- // })
|
|
|
- this.formSubmit()
|
|
|
+ let _this = this
|
|
|
+ let version = getApp().globalData.version
|
|
|
+ uni.showLoading({
|
|
|
+ title: '正在登录...'
|
|
|
+ });
|
|
|
+ getSysVersion({versionType:version.platform=='android'?'ANDROID':'IOS'}).then(ret => {
|
|
|
+ if(ret.status == 200){
|
|
|
+ if(ret.data){
|
|
|
+ this.$store.state.vuex_versionInfo = ret.data || null
|
|
|
+ checkVersionToLoadUpdate(ret.data,0,_this.formSubmit)
|
|
|
+ }else{
|
|
|
+ this.formSubmit()
|
|
|
+ }
|
|
|
+ }
|
|
|
+ uni.hideLoading()
|
|
|
+ })
|
|
|
},
|
|
|
// 过滤权限code
|
|
|
fiterAuthCode(data) {
|