Commit 1f42a4605ba9de280bc508df58b4d6b4f9e33cce

Authored by WXD-SEASON\season
2 parents c1481ad8 4fe9d6fb

解决冲突测试

packageE/pages/cart/cart2/cart2.js
... ... @@ -145,8 +145,6 @@ Page({
145 145 //订单所有搭配购的
146 146 all_collocation_list: [],
147 147 appoint_pick_keyid: '',
148   - //2222
149   - //555
150 148 },
151 149 onLoad: function (t) {
152 150 wx.setNavigationBarTitle({ title: "填写订单", })
... ...