Merge branch 'master' of http://119.23.72.7/liangjianmin/h5
# Conflicts: # view/37.js # view/38.js # view/51.js # view/52.js # view/53.js # view/54.js # view/55.js # view/56.js # view/57.js # view/59.js # view/60.js
Showing
with
508 additions
and
12 deletions
src/assets/css/user/orderDetail.css
0 → 100644
src/assets/css/user/orderDetail.css.map
0 → 100644
src/assets/css/user/settings.css
0 → 100644
src/assets/css/user/settings.css.map
0 → 100644
src/assets/css/user/settings.less
0 → 100644
src/assets/images/user/向上.png
0 → 100644
18 KB
src/assets/images/user/客服.png
0 → 100644
19.1 KB
src/assets/images/user/购物车.png
0 → 100644
17.6 KB
src/views/user/settings.vue
0 → 100644
Please
register
or
sign in
to comment