diff --git a/.github/workflows/close_inactive_issue.yml b/.github/workflows/close_inactive_issue.yml
new file mode 100644
index 00000000..15de553d
--- /dev/null
+++ b/.github/workflows/close_inactive_issue.yml
@@ -0,0 +1,19 @@
+name: Close Inactive Issue
+
+on:
+ schedule:
+ - cron: "0 0 * * *"
+
+jobs:
+ close-issues:
+ runs-on: ubuntu-latest
+ steps:
+ - name: close inactive issue
+ uses: actions-cool/issues-helper@v2.2.1
+ with:
+ actions: 'close-issues'
+ labels: 'inactive'
+ inactive-day: 30
+ body: |
+ Since the issue was labeled with `inactive`, but no response in 30 days. This issue will be close. If you have any questions, you can comment and reply.
+ 由于该 issue 被标记为不活跃,且 30 天未收到回应。现关闭 issue,若有任何问题,可评论回复。
diff --git a/.gitignore b/.gitignore
index 205bd746..25c45ee2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,12 @@
.DS_Store
node_modules/
npm-debug.log
+package-lock.json
# 忽略使用WebStorm开发时,生成的缓存文件夹
.idea
# 忽略使用VSCode开发时,生成的缓存文件夹
.vscode
tree.md
+*.idea
+
+elm/
diff --git a/README-en.md b/README-en.md
new file mode 100644
index 00000000..0631adbd
--- /dev/null
+++ b/README-en.md
@@ -0,0 +1,322 @@
+# Introduction
+
+[README in Chinese](README.md)
+
+When I began to learn to vue, search of some practical source code about vue, but most of them are simple demo and didn't help to explore the vue. The most of demo are front-end page, such as music player interaction not as complicated as expected.But in actual work, we often meet some project involving money, such as shopping cart page. This kind of project is complex, accompany by login, register ,user information and so on. It's difficult, no one has ever written a project like this in vue and commit to github. So I write it, hope I can help you.
+
+This functional project is practical but often boring, with no music player so gorgeous. For a long time, I think that Elm APP is a good material. First, it is complex that the open delivery platform is more complicated than the typical project. Second, you won't get bored seeing so much beautiful food.
+
+But why is the Elm APP, not Baidu App or Meituan App? The reason is simple, that Elm's layout is the most beautiful and the most comfortable in the three APP.
+
+There are 45 pages of this project, involving registration, login, merchandise display, shopping cart, order and so on. It is a complete process. The average company project is not that complicated, so if you can understand this project fully, I believe that you can able to do the most of single-page applications in the other company. Even if it's more complex, and it won't be much higher than this one.
+
+The project was done in the spare time, actually it was written years ago and over the years, so the spend time seem a bit long. The project spend more than two months from beginning to end. Now it has been completed, some performance optimizations are being performed to add detailed annotations.
+
+In addition, the project don't related elm video of imooc website, and that project only have one page. After watching the official documentation of vue, I wrote this project directly, and without reference to any code, so please don't mix them up.
+
+__Note: This project is purely personal. If you want to order, please choose the official elm client.__
+
+
+
+## Technology
+
+vue2 + vuex + vue-router + webpack + ES6/7 + fetch + sass + flex + svg
+
+
+## Development
+
+Note:This project used a lot of properties such as ES6/7, so node 6.0.0+ is required.
+
+```
+git clone https://github.com/bailicangdu/vue2-elm.git
+
+cd vue2-elm
+
+npm install
+
+npm run dev
+
+```
+
+
+## More
+This project has the supporting background system. If you want to develop it, you can download the corresponding backend system.[backend system](https://github.com/bailicangdu/node-elm)。
+
+Backend system's run command:npm run local .
+
+If you only do the front-end development, ignore this note.
+
+
+# Explain
+
+> If it helps you, you can click "Star" in the upper right corner to support,thank you. ^_^
+
+> May be you can "follow" me, I will make more interstng projects.
+
+> Development environment: macOS 10.12.3 Chrome 56 nodejs 6.10.0
+
+> Thanks for 辰妹子[@bailichen](https://github.com/bailichen), [@iceRao](https://github.com/raoenhui),to help complete the project,thank you🌹
+
+> If you hava some question,you can post the question in Issues, and if you find some solution or some improvement,please pull request. 👍
+
+> [communication group](https://gitter.im/vue2-elm/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link)
+
+> Recommend a open source project about react and redux。[address](https://github.com/bailicangdu/react-pxq)
+
+> Recommend a other demo about vue2 and vuex,it's simple and good for newbie.[address](https://github.com/bailicangdu/vue2-happyfri)
+
+
+## Dscription of the data interface 🤔
+
+### 2017-05-30
+
+For some reason,previous interfaces could not be used, it made the project failed to run.The new backend system is built by nodejs.[backend system address](https://github.com/bailicangdu/node-elm). It can kept consisent with the offical website. And provide corresponding [background management system](https://github.com/bailicangdu/vue2-manage)
+
+
+# Demo
+
+[click it](http://cangdu.org/elm/)(Preview with chrome phone mode please)
+
+### The mobile can scan the qr code in the below
+
+
+
+
+
+# Features
+- [x] location function -- finished
+- [x] choose city -- finished
+- [x] search address-- finished
+- [x] display a list of merchant that near by the selected address -- finished
+- [x] find food or restaurant -- finished
+- [x] sorting and filter according to distance,sales,rating,special course,distribution and so on -- finished
+- [x] food list of restaurant -- finished
+- [x] cart function -- finished
+- [x] evaluation page of shop -- finished
+- [x] detail page about one food-- finished
+- [x] detail page about merchant -- finished
+- [x] login、register -- finished
+- [x] change password -- finished
+- [x] user center -- finished
+- [x] send message、voice verification -- finished
+- [x] order function -- finished ✨✨🎉🎉
+- [x] order list -- finished
+- [x] order detail -- finished
+- [x] download App -- finished
+- [x] add、delete、change delivery address -- finished
+- [x] account info -- finished
+- [x] service center -- finished
+- [x] red packet -- finished
+- [x] upload avator -- finished
+- [ ] pay -- No money~~
+
+
+
+# Summarize
+
+1, It is not the official of elm, so it is necessary to open the agent, and must be opened on the PC. At most, you can order but not more, after the success of the order, you can check and pay the payment on your mobile phone.
+
+2, In general, the page involves money that is complicated, especially like elm? An open platform, It has many types of merchants and foods, need some complex interaction between page and page. When I writing the cart and order pages, without API but it has a lot of
+
+3, Vue is so bright, because of it's a lightweight framework good at the small and medium-sized project. Whem you want make a large single-page application, you can use vuex, the performance is still outstanding. In the treatment of the complex interaction logic page, vuex is necessary. So if you use vue and vuex, you can make large single-page projects.
+
+4, Now, after make process of the login to register, homepage, search, businesses, shopping cart, order, order list, personal center and so on. I not only understanding the vue to a deeper level, and it's can help for me to control the large project in the future. Do a practical project has great improvement in myself.
+
+5, Sometimes I doubt that to spend a few months make this project has meaning or not. At first I just wanted to do a small project, but I didn't think I could write more, but when I finished I believed it was worth it.
+
+6, The project was already finished, and have 45 pages.
+
+
+# Ultimate Goal
+
+1, Build a background system to simulate the delivery platform with node.js。[address](https://github.com/bailicangdu/node-elm)
+
+2, Use react-native to write native APP of Android and IOS。[地址在这里](https://github.com/bailicangdu/React-Native-elm)
+
+3、May be I will make a seller's version in the future.
+
+ So my goal is to build a full ecosystem across the frontend , backend, IOS and Android.
+
+ ...Waiting for me
+
+
+
+# Screenshot
+
+
+### store list page
+
+
+
+
+### store filter page
+
+
+
+
+
+### food list and cart
+
+
+
+### oder check page
+
+
+
+
+### search page
+
+
+
+
+### login page
+
+
+
+
+### user center
+
+
+
+
+
+
+
+
+# Layout
+
+```
+.
+├── build // webpack config file
+├── config // package path
+├── elm // online project file,can access if put them one the server
+├── screenshots // screenshot
+├── src // source directory
+│ ├── components // components
+│ │ ├── common // common components
+│ │ │ ├── alertTip.vue // popup components
+│ │ │ ├── buyCart.vue // cart components
+│ │ │ ├── computeTime.vue // countdown components
+│ │ │ ├── loading.vue // the animation component when page is initialized
+│ │ │ ├── mixin.js // mixinf components(inculde:directive-loading more,make picture address)
+│ │ │ ├── ratingStar.vue // the five rating star component about comment
+│ │ │ └── shoplist.vue // the resturant list common component of msite and shop page
+│ │ ├── footer
+│ │ │ └── footGuide.vue // footer common component
+│ │ └── header
+│ │ └── head.vue // header common component
+│ ├── config // basic configuration
+│ │ ├── env.js // environment switch configuration
+│ │ ├── fetch.js // git data
+│ │ ├── mUtils.js // common function about js
+│ │ └── rem.js // px transform rem
+│ ├── images // public picture
+│ ├── page
+│ │ ├── balance
+│ │ │ ├── balance.vue // balance page
+│ │ │ └── children
+│ │ │ └── detail.vue // balance detail page
+│ │ ├── benefit
+│ │ │ ├── benefit.vue // benefit pahe
+│ │ │ └── children
+│ │ │ ├── commend.vue // recommend prize
+│ │ │ ├── coupon.vue // coupon introduction
+│ │ │ ├── exchange.vue // exchange benefit
+│ │ │ ├── hbDescription.vue // benefit descripting
+│ │ │ └── hbHistory.vue // benefit's history
+│ │ ├── city
+│ │ │ └── city.vue // local city page
+│ │ ├── confirmOrder
+│ │ │ ├── children
+│ │ │ │ ├── children
+│ │ │ │ │ ├── addAddress.vue // add address page
+│ │ │ │ │ └── children
+│ │ │ │ │ └── searchAddress.vue // search address page
+│ │ │ │ ├── chooseAddress.vue // choose address page
+│ │ │ │ ├── invoice.vue // choose invoice page
+│ │ │ │ ├── payment.vue // pay page
+│ │ │ │ ├── remark.vue // order remark page
+│ │ │ │ └── userValidation.vue // user validation page
+│ │ │ └── confirmOrder.vue // confirm order page
+│ │ ├── download
+│ │ │ └── download.vue // downlad App
+│ │ ├── find
+│ │ │ └── find.vue // find page
+│ │ ├── food
+│ │ │ └── food.vue // food filter sort page
+│ │ ├── forget
+│ │ │ └── forget.vue // forget password, change password
+│ │ ├── home
+│ │ │ └── home.vue // index page
+│ │ ├── login
+│ │ │ └── login.vue // login and register page
+│ │ ├── msite
+│ │ │ └── msite.vue // merchant list page
+│ │ ├── order
+│ │ │ ├── children
+│ │ │ │ └── orderDetail.vue // order detail page
+│ │ │ └── order.vue // order list page
+│ │ ├── points
+│ │ │ ├── children
+│ │ │ │ └── detail.vue // points detail page
+│ │ │ └── points.vue // points page
+│ │ ├── profile
+│ │ │ ├── children
+│ │ │ │ ├── children
+│ │ │ │ │ ├── address.vue // address page
+│ │ │ │ │ └── children
+│ │ │ │ │ ├── add.vue // add address page
+│ │ │ │ │ └── children
+│ │ │ │ │ └── addDetail.vue // search address page
+│ │ │ │ ├── info.vue // account info page
+│ │ │ │ └── setusername.vue // reset user page
+│ │ │ └── profile.vue // user profile page
+│ │ ├── search
+│ │ │ └── search.vue // search page
+│ │ ├── service
+│ │ │ ├── children
+│ │ │ │ └── questionDetail.vue // question detail page
+│ │ │ └── service.vue // service center page
+│ │ ├── shop
+│ │ │ ├── children
+│ │ │ │ ├── children
+│ │ │ │ │ └── shopSafe.vue // shop check info page
+│ │ │ │ ├── foodDetail.vue // food detail page
+│ │ │ │ └── shopDetail.vue // shop detail page
+│ │ │ └── shop.vue // shop filter page
+│ │ └── vipcard
+│ │ ├── children
+│ │ │ ├── invoiceRecord.vue // invoice record page
+│ │ │ ├── useCart.vue // use card page
+│ │ │ └── vipDescription.vue // vip deacription page
+│ │ └── vipcard.vue // vip handling page
+│ ├── plugins // plugins
+│ ├── router
+│ │ └── router.js // router configuration
+│ ├── service // data interaction and unified deployment
+│ │ ├── getData.js // the unified deployment file for get data, and unified management of interfaces
+│ │ └── tempdata // temporary data for the development
+│ ├── store // Vuex status management
+│ │ ├── action.js // actions configuration
+│ │ ├── getters.js // getters configuration
+│ │ ├── index.js // use vuex,new store
+│ │ ├── modules // store modules
+│ │ ├── mutation-types.js // make const for muations
+│ │ └── mutations.js // mutations configuration
+│ └── style
+│ ├── common.scss // common css
+│ ├── mixin.scss // cs configuration file
+│ └── swiper.min.css
+│ ├── App.vue // entry page js file
+│ ├── main.js // the main js for loading components
+├── favicon.ico // icon
+├── index.html // entry page html file
+.
+
+56 directories, 203 files
+```
+
+
+# License
+
+[GPL](https://github.com/bailicangdu/vue2-elm/blob/master/COPYING)
diff --git a/README.md b/README.md
index 55eba894..366f295c 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,22 @@
# 前言
+[README in English](README-en.md)
+
初学vue时曾在网上搜索vue的实战项目源码,无奈大部分都是简单的demo,对于深究vue没有太大的帮助,剩下的一些大部分都是像音乐播放器之类的展示型项目,交互没有预期那么复杂。但我们实际在工作中,经常会遇到有购物车的项目,这类项目因为涉及到money,所以对逻辑严谨度要求高,页面之间交互复杂,又会伴随着登录、注册、用户信息等等,常常会让我们很头疼。既然还没人用vue写过这样的项目,那不如我来写,开源出来对能看到的人也会有帮助。
这种功能性的项目很实用但是往往也很枯燥,没有音乐播放器那么看起来绚丽,思来想去发现饿了么是一个不错的素材,一来它足够复杂,开放的外卖平台比一般的公司独有商店更加复杂。二来 见到那么多美食,大家也不会感觉到厌烦。
-为啥是饿了么,而不是百度,美团?原因很简单,三个外卖大佬里,饿了么的色调和布局是最漂亮的,看起来最舒服。
+为啥是饿了么,而不是美团?原因很简单,饿了么的色调和布局是最漂亮的,看起来最舒服。
此项目大大小小共 45 个页面,涉及注册、登录、商品展示、购物车、下单等等,是一个完整的流程。一般公司即便是官网的单页面项目都没这么复杂,如果这个项目能驾驭的了,相信大部分公司的其他单页面应用也就不在话下,即便更复杂,也不会比这个高到哪里去。
-因为利用业余时间来做,年前就开始写,又跨个年,周期有点长,项目从零布局到完成共用了2个多月的时间,目前项目已经完成,正在进行一些性能的优化,增加详细的注释。
+因为利用业余时间来做,年前就开始写,又跨个年,周期有点长,项目从零布局到完成共用了2个多月的时间。
另外,这个项目和慕课网视频的那个饿了么没有任何关系,慕课网的项目只有一个页面,我在看完vue的官方文档后直接写了这个项目,没有参照任何人的代码,请大家不要混为一谈。
-__注:此项目纯属个人瞎搞,正常下单请选择饿了么官方客户端。__
+__注1:此项目纯属个人瞎搞,正常下单请选择饿了么官方客户端。__
+
+__注2:项目预览地址和接口需要使用https访问哦!__
## 技术栈
@@ -22,24 +26,29 @@ vue2 + vuex + vue-router + webpack + ES6/7 + fetch + sass + flex + svg
## 项目运行
-#### 注意:由于涉及大量的 ES6/7 等新属性,node 需要 6.0 以上版本
+#### 注意:由于涉及大量的 ES6/7 等新属性,node 需要 6.0 以上版本
```
git clone https://github.com/bailicangdu/vue2-elm.git
cd vue2-elm
-npm install
+npm install 或 yarn(推荐)
npm run dev
```
-## 另外
-此项目有配套的后台系统,如果想前后台同时开发,可以下载对应的后台系统:[后台项目传送地址](https://github.com/bailicangdu/node-elm)。
+## 关于接口数据
+
+此项目的所有接口数据都来源于配套的后台系统,[后台项目传送地址](https://github.com/bailicangdu/node-elm)。
-此时启动项目使用:npm run local 而不是 npm run dev。
+如果想体验前后台同时开发,可以下载后台系统。
-如果只做前端开发,请忽略这句话。
+此时启动本项目的命令为:npm run local 而不是 npm run dev。
+
+同时我们也提供了基于`element-ui`搭建的[后台管理页面](https://github.com/bailicangdu/vue2-manage)
+
+如果只做前端开发,请忽略上面这几句话哟~
# 说明
@@ -50,32 +59,24 @@ npm run dev
> 开发环境 macOS 10.12.3 Chrome 56 nodejs 6.10.0
-> 特别感谢辰妹子[@bailichen](https://github.com/bailichen),在百忙之中抽出时间和我一起完成了这个项目,辛苦了🌹
+> 特别感谢[@bailichen](https://github.com/bailichen), [@iceRao](https://github.com/raoenhui),在百忙之中抽出时间和我一起完成了这个项目,辛苦了🌹
> 如有问题请直接在 Issues 中提,或者您发现问题并有非常好的解决方案,欢迎 PR 👍
-> 项目交流群:528447162(QQ)
+> [项目交流群](https://gitter.im/vue2-elm/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link)
> 推荐一个 react + redux 开源项目,对react感兴趣的朋友赶紧去看看。[地址在这里](https://github.com/bailicangdu/react-pxq)
> 另外一个 vue2 + vuex 的入门项目,比当前的项目简单很多,非常适合入门练习。[地址在这里](https://github.com/bailicangdu/vue2-happyfri)
-## 关于 数据接口 的说明🤔
-
-### 2017-05-30
-
-由于一些原因,以前的数据接口无法使用,导致项目无法正常运行。以后改用nodejs构建的[后台系统](https://github.com/bailicangdu/node-elm)接口,数据接口的格式保持了和官网的一致。并提供对应的[后台管理系统](https://github.com/bailicangdu/vue2-manage)
-
-
-
# 效果演示
-[查看demo请戳这里](http://cangdu.org:8001/)(请用chrome手机模式预览)
+[查看demo请戳这里](https://cangdu.org/elm/#/msite)(请用chrome手机模式预览)
### 移动端扫描下方二维码
-
+
@@ -110,24 +111,22 @@ npm run dev
# 总结
-1、因为并不是elm官方,而且因为要开代理,必须在pc端打开,最多只能做到下单这一步,下单成功后可以在手机客户端查看并付款。
-
-2、一般涉及到money的网页逻辑都比较复杂,尤其像饿了么这样一个开放的平台,商家和食品种类繁多,页面与页面之间交互复杂,在写到 购物车 和 下单 功能时众多的数据和逻辑一度让人很头疼,又没有设计和接口api文档,只能一步步摸索。
+1、一般涉及到money的网页逻辑都比较复杂,尤其像饿了么这样一个开放的平台,商家和食品种类繁多,页面与页面之间交互复杂,在写到 购物车 和 下单 功能时众多的数据和逻辑一度让人很头疼,又没有设计和接口api文档,只能一步步摸索。
-3、vue因其轻量级的框架在中小型项目中表现亮眼,在大型单页面应用中因为vuex的存在,表现依然出色,在处理复杂交互逻辑的时候,vuex的存在是不可或缺的。所以说利用 vue + vuex 完全可以去做大型的单页面项目。
+2、vue因其轻量级的框架在中小型项目中表现亮眼,在大型单页面应用中因为vuex的存在,表现依然出色,在处理复杂交互逻辑的时候,vuex的存在是不可或缺的。所以说利用 vue + vuex 完全可以去做大型的单页面项目。
-4、项目写到现在,从 登录注册到、首页、搜索、商家列表、购物车、下单、订单列表、个人中心 一个流程走完之后、不但对vue的理解更深一层,而且对以后掌控大型项目的时候也有非常多的帮助,做一个实际的项目才能对自己有很大的提升。
+3、项目写到现在,从 登录注册到、首页、搜索、商家列表、购物车、下单、订单列表、个人中心 一个流程走完之后、不但对vue的理解更深一层,而且对以后掌控大型项目的时候也有非常多的帮助,做一个实际的项目才能对自己有很大的提升。
-5、曾一度怀疑,花几个月的时间做这样一个项目到底有没有意义,本来只是想做一个小项目练练手,没想到后来越写越多,不过坚持下来后我相信一切都是值得的。
+4、曾一度怀疑,花几个月的时间做这样一个项目到底有没有意义,本来只是想做一个小项目练练手,没想到后来越写越多,不过坚持下来后我相信一切都是值得的。
-6、项目已经完成,共45个页面。
+5、项目已经完成,共45个页面。
# 最终目标
1、用node.js构建一个模拟外卖平台的后台系统。[地址在这里](https://github.com/bailicangdu/node-elm)
-2、利用 react-native 写出跨 Android 和 IOS 的原生APP版本。[地址在这里](https://github.com/bailicangdu/React-Native-elm)
+2、写出跨 Android 和 IOS 的原生APP版本。[地址在这里](https://github.com/bailicangdu/native-xdm)
3、如果时间来的及,会出一卖家版本。
@@ -221,7 +220,7 @@ npm run dev
│ │ │ ├── exchange.vue // 兑换红包
│ │ │ ├── hbDescription.vue // 红包说明
│ │ │ └── hbHistory.vue // 历史红包
-│ │ ├── city
+│ │ ├── city
│ │ │ └── city.vue // 当前城市页
│ │ ├── confirmOrder
│ │ │ ├── children
@@ -232,7 +231,7 @@ npm run dev
│ │ │ │ ├── chooseAddress.vue // 选择地址页
│ │ │ │ ├── invoice.vue // 选择发票页
│ │ │ │ ├── payment.vue // 付款页
-│ │ │ │ ├── remark.vue // 订单备注页
+│ │ │ │ ├── remark.vue // 订单备注页
│ │ │ │ └── userValidation.vue // 用户验证页
│ │ │ └── confirmOrder.vue // 确认订单页
│ │ ├── download
@@ -260,7 +259,7 @@ npm run dev
│ │ ├── profile
│ │ │ ├── children
│ │ │ │ ├── children
-│ │ │ │ │ ├── address.vue // 添加地址
+│ │ │ │ │ ├── address.vue // 地址
│ │ │ │ │ └── children
│ │ │ │ │ ├── add.vue // 新增地址
│ │ │ │ │ └── children
@@ -313,7 +312,6 @@ npm run dev
56 directories, 203 files
```
-
# License
[GPL](https://github.com/bailicangdu/vue2-elm/blob/master/COPYING)
diff --git a/build/dev-server.js b/build/dev-server.js
index fdbaed5e..3af6fabe 100644
--- a/build/dev-server.js
+++ b/build/dev-server.js
@@ -38,8 +38,8 @@ var context = config.dev.context
switch(process.env.NODE_ENV){
case 'local': var proxypath = 'http://localhost:8001'; break;
- case 'online': var proxypath = 'http://cangdu.org:8001'; break;
- default: var proxypath = config.dev.proxypath;
+ case 'online': var proxypath = 'https://elm.cangdu.org'; break;
+ default: var proxypath = config.dev.proxypath;
}
var options = {
target: proxypath,
@@ -75,4 +75,4 @@ module.exports = server.listen(port, function(err) {
if (process.env.NODE_ENV !== 'testing') {
opn(uri)
}
-})
\ No newline at end of file
+})
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index 3fbcb2aa..cfa2213f 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -67,8 +67,11 @@ module.exports = {
}),
postcss: [
require('autoprefixer')({
- browsers: ['last 10 versions']
+ browsers: [
+ 'Android >= 4.4',
+ 'iOS >= 8'
+ ]
})
]
}
-}
\ No newline at end of file
+}
diff --git a/config/index.js b/config/index.js
index 1f604d91..faa28b46 100644
--- a/config/index.js
+++ b/config/index.js
@@ -9,7 +9,7 @@ module.exports = {
index: path.resolve(__dirname, '../elm/index.html'),
assetsRoot: path.resolve(__dirname, '../elm'),
assetsSubDirectory: 'static',
- assetsPublicPath: '/',
+ assetsPublicPath: '/elm/',
productionSourceMap: true,
// Surge or Netlify already gzip all static assets for you.
// Before setting to `true`, make sure to:
@@ -36,6 +36,7 @@ module.exports = {
'/promotion',
'/eus',
'/payapi',
+ '/img',
],
proxypath: 'http://cangdu.org:8001',
// CSS Sourcemaps off by default because relative paths are "buggy"
diff --git a/elm/favicon.ico b/elm/favicon.ico
deleted file mode 100644
index 622d15fd..00000000
Binary files a/elm/favicon.ico and /dev/null differ
diff --git a/elm/index.html b/elm/index.html
index 23793b95..c0ae0d6b 100644
--- a/elm/index.html
+++ b/elm/index.html
@@ -8,126 +8,13 @@
+
+