pull new-share and solve conflict
Showing
build/asset-manifest.json
0 → 100644
build/index.html
0 → 100644
build/mrstatic/css/24.1c26611f.chunk.css
0 → 100644
build/mrstatic/css/24.1c26611f.chunk.css.map
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
build/mrstatic/css/26.4c706a4e.chunk.css
0 → 100644
build/mrstatic/css/26.4c706a4e.chunk.css.map
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
build/mrstatic/css/28.0bb224f2.chunk.css
0 → 100644
build/mrstatic/css/28.0bb224f2.chunk.css.map
0 → 100644
build/mrstatic/css/29.5ed15c7e.chunk.css
0 → 100644
build/mrstatic/css/29.5ed15c7e.chunk.css.map
0 → 100644
build/mrstatic/css/30.ecbb6f9a.chunk.css
0 → 100644
build/mrstatic/css/30.ecbb6f9a.chunk.css.map
0 → 100644
build/mrstatic/css/31.278ad3b1.chunk.css
0 → 100644
build/mrstatic/css/31.278ad3b1.chunk.css.map
0 → 100644
build/mrstatic/css/Order.8bb031ea.chunk.css
0 → 100644
build/mrstatic/css/detail.00799624.chunk.css
0 → 100644
build/mrstatic/css/main.ad15f1e8.chunk.css
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
build/mrstatic/css/search.fab97849.chunk.css
0 → 100644
build/mrstatic/css/study.5e9927d1.chunk.css
0 → 100644
build/mrstatic/css/video.b57a1aec.chunk.css
0 → 100644
build/mrstatic/js/24.8b57854d.chunk.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
build/mrstatic/js/24.8b57854d.chunk.js.map
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
build/mrstatic/js/25.62a38731.chunk.js
0 → 100644
build/mrstatic/js/25.62a38731.chunk.js.map
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
build/mrstatic/js/26.e9b5eb76.chunk.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
build/mrstatic/js/26.e9b5eb76.chunk.js.map
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
build/mrstatic/js/27.10103e6c.chunk.js
0 → 100644
build/mrstatic/js/27.10103e6c.chunk.js.map
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
build/mrstatic/js/28.17100866.chunk.js
0 → 100644
build/mrstatic/js/28.17100866.chunk.js.map
0 → 100644
build/mrstatic/js/29.546a4983.chunk.js
0 → 100644
build/mrstatic/js/29.546a4983.chunk.js.map
0 → 100644
build/mrstatic/js/30.4fbfd24d.chunk.js
0 → 100644
build/mrstatic/js/30.4fbfd24d.chunk.js.map
0 → 100644
build/mrstatic/js/31.03a6b312.chunk.js
0 → 100644
build/mrstatic/js/31.03a6b312.chunk.js.map
0 → 100644
build/mrstatic/js/Classify.92c21c48.chunk.js
0 → 100644
build/mrstatic/js/MyEdit.b7d97694.chunk.js
0 → 100644
build/mrstatic/js/Order.c525d6df.chunk.js
0 → 100644
build/mrstatic/js/PayOrder.cdf74e28.chunk.js
0 → 100644
build/mrstatic/js/ShopCart.d9227d6c.chunk.js
0 → 100644
build/mrstatic/js/coupons.3ebaabaa.chunk.js
0 → 100644
build/mrstatic/js/detail.780b0832.chunk.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
build/mrstatic/js/main.683cbae2.chunk.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
build/mrstatic/js/main.683cbae2.chunk.js.map
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
build/mrstatic/js/myorders.da01fca5.chunk.js
0 → 100644
build/mrstatic/js/runtime~main.6d29b145.js
0 → 100644
build/mrstatic/js/search.4b03ee71.chunk.js
0 → 100644
build/mrstatic/js/study.dc86167d.chunk.js
0 → 100644
build/mrstatic/js/togroup.8c8d22c3.chunk.js
0 → 100644
build/mrstatic/js/video.a73f0319.chunk.js
0 → 100644
build/service-worker.js
0 → 100644
| ... | ... | @@ -7,7 +7,7 @@ |
| "@babel/plugin-proposal-decorators": "^7.4.4", | ||
| "@loadable/component": "^5.10.1", | ||
| "@svgr/webpack": "4.1.0", | ||
| "antd-mobile": "^2.2.13", | ||
| "antd-mobile": "^2.3.1", | ||
| "autoprefixer": "^9.6.0", | ||
| "axios": "^0.19.0", | ||
| "babel-core": "7.0.0-bridge.0", | ||
| ... | ... | @@ -66,6 +66,7 @@ |
| "react-redux": "^7.0.2", | ||
| "react-router-dom": "^5.0.1", | ||
| "react-spinners": "^0.5.4", | ||
| "react-sticky": "^6.0.3", | ||
| "redux": "^4.0.1", | ||
| "redux-immutable": "^4.0.0", | ||
| "redux-logger": "^3.0.6", | ||
| ... | ... |
Please
register
or
sign in
to comment