Commit 1f42a4605ba9de280bc508df58b4d6b4f9e33cce
解决冲突测试
Showing
1 changed file
with
0 additions
and
2 deletions
packageE/pages/cart/cart2/cart2.js
| @@ -145,8 +145,6 @@ Page({ | @@ -145,8 +145,6 @@ Page({ | ||
| 145 | //订单所有搭配购的 | 145 | //订单所有搭配购的 |
| 146 | all_collocation_list: [], | 146 | all_collocation_list: [], |
| 147 | appoint_pick_keyid: '', | 147 | appoint_pick_keyid: '', |
| 148 | - //2222 | ||
| 149 | - //555 | ||
| 150 | }, | 148 | }, |
| 151 | onLoad: function (t) { | 149 | onLoad: function (t) { |
| 152 | wx.setNavigationBarTitle({ title: "填写订单", }) | 150 | wx.setNavigationBarTitle({ title: "填写订单", }) |