Skip to content

Commit 501fe0a

Browse files
committed
Changed additional cost
1 parent 551f442 commit 501fe0a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

projects/wonder_flowers/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ <h1>Доставка цветов</h1>
9696
</p>
9797
<p>
9898
При совмещении нескольких заказов стоимость каждого последующего заказа рассчитывается как:<br>
99-
<mark>cost = max(100, 5 * duration)</mark>
99+
<mark>cost = 330 + atan((duration - 30) / 20) * 230</mark>
100100
</p>
101101
<p>
102102
<mark>cost</mark> - стоимость доставки<br>

projects/wonder_flowers/script.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Vue.component('calc-item', {
2929
},
3030
computed: {
3131
cost: function () {
32-
return Math.round(Math.max(this.duration * 5, 100) / 10) * 10
32+
return Math.round((330 + Math.atan((this.duration - 30) / 20) * 230) / 10) * 10
3333
}
3434
},
3535
methods: {

0 commit comments

Comments
 (0)