fix(视频、登录): 视频webview地址改成动态、解决验证码显示bug、默认添加http://192.168.21.22地址(app环境),升级1.0.29
This commit is contained in:
parent
435267f34f
commit
1dac10fcb1
7
App.vue
7
App.vue
|
@ -13,6 +13,13 @@
|
|||
protocol:'https://',
|
||||
address:'cloud.iot-fast.com',
|
||||
}]
|
||||
// #ifdef APP-PLUS
|
||||
configList.push({
|
||||
id:this.$u.guid(32),
|
||||
protocol:'http://',
|
||||
address:'192.168.21.22',
|
||||
})
|
||||
// #endif
|
||||
uni.setStorageSync('configList',configList)
|
||||
uni.setStorageSync('configIndex',0)
|
||||
}
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
"name" : "物联网可视化",
|
||||
"appid" : "__UNI__604B8F1",
|
||||
"description" : "",
|
||||
"versionName" : "1.0.28",
|
||||
"versionCode" : 1028,
|
||||
"versionName" : "1.0.29",
|
||||
"versionCode" : 1029,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
|
|
|
@ -217,7 +217,7 @@
|
|||
getLoginConfig(){
|
||||
this.$api.getLoginConfig({}).then(res => {
|
||||
if(res.code == 0){
|
||||
this.isImgCode = res.data.loginDemoSwitch===1?true:false;
|
||||
this.isImgCode = res.data.loginCaptchaSwitch===1?true:false;
|
||||
}else{
|
||||
this.$u.toast(res.message);
|
||||
}
|
||||
|
|
|
@ -15,10 +15,15 @@
|
|||
isWebview:false,
|
||||
deviceObj:null,
|
||||
channeList:[],
|
||||
webviewUrl:'https://v2-test.gkiiot.com/video/web/h5/index.html'
|
||||
webviewHost:'',
|
||||
webviewUrl:''
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
let configList = uni.getStorageSync('configList');
|
||||
let configIndex = uni.getStorageSync('configIndex');
|
||||
this.webviewHost = configList[configIndex].protocol + configList[configIndex].address;
|
||||
this.webviewUrl = configList[configIndex].protocol + configList[configIndex].address + '/video/web/h5/index.html';
|
||||
console.log("option",option)
|
||||
let deviceObj = JSON.parse(decodeURIComponent(option.deviceObj));
|
||||
this.deviceObj = deviceObj;
|
||||
|
@ -40,7 +45,7 @@
|
|||
// })
|
||||
this.$nextTick(()=>{
|
||||
this.$set(this,'channeList',res.data.list);
|
||||
let url = 'https://v2-test.gkiiot.com/video/web/h5/index.html?deviceObj=' + encodeURIComponent(JSON.stringify(this.deviceObj)) + '&channeList='+encodeURIComponent(JSON.stringify(channeList))
|
||||
let url = this.webviewHost + '/video/web/h5/index.html?deviceObj=' + encodeURIComponent(JSON.stringify(this.deviceObj)) + '&channeList='+encodeURIComponent(JSON.stringify(channeList))
|
||||
this.$set(this,'webviewUrl',url);
|
||||
this.isWebview = true;
|
||||
})
|
||||
|
|
Loading…
Reference in New Issue