Showing
13 changed files
with
91 additions
and
13 deletions
| @@ -1078,6 +1078,12 @@ Page({ | @@ -1078,6 +1078,12 @@ Page({ | ||
| 1078 | let totalPrice = 0; | 1078 | let totalPrice = 0; |
| 1079 | let coupon_dataList = this.data.coupon_dataList; | 1079 | let coupon_dataList = this.data.coupon_dataList; |
| 1080 | let list = res.data; | 1080 | let list = res.data; |
| 1081 | + list = list.reduce((accumulator, current) => { | ||
| 1082 | + if (!accumulator.some(item => item.aid === current.aid)) { | ||
| 1083 | + accumulator.push(current); | ||
| 1084 | + } | ||
| 1085 | + return accumulator; | ||
| 1086 | + }, []); | ||
| 1081 | const strArray = str.split(','); | 1087 | const strArray = str.split(','); |
| 1082 | const result = strArray.filter(num => { | 1088 | const result = strArray.filter(num => { |
| 1083 | return!list.some(item => item.id === num); | 1089 | return!list.some(item => item.id === num); |
| @@ -1127,7 +1133,7 @@ Page({ | @@ -1127,7 +1133,7 @@ Page({ | ||
| 1127 | } | 1133 | } |
| 1128 | list.forEach(item=>{ | 1134 | list.forEach(item=>{ |
| 1129 | let idx = coupon_dataList.findIndex(b => b.id === item.id); | 1135 | let idx = coupon_dataList.findIndex(b => b.id === item.id); |
| 1130 | - if (idx!== null && idx!== undefined) { | 1136 | + if (idx!== null && idx!== undefined && coupon_dataList[idx]) { |
| 1131 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 | 1137 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 |
| 1132 | } | 1138 | } |
| 1133 | }) | 1139 | }) |
| @@ -1147,6 +1147,12 @@ Page({ | @@ -1147,6 +1147,12 @@ Page({ | ||
| 1147 | let totalPrice = 0; | 1147 | let totalPrice = 0; |
| 1148 | let coupon_dataList = this.data.coupon_dataList; | 1148 | let coupon_dataList = this.data.coupon_dataList; |
| 1149 | let list = res.data; | 1149 | let list = res.data; |
| 1150 | + list = list.reduce((accumulator, current) => { | ||
| 1151 | + if (!accumulator.some(item => item.aid === current.aid)) { | ||
| 1152 | + accumulator.push(current); | ||
| 1153 | + } | ||
| 1154 | + return accumulator; | ||
| 1155 | + }, []); | ||
| 1150 | const strArray = str.split(','); | 1156 | const strArray = str.split(','); |
| 1151 | const result = strArray.filter(num => { | 1157 | const result = strArray.filter(num => { |
| 1152 | return!list.some(item => item.id === num); | 1158 | return!list.some(item => item.id === num); |
| @@ -1196,7 +1202,7 @@ Page({ | @@ -1196,7 +1202,7 @@ Page({ | ||
| 1196 | } | 1202 | } |
| 1197 | list.forEach(item=>{ | 1203 | list.forEach(item=>{ |
| 1198 | let idx = coupon_dataList.findIndex(b => b.id === item.id); | 1204 | let idx = coupon_dataList.findIndex(b => b.id === item.id); |
| 1199 | - if (idx!== null && idx!== undefined) { | 1205 | + if (idx!== null && idx!== undefined && coupon_dataList[idx]) { |
| 1200 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 | 1206 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 |
| 1201 | } | 1207 | } |
| 1202 | }) | 1208 | }) |
| @@ -1162,6 +1162,12 @@ Page({ | @@ -1162,6 +1162,12 @@ Page({ | ||
| 1162 | let totalPrice = 0; | 1162 | let totalPrice = 0; |
| 1163 | let coupon_dataList = this.data.coupon_dataList; | 1163 | let coupon_dataList = this.data.coupon_dataList; |
| 1164 | let list = res.data; | 1164 | let list = res.data; |
| 1165 | + list = list.reduce((accumulator, current) => { | ||
| 1166 | + if (!accumulator.some(item => item.aid === current.aid)) { | ||
| 1167 | + accumulator.push(current); | ||
| 1168 | + } | ||
| 1169 | + return accumulator; | ||
| 1170 | + }, []); | ||
| 1165 | const strArray = str.split(','); | 1171 | const strArray = str.split(','); |
| 1166 | const result = strArray.filter(num => { | 1172 | const result = strArray.filter(num => { |
| 1167 | return!list.some(item => item.id === num); | 1173 | return!list.some(item => item.id === num); |
| @@ -1211,7 +1217,7 @@ Page({ | @@ -1211,7 +1217,7 @@ Page({ | ||
| 1211 | } | 1217 | } |
| 1212 | list.forEach(item=>{ | 1218 | list.forEach(item=>{ |
| 1213 | let idx = coupon_dataList.findIndex(b => b.id === item.id); | 1219 | let idx = coupon_dataList.findIndex(b => b.id === item.id); |
| 1214 | - if (idx!== null && idx!== undefined) { | 1220 | + if (idx!== null && idx!== undefined && coupon_dataList[idx]) { |
| 1215 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 | 1221 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 |
| 1216 | } | 1222 | } |
| 1217 | }) | 1223 | }) |
| @@ -1053,6 +1053,12 @@ Page({ | @@ -1053,6 +1053,12 @@ Page({ | ||
| 1053 | let totalPrice = 0; | 1053 | let totalPrice = 0; |
| 1054 | let coupon_dataList = this.data.coupon_dataList; | 1054 | let coupon_dataList = this.data.coupon_dataList; |
| 1055 | let list = res.data; | 1055 | let list = res.data; |
| 1056 | + list = list.reduce((accumulator, current) => { | ||
| 1057 | + if (!accumulator.some(item => item.aid === current.aid)) { | ||
| 1058 | + accumulator.push(current); | ||
| 1059 | + } | ||
| 1060 | + return accumulator; | ||
| 1061 | + }, []); | ||
| 1056 | const strArray = str.split(','); | 1062 | const strArray = str.split(','); |
| 1057 | const result = strArray.filter(num => { | 1063 | const result = strArray.filter(num => { |
| 1058 | return!list.some(item => item.id === num); | 1064 | return!list.some(item => item.id === num); |
| @@ -1102,7 +1108,7 @@ Page({ | @@ -1102,7 +1108,7 @@ Page({ | ||
| 1102 | } | 1108 | } |
| 1103 | list.forEach(item=>{ | 1109 | list.forEach(item=>{ |
| 1104 | let idx = coupon_dataList.findIndex(b => b.id === item.id); | 1110 | let idx = coupon_dataList.findIndex(b => b.id === item.id); |
| 1105 | - if (idx!== null && idx!== undefined) { | 1111 | + if (idx!== null && idx!== undefined && coupon_dataList[idx]) { |
| 1106 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 | 1112 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 |
| 1107 | } | 1113 | } |
| 1108 | }) | 1114 | }) |
| @@ -1008,6 +1008,12 @@ Page({ | @@ -1008,6 +1008,12 @@ Page({ | ||
| 1008 | let totalPrice = 0; | 1008 | let totalPrice = 0; |
| 1009 | let coupon_dataList = this.data.coupon_dataList; | 1009 | let coupon_dataList = this.data.coupon_dataList; |
| 1010 | let list = res.data; | 1010 | let list = res.data; |
| 1011 | + list = list.reduce((accumulator, current) => { | ||
| 1012 | + if (!accumulator.some(item => item.aid === current.aid)) { | ||
| 1013 | + accumulator.push(current); | ||
| 1014 | + } | ||
| 1015 | + return accumulator; | ||
| 1016 | + }, []); | ||
| 1011 | const strArray = str.split(','); | 1017 | const strArray = str.split(','); |
| 1012 | const result = strArray.filter(num => { | 1018 | const result = strArray.filter(num => { |
| 1013 | return!list.some(item => item.id === num); | 1019 | return!list.some(item => item.id === num); |
| @@ -1057,7 +1063,7 @@ Page({ | @@ -1057,7 +1063,7 @@ Page({ | ||
| 1057 | } | 1063 | } |
| 1058 | list.forEach(item=>{ | 1064 | list.forEach(item=>{ |
| 1059 | let idx = coupon_dataList.findIndex(b => b.id === item.id); | 1065 | let idx = coupon_dataList.findIndex(b => b.id === item.id); |
| 1060 | - if (idx!== null && idx!== undefined) { | 1066 | + if (idx!== null && idx!== undefined && coupon_dataList[idx]) { |
| 1061 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 | 1067 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 |
| 1062 | } | 1068 | } |
| 1063 | }) | 1069 | }) |
| @@ -1009,6 +1009,12 @@ Page({ | @@ -1009,6 +1009,12 @@ Page({ | ||
| 1009 | let totalPrice = 0; | 1009 | let totalPrice = 0; |
| 1010 | let coupon_dataList = this.data.coupon_dataList; | 1010 | let coupon_dataList = this.data.coupon_dataList; |
| 1011 | let list = res.data; | 1011 | let list = res.data; |
| 1012 | + list = list.reduce((accumulator, current) => { | ||
| 1013 | + if (!accumulator.some(item => item.aid === current.aid)) { | ||
| 1014 | + accumulator.push(current); | ||
| 1015 | + } | ||
| 1016 | + return accumulator; | ||
| 1017 | + }, []); | ||
| 1012 | const strArray = str.split(','); | 1018 | const strArray = str.split(','); |
| 1013 | const result = strArray.filter(num => { | 1019 | const result = strArray.filter(num => { |
| 1014 | return!list.some(item => item.id === num); | 1020 | return!list.some(item => item.id === num); |
| @@ -1058,7 +1064,7 @@ Page({ | @@ -1058,7 +1064,7 @@ Page({ | ||
| 1058 | } | 1064 | } |
| 1059 | list.forEach(item=>{ | 1065 | list.forEach(item=>{ |
| 1060 | let idx = coupon_dataList.findIndex(b => b.id === item.id); | 1066 | let idx = coupon_dataList.findIndex(b => b.id === item.id); |
| 1061 | - if (idx!== null && idx!== undefined) { | 1067 | + if (idx!== null && idx!== undefined && coupon_dataList[idx]) { |
| 1062 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 | 1068 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 |
| 1063 | } | 1069 | } |
| 1064 | }) | 1070 | }) |
| @@ -1007,6 +1007,12 @@ Page({ | @@ -1007,6 +1007,12 @@ Page({ | ||
| 1007 | let totalPrice = 0; | 1007 | let totalPrice = 0; |
| 1008 | let coupon_dataList = this.data.coupon_dataList; | 1008 | let coupon_dataList = this.data.coupon_dataList; |
| 1009 | let list = res.data; | 1009 | let list = res.data; |
| 1010 | + list = list.reduce((accumulator, current) => { | ||
| 1011 | + if (!accumulator.some(item => item.aid === current.aid)) { | ||
| 1012 | + accumulator.push(current); | ||
| 1013 | + } | ||
| 1014 | + return accumulator; | ||
| 1015 | + }, []); | ||
| 1010 | const strArray = str.split(','); | 1016 | const strArray = str.split(','); |
| 1011 | const result = strArray.filter(num => { | 1017 | const result = strArray.filter(num => { |
| 1012 | return!list.some(item => item.id === num); | 1018 | return!list.some(item => item.id === num); |
| @@ -1056,7 +1062,7 @@ Page({ | @@ -1056,7 +1062,7 @@ Page({ | ||
| 1056 | } | 1062 | } |
| 1057 | list.forEach(item=>{ | 1063 | list.forEach(item=>{ |
| 1058 | let idx = coupon_dataList.findIndex(b => b.id === item.id); | 1064 | let idx = coupon_dataList.findIndex(b => b.id === item.id); |
| 1059 | - if (idx!== null && idx!== undefined) { | 1065 | + if (idx!== null && idx!== undefined && coupon_dataList[idx]) { |
| 1060 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 | 1066 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 |
| 1061 | } | 1067 | } |
| 1062 | }) | 1068 | }) |
| @@ -964,6 +964,12 @@ Page({ | @@ -964,6 +964,12 @@ Page({ | ||
| 964 | let totalPrice = 0; | 964 | let totalPrice = 0; |
| 965 | let coupon_dataList = this.data.coupon_dataList; | 965 | let coupon_dataList = this.data.coupon_dataList; |
| 966 | let list = res.data; | 966 | let list = res.data; |
| 967 | + list = list.reduce((accumulator, current) => { | ||
| 968 | + if (!accumulator.some(item => item.aid === current.aid)) { | ||
| 969 | + accumulator.push(current); | ||
| 970 | + } | ||
| 971 | + return accumulator; | ||
| 972 | + }, []); | ||
| 967 | const strArray = str.split(','); | 973 | const strArray = str.split(','); |
| 968 | const result = strArray.filter(num => { | 974 | const result = strArray.filter(num => { |
| 969 | return!list.some(item => item.id === num); | 975 | return!list.some(item => item.id === num); |
| @@ -1013,7 +1019,7 @@ Page({ | @@ -1013,7 +1019,7 @@ Page({ | ||
| 1013 | } | 1019 | } |
| 1014 | list.forEach(item=>{ | 1020 | list.forEach(item=>{ |
| 1015 | let idx = coupon_dataList.findIndex(b => b.id === item.id); | 1021 | let idx = coupon_dataList.findIndex(b => b.id === item.id); |
| 1016 | - if (idx!== null && idx!== undefined) { | 1022 | + if (idx!== null && idx!== undefined && coupon_dataList[idx]) { |
| 1017 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 | 1023 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 |
| 1018 | } | 1024 | } |
| 1019 | }) | 1025 | }) |
| @@ -1008,6 +1008,12 @@ Page({ | @@ -1008,6 +1008,12 @@ Page({ | ||
| 1008 | let totalPrice = 0; | 1008 | let totalPrice = 0; |
| 1009 | let coupon_dataList = this.data.coupon_dataList; | 1009 | let coupon_dataList = this.data.coupon_dataList; |
| 1010 | let list = res.data; | 1010 | let list = res.data; |
| 1011 | + list = list.reduce((accumulator, current) => { | ||
| 1012 | + if (!accumulator.some(item => item.aid === current.aid)) { | ||
| 1013 | + accumulator.push(current); | ||
| 1014 | + } | ||
| 1015 | + return accumulator; | ||
| 1016 | + }, []); | ||
| 1011 | const strArray = str.split(','); | 1017 | const strArray = str.split(','); |
| 1012 | const result = strArray.filter(num => { | 1018 | const result = strArray.filter(num => { |
| 1013 | return!list.some(item => item.id === num); | 1019 | return!list.some(item => item.id === num); |
| @@ -1057,7 +1063,7 @@ Page({ | @@ -1057,7 +1063,7 @@ Page({ | ||
| 1057 | } | 1063 | } |
| 1058 | list.forEach(item=>{ | 1064 | list.forEach(item=>{ |
| 1059 | let idx = coupon_dataList.findIndex(b => b.id === item.id); | 1065 | let idx = coupon_dataList.findIndex(b => b.id === item.id); |
| 1060 | - if (idx!== null && idx!== undefined) { | 1066 | + if (idx!== null && idx!== undefined && coupon_dataList[idx]) { |
| 1061 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 | 1067 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 |
| 1062 | } | 1068 | } |
| 1063 | }) | 1069 | }) |
| @@ -1007,6 +1007,12 @@ Page({ | @@ -1007,6 +1007,12 @@ Page({ | ||
| 1007 | let totalPrice = 0; | 1007 | let totalPrice = 0; |
| 1008 | let coupon_dataList = this.data.coupon_dataList; | 1008 | let coupon_dataList = this.data.coupon_dataList; |
| 1009 | let list = res.data; | 1009 | let list = res.data; |
| 1010 | + list = list.reduce((accumulator, current) => { | ||
| 1011 | + if (!accumulator.some(item => item.aid === current.aid)) { | ||
| 1012 | + accumulator.push(current); | ||
| 1013 | + } | ||
| 1014 | + return accumulator; | ||
| 1015 | + }, []); | ||
| 1010 | const strArray = str.split(','); | 1016 | const strArray = str.split(','); |
| 1011 | const result = strArray.filter(num => { | 1017 | const result = strArray.filter(num => { |
| 1012 | return!list.some(item => item.id === num); | 1018 | return!list.some(item => item.id === num); |
| @@ -1056,7 +1062,7 @@ Page({ | @@ -1056,7 +1062,7 @@ Page({ | ||
| 1056 | } | 1062 | } |
| 1057 | list.forEach(item=>{ | 1063 | list.forEach(item=>{ |
| 1058 | let idx = coupon_dataList.findIndex(b => b.id === item.id); | 1064 | let idx = coupon_dataList.findIndex(b => b.id === item.id); |
| 1059 | - if (idx!== null && idx!== undefined) { | 1065 | + if (idx!== null && idx!== undefined && coupon_dataList[idx]) { |
| 1060 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 | 1066 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 |
| 1061 | } | 1067 | } |
| 1062 | }) | 1068 | }) |
| @@ -1041,6 +1041,12 @@ Page({ | @@ -1041,6 +1041,12 @@ Page({ | ||
| 1041 | let totalPrice = 0; | 1041 | let totalPrice = 0; |
| 1042 | let coupon_dataList = this.data.coupon_dataList; | 1042 | let coupon_dataList = this.data.coupon_dataList; |
| 1043 | let list = res.data; | 1043 | let list = res.data; |
| 1044 | + list = list.reduce((accumulator, current) => { | ||
| 1045 | + if (!accumulator.some(item => item.aid === current.aid)) { | ||
| 1046 | + accumulator.push(current); | ||
| 1047 | + } | ||
| 1048 | + return accumulator; | ||
| 1049 | + }, []); | ||
| 1044 | const strArray = str.split(','); | 1050 | const strArray = str.split(','); |
| 1045 | const result = strArray.filter(num => { | 1051 | const result = strArray.filter(num => { |
| 1046 | return!list.some(item => item.id === num); | 1052 | return!list.some(item => item.id === num); |
| @@ -1090,7 +1096,7 @@ Page({ | @@ -1090,7 +1096,7 @@ Page({ | ||
| 1090 | } | 1096 | } |
| 1091 | list.forEach(item=>{ | 1097 | list.forEach(item=>{ |
| 1092 | let idx = coupon_dataList.findIndex(b => b.id === item.id); | 1098 | let idx = coupon_dataList.findIndex(b => b.id === item.id); |
| 1093 | - if (idx!== null && idx!== undefined) { | 1099 | + if (idx!== null && idx!== undefined && coupon_dataList[idx]) { |
| 1094 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 | 1100 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 |
| 1095 | } | 1101 | } |
| 1096 | }) | 1102 | }) |
| @@ -283,9 +283,15 @@ Page({ | @@ -283,9 +283,15 @@ Page({ | ||
| 283 | if (res.ret == 200) { | 283 | if (res.ret == 200) { |
| 284 | let coupon_dataList = this.data.coupon_dataList; | 284 | let coupon_dataList = this.data.coupon_dataList; |
| 285 | let list = res.data; | 285 | let list = res.data; |
| 286 | + list = list.reduce((accumulator, current) => { | ||
| 287 | + if (!accumulator.some(item => item.aid === current.aid)) { | ||
| 288 | + accumulator.push(current); | ||
| 289 | + } | ||
| 290 | + return accumulator; | ||
| 291 | + }, []); | ||
| 286 | list.forEach(item=>{ | 292 | list.forEach(item=>{ |
| 287 | let idx = coupon_dataList.findIndex(b => b.id === item.id); | 293 | let idx = coupon_dataList.findIndex(b => b.id === item.id); |
| 288 | - if (idx!== null && idx!== undefined) { | 294 | + if (idx!== null && idx!== undefined && coupon_dataList[idx]) { |
| 289 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 | 295 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 |
| 290 | } | 296 | } |
| 291 | }) | 297 | }) |
| @@ -364,6 +364,12 @@ Page({ | @@ -364,6 +364,12 @@ Page({ | ||
| 364 | let totalPrice = 0; | 364 | let totalPrice = 0; |
| 365 | let coupon_dataList = this.data.coupon_dataList; | 365 | let coupon_dataList = this.data.coupon_dataList; |
| 366 | let list = res.data; | 366 | let list = res.data; |
| 367 | + list = list.reduce((accumulator, current) => { | ||
| 368 | + if (!accumulator.some(item => item.aid === current.aid)) { | ||
| 369 | + accumulator.push(current); | ||
| 370 | + } | ||
| 371 | + return accumulator; | ||
| 372 | + }, []); | ||
| 367 | const strArray = str.split(','); | 373 | const strArray = str.split(','); |
| 368 | const result = strArray.filter(num => { | 374 | const result = strArray.filter(num => { |
| 369 | return!list.some(item => item.id === num); | 375 | return!list.some(item => item.id === num); |
| @@ -413,7 +419,7 @@ Page({ | @@ -413,7 +419,7 @@ Page({ | ||
| 413 | } | 419 | } |
| 414 | list.forEach(item=>{ | 420 | list.forEach(item=>{ |
| 415 | let idx = coupon_dataList.findIndex(b => b.id === item.id); | 421 | let idx = coupon_dataList.findIndex(b => b.id === item.id); |
| 416 | - if (idx!== null && idx!== undefined) { | 422 | + if (idx!== null && idx!== undefined && coupon_dataList[idx]) { |
| 417 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 | 423 | coupon_dataList[idx].resultCoupon = '1';//显示已领取 |
| 418 | } | 424 | } |
| 419 | }) | 425 | }) |
-
Please register or login to post a comment