Merge remote-tracking branch 'origin/master'

nuxt.config.js

@@ -19,7 +19,11 @@ module.exports = {
       { hid: 'description', name: 'description', content: '优软商城（usoftmall.com）是中国领先的IC电子元器件现货采购交易网上商城，提供上千万种电子元器件现货采购交易，采购电子元器件就上优软商城！' }
     ],
     link: [
-      { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }
+      { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
+      { rel: 'stylesheet', type: 'text/css', href: 'https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css' },
+      { rel: 'stylesheet', type: 'text/css', href: 'https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css' },
+      { rel: 'stylesheet', type: 'text/css', href: 'https://cdn.bootcss.com/element-ui/1.3.7/theme-default/index.css' },
+      { rel: 'stylesheet', type: 'text/css', href: 'https://at.alicdn.com/t/font_0d1jjt5tukcblnmi.css' }
     ]
   },
   /*
@@ -71,12 +75,16 @@ module.exports = {
       })
     ]
   },
-  css: [ {
-    src: '~assets/scss/app.scss',
-    lang: 'scss'
-  }, {
-    src: 'swiper/dist/css/swiper.css'
-  }],
+  css: [
+    /* {
+    src: 'font-awesome/css/font-awesome.css'
+  }, */{src: '~assets/scss/app.scss', lang: 'scss'},
+    {
+      src: 'swiper/dist/css/swiper.css'
+    } /* , {
+      src: 'element-ui/lib/theme-default/index.css'
+    } */
+  ],
   dev: !isProdMode,
   env: {
     baseUrl

pages/provider/home.vue

@@ -18,7 +18,7 @@ export default{
       store.dispatch('loadBanners'),
       store.dispatch('provider/loadSalesStore', { isOriginal: false }),
       store.dispatch('provider/loadNewStores', { types: 'AGENCY-DISTRIBUTION' }),
-      store.dispatch('provider/loadRecommendStores'),
+      store.dispatch('provider/loadRecommendStores', { types: 'AGENCY-DISTRIBUTION', num: 5 }),
       store.dispatch('provider/loadHotComponents')
     ])
   },

store/provider.js

@@ -77,9 +77,9 @@ export const actions = {
     })
   },
   // 获取优秀商家信息
-  loadRecommendStores ({ commit }) {
+  loadRecommendStores ({ commit }, params = {}) {
     commit('storeCms/REQUEST_RECOMMEND_STORE')
-    return axios.get('/api/cms-service/storeIn/5')
+    return axios.get('/api/cms-service/storeIn', { params })
       .then(response => {
         commit('storeCms/GET_RECOMMEND_STORE_SUCCESS', response.data)
       }, err => {