diff --git a/components/spellbanner/index.wxml b/components/spellbanner/index.wxml index cedae0e..e867686 100644 --- a/components/spellbanner/index.wxml +++ b/components/spellbanner/index.wxml @@ -6,9 +6,9 @@ - + \ No newline at end of file diff --git a/config/config.js b/config/config.js index 545d644..4d09bf7 100755 --- a/config/config.js +++ b/config/config.js @@ -285,7 +285,11 @@ var config = { /** * 用户更新位置信息 */ - updateLBS:"/user/updateLBS" + updateLBS:"/user/updateLBS", + /** + * 用户更新信息 + */ + updateUserInfo:"/user/updateUserInfo" }, weapp: { AppId: weappId diff --git a/pages/index/index.js b/pages/index/index.js index 261cd22..b07aaee 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -13,7 +13,6 @@ Page({ */ onLoad: function(options) { let that = this; - console.log(options) wx.showToast({ title: '加载中', icon: "loading", diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js index 0e8501b..da869b3 100644 --- a/pages/joinFrDpell/index.js +++ b/pages/joinFrDpell/index.js @@ -296,7 +296,6 @@ Page({ }); }) .catch(err => { - console.log(err); that.setData({ showbutton: false, showbutton1: false, @@ -360,18 +359,9 @@ Page({ mask: false }); } else if (err.code == 3012) { - wx.showModal({ - title: '提示', - content: '您有未支付订单,请先进行支付', - confirmText: "去支付", - success: function (res) { - console.log(res.confirm) - if (res.confirm) { - wx.navigateTo({ - url: '/pages/order/index/index?id=all', - }) - } - } + wx.showToast({ + title: err.message, + icon: "none" }) } else if (err.code == 11005) { /** @@ -475,13 +465,6 @@ Page({ }) }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - /** * 生命周期函数--监听页面显示 */ @@ -519,12 +502,5 @@ Page({ */ onPullDownRefresh: function () { this.checkUser(this.data.paramData) - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - } }) \ No newline at end of file diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index 165d45b..39f861c 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -393,25 +393,9 @@ Page({ mask: false }); } else if (err.code == 3012) { - wx.showModal({ - title: '提示', - content: '您有未支付订单,请先进行支付', - confirmText: "去支付", - success: function (res) { - console.log(res.confirm) - if (res.confirm) { - console.log(that.data.isFromSpell) - if (that.data.isFromSpell){ - wx.navigateTo({ - url: '/pages/spellGroup/spellGroup?from=myspellList', - }) - }else{ - wx.navigateTo({ - url: '/pages/order/index/index?id=all', - }) - } - } - } + wx.showToast({ + title: err.message, + icon: "none" }) } else if (err.code == 11005) { /** diff --git a/pages/spellGroup/spellGroup.js b/pages/spellGroup/spellGroup.js index bda751a..40f3361 100644 --- a/pages/spellGroup/spellGroup.js +++ b/pages/spellGroup/spellGroup.js @@ -52,6 +52,9 @@ Page({ myspellList: true, lists: null }) + wx.setNavigationBarTitle({ + title: '我的拼团' + }) }else{ that.getList(1, "spellList"); that.setData({ @@ -60,6 +63,9 @@ Page({ myspellList: false, lists: null }) + wx.setNavigationBarTitle({ + title: '拼团专场' + }) } } that.getUserInfo(); @@ -151,7 +157,6 @@ Page({ return spellStatus.filter(item => status == item.value)[0].name }, gotoPay(e){ - console.log(e,333) this.setData({ reloadIf:true }) diff --git a/pages/user/index.js b/pages/user/index.js index 828d423..f9d2db9 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -69,6 +69,7 @@ Page({ }, onLoad() { this.getLocation(); + this.updateUserInfo(); }, /** * 获得经纬度 @@ -96,6 +97,23 @@ Page({ } }) }, + /** + * 获取手机信息 + */ + updateUserInfo() { + wx.getSystemInfo({ + success: function(res) { + Http.post({ + url: config.api.updateUserInfo, + data: { + systemInfo: JSON.stringify(res) + } + }).then(res => { + console.log(res) + }) + } + }) + }, /** * 生命周期函数--监听页面显示 */