Browse Source

no message

master
xpz2018 6 years ago
parent
commit
481bedc011
2 changed files with 3 additions and 5 deletions
  1. 7
      app.js
  2. 1
      pages/mall/shops/index.js

7
app.js

@ -1,6 +1,6 @@
//app.js //app.js
App({ App({
//----------------------------------------------globalData--------------------------------------
release: true, release: true,
httpUrl: 'https://api-test.qniao.cn', httpUrl: 'https://api-test.qniao.cn',
tmplIds: ['kg0T1ve0FpYrEtZ4ExbypHm8mtS7OJaehvqN_T9ypoI'], tmplIds: ['kg0T1ve0FpYrEtZ4ExbypHm8mtS7OJaehvqN_T9ypoI'],
@ -10,7 +10,7 @@
token: null, token: null,
isIPhoneX: false isIPhoneX: false
}, },
//-----------------------------------------onLaunch---------------------------------------------
onLaunch: function () { onLaunch: function () {
if (this.release) { if (this.release) {
this.httpUrl = 'https://api.qniao.cn' this.httpUrl = 'https://api.qniao.cn'
@ -26,12 +26,11 @@
let windowHeight = e.windowHeight * (750 / e.windowWidth); let windowHeight = e.windowHeight * (750 / e.windowWidth);
let statusBarHeight = this.globalData.CustomBar * (750 / e.windowWidth); let statusBarHeight = this.globalData.CustomBar * (750 / e.windowWidth);
this.globalData.fragmentHeight = windowHeight - statusBarHeight this.globalData.fragmentHeight = windowHeight - statusBarHeight
// console.log('fragmentHeight>>>' + this.globalData.fragmentHeight + ',windowHeight=' + windowHeight)
this.globalData.isIPhoneX = this.checkIPhoneX(e) this.globalData.isIPhoneX = this.checkIPhoneX(e)
} }
}) })
}, },
//-----------------------------------------checkIPhoneX---------------------------------------------
checkIPhoneX: function (e) { checkIPhoneX: function (e) {
var t = e.model, var t = e.model,
o = e.platform; o = e.platform;

1
pages/mall/shops/index.js

@ -120,7 +120,6 @@ Page({
if (this.data.requesting || this.data.finished) { if (this.data.requesting || this.data.finished) {
return return
} }
console.log('fetchTaskList>>>')
if(this.data.loading){ if(this.data.loading){
this.data.requesting = true this.data.requesting = true
} else { } else {

Loading…
Cancel
Save