|
@@ -1,7 +1,7 @@
|
|
|
// 获取应用实例
|
|
|
const app = getApp();
|
|
|
const {
|
|
|
- getDevices,
|
|
|
+ getBanner,
|
|
|
login,
|
|
|
listByDevice
|
|
|
} = require('../../utils/api.js');
|
|
@@ -80,11 +80,20 @@ Page({
|
|
|
if (nickname != "" && nickname != "未登录") {
|
|
|
greeting = greeting + ',' + nickname;;
|
|
|
}
|
|
|
- console.log("gadfqwwerqewrqr===00==" + greeting);
|
|
|
- console.log("gadfqwwerqewrqr===11==" + nickname);
|
|
|
that.setData({
|
|
|
greeting: greeting
|
|
|
});
|
|
|
+
|
|
|
+ getBanner({}).then((res) => {
|
|
|
+ console.log("gadfadfqwwerqewqr===" + JSON.stringify(res));
|
|
|
+ that.setData({
|
|
|
+ bannerList: res
|
|
|
+ });
|
|
|
+ wx.setStorage({
|
|
|
+ key: "homeBanner",
|
|
|
+ data: res
|
|
|
+ });
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
updateGreeting() {
|
|
@@ -156,14 +165,11 @@ Page({
|
|
|
};
|
|
|
|
|
|
var nickname = res.data.nickname || "";
|
|
|
- console.log("gadfqwwerqewrqr===44==" + res.data.nickname);
|
|
|
var greeting = that.updateGreeting();
|
|
|
if (nickname != "" && nickname != "未登录") {
|
|
|
greeting = greeting + ',' + nickname;;
|
|
|
}
|
|
|
|
|
|
- console.log("gadfqwwerqewrqr===22==" + greeting);
|
|
|
- console.log("gadfqwwerqewrqr===33==" + nickname);
|
|
|
that.setData({
|
|
|
greeting: greeting,
|
|
|
nickname: nickname,
|
|
@@ -790,12 +796,4 @@ Page({
|
|
|
});
|
|
|
},
|
|
|
|
|
|
-})
|
|
|
-
|
|
|
-// getDevices({}).then((res) => {
|
|
|
-// console.log("gadfadfqwwerqewqr===" + JSON.stringify(res));
|
|
|
-// // wx.setStorage({
|
|
|
-// // key: "channelData",
|
|
|
-// // data: res
|
|
|
-// // });
|
|
|
-// })
|
|
|
+})
|