Merge branch 'master' of ssh://10.10.101.21/source/mall-web-ssr into HEAD

# Conflicts:
#	store/index.js

store/index.js

@@ -82,38 +82,6 @@ export const actions = {
         commit('news/GET_SNAPSHOT_FAILURE', err)
       })
   },
-  // 获取快讯页新闻
-  loadAllNews ({ commit }, params = {}) {
-    commit('newsPage/REQUEST_ALLNEWS')
-    return axios.get('/api/news/created', {params})
-      .then(response => {
-        commit('newsPage/GET_ALLNEWS_SUCCESS', response.data)
-      }, err => {
-        commit('newsPage/GET_ALLNEWS_FAILURE', err)
-      })
-  },
-  // 获取详细新闻
-  loadDetailNews ({ commit }, params = {}) {
-    console.log(params.id)
-    let id = params.id
-    commit('detailNews/REQUEST_DETAILNEWS', params)
-    return axios.get(`/api/news/${id}`)
-      .then(response => {
-        commit('detailNews/GET_DETAILNEWS_SUCCESS', response.data)
-      }, err => {
-        commit('detailNews/GET_DETAILNEWS_FAILURE', err)
-      })
-  },
-  // 获取热点新闻
-  loadHotNews ({ commit }, params = {}) {
-    commit('hotNews/REQUEST_HOTNEWS')
-    return axios.get('/api/news/viewCount', {params})
-      .then(response => {
-        commit('hotNews/GET_HOTNEWS_SUCCESS', response.data)
-      }, err => {
-        commit('hotNews/GET_HOTNEWS_FAILURE', err)
-      })
-  },
   // 获取器件统计信息
   loadProductCounts ({ commit }, params = {}) {
     commit('product/common/REQUEST_COUNTS')