Skip to content

Commit 2a95e66

Browse files
928255095928255095
committed
优化代码
1 parent 8c08690 commit 2a95e66

4 files changed

Lines changed: 70 additions & 38 deletions

File tree

‎pages/payParkingFee/payParkingFee.js‎

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Page({
1111
*/
1212
data: {
1313
showFeeMonth:false,
14-
feeMonthList:['一个月','半年','一年','两年'],
15-
feeMonthName:'一个月',
16-
feeMonth:1,
14+
feeMonthList:[],
15+
feeMonthName:'',
16+
feeMonth:0,
1717
endTime:'',
1818
ordEndTime:'',
1919
amount:0,
@@ -22,7 +22,8 @@ Page({
2222

2323
communityId:'',
2424
communityName:'',
25-
feeId:''
25+
feeId:'',
26+
paymentCycles: []
2627

2728
},
2829

@@ -32,11 +33,19 @@ Page({
3233
onLoad: function (options) {
3334
let _fee = JSON.parse(options.fee);
3435
console.log('_fee',_fee);
35-
let _receivableAmount = this.data.feeMonth * _fee.feePrice * 100;
36+
3637
let _communityInfo = context.getCurrentCommunity();
3738
let _lastDate = new Date(_fee.endTime);
38-
let _endTime = util.date.addMonth(_lastDate, this.data.feeMonth);
39-
39+
let _paymentCycle = _fee.paymentCycle;
40+
let _paymentCycles = [];
41+
let _feeMonthList = [];
42+
let _receivableAmount = _paymentCycle * _fee.feePrice * 100;
43+
let _endTime = util.date.addMonth(_lastDate, _paymentCycle);
44+
45+
for (let _index = 1; _index < 6; _index++) {
46+
_paymentCycles.push(_index * parseInt(_paymentCycle));
47+
_feeMonthList.push((_index * parseInt(_paymentCycle)) + "个月");
48+
}
4049
this.setData({
4150
receivableAmount: _receivableAmount,
4251
communityId: _communityInfo.communityId,
@@ -47,7 +56,11 @@ Page({
4756
feeId:_fee.feeId,
4857
feePrice: _fee.feePrice,
4958
endTime: util.date.formatDate(_endTime),
50-
ordEndTime: _fee.endTime
59+
ordEndTime: _fee.endTime,
60+
feeMonth: _paymentCycle,
61+
feeMonthName: _paymentCycle + '个月',
62+
paymentCycles: _paymentCycles,
63+
feeMonthList: _feeMonthList,
5164
});
5265

5366
var pages = getCurrentPages();
@@ -115,18 +128,18 @@ Page({
115128
console.log("onConfirm", e);
116129
let _feeMonthName = null;
117130
_feeMonthName = e.detail.value;
118-
let _feeMonth = 1;
119-
if (_feeMonthName == '一个月'){
120-
_feeMonth = 1;
121-
} else if (_feeMonthName == '半年'){
122-
_feeMonth = 6;
123-
} else if (_feeMonthName == '一年') {
124-
_feeMonth = 12;
125-
} else if (_feeMonthName == '两年') {
126-
_feeMonth = 24;
127-
}else{
128-
return ;
129-
}
131+
let _feeMonth = this.data.paymentCycles[e.detail.index];
132+
// if (_feeMonthName == '一个月'){
133+
// _feeMonth = 1;
134+
// } else if (_feeMonthName == '半年'){
135+
// _feeMonth = 6;
136+
// } else if (_feeMonthName == '一年') {
137+
// _feeMonth = 12;
138+
// } else if (_feeMonthName == '两年') {
139+
// _feeMonth = 24;
140+
// }else{
141+
// return ;
142+
// }
130143

131144
let _receivableAmount = _feeMonth * this.data.feePrice * 100;
132145

@@ -159,7 +172,8 @@ Page({
159172
communityId: this.data.communityId,
160173
feeId: this.data.feeId,
161174
feeName: '停车费',
162-
receivedAmount: _receivedAmount
175+
receivedAmount: _receivedAmount,
176+
tradeType: 'JSAPI'
163177
}
164178

165179
context.request({

‎pages/payParkingFeeList/payParkingFeeList.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ Page({
138138
_tmpParkingSpace.feeTypeCdName = _fee.feeTypeCdName;
139139
_tmpParkingSpace.feeName = _fee.feeName;
140140
_tmpParkingSpace.feeId = _fee.feeId;
141+
_tmpParkingSpace.paymentCycle = _fee.paymentCycle;
141142
_that.data.moreParkingSpaces.push(_tmpParkingSpace);
142143
});
143144
_that.setData({

‎pages/roomFee/roomFee.js‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Page({
1111
*/
1212
data: {
1313
showFeeMonth: false,
14-
feeMonthList: ['一个月', '半年', '一年', '两年'],
14+
feeMonthList: [],
1515
feeMonthName: '一个月',
1616
feeMonth: 1,
1717
endTime: '',
@@ -26,7 +26,8 @@ Page({
2626
unitNum: '',
2727
roomNum: '',
2828
layer: '',
29-
builtUpArea: ''
29+
builtUpArea: '',
30+
paymentCycles: []
3031

3132
},
3233

@@ -37,10 +38,21 @@ Page({
3738
let _fee = JSON.parse(options.fee);
3839
console.log('_fee', _fee);
3940
let _amount = _fee.amount;
40-
let _receivableAmount = _amount* 100;
41+
4142
let _communityInfo = context.getCurrentCommunity();
43+
44+
let _paymentCycle = _fee.paymentCycle;
45+
let _paymentCycles = [];
46+
let _feeMonthList = [];
47+
let _receivableAmount = _paymentCycle * _amount * 100;
4248
let _lastDate = new Date(_fee.endTime);
43-
let _endTime = util.date.addMonth(_lastDate, this.data.feeMonth);
49+
let _endTime = util.date.addMonth(_lastDate, _paymentCycle);
50+
console.log(_paymentCycle)
51+
52+
for(let _index = 1;_index < 6 ;_index++){
53+
_paymentCycles.push(_index * parseInt(_paymentCycle));
54+
_feeMonthList.push((_index * parseInt(_paymentCycle))+"个月");
55+
}
4456

4557
this.setData({
4658
receivableAmount: _receivableAmount,
@@ -56,7 +68,11 @@ Page({
5668
amount: _amount,
5769
additionalAmount: _fee.additionalAmount,
5870
endTime: util.date.formatDate(_endTime),
59-
ordEndTime: _fee.endTime
71+
ordEndTime: _fee.endTime,
72+
paymentCycles: _paymentCycles,
73+
feeMonthList: _feeMonthList,
74+
feeMonth: _paymentCycle,
75+
feeMonthName: _paymentCycle +'个月'
6076
});
6177
var pages = getCurrentPages();
6278
var prevPage = pages[pages.length - 2]; //上一个页面
@@ -123,18 +139,18 @@ Page({
123139
console.log("onConfirm", e);
124140
let _feeMonthName = null;
125141
_feeMonthName = e.detail.value;
126-
let _feeMonth = 1;
127-
if (_feeMonthName == '一个月') {
128-
_feeMonth = 1;
129-
} else if (_feeMonthName == '半年') {
130-
_feeMonth = 6;
131-
} else if (_feeMonthName == '一年') {
132-
_feeMonth = 12;
133-
} else if (_feeMonthName == '两年') {
134-
_feeMonth = 24;
135-
} else {
136-
return;
137-
}
142+
let _feeMonth = this.data.paymentCycles[e.detail.index];
143+
// if (_feeMonthName == '一个月') {
144+
// _feeMonth = 1;
145+
// } else if (_feeMonthName == '半年') {
146+
// _feeMonth = 6;
147+
// } else if (_feeMonthName == '一年') {
148+
// _feeMonth = 12;
149+
// } else if (_feeMonthName == '两年') {
150+
// _feeMonth = 24;
151+
// } else {
152+
// return;
153+
// }
138154

139155
let _receivableAmount = _feeMonth * this.data.amount * 100;
140156

‎pages/roomFeeList/roomFeeList.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ Page({
133133
_tmpRoom.amount = _roomFee.feePrice;
134134
_tmpRoom.feeId = _roomFee.feeId;
135135
_tmpRoom.feeName = _roomFee.feeName;
136+
_tmpRoom.paymentCycle = _roomFee.paymentCycle;
136137
_that.data.moreRooms.push(_tmpRoom);
137138
});
138139
_that.setData({

0 commit comments

Comments
 (0)