Merge remote-tracking branch 'origin/feature/门店签到需求' into master
# Conflicts: # index.html # src/router/routes.js
Showing
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
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.
dist/static/js/card.c713da56138b5476aad3.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dist/static/js/cdKey.52134b24fc8b9e9e0f7a.js
0 → 100644
This diff is collapsed.
Click to expand it.
dist/static/js/ecm.4bc7117a17765999514d.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dist/static/js/ewash.2aea6e7dfdf4a40cb08d.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dist/static/js/game.398009c91a7388812f00.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dist/static/js/main.71b4c4e2af7595947b49.js
0 → 100644
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 source diff could not be displayed because it is too large.
You can
view the blob
instead.
dist/static/js/scan.cbb700e6d6c4f353b03b.js
0 → 100644
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.
src/router/modules/signIn.js
0 → 100644
src/service/api/ecmApi.js
100755 → 100644
src/service/api/storeSign.js
0 → 100644
src/views/ecm/current-list.vue
100755 → 100644
src/views/ecm/marketing-event/components/item-text.vue
100755 → 100644
File mode changed from 100755 to 100644
src/views/sign/assets/api.js
0 → 100644
src/views/sign/assets/emitter.js
0 → 100644
src/views/sign/assets/img/card.svg
0 → 100644
src/views/sign/assets/img/delete_icon.png
0 → 100644
6.2 KB
src/views/sign/assets/img/integral.svg
0 → 100644
src/views/sign/assets/img/loaderror.png
0 → 100644
4.55 KB
src/views/sign/assets/img/stock_icon.png
0 → 100644
6.06 KB
src/views/sign/assets/options.js
0 → 100644
src/views/sign/assets/style/index.css
0 → 100644
src/views/sign/assets/utils.js
0 → 100644
src/views/sign/components/dm-delete.vue
0 → 100644
src/views/sign/components/item-card.vue
0 → 100644
src/views/sign/components/item-integral.vue
0 → 100644
src/views/sign/components/lib-card.vue
0 → 100644
src/views/sign/components/lib-integral.vue
0 → 100644
src/views/sign/components/opt.vue
0 → 100644
src/views/sign/index.vue
0 → 100644
src/views/sign/list.vue
0 → 100644
src/views/sign/setting.vue
0 → 100644
This diff is collapsed.
Click to expand it.
yarn.lock
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.