Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
This commit is contained in:
commit
e0ea0f32b0
|
|
@ -242,7 +242,7 @@
|
||||||
itemId: '', // 栏目右边scroll-view用于滚动的id
|
itemId: '', // 栏目右边scroll-view用于滚动的id
|
||||||
tabbar: storageManage.cacheGoods() || [],
|
tabbar: storageManage.cacheGoods() || [],
|
||||||
menuItemPos: [],
|
menuItemPos: [],
|
||||||
arr: storageManage.cacheGoodsNode() || [], //左右联动布局节点信息
|
arr: [], //左右联动布局节点信息
|
||||||
scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
|
scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
|
||||||
timer: null, // 定时器
|
timer: null, // 定时器
|
||||||
topZhanwei: 136 + 24,
|
topZhanwei: 136 + 24,
|
||||||
|
|
@ -1110,7 +1110,6 @@
|
||||||
})
|
})
|
||||||
data.arr = arr
|
data.arr = arr
|
||||||
console.log(data.arr);
|
console.log(data.arr);
|
||||||
storageManage.cacheGoodsNode(data.arr)
|
|
||||||
resolve();
|
resolve();
|
||||||
}).exec()
|
}).exec()
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue