ソースを参照

修正数据时有时无问题

tags/2.2.4
Stormeye.Wu 6年前
コミット
477c3f7ba3
9個のファイルの変更105行の追加90行の削除
  1. +5
    -3
      app.js
  2. +3
    -3
      app.json
  3. +4
    -0
      config/config.js
  4. +1
    -0
      pages/addPark/addPark.js
  5. +13
    -41
      pages/index/coupons/index.js
  6. +0
    -12
      pages/index/index.js
  7. +7
    -16
      pages/index/rushToBuy/index.js
  8. +71
    -14
      pages/passCar/passCar.js
  9. +1
    -1
      pages/passCar/passCar.wxml

+ 5
- 3
app.js ファイルの表示

@@ -23,10 +23,12 @@ App({
console.log("req",res);
that.globalData.token = res.data.token;
Http.setToken(res.data.token)
if (that.tokenCallback) {
that.tokenCallback(res.data.token);
if (that.couponChannelListCallback) {
that.couponChannelListCallback(that.globalData.token);
}
if (that.couponListCallback) {
that.couponListCallback(that.globalData.token);
}
return Http.post({
url: config.api.checkUserStatus,
data: {}


+ 3
- 3
app.json ファイルの表示

@@ -16,8 +16,8 @@
"pages/success/index",
"pages/login/index",
"pages/park/park",
"pages/addPark/addPark",
"pages/passCar/passCar"
"pages/passCar/passCar",
"pages/addPark/addPark"
],
"tabBar": {
"color":"#9F9F9F",
@@ -28,7 +28,7 @@
"selectedIconPath":"assets/img/home-y.png",
"text": "首页"
}, {
"pagePath": "pages/addPark/addPark",
"pagePath": "pages/passCar/passCar",
"iconPath": "assets/img/pass1.png",
"selectedIconPath": "assets/img/pass0.png",
"text": "停车"


+ 4
- 0
config/config.js ファイルの表示

@@ -75,6 +75,10 @@ var config = {
* 车场信息获取
*/
getParkInfo: '/wxPark/info',
/**
* 用户所绑车牌获取
*/
getUserCarList: '/user/carlist',
/**
* 联合登录
*/


+ 1
- 0
pages/addPark/addPark.js ファイルの表示

@@ -59,6 +59,7 @@ Page({

},
jumpTo: function () {
// 返回
wx.redirectTo({
url: '/pages/passCar/passCar'
});


+ 13
- 41
pages/index/coupons/index.js ファイルの表示

@@ -42,17 +42,17 @@ Component({
},
ready() {
var that = this
var pageNum = 1
if (app.globalData.token && app.globalData.token != null) {
app.couponListCallback = token =>{
Http.setToken(token)
// business获取
Http.get({
url: config.api.businessList,
data: {
pageNum: pageNum,
pageSize: 10,
type: 1
}
})
url: config.api.businessList,
data: {
pageNum: 1,
pageSize: 10,
type: 1
}
})
.then(res => {
console.log(res)
that.setData({
@@ -63,7 +63,7 @@ Component({
Http.get({
url: config.api.couponList,
data: {
pageNum: pageNum,
pageNum: 1,
pageSize: 10
}
}).then(res => {
@@ -72,37 +72,9 @@ Component({
list: res.data.list
})
})
} else {
app.couponListCallback = token => {
// business获取
Http.get({
url: config.api.businessList,
data: {
pageNum: pageNum,
pageSize: 10,
type: 1
}
})
.then(res => {
console.log(res)
that.setData({
tabs: res.data.list
})
})
// 券list获取
Http.get({
url: config.api.couponList,
data: {
pageNum: pageNum,
pageSize: 10
}
}).then(res => {
console.log(res);
that.setData({
list: res.data.list
})
})
}
}
if (app.globalData.token && app.globalData.token != null) {
app.couponListCallback(app.globalData.token)
}
}
})

+ 0
- 12
pages/index/index.js ファイルの表示

@@ -27,23 +27,11 @@ Page({
var that = this;
if (app.globalData.token && app.globalData.token != null) {
console.log("index ++ " + app.globalData.token);
if (that.couponChannelListCallback) {
that.couponChannelListCallback(res.data.token);
}
if (that.couponListCallback) {
that.couponListCallback(res.data.token);
}
} else {
// 由于是网络请求,可能会在 Page.onLoad 之后才返回
// 所以此处加入 callback 以防止这种情况
app.tokenCallback = token => {
console.log("index + " + token);
if (that.couponChannelListCallback) {
that.couponChannelListCallback(res.data.token);
}
if (that.couponListCallback) {
that.couponListCallback(res.data.token);
}
}
}
wx.showLoading({


+ 7
- 16
pages/index/rushToBuy/index.js ファイルの表示

@@ -52,7 +52,9 @@ Component({
methods: {
},
ready() {
if (app.globalData.token && app.globalData.token != null) {
app.couponChannelListCallback = token => {
console.log("couponChannelList init");
Http.setToken(token);
Http.get({
url: config.api.couponChannelList,
data: {
@@ -64,21 +66,10 @@ Component({
list: res.data.list
})
})
} else {
app.couponChannelListCallback = token => {
Http.setToken(token);
Http.get({
url: config.api.couponChannelList,
data: {
pageNum: 1,
pageSize: 10
}
}).then(res => {
this.setData({
list: res.data.list
})
})
}
}
if (app.globalData.token && app.globalData.token != null) {
console.log("couponChannelList init 1");
app.couponChannelListCallback(app.globalData.token)
}
}
})

+ 71
- 14
pages/passCar/passCar.js ファイルの表示

@@ -1,10 +1,15 @@
// pages/passCar/passCar.js
const app = getApp();
Component({
properties: {

},
data: {
parkVendor: 1,
park: null,
carList: [],

etcpToken: null,
},
methods: {
jumpToAdd: function() {
@@ -32,20 +37,72 @@ Component({
url: '/pages/pay/pay'
});
},
delete: function () {
wx.showModal({
title: '提示',
showCancel: false,
content: "删除车牌成功!",
success: function () {
wx.redirectTo({
url: '/pages/passCar/passCar'
});
// wx.switchTab({
// url: '/pages/index/index',
// });
}
})
unbindCar: function() {
var that = this
// ETCP
var etcpData = {
etcpToken: that.data.etcpToken,
carNumber: null,
}
// 停简单
var tjdData = {
carNumber: null,
carNumColor: null,
outCarId: null,
}
var postData = (parkVendor == 1) ? etcpData : tjdData
Http.post({
url: config.api.unbindCar,
data: postData,
})
.then(res => {
console.log(res)
wx.showModal({
title: '提示',
showCancel: false,
content: "解绑车牌成功!",
success: function() {}
})
})
.catch(error => {
wx.showModal({
title: '提示',
showCancel: false,
content: "解绑车牌失败!",
success: function () { }
})
})
},
},
ready() {
var that = this
initCallback = token => {
// 车场信息获取
Http.get({
url: config.api.getParkInfo,
data: {}
})
.then(res => {
console.log(res)
that.setData({
tabs: res.data
})
})
//绑定车获取
Http.get({
url: config.api.getUserCarList,
data: {}
}).then(res => {
console.log(res);
that.setData({
carList: res.data
})
})
}
if (app.globalData.token && app.globalData.token != null) {
initCallback(app.globalData.token)
} else {
initCallback(app.globalData.token)
}
}
})

+ 1
- 1
pages/passCar/passCar.wxml ファイルの表示

@@ -17,7 +17,7 @@
</view>
<view class='passNumberBox'>
<view class='passNumber' bindtap='orderPay'>京C·21457</view>
<button class='deleteButton' bindtap='delete'>删除</button>
<button class='deleteButton' bindtap='unbindCar'>解绑</button>
</view>
<view class='addBox'>
<view class='add' bindtap="jumpToAdd">点击添加我的爱车</view>


読み込み中…
キャンセル
保存