Merge branch 'feature-201817-yc'

# Conflicts:
#	components/provider/Suppliers.vue

components/applyPurchase/articleOne.vue

@@ -181,14 +181,16 @@
       }
     },
     mounted () {
-      document.getElementsByClassName('el-upload-dragger')[0].onclick = function (event) {
-        event.stopPropagation()
-      }
       let _this = this
-      document.body.onclick = function () {
-        _this.showSimilarCodeList = false
-        _this.showSimilarBrandList = false
-      }
+      this.$nextTick(() => {
+        document.getElementsByClassName('el-upload-dragger')[0].onclick = function (event) {
+          event.stopPropagation()
+        }
+        document.body.onclick = function () {
+          _this.showSimilarCodeList = false
+          _this.showSimilarBrandList = false
+        }
+      })
     },
     methods: {
       emptyForm: function () {

components/common/PcSearchHeader.vue

@@ -125,7 +125,7 @@
             } else if (this.similarList.component[0] && this.keyword === this.similarList.component[0].code) {
               sType = 'code'
             } else {
-              let arr = [...this.similarList.component, ...this.similarList.brand, ...this.similarList.kind]
+              let arr = [ ...this.similarList.brand, ...this.similarList.kind, ...this.similarList.component]
               if (arr[0]) {
                 if (arr[0].nameEn) {
                   this.keyword = arr[0].nameEn
@@ -147,7 +147,7 @@
             } else if (this.similarList.pCmpCode[0] && this.keyword === this.similarList.pCmpCode[0].pCmpCode) {
               sType = 'pCmpCode'
             } else {
-              let arr = [...this.similarList.pCmpCode, ...this.similarList.pBrandEn, ...this.similarList.kind]
+              let arr = [...this.similarList.pBrandEn, ...this.similarList.kind, ...this.similarList.pCmpCode]
               if (arr[0]) {
                 if (arr[0].nameEn) {
                   this.keyword = arr[0].nameEn

components/mobile/MobileHeader.vue

@@ -108,7 +108,7 @@
         return this.$store.state.componentDetail.detail.data
       },
       showEnHeader () {
-        return this.startWith(this.$route.path, '/mobile/center')
+        return this.startWith(this.$route.path, '/mobile/center') || this.startWith(this.$route.path, '/mobile/order')
       }
 //      showHeader () {
 //        return this.$route.path !== '/' || !this.$route.path || this.$route.path === ''
@@ -210,7 +210,11 @@
           title = '订单详情'
         } else if (this.startWith(val, '/mobile/order')) {
           this.showSearchIcon = false
-          title = '订单中心'
+          if (query.type === 'buyer') {
+            title = '采购订单'
+          } else {
+            title = '销售订单'
+          }
         } else {
           this.showSearchIcon = true
           title = '优软商城'

components/provider/Suppliers.vue

@@ -19,7 +19,7 @@
             <a @click="goStoreApply" class="btn-sure"><button class="btn btn-primary">立即入驻</button></a>
           </td>
         </tr>
-        <nuxt-link tag="tr" :to="'/store/' + store.uuid" v-for="store in stores.content" v-if="store" v-bind:key="store.uuid">
+        <nuxt-link tag="tr" :to="'/store/' + store.uuid" :key="store.uuid" v-for="store in stores.content" v-if="store">
           <td>
             <div class="logo">
               <a :href="'/store/' + store.uuid" target="_blank"><img :src="store.logoUrl || '/images/store/common/default.png'" :alt="store.storeName"></a>

pages/mobile/order/details.vue

@@ -888,7 +888,7 @@
   }
   .order-wrapper {
     background: #f1f3f6;
-    margin: 0.88rem 0 0.98rem 0;
+    margin: 1.26rem 0 0.98rem 0;
     height: calc(100vh - 0.88rem - 0.96rem);
     overflow-y: scroll;
     .order-details-wrap {

pages/mobile/order/index.vue

@@ -827,7 +827,7 @@
   }
 .order-wrapper {
   background: #f1f3f6;
-  margin: 0.88rem 0 0.98rem 0;
+  margin: 1.26rem 0 0.98rem 0;
   height: calc(100vh - 0.88rem - 0.96rem);
   overflow-y: scroll;
   /*padding-bottom: 0.96rem;*/

pages/mobile/order/logistics.vue

@@ -101,7 +101,7 @@
   }
   .order-wrapper {
     background: #f1f3f6;
-    margin: 0.88rem 0 0.98rem 0;
+    margin: 1.26rem 0 0.98rem 0;
     height: calc(100vh - 0.88rem - 0.98rem);
     overflow-y: scroll;
     .logistics_top {