Merge remote-tracking branch 'origin/release-201813-yc' into release-201813-yc

components/applyPurchase/PublishApply.vue

@@ -610,7 +610,7 @@
             ul {
               line-height: normal;
               position: absolute;
-              top: 16px;
+              top: 19px;
               left: 114px;
               background: #fff;
               border: 1px solid #b5b5b5;
@@ -619,7 +619,7 @@
               overflow-y: auto;
               overflow-x: hidden;
               border-radius: 3px;
-              width: 107px;
+              width: 162px;
               font-size: 12px;
               li {
                 height: 24px;

components/home/floor/FloorList.vue

@@ -374,6 +374,7 @@
               white-space: nowrap;
               display: inline-block;
               text-align: center;
+              padding: 0px 10px;
               &:first-child {
                 color: #f57a2e;
               }

components/mobile/center/Message.vue

@@ -14,7 +14,7 @@
           </div>
           <div class="message">
             <p>{{item.createTime | time}}</p>
-            <a :href="item.type === 'MALL跳转卖家待报价页面' ? '/mobile/center/user/seek?seekType=done' : item.type === 'MALL公共询价' ? '/mobile/center/vendor/seek?seekType=wait' : item.type === '商城公共询价采纳结果' ? '/mobile/center/vendor/seek?seekType=done' : ''"
+            <a :href="item.type === 'MALL跳转卖家待报价页面' ? '/mobile/center/user/seek?seekType=done' : item.type === 'MALL公共询价' ? '/mobile/center/vendor/seek?seekType=wait&messageType=my' : item.type === '商城公共询价采纳结果' ? '/mobile/center/vendor/seek?seekType=done' : ''"
                v-if="item.type"
                :title="item.content" class="info">{{item.content}}</a>
             <a v-else :title="item.content" class="noLink info">{{item.content}}</a>
@@ -146,6 +146,9 @@
             font-size: .28rem;
             color: #333;
             word-break: break-all;
+            &:active{
+               background: #e1e1e1;
+            }
           }
         }
       }

components/mobile/center/Seek.vue

@@ -94,6 +94,12 @@
         return '已报价'
       }
     },
+    mounted () {
+//      获取链接
+      this.$nextTick(() => {
+        this.myActiveType()
+      })
+    },
     methods: {
       onSearch: function () {
         this.isSearch = true
@@ -116,6 +122,13 @@
         this.page = 1
         this.isChange = true
         this.reloadData()
+      },
+      myActiveType: function () {
+        if (this.$store.state.option.messageType) {
+          this.activeType = 'self'
+        } else {
+          this.activeType = 'all'
+        }
       }
     }
   }

components/provider/Carousel.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="carousel">
+  <div class="carousel" :class="{width_670: providerType === 'original'}">
     <div v-swiper:mySwiper="swiperOption">
       <div class="swiper-wrapper">
         <div class="swiper-slide" v-for="banner in banners">
