Merge branch 'dev'
* dev: (64 commits)
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
解决bug
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/mine/mine.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/order.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/mp-weixin/app.json
# unpackage/dist/dev/mp-weixin/common/main.js
# unpackage/dist/dev/mp-weixin/common/vendor.js
# unpackage/dist/dev/mp-weixin/pages/mine/mine.js
# unpackage/dist/dev/mp-weixin/pages/order/order.js
# unpackage/dist/dev/mp-weixin/pagesA/login/login.js
# unpackage/dist/dev/mp-weixin/pagesA/selectAccount/selectAccount.js
Showing
.gitignore
0 → 100644
.npmignore
0 → 100644
components/Alert/Alert.vue
0 → 100644
components/AlertRecover/AlertRecover.vue
0 → 100644
This diff is collapsed.
Click to expand it.
components/AlertUnlock/AlertUnlock.vue
0 → 100644
components/goodsSelect/goodsSelect.vue
0 → 100644
components/previewImages/previewImages.vue
0 → 100644
components/pwdCodeAlert/pwdCodeAlert.vue
0 → 100644
components/setPwdAlert/setPwdAlert.vue
0 → 100644
components/smsCodeAlert/smsCodeAlert.vue
0 → 100644
components/validCode/validCode.vue
0 → 100644
pagesA/AlertToLogin/AlertToLogin.vue
0 → 100644
pagesA/GoodSkuList/GoodSkuList.vue
0 → 100644
pagesA/SetPwd/SetPwd.vue
0 → 100644
pagesA/VertifyPhone/VertifyPhone.vue
0 → 100644
pagesA/coupon/coupon.vue
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
pagesA/goods/goods.vue
0 → 100644
This diff is collapsed.
Click to expand it.
pagesA/integralDetail/integralDetail.vue
0 → 100644
pagesA/orderDetail/orderDetail.vue
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
pagesA/setting/setting.vue
0 → 100644
pagesA/submitOrder/submitOrder.vue
0 → 100644
static/add.png
0 → 100644
882 Bytes
static/arrow-down.png
0 → 100644
571 Bytes


static/close-gray.png
0 → 100644
1.59 KB
static/coupon-bg-w.png
0 → 100644
6.52 KB
static/coupon-bottom-gray.png
0 → 100644
54.9 KB
static/coupon-bottom-h.png
0 → 100644
78.3 KB
static/coupon-select-btn.png
0 → 100644
1.18 KB
static/coupon-select-close.png
0 → 100644
1.45 KB
static/coupon-top-gray.png
0 → 100644
2.57 KB
static/coupon-top-h.png
0 → 100644
33.5 KB
static/empty-coupon.png
0 → 100644
36.5 KB
static/expired.png
0 → 100644
15 KB
static/eye-off.png
0 → 100644
2.51 KB
static/eye-open.png
0 → 100644
1.83 KB
static/goods-customer.png
0 → 100644
2.52 KB
static/goods-home.png
0 → 100644
2.04 KB

static/goods-right.png
0 → 100644
526 Bytes
static/home-header-bg.png
0 → 100644
11.5 KB
static/icon-bottom-row.png
0 → 100644
1.24 KB
static/integral-detail-bg.png
0 → 100644
1023 Bytes
static/integral-empty-icon.png
0 → 100644
106 KB
static/integral-income.png
0 → 100644
19.4 KB
static/integral-use.png
0 → 100644
21.2 KB
static/lock-gray.png
0 → 100644
3.19 KB
static/lock-h.png
0 → 100644
6.25 KB
static/order-bg.png
0 → 100644
155 KB
static/order-fail.png
0 → 100644
1.23 KB
static/order-pending.png
0 → 100644
1.23 KB
static/order-success.png
0 → 100644
1.28 KB
static/recover-1.png
0 → 100644
407 KB
static/recover-2.png
0 → 100644
404 KB
static/recover-bg.png
0 → 100644
54.4 KB
static/reduce-h.png
0 → 100644
654 Bytes
static/reduce.png
0 → 100644
793 Bytes
static/tabbar/home.png
0 → 100644
1.05 KB
static/tabbar/home_h.png
0 → 100644
1.53 KB
static/tabbar/mine.png
0 → 100644
595 Bytes
static/tabbar/mine_h.png
0 → 100644
1.44 KB
static/tabbar/order.png
0 → 100644
371 Bytes
static/tabbar/order_h.png
0 → 100644
1.46 KB
static/write-gray.png
0 → 100644
2.45 KB
static/write-h.png
0 → 100644
4.55 KB
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
unpackage/dist/dev/mp-weixin/app.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.