yibo 7 years ago
parent
commit
7fe5fda947
4 changed files with 16 additions and 42 deletions
  1. +1
    -2
      pages/fenxiang/fenxiang.js
  2. +1
    -1
      pages/sendCargo/sendCargo.js
  3. +2
    -25
      pages/sendTheDetails/sendTheDetails.js
  4. +12
    -14
      pages/statementOfAccount/statementOfAccount.js

+ 1
- 2
pages/fenxiang/fenxiang.js View File

@ -16,14 +16,13 @@ Page({
var that = this var that = this
var ID6 = ID; var ID6 = ID;
wx.navigateToMiniProgram({ wx.navigateToMiniProgram({
appId:'wxa437748f46540519',
appId:'wx246fd8f3a0273f2f',
// path:"pages/sendTheDetails/sendTheDetails?ID=" + ID, // path:"pages/sendTheDetails/sendTheDetails?ID=" + ID,
path: "", path: "",
extraData:{ extraData:{
orderID : ID, orderID : ID,
}, },
}) })
console.log(ID5)
}, },
}) })

+ 1
- 1
pages/sendCargo/sendCargo.js View File

@ -74,7 +74,7 @@ Page({
onShow: function (e) { onShow: function (e) {
var that = this; var that = this;
var reslut = []; var reslut = [];
var method = '/MainSystem/B3MiniProgramRpc/Rpcs/CustomerRpc/OrderRpc/GetNoDriverOrder';
var method = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/OrderRpc/GetNoDriverOrder';
var params = []; var params = [];
network.requestLoading(method, params, function (res) { network.requestLoading(method, params, function (res) {


+ 2
- 25
pages/sendTheDetails/sendTheDetails.js View File

@ -33,7 +33,6 @@ Page({
name1: res.result, name1: res.result,
}) })
}) })
console.log(Phone)
}, },
onLoad: function(options) { onLoad: function(options) {
@ -51,7 +50,7 @@ Page({
}, },
}) })
var method1 = '/MainSystem/B3MiniProgramRpc/Rpcs/CustomerRpc/OrderRpc/LoadForDriver';
var method1 = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/OrderRpc/LoadForDriver';
var params1 = [ID]; var params1 = [ID];
network.requestLoading(method1, params1, function(res) { network.requestLoading(method1, params1, function(res) {
@ -67,7 +66,6 @@ Page({
}, },
powerDrawer1: function(e) { powerDrawer1: function(e) {
console.log("12")
var that = this; var that = this;
var method2 = '/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetDriver'; var method2 = '/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetDriver';
var params2 = [{ var params2 = [{
@ -78,8 +76,6 @@ Page({
network.requestLoading(method2, params2, function(res) { network.requestLoading(method2, params2, function(res) {
//res就是我们请求接口返回的数据 //res就是我们请求接口返回的数据
console.log(res.result)
that.setData({ that.setData({
name1: res.result, name1: res.result,
@ -87,24 +83,17 @@ Page({
obj: { obj: {
1: { 1: {
"yaopin": "请选择司机", "yaopin": "请选择司机",
} }
} }
}) })
// console.log(ID2+"+cccccccccc")
}) })
var currentStatu = e.currentTarget.dataset.statu; var currentStatu = e.currentTarget.dataset.statu;
var i = e.currentTarget.dataset.index; var i = e.currentTarget.dataset.index;
console.log(i)
console.log(currentStatu)
this.util(currentStatu) this.util(currentStatu)
this.setData({ this.setData({
thatIndex: i thatIndex: i
}) })
}, },
a: function(event) { a: function(event) {
@ -114,11 +103,8 @@ Page({
let indexNum = this.data.thatIndex; let indexNum = this.data.thatIndex;
let obj = this.data.obj; let obj = this.data.obj;
// console.log(that.data.name1[index]);
ID3 = that.data.name1[index].ID ID3 = that.data.name1[index].ID
console.log(ID3 + "dddd");
ID4 = ID3; ID4 = ID3;
console.log(ID4);
obj[indexNum] = { obj[indexNum] = {
"yaopin": that.data.name1[index].Name, "yaopin": that.data.name1[index].Name,
@ -140,25 +126,17 @@ Page({
that.setData({ that.setData({
ID4:ID4, ID4:ID4,
}) })
console.log("高树凯"+ID4)
if (ID4 == null) { if (ID4 == null) {
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
content: '不能为空', content: '不能为空',
}) })
console.log("11111111111111")
} else { } else {
console.log("222222222222")
var method = '/MainSystem/B3MiniProgramRpc/Rpcs/CustomerRpc/OrderRpc/SetDriverToOrder';
var method = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/OrderRpc/SetDriverToOrder';
var params = [ID, ID4]; var params = [ID, ID4];
console.log(params + "999999999999")
network.requestLoading(method, params, function(res) { network.requestLoading(method, params, function(res) {
if (ID4 != null) { if (ID4 != null) {
console.log("333333333333")
wx.navigateBack({ wx.navigateBack({
delta: "/pages/theDriverSend/theDriverSend" delta: "/pages/theDriverSend/theDriverSend"
}) })
} }
@ -210,7 +188,6 @@ Page({
powerDrawer: function(e) { powerDrawer: function(e) {
var currentStatu = e.currentTarget.dataset.statu; var currentStatu = e.currentTarget.dataset.statu;
console.log(currentStatu)
this.util(currentStatu) this.util(currentStatu)
}, },
util: function(currentStatu) { util: function(currentStatu) {


+ 12
- 14
pages/statementOfAccount/statementOfAccount.js View File

@ -5,7 +5,7 @@ var pageindex = 0;
var pagesize = 10; var pagesize = 10;
var year; var year;
var month; var month;
var method = '/MainSystem/B3MiniProgramRpc/Rpcs/CustomerRpc/GatheringRpc/GetGatheringList';
var method = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/AccountBalanceRpc/GetBalanceList';
Page({ Page({
data: { data: {
@ -29,7 +29,7 @@ Page({
var that=this; var that=this;
pageindex = 0; pageindex = 0;
var params = [i1, i2, pageindex,pagesize]; var params = [i1, i2, pageindex,pagesize];
this.getGatheringList(that, params);
this.getBalanceList(that, params);
}, },
//滑动到底部加载 //滑动到底部加载
@ -39,7 +39,7 @@ Page({
var year = this.data.dates.split('-')[0]; var year = this.data.dates.split('-')[0];
var month = this.data.dates.split('-')[1]; var month = this.data.dates.split('-')[1];
var params = [year, month, pageindex, pagesize]; var params = [year, month, pageindex, pagesize];
this.getGatheringList(that, params);
this.getBalanceList(that, params);
}, },
onLoad: function (options) { onLoad: function (options) {
@ -51,13 +51,14 @@ Page({
var year = this.data.dates.split('-')[0]; var year = this.data.dates.split('-')[0];
var month = this.data.dates.split('-')[1]; var month = this.data.dates.split('-')[1];
var params = [year, month, pageindex, pagesize]; var params = [year, month, pageindex, pagesize];
this.getGatheringList(that, params);
this.getBalanceList(that, params);
}, },
getGatheringList : function (that,params) {
getBalanceList : function (that,params) {
var reslut = []; var reslut = [];
network.requestLoading(method, params, function (res) { network.requestLoading(method, params, function (res) {
var array = res.result;
console.log(res);
var array = JSON.parse(res.result);
if (array.length <= 0) { if (array.length <= 0) {
wx.showToast({ wx.showToast({
title: '无数据更新', title: '无数据更新',
@ -67,14 +68,11 @@ Page({
} }
return; return;
} }
for (var i = 0; i < array.length; i++) {
let dmo = {
GatheringTime: timechage.formatTimeTwo(res.result[i].GatheringTime.substring(6, 19), "Y/M/D"),
GatheringMoney: res.result[i].GatheringMoney,
}
reslut.push(dmo)
}
let arrLast = that.data.list.concat(reslut);
for (var i = 0; i < array.length; i++) {
array[i].Date = timechage.formatTimeTwo(array[i].Date.substring(6, 19), "Y/M/D");
}
console.log(array);
let arrLast = that.data.list.concat(array);
that.setData({ that.setData({
list: arrLast list: arrLast
}) })


Loading…
Cancel
Save