@@ -45,6 +45,9 @@
 //      })
 //    }
     computed: {
+      providerType () {
+        return this.$route.path === '/provider/home' ? 'agency' : 'original'
+      },
       banners () {
         if (this.$store.state.carousel.banners) {
           let banner = this.$store.state.carousel.banners.data.slice()
@@ -62,10 +65,14 @@
 <style lang="scss" scoped>
   @import '~assets/scss/variables';
 
-  $carousel_width: 908px;
+  $carousel_width: 910px;
+  $carousel_width_670: 670px;
   $carousel_height: 358px;
 
   .carousel {
+    &.width_670{
+      width: $carousel_width_670;
+    }
     width: $carousel_width;
     height: $carousel_height;
     transition: background-color .3s;
@@ -76,7 +83,7 @@
       .swiper-slide {
         img {
           display: block;
-          width: $carousel_width;
+          width: 100%;
           height: $carousel_height;
         }
       }

components/provider/RecommendStore.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="container marketing">
-    <!--<div class="sales-rank">
+    <div class="sales-rank" v-if="providerType === 'original'">
       <sales-rank />
-    </div>-->
-    <div class="carousel">
+    </div>
+    <div class="carousel" :class="{carousel_670: providerType === 'original'}">
       <carousel />
     </div>
     <div class="new-store">
@@ -12,16 +12,21 @@
   </div>
 </template>
 <script>
-// import SalesRank from './SalesRank.vue'
+import SalesRank from './SalesRank.vue'
 import NewStore from './NewStore.vue'
 import Carousel from './Carousel.vue'
 
 export default {
   name: 'recommend-store',
   components: {
-//    SalesRank,
+   SalesRank,
     NewStore,
     Carousel
+  },
+  computed: {
+    providerType () {
+      return this.$route.path === '/provider/home' ? 'agency' : 'original'
+    }
   }
 }
 </script>
@@ -33,12 +38,12 @@ export default {
     min-height: 360px;
     padding: 0;
 
-    /*.sales-rank {
+    .sales-rank {
       width: 240px;
       min-height: 360px;
       float: left;
       display: inline-block;
-    }*/
+    }
 
     .carousel {
       width: 910px;
@@ -48,6 +53,14 @@ export default {
       border: 1px solid #D6D3CE;
     }
 
+    .carousel_670 {
+      width: 670px;
+      min-height: 360px;
+      display: inline-block;
+      float: left;
+      border: 1px solid #D6D3CE;
+    }
+
     .new-store {
       width: 280px;
       min-height: 360px;

components/provider/SalesRank.vue

@@ -1,24 +1,24 @@
 <template>
   <div class="sale-module">
-    <div class="agency" v-if="providerType == 'agency'">
-      <div class="title">
-        <img src="/images/store/home/hot.png" />
-        <span>销售排行榜</span>
-      </div>
-      <ul class="list-unstyled list-inline">
-        <li v-for="(store, index) in stores">
-          <div class="rank">
-            <img v-if="index == 0" src="/images/store/home/first.png"/>
-            <img v-else-if="index == 1" src="/images/store/home/second.png"/>
-            <img v-else-if="index == 2" src="/images/store/home/third.png"/>
-          </div>
-          <div class="content">
-            <div class="name"><a target="_blank" :href="'/store/' + store.uuid" :title="store.storeName">{{store.storeName}}</a></div>
-            <div class="grade"> 交易量： <span>{{store.orderCount || 0}}</span></div>
-          </div>
-        </li>
-      </ul>
-    </div>
+    <!--<div class="agency" v-if="providerType == 'agency'">-->
+      <!--<div class="title">-->
+        <!--<img src="/images/store/home/hot.png" />-->
+        <!--<span>销售排行榜</span>-->
+      <!--</div>-->
+      <!--<ul class="list-unstyled list-inline">-->
+        <!--<li v-for="(store, index) in stores">-->
+          <!--<div class="rank">-->
+            <!--<img v-if="index == 0" src="/images/store/home/first.png"/>-->
+            <!--<img v-else-if="index == 1" src="/images/store/home/second.png"/>-->
+            <!--<img v-else-if="index == 2" src="/images/store/home/third.png"/>-->
+          <!--</div>-->
+          <!--<div class="content">-->
+            <!--<div class="name"><a target="_blank" :href="'/store/' + store.uuid" :title="store.storeName">{{store.storeName}}</a></div>-->
+            <!--<div class="grade"> 交易量： <span>{{store.orderCount || 0}}</span></div>-->
+          <!--</div>-->
+        <!--</li>-->
+      <!--</ul>-->
+    <!--</div>-->
     <div class="original" v-if="providerType == 'original'">
       <div class="title">
         <img src="/images/original/hot-title.png" alt="">

store/index.js

@@ -34,6 +34,10 @@ export const actions = {
     store.commit('option/SET_USER_AGENT', userAgent)
     store.commit('option/SET_COOKIES', cookie)
     // console.log(req.headers.referer)
+    if (route.query) {
+      let messageType = route.query.messageType || ''
+      store.commit('option/GET_MESSAGETYPE', messageType)
+    }
     if (cookie) {
       if (cookie && cookie.length) {
         for (let i = 0; i < cookie.length; i++) {

store/option.js

@@ -35,7 +35,8 @@ export const state = () => ({
   wechatInfo: {
     fetching: false,
     data: {}
-  }
+  },
+  messageType: ''
 })
 
 export const mutations = {
@@ -115,5 +116,8 @@ export const mutations = {
   },
   REQUEST_WECHATINFO_STATUS_FAILURE (state) {
     state.wechatInfo.fetching = false
+  },
+  GET_MESSAGETYPE (state, result) {
+    state.messageType = result || ''
   }
 }