Merge branch 'release' into dev-stage3-20191212
# Conflicts: # package-lock.json # service/index.js
正在显示
assets/img/bgtop.png
0 → 100644
268.1 KB
19.1 KB
assets/img/ico1.png
0 → 100644
16.6 KB
assets/img/ico2.png
0 → 100644
18.4 KB
assets/img/ico3.png
0 → 100644
29.1 KB
assets/img/ico4.png
0 → 100644
18.4 KB
assets/img/icon-back.png
0 → 100644
832 字节
assets/img/icon-copper.png
0 → 100644
4.3 KB
assets/img/icon-gold.png
0 → 100644
3.3 KB
assets/img/icon-nodata.png
0 → 100644
16.9 KB
assets/img/icon-silver.png
0 → 100644
4.3 KB
assets/img/mask.png
0 → 100644
28.5 KB
18.9 KB
718 字节
assets/img/resimg0.png
0 → 100644
2.1 KB
assets/img/resimg1.png
0 → 100644
38.9 KB
assets/img/resimg2.png
0 → 100644
26.8 KB
assets/img/resimg3.png
0 → 100644
31.6 KB
assets/img/resimg4.png
0 → 100644
34.1 KB
191 字节
15.0 KB
15.1 KB
14.9 KB
15.6 KB
19.4 KB
10.8 KB
13.5 KB
13.8 KB
13.2 KB
250 字节
2.0 KB
16.3 KB
674 字节
2.0 KB
1.2 KB
2.8 KB
2.0 KB
5.0 KB
2.4 KB
7.6 KB
11.2 KB
366 字节
200 字节
648 字节
assets/img/stage-two/rule-btn.png
0 → 100644
2.5 KB
assets/img/stage-two/smo-icon.png
0 → 100644
2.7 KB
4.5 KB
4.5 KB
4.5 KB
4.6 KB
47.4 KB
7.2 KB
19.7 KB
2.0 KB
22.4 KB
2.4 KB
12.5 KB
assets/img/task-icon/smo-icon.png
0 → 100644
2.7 KB
assets/style/in-activity.less
0 → 100644
此差异已折叠。
components/footer-button.vue
0 → 100644
components/normal-header.vue
0 → 100644
components/ranking-header.vue
0 → 100644
configs/wxShare.js
0 → 100644
此差异已折叠。
| ... | ... | @@ -15,15 +15,18 @@ |
| "cookie-universal": "^2.0.16", | ||
| "cross-env": "^5.2.0", | ||
| "exif-js": "^2.3.0", | ||
| "js-base64": "^2.5.1", | ||
| "koa": "^2.6.2", | ||
| "node-sass": "^4.12.0", | ||
| "nuxt": "^2.0.0", | ||
| "pica-h5-login": "^1.0.63", | ||
| "pica-jsbridge": "^1.0.1", | ||
| "pica-wx-share": "^1.1.3", | ||
| "pica-wx-share": "^1.2.0", | ||
| "query-string": "^6.9.0", | ||
| "sass-loader": "^8.0.0", | ||
| "vant": "^2.0.9", | ||
| "vconsole": "^3.3.4", | ||
| "vue-infinite-scroll": "^2.0.2", | ||
| "web-buried-point": "^2.1.0" | ||
| }, | ||
| "devDependencies": { | ||
| ... | ... |
pages/activityPage.vue
0 → 100644
此差异已折叠。
pages/hospital-ranking/index.less
0 → 100644
pages/hospital-ranking/index.vue
0 → 100644
pages/index.vue
0 → 100644
pages/invite-details/index.less
0 → 100644
pages/invite-details/index.vue
0 → 100644
pages/person-detail/index.less
0 → 100644
pages/person-detail/index.vue
0 → 100644
pages/person-ranking/index.less
0 → 100644
pages/person-ranking/index.vue
0 → 100644
pages/shareActive.vue
0 → 100644
此差异已折叠。
pages/shareResult.vue
0 → 100644
pages/yesterday-prize/index.less
0 → 100644
此差异已折叠。
pages/yesterday-prize/index.vue
0 → 100644
此差异已折叠。
plugins/mixins.js
0 → 100644
此差异已折叠。
plugins/vue-infinite-scroll.js
0 → 100644
service/activityMainpage.js
0 → 100644
此差异已折叠。
此差异已折叠。
service/detailsAndRanking.js
0 → 100644
此差异已折叠。
此差异已折叠。
utils/cookieFun.js
0 → 100644
此差异已折叠。
此差异已折叠。