Merge remote-tracking branch 'origin/feature-201826-wangcz' into feature-201826-wangcz

components/applyPurchase/PublishApply.vue

@@ -1,14 +1,84 @@
 <template>
-  <div class="publish-apply"></div>
+  <div class="publish-apply">
+    <div v-swiper:mySwiper="swiperOption" class="swiper-container">
+      <div class="swiper-wrapper">
+        <div class="swiper-slide" v-for="banner in banners">
+          <a>
+            <img :src="banner.pictureLink"/>
+          </a>
+        </div>
+        <div v-if="banners.length === 0" class="swiper-button-prev"><i class="iconfont icon-swiper-left"></i></div>
+        <div v-if="banners.length === 0"class="swiper-button-next"><i class="iconfont icon-swiper-right"></i></div>
+      </div>
+      <div v-if="banners.length === 0" class="swiper-pagination swiper-pagination-bullets"></div>
+    </div>
+  </div>
 </template>
 <script>
-
+  export default {
+    data () {
+      return {
+        swiperOption: {
+          autoplay: 6000,
+          pagination: '.swiper-pagination',
+          paginationClickable: true,
+          mousewheelControl: false,
+          effect: 'fade',
+          lazyLoading: true,
+          loop: true,
+          prevButton: '.swiper-button-prev',
+          nextButton: '.swiper-button-next',
+          onTransitionStart: (swiper) => {
+            if (this.banners.data && this.banners.data.length && (swiper.activeIndex > this.banners.data.length)) {
+              swiper.activeIndex = 1
+            }
+            if (this.banners.data && this.banners.data.length && swiper.activeIndex <= 0) {
+              swiper.activeIndex = this.banners.data.length
+            }
+          }
+        }
+      }
+    },
+    computed: {
+      banners () {
+        return this.$store.state.applyPurchase.purchaseBannerList.bannerList.data.data
+      }
+    }
+  }
 </script>
 <style lang="scss">
   .publish-apply {
-    border-radius:5px;
-    background: url('/images/applyPurchase/banner.png') center center/cover no-repeat;
+    border-radius: 5px;
     height: 400px;
-    margin-bottom:20px;
+    margin-bottom: 20px;
+    .swiper-container {
+      z-index: 2;
+      width: 955px;
+      height: 400px;
+      .swiper-wrapper {
+        width: 955px;
+        height: 400px;
+        margin: 0 auto;
+        .swiper-slide {
+          height: 400px;
+          margin: 0 auto;
+          display: flex;
+          img {
+            width: 955px;
+            height: 400px;
+            border-radius: 5px;
+          }
+        }
+        .swiper-button-prev i, .swiper-button-next i {
+          font-size: 26px;
+        }
+      }
+      .swiper-pagination-bullets {
+        .swiper-pagination-bullet {
+          width: 10px!important;
+          height: 10px!important;
+        }
+      }
+    }
   }
 </style>

components/provider/ToggleStore.vue

@@ -7,7 +7,7 @@
         <a class="enter" @click="open('/store/33069557578d44e69bd91ad12d28a8d4')">进入店铺 <i class="fa fa-angle-right"></i></a>
       </div>
       <div class="body">
-        <p>海量库存、不赚差价</p>
+        <p>海量库存，不赚差价</p>
       </div>
     </div>
     <!--原厂-->

components/supplier/banner.vue

@@ -1,10 +1,51 @@
 <template>
-  <div class="banner"></div>
+  <div class="banner">
+    <div v-swiper:mySwiper="swiperOption" class="swiper-container">
+      <div class="swiper-wrapper">
+        <div class="swiper-slide" v-for="banner in banners">
+          <a>
+            <img :src="banner.pictureLink"/>
+          </a>
+        </div>
+        <div v-if="banners.length === 0" class="swiper-button-prev"><i class="iconfont icon-swiper-left"></i></div>
+        <div v-if="banners.length === 0"class="swiper-button-next"><i class="iconfont icon-swiper-right"></i></div>
+      </div>
+      <div v-if="banners.length === 0" class="swiper-pagination swiper-pagination-bullets"></div>
+    </div>
+  </div>
 </template>
 
 <script>
   export default {
-    name: 'BannerView'
+    name: 'BannerView',
+    data () {
+      return {
+        swiperOption: {
+          autoplay: 6000,
+          pagination: '.swiper-pagination',
+          paginationClickable: true,
+          mousewheelControl: false,
+          effect: 'fade',
+          lazyLoading: true,
+          loop: true,
+          prevButton: '.swiper-button-prev',
+          nextButton: '.swiper-button-next',
+          onTransitionStart: (swiper) => {
+            if (this.banners.data && this.banners.data.length && (swiper.activeIndex > this.banners.data.length)) {
+              swiper.activeIndex = 1
+            }
+            if (this.banners.data && this.banners.data.length && swiper.activeIndex <= 0) {
+              swiper.activeIndex = this.banners.data.length
+            }
+          }
+        }
+      }
+    },
+    computed: {
+      banners () {
+        return this.$store.state.supplier.detail.banner.data.data
+      }
+    }
   }
 </script>
 

