diff --git a/pages/quest/quest.js b/pages/quest/quest.js index 769dbc5..fc0261e 100644 --- a/pages/quest/quest.js +++ b/pages/quest/quest.js @@ -1,4 +1,7 @@ // pages/quest/quest.js +import { + http +} from '../../utils/util' Page({ /** @@ -271,6 +274,7 @@ Page({ title: '任务中心', success: function (res) {} }) + http("/task/list", "post", '') }, /** diff --git a/pages/quest/subpage/detail/components/collection/collection.js b/pages/quest/subpage/detail/components/collection/collection.js index 3fae9ca..7f4c1ac 100644 --- a/pages/quest/subpage/detail/components/collection/collection.js +++ b/pages/quest/subpage/detail/components/collection/collection.js @@ -37,7 +37,7 @@ Component({ console.log(e.detail.value) console.log(this.data) this.setData({ - [form.add]: e.detail.value + 'form.add': e.detail.value }) }, } diff --git a/pages/quest/subpage/detail/components/collection/collection.wxml b/pages/quest/subpage/detail/components/collection/collection.wxml index 53d2d07..2dc14a6 100644 --- a/pages/quest/subpage/detail/components/collection/collection.wxml +++ b/pages/quest/subpage/detail/components/collection/collection.wxml @@ -21,8 +21,8 @@ - {{form.add}} - 请选择地区 + {{form.add}} + 请选择地区 @@ -30,7 +30,7 @@ 关注车型 - 请选择关注车型 + 请选择关注车型 @@ -44,4 +44,11 @@ 上传 - \ No newline at end of file + + + + 选择平台 + {{item.name}} + + + \ No newline at end of file diff --git a/pages/user/subpage/quest.js b/pages/user/subpage/quest.js index e9ac3b4..d8945fd 100644 --- a/pages/user/subpage/quest.js +++ b/pages/user/subpage/quest.js @@ -8,11 +8,12 @@ Page({ }, + getlist() { + }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - }, /** diff --git a/pages/user/user.js b/pages/user/user.js index 3782aec..a5ecfe4 100644 --- a/pages/user/user.js +++ b/pages/user/user.js @@ -67,7 +67,7 @@ Page({ if (res.msg === "未注册!") { this.getUserProfile() } else { - // getApp().globalData.token = res.token + getApp().globalData.token = res.data.token this.setData({ user_avatar:res.data.user.avatar, user_name:res.data.user.name, diff --git a/utils/util.js b/utils/util.js index 3522e9c..2795518 100644 --- a/utils/util.js +++ b/utils/util.js @@ -26,10 +26,21 @@ const http = (url, method, data, isLoading = true) => { } return new Promise(function (resolve, reject) { let token = getApp().globalData.token + // wx.getStorage({ + // key: 'token', + // success (res) { + // // console.log(res.data) + // let token = res.data + // }, + // fail (res) { + // console.log(res) + // wx.hideLoading(); + // } + // }) let header = { - 'Customer-Wxapp-Token': token + 'token': token } - // if (token && uid) { + if (token) { wx.request({ url: host + url, data: data, @@ -55,13 +66,13 @@ const http = (url, method, data, isLoading = true) => { wx.hideLoading(); } }) - // } else { - // wx.showToast({ - // title: '未登录\r\n点击个人中心头像登录', - // icon: 'none', - // duration: 2000 - // }) - // } + } else { + wx.showToast({ + title: '未登录\r\n点击个人中心头像登录', + icon: 'none', + duration: 2000 + }) + } }) }