Browse Source

[手机信息,拼团][增加]:[增加获得手机信息的接口,拼团如果有未支付的订单,提示方式的修改]

tags/江西版6.1.0
meo 6 years ago
parent
commit
a1b1c84bd0
7 changed files with 37 additions and 51 deletions
  1. +2
    -2
      components/spellbanner/index.wxml
  2. +5
    -1
      config/config.js
  3. +0
    -1
      pages/index/index.js
  4. +3
    -27
      pages/joinFrDpell/index.js
  5. +3
    -19
      pages/spellGroup/mySpellGroup/index.js
  6. +6
    -1
      pages/spellGroup/spellGroup.js
  7. +18
    -0
      pages/user/index.js

+ 2
- 2
components/spellbanner/index.wxml View File

@@ -6,9 +6,9 @@
</swiper-item>
</block>
</swiper>
<view class="dots">
<!-- <view class="dots">
<block wx:for="{{list}}" wx:key="unique">
<view class="dot{{index == swiperCurrent ? ' active' : ''}}"></view>
</block>
</view>
</view> -->
</view>

+ 5
- 1
config/config.js View File

@@ -285,7 +285,11 @@ var config = {
/**
* 用户更新位置信息
*/
updateLBS:"/user/updateLBS"
updateLBS:"/user/updateLBS",
/**
* 用户更新信息
*/
updateUserInfo:"/user/updateUserInfo"
},
weapp: {
AppId: weappId


+ 0
- 1
pages/index/index.js View File

@@ -13,7 +13,6 @@ Page({
*/
onLoad: function(options) {
let that = this;
console.log(options)
wx.showToast({
title: '加载中',
icon: "loading",


+ 3
- 27
pages/joinFrDpell/index.js View File

@@ -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 () {

}
})

+ 3
- 19
pages/spellGroup/mySpellGroup/index.js View File

@@ -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) {
/**


+ 6
- 1
pages/spellGroup/spellGroup.js View File

@@ -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
})


+ 18
- 0
pages/user/index.js View File

@@ -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)
})
}
})
},
/**
* 生命周期函数--监听页面显示
*/


Loading…
Cancel
Save