Merge branch 'dev' into test
* dev: (189 commits) update: dist fix: 编辑活码 update: dist update: dist update: dist fix: 活码新增 验证展示效果代码删除 update: dist fix: 编辑活码 update: 新建、编辑活码缓存表单数据 update: dist update: dist fix: kk update: dist update: dist update: dist fix: 门店,导购接口跨域问题 update: dist update: 链接 fix: dist ... # Conflicts: # dist/index.html # dist/static/css/app.ae3f25d44878542aa539bc26cca27687.css # dist/static/js/100.bac5ba5150667ca637e6.js # dist/static/js/101.aa785281d7787f809c0f.js # dist/static/js/11.9212e6f38151d9b2064f.js # dist/static/js/11.d05a6b9ddd5ad3344c2b.js # dist/static/js/117.7a08db5a06bf55c2055c.js # dist/static/js/12.de0d92825f5659f53f9a.js # dist/static/js/14.d4a40d8b3b381d037999.js # dist/static/js/60.4c5a527a33889ead899e.js # dist/static/js/60.bb76a745c4bb599d309f.js # dist/static/js/61.97a0a48860bba3d3af7d.js # dist/static/js/61.e546948215b9a5c4b5a6.js # dist/static/js/62.81110b3692cf11009820.js # dist/static/js/62.b0a6b3276a7b76ff3cf5.js # dist/static/js/63.6515da8816b70ce892ed.js # dist/static/js/63.fd1d9edbe65e3b568fb9.js # dist/static/js/64.705f7b2b5cc9ff15988f.js # dist/static/js/64.bc2a9d8ac8c46b7ba054.js # dist/static/js/65.1f818ef70dc8c00a03c9.js # dist/static/js/65.df1fc55b18b161438823.js # dist/static/js/66.ef9b45f25efacaeb2a6e.js # dist/static/js/66.fc5bd246db6406c90d24.js # dist/static/js/67.5d5badfc2a167e2a371b.js # dist/static/js/67.b367c36043f148c9d0f4.js # dist/static/js/68.eed264afffd043afa25e.js # dist/static/js/69.311f9c7bb94dba78be5f.js # dist/static/js/69.b77aebc03c0cc5b20a6c.js # dist/static/js/7.23995b8ab7929b431642.js # dist/static/js/70.d13d233b39fda3127326.js # dist/static/js/71.df5bfc582f542452fa36.js # dist/static/js/71.f223f08905ddcbf1c937.js # dist/static/js/72.b88dade8d03805e3b11d.js # dist/static/js/72.c0c05739a2671f510e21.js # dist/static/js/72.f2abde272d1e85fc446b.js # dist/static/js/73.b934178ec94051db4dbf.js # dist/static/js/73.c333b24a4f1db17cf7c6.js # dist/static/js/73.fa5150d7ecab16c9ac80.js # dist/static/js/74.ab7ad420ed9f3eacbf30.js # dist/static/js/74.c08af2069b1140954569.js # dist/static/js/74.c653c1cad89d3af67bd2.js # dist/static/js/75.25ab8a64ef8172ff2224.js # dist/static/js/75.99a5cfd3433737dbdd91.js # dist/static/js/75.b3ca1a8296d4b0fefcc2.js # dist/static/js/76.8e79739af980e3ed65a4.js # dist/static/js/76.a37ab425d4da4ce4b078.js # dist/static/js/77.0320dceb8b6cf323d955.js # dist/static/js/77.b2faee0c81f8d825c1e2.js # dist/static/js/77.e7a9c5675944eeb90a00.js # dist/static/js/78.204b526b6cd4d67e553a.js # dist/static/js/78.8eeba5a8af5f371c5f9c.js # dist/static/js/79.ddbc5dd0f86cf21fb297.js # dist/static/js/79.dfcbfb06cd3e11121910.js # dist/static/js/80.8a1971a7fe9554fc8961.js # dist/static/js/80.cc39bcb61013962ba0dc.js # dist/static/js/81.1d0b9cb77985cc0d2903.js # dist/static/js/81.54e4e605a996c3e758eb.js # dist/static/js/81.9c414a03690822714e56.js # dist/static/js/82.557ea621af71cd24bd9b.js # dist/static/js/82.c004d3c85ae0b8b1c7d6.js # dist/static/js/82.d6af80b1760253c84c89.js # dist/static/js/83.0588dc58d3ccf494aa0b.js # dist/static/js/83.688fd63f6d76e2a75837.js # dist/static/js/83.ccc5a07baa9280a529d0.js # dist/static/js/84.7bf80d8360c91aba0639.js # dist/static/js/84.9235b0acae13a0283193.js # dist/static/js/84.b7f12f8507428bb03e4a.js # dist/static/js/85.9b91b93494090f3a5720.js # dist/static/js/87.ad99bfdb6fc3a35bdbc4.js # dist/static/js/89.3c4d924f2e88952a42fd.js # dist/static/js/90.de41ebd0485dfd87eed8.js # dist/static/js/91.ec76ef8e605ed72e9120.js # dist/static/js/93.d72ec2ba8f710387a9b0.js # dist/static/js/94.c46ee65ecd55cf156432.js # dist/static/js/95.651e7599927367daf54e.js # dist/static/js/96.30ae3888a84aa316ad94.js # dist/static/js/97.2dc694955bf45fe63c07.js # dist/static/js/98.9b8b55b8f197e86fd2c3.js # dist/static/js/app.6ec35df0f6d9ea309c06.js # dist/static/js/vendor.7e88f34d6498df152a6d.js
Showing
... | ... | @@ -40,6 +40,7 @@ |
"vue-amap": "^0.5.10", | ||
"vue-awesome-swiper": "^3.1.3", | ||
"vue-clipboard2": "^0.2.0", | ||
"vue-qr": "^1.5.3", | ||
"vue-runtime-helpers": "^1.1.2", | ||
"xlsx": "^0.13.5" | ||
}, | ||
... | ... | @@ -96,7 +97,7 @@ |
"vue-axios": "^2.1.1", | ||
"vue-loader": "^13.3.0", | ||
"vue-style-loader": "^3.0.1", | ||
"vue-template-compiler": "2.6.6", | ||
"vue-template-compiler": "^2.6.6", | ||
"vuedraggable": "^2.23.2", | ||
"webpack": "^3.6.0", | ||
"webpack-bundle-analyzer": "^2.9.0", | ||
... | ... |
src/api/actCode.js
0 → 100644
src/assets/QRcode.png
0 → 100644
15 KB
src/assets/font/demo.css
0 → 100644
src/assets/font/demo_index.html
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/assets/font/iconfont.css
0 → 100644
src/assets/font/iconfont.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/assets/font/iconfont.json
0 → 100644
This diff is collapsed.
Click to expand it.
src/assets/font/iconfont.ttf
0 → 100644
File added
src/assets/font/iconfont.woff
0 → 100644
File added
src/assets/font/iconfont.woff2
0 → 100644
File added
src/assets/gic后台font/demo.css
0 → 100644
src/assets/gic后台font/demo_index.html
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/assets/gic后台font/iconfont.css
0 → 100644
This diff is collapsed.
Click to expand it.
src/assets/gic后台font/iconfont.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/assets/gic后台font/iconfont.json
0 → 100644
This diff is collapsed.
Click to expand it.
src/assets/gic后台font/iconfont.ttf
0 → 100644
File added
src/assets/gic后台font/iconfont.woff
0 → 100644
File added
src/assets/gic后台font/iconfont.woff2
0 → 100644
File added
src/assets/iphone-head.png
0 → 100644
5.13 KB
src/assets/iphone3.png
0 → 100644
146 KB
src/assets/user-default.svg
0 → 100644
src/components/common/links.vue
0 → 100644
src/components/common/selectShop.vue
0 → 100644
src/components/notice/expire-dialog.vue
0 → 100644
src/components/notice/notice.vue
0 → 100644
src/components/notice/request.js
0 → 100644
src/components/notice/serviceUtil.js
0 → 100644
src/components/preview-page.vue
0 → 100644
src/components/preview-welcome.vue
0 → 100644
src/components/target-group.vue
0 → 100644
src/components/utils/directives.js
0 → 100644
src/router/actCodeManageRouter/index.js
0 → 100644
src/views/enterprise/relationDialog.vue
0 → 100644
This diff is collapsed.
Click to expand it.
src/views/enterprise/salutatoryIndex.vue
0 → 100644
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.