diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js index c90c26f..9e7c3d6 100644 --- a/src/api/testZongXian.js +++ b/src/api/testZongXian.js @@ -1,5 +1,5 @@ -var ip = '10.9.39.5' +var ip = '10.9.39.8' // 新版本查询 function generateJson(method,params={},type='GET') { const data = { @@ -30,7 +30,7 @@ function getBWBH(){ let head = "SR" - let ip = changeIP('10.9.39.5'); + let ip = changeIP('10.9.39.8'); let mdate = new Date(); let year = mdate.getFullYear(); let month = mdate.getMonth()+1; diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js index c90c26f..9e7c3d6 100644 --- a/src/api/testZongXian.js +++ b/src/api/testZongXian.js @@ -1,5 +1,5 @@ -var ip = '10.9.39.5' +var ip = '10.9.39.8' // 新版本查询 function generateJson(method,params={},type='GET') { const data = { @@ -30,7 +30,7 @@ function getBWBH(){ let head = "SR" - let ip = changeIP('10.9.39.5'); + let ip = changeIP('10.9.39.8'); let mdate = new Date(); let year = mdate.getFullYear(); let month = mdate.getMonth()+1; diff --git a/src/page/wellManage/WellManage.vue b/src/page/wellManage/WellManage.vue index d9aeecf..97a910b 100644 --- a/src/page/wellManage/WellManage.vue +++ b/src/page/wellManage/WellManage.vue @@ -158,6 +158,7 @@ methods: { loadTop() { console.log('wellManageloadTop') + this.list = [] this.$refs.loadmore.onTopLoaded(); this.loadConf.loadBottomConf.isFinish = false this.isLoading = true @@ -313,7 +314,7 @@ } .welltype-popup { top: 90px - width 90px + width 105px left:50px background-color rgba(0, 0, 0, 0.7) border-radius 5px @@ -321,7 +322,7 @@ ul{ li{ margin:0px 0px 0px 0px - padding:15px 0px 15px 15px + padding:8px 0px 8px 15px } } .mint-button { diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js index c90c26f..9e7c3d6 100644 --- a/src/api/testZongXian.js +++ b/src/api/testZongXian.js @@ -1,5 +1,5 @@ -var ip = '10.9.39.5' +var ip = '10.9.39.8' // 新版本查询 function generateJson(method,params={},type='GET') { const data = { @@ -30,7 +30,7 @@ function getBWBH(){ let head = "SR" - let ip = changeIP('10.9.39.5'); + let ip = changeIP('10.9.39.8'); let mdate = new Date(); let year = mdate.getFullYear(); let month = mdate.getMonth()+1; diff --git a/src/page/wellManage/WellManage.vue b/src/page/wellManage/WellManage.vue index d9aeecf..97a910b 100644 --- a/src/page/wellManage/WellManage.vue +++ b/src/page/wellManage/WellManage.vue @@ -158,6 +158,7 @@ methods: { loadTop() { console.log('wellManageloadTop') + this.list = [] this.$refs.loadmore.onTopLoaded(); this.loadConf.loadBottomConf.isFinish = false this.isLoading = true @@ -313,7 +314,7 @@ } .welltype-popup { top: 90px - width 90px + width 105px left:50px background-color rgba(0, 0, 0, 0.7) border-radius 5px @@ -321,7 +322,7 @@ ul{ li{ margin:0px 0px 0px 0px - padding:15px 0px 15px 15px + padding:8px 0px 8px 15px } } .mint-button { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index d81ae8a..c521eff 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -18,7 +18,7 @@ token: getToken(),//token username: getAccount(),//用户名 password:getPwd(),//加密密码 - ip:"10.9.39.5",// ip地址 + ip:"10.9.39.8",// ip地址 imei:"", //imei号 yys:"", //运营商 identityCard: "",//身份证号 @@ -128,16 +128,11 @@ console.log("IDLogin function:") const userInfo = JSON.parse(window.android.getUser()) console.log(userInfo); - //临时身份证号 - // const userInfo = { - // card: '110226198909261410', - // yys: 'lt', - // name:'张森' - // } commit('SET_NAME', userInfo.name) commit('SET_YYS', userInfo.yys) commit('SET_IDENTITYCARD', userInfo.card) + commit('SET_IMEI', userInfo[0].imei) appSpApi('app/tokenByCard',{card: userInfo.card}).then(response => { if (response.code === 200) { @@ -182,7 +177,7 @@ //设备信息 const devices = data.devices - if(devices.length>0){ + if(devices.length==1){ commit('SET_IMEI', devices[0].imei) }else{ commit('SET_IMEI', "")