|
@@ -34,44 +34,61 @@ Page({
|
|
|
]
|
|
|
},
|
|
|
goCollect() {
|
|
|
-
|
|
|
+ // if (wx.getStorageSync('user') == '') {
|
|
|
+ // wx.showModal({
|
|
|
+ // showCancel: false,
|
|
|
+ // content: '当前您未登录,请登录',
|
|
|
+ // success(res) {
|
|
|
+ // if (res.confirm) {
|
|
|
+ // wx.redirectTo({
|
|
|
+ // url: '/pages/login/login',
|
|
|
+ // })
|
|
|
+ // } else if (res.cancel) {
|
|
|
+ // console.log('用户点击取消')
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // } else {
|
|
|
+ // wx.switchTab({
|
|
|
+ // url: '/pages/collectInfo/collectInfo',
|
|
|
+ // })
|
|
|
+ // }
|
|
|
if (wx.getStorageSync('user') == '') {
|
|
|
- wx.showModal({
|
|
|
- showCancel: false,
|
|
|
- content: '当前您未登录,请登录',
|
|
|
- success(res) {
|
|
|
- if (res.confirm) {
|
|
|
- wx.redirectTo({
|
|
|
- url: '/pages/login/login',
|
|
|
- })
|
|
|
- } else if (res.cancel) {
|
|
|
- console.log('用户点击取消')
|
|
|
- }
|
|
|
- }
|
|
|
+ wx.redirectTo({
|
|
|
+ url: '/pages/login/login',
|
|
|
})
|
|
|
} else {
|
|
|
- wx.switchTab({
|
|
|
+ wx.navigateTo({
|
|
|
url: '/pages/collectInfo/collectInfo',
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
goXunfang() {
|
|
|
+ // if (wx.getStorageSync('user') == '') {
|
|
|
+ // wx.showModal({
|
|
|
+ // showCancel: false,
|
|
|
+ // content: '当前您未登录,请登录',
|
|
|
+ // success(res) {
|
|
|
+ // if (res.confirm) {
|
|
|
+ // wx.redirectTo({
|
|
|
+ // url: '/pages/login/login',
|
|
|
+ // })
|
|
|
+ // } else if (res.cancel) {
|
|
|
+ // console.log('用户点击取消')
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // } else {
|
|
|
+ // wx.switchTab({
|
|
|
+ // url: '/pages/visitandinfo/visitandinfo',
|
|
|
+ // })
|
|
|
+ // }
|
|
|
if (wx.getStorageSync('user') == '') {
|
|
|
- wx.showModal({
|
|
|
- showCancel: false,
|
|
|
- content: '当前您未登录,请登录',
|
|
|
- success(res) {
|
|
|
- if (res.confirm) {
|
|
|
- wx.redirectTo({
|
|
|
- url: '/pages/login/login',
|
|
|
- })
|
|
|
- } else if (res.cancel) {
|
|
|
- console.log('用户点击取消')
|
|
|
- }
|
|
|
- }
|
|
|
+ wx.redirectTo({
|
|
|
+ url: '/pages/login/login',
|
|
|
})
|
|
|
} else {
|
|
|
- wx.switchTab({
|
|
|
+ wx.navigateTo({
|
|
|
url: '/pages/visitandinfo/visitandinfo',
|
|
|
})
|
|
|
}
|
|
@@ -127,7 +144,6 @@ Page({
|
|
|
|
|
|
},
|
|
|
depts() {
|
|
|
- console.log("打印走了么的接口呢");
|
|
|
console.log(wx.getStorageSync('openId'));
|
|
|
wx.request({
|
|
|
url: app.globalData.publicUrl + '/applet/homeStatistics',
|
|
@@ -156,7 +172,6 @@ Page({
|
|
|
method: "GET",
|
|
|
success: (res) => {
|
|
|
if (res.data.code == 0) {
|
|
|
-
|
|
|
if (res.data.data.length != 0) {
|
|
|
let result = res.data.data[0].title
|
|
|
this.data.msgList.push({
|
|
@@ -214,13 +229,13 @@ Page({
|
|
|
|
|
|
},
|
|
|
onLoad: function () {
|
|
|
- console.log("onload11111111111111111111111");
|
|
|
+ console.log("主页onload");
|
|
|
var that = this;
|
|
|
const apps = getApp()
|
|
|
apps.getAuthKey().then(function (res) {
|
|
|
that.depts();
|
|
|
})
|
|
|
- console.log("onload12222222222222222222222222222221");
|
|
|
+ console.log("主页onload22222222222222222");
|
|
|
|
|
|
}
|
|
|
|