Merge branch 'master' into dev
* master:
1
1
# Conflicts:
# unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/integral/integral.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/login/login.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/selectAccount/selectAccount.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
# unpackage/dist/dev/mp-weixin/app.json
# unpackage/dist/dev/mp-weixin/common/main.js
# unpackage/dist/dev/mp-weixin/common/main.wxss
# unpackage/dist/dev/mp-weixin/common/vendor.js
# unpackage/dist/dev/mp-weixin/pages/home/home.js
# unpackage/dist/dev/mp-weixin/pages/mine/mine.js
# unpackage/dist/dev/mp-weixin/pages/mine/mine.json
# unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml
# unpackage/dist/dev/mp-weixin/pages/order/order.js
# unpackage/dist/dev/mp-weixin/pagesA/integral/integral.js
# unpackage/dist/dev/mp-weixin/pagesA/login/login.js
# unpackage/dist/dev/mp-weixin/pagesA/selectAccount/selectAccount.js
# unpackage/dist/dev/mp-weixin/project.config.json
# unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js
Showing
static/arrow-right-w.png
0 → 100644
651 Bytes
static/coupon.png
0 → 100644
4.47 KB
static/customer.png
0 → 100644
6.05 KB
static/integral.png
0 → 100644
5.58 KB
static/mine-bg.png
0 → 100644
35.4 KB
static/setting.png
0 → 100644
5.93 KB
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
unpackage/dist/dev/mp-weixin/app.json
0 → 100644
unpackage/dist/dev/mp-weixin/common/main.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
651 Bytes
4.47 KB
6.05 KB
5.58 KB
35.4 KB
5.93 KB
279 Bytes
327 Bytes
250 Bytes