瀏覽代碼

feature: 加入首页banner图片数据

Damon 8 月之前
父節點
當前提交
d901247666
共有 3 個文件被更改,包括 16 次插入19 次删除
  1. 13 15
      pages/index/index.js
  2. 0 1
      pages/login/login.js
  3. 3 3
      utils/api.js

+ 13 - 15
pages/index/index.js

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

+ 0 - 1
pages/login/login.js

@@ -97,7 +97,6 @@ Page({
         code: e.detail.code,
         code: e.detail.code,
       }).then((res) => {
       }).then((res) => {
 
 
-        console.log("gadfqwwerqewrqr===啊啊啊啊==" + JSON.stringify(res));
         wx.showToast({
         wx.showToast({
           title: "登陆成功",
           title: "登陆成功",
           icon: 'success',
           icon: 'success',

+ 3 - 3
utils/api.js

@@ -2,9 +2,9 @@ const {
   request
   request
 } = require('./util.js')
 } = require('./util.js')
 module.exports = {
 module.exports = {
-  // 首页设备列表
-  getDevices: (data) => {
-    return request("/mini/wx/device/base/deviceList", data, "GET", {
+  // 首页banner
+  getBanner: (data) => {
+    return request("/mini/wx/config/bannerList", data, "GET", {
       "content-type": "application/x-www-form-urlencoded"
       "content-type": "application/x-www-form-urlencoded"
     })
     })
   },
   },