Merge branch 'XK_sample20190923' into Development
# Conflicts: # view/12.js # view/13.js # view/14.js # view/15.js # view/16.js # view/17.js # view/18.js # view/19.js # view/20.js # view/21.js # view/3.js # view/37.js # view/38.js # view/47.js # view/6.js # view/7.js # view/8.js # view/9.js # view/app.js
Showing
with
2215 additions
and
956 deletions
| ... | ... | @@ -13,7 +13,8 @@ |
| "vant": "^2.0.1", | ||
| "vue": "^2.5.21", | ||
| "vue-router": "^3.0.1", | ||
| "vuex": "^3.0.1" | ||
| "vuex": "^3.0.1", | ||
| "weixin-js-sdk": "^1.4.0-test" | ||
| }, | ||
| "devDependencies": { | ||
| "@vue/cli-plugin-babel": "^3.3.0", | ||
| ... | ... |
src/assets/css/sample/sample.css
0 → 100644
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
Please
register
or
sign in
to comment