pages/applyPurchase/index.vue

@@ -35,7 +35,8 @@
         store.dispatch('applyPurchase/loadPurchaseManList', {pageNumber: 1, pageSize: 10, enUU: store.state.option.user.data.enterprise ? store.state.option.user.data.enterprise.uu : null}),
         store.dispatch('applyPurchase/loadPurchaseApplyRank'),
         store.dispatch('applyPurchase/loadGoodPurchaseManList'),
-        store.dispatch('loadStoreStatus', { op: 'check' })
+        store.dispatch('loadStoreStatus', { op: 'check' }),
+        store.dispatch('applyPurchase/loadPurchaseBanner')
       ])
     }
   }

pages/eCommerce/home/_type.vue

@@ -14,6 +14,7 @@
         store.dispatch('supplier/loadVendorAll', {page: 1, size: 20}),
         store.dispatch('supplier/loadNewMerchant', {filter: 'page', size: 10}),
         store.dispatch('supplier/loadRecommend', {size: 19}),
+        store.dispatch('supplier/loadSupplierBanner')
       ]) : params.type === 'brand' ? Promise.all([
         store.dispatch('loadFloors'),
         store.dispatch('loadBanners', {type: 'Brand-v3'}),

pages/supplier/index.vue

@@ -25,7 +25,8 @@
         store.dispatch('supplier/loadVendorList', {page: 1, size: 10}),
         store.dispatch('supplier/loadVendorAll', {page: 1, size: 20}),
         store.dispatch('supplier/loadNewMerchant', {filter: 'page', size: 10}),
-        store.dispatch('supplier/loadRecommend', {size: 19})
+        store.dispatch('supplier/loadRecommend', {size: 19}),
+        store.dispatch('supplier/loadSupplierBanner')
       ])
     },
     components: {

store/applyPurchase.js

@@ -192,6 +192,16 @@ export const actions = {
       }, err => {
         commit('bomMaterial/GET_BOM_INFO_FAILURE', err)
       })
+  },
+  // 获取询价求购轮播图
+  loadPurchaseBanner ({ commit }) {
+    commit('purchaseBannerList/REQUEST_BANNER_LIST')
+    return axios.get('/cmsApi?method=queryContentPage&module=purchase_banner_carousel&orderBy=order_number ASC')
+      .then(response => {
+        commit('purchaseBannerList/GET_BANNER_LIST_SUCCESS', response.data)
+      }, err => {
+        commit('purchaseBannerList/GET_BANNER_LIST_FAILURE', err)
+      })
   }
 }
 

store/applyPurchase/purchaseBannerList.js

@@ -0,0 +1,20 @@
+export const state = () => ({
+ bannerList: {
+    fetching: false,
+    data: []
+  }
+})
+
+export const mutations = {
+  REQUEST_BANNER_LIST (state) {
+    state.bannerList.fetching = true
+  },
+  GET_BANNER_LIST_FAILURE (state) {
+    state.bannerList.fetching = false
+  },
+  GET_BANNER_LIST_SUCCESS (state, result) {
+    state.bannerList.fetching = false
+    state.bannerList.data = result
+  }
+}
+

store/supplier.js

@@ -109,5 +109,15 @@ export const actions = {
       }, (err) => {
         commit('merchant/GET_RECOMMEND_FAILURE', err)
       })
+  },
+  // 获取供应商轮播
+  loadSupplierBanner ({commit}) {
+    commit('detail/REQUEST_BANNER')
+    return axios.get(`/cmsApi?method=queryContentPage&module=supplier_banner_carousel&orderBy=order_number ASC`)
+      .then(res => {
+        commit('detail/GET_BANNER_SUCCESS', res.data)
+      }, (err) => {
+        commit('detail/GET_BANNER_FAILURE', err)
+      })
   }
 }

store/supplier/detail.js

@@ -6,6 +6,10 @@ export const state = () => ({
   cmpInfo: {
     fetching: false,
     data: []
+  },
+  banner: {
+    fetching: false,
+    data: []
   }
 })
 
@@ -29,5 +33,15 @@ export const mutations = {
   },
   GET_CMPINFO_FAILURE (state) {
     state.cmpInfo.fetching = false
+  },
+  REQUEST_BANNER (state) {
+    state.banner.detching = true
+  },
+  GET_BANNER_SUCCESS (state, result) {
+    state.banner.fetching = false
+    state.banner.data = result
+  },
+  GET_BANNER_FAILURE (state) {
+    state.banner.fetching = false
   }
 }