|
@@ -63,12 +63,8 @@ Page({
|
|
|
hotInput: '12345',
|
|
hotInput: '12345',
|
|
|
mineSettingInfo: '528',
|
|
mineSettingInfo: '528',
|
|
|
hide: true,
|
|
hide: true,
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
isIOS:app.globalData.isIOS,
|
|
isIOS:app.globalData.isIOS,
|
|
|
ifHaveMore: true
|
|
ifHaveMore: true
|
|
|
-=======
|
|
|
|
|
- isIOS: app.globalData.isIOS,
|
|
|
|
|
->>>>>>> master
|
|
|
|
|
},
|
|
},
|
|
|
jurisdiction: function () {
|
|
jurisdiction: function () {
|
|
|
//隐藏弹框
|
|
//隐藏弹框
|
|
@@ -223,7 +219,6 @@ Page({
|
|
|
setTimeout(function () {
|
|
setTimeout(function () {
|
|
|
wx.hideNavigationBarLoading() //完成停止加载
|
|
wx.hideNavigationBarLoading() //完成停止加载
|
|
|
wx.stopPullDownRefresh() //停止下拉刷新
|
|
wx.stopPullDownRefresh() //停止下拉刷新
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
},1500);
|
|
},1500);
|
|
|
},
|
|
},
|
|
|
// 获取全部课本
|
|
// 获取全部课本
|
|
@@ -261,9 +256,5 @@ Page({
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
},
|
|
},
|
|
|
-=======
|
|
|
|
|
- }, 1500);
|
|
|
|
|
- }
|
|
|
|
|
->>>>>>> master
|
|
|
|
|
|
|
|
|
|
})
|
|
})
|
