Merge branch 'cps' into test

htmldev/cps/src/views/category/index/child/main.vue

@@ -114,7 +114,8 @@ export default {
       pagesize: 20,
       list: [],
       scroll: null,
-      screenHeight: Math.round(window.screen.height / 2)
+      screenHeight: Math.round(window.screen.height / 2),
+      currentSource: ''
     }
   },
   computed: {
@@ -122,7 +123,7 @@ export default {
       return this.$store.getters['common/sourceList']
     },
     businessLogo () {
-      const result = this.sourceList.filter(item => item.value === this.source)
+      const result = this.sourceList.filter(item => item.value === this.currentSource)
       if (result.length) {
         return result[0].logo
       }
@@ -136,6 +137,7 @@ export default {
       this.isFetchLock = false
       this.pagenum = 0
       this.pagesize = 20
+      this.currentSource = ''
       this.list = []
       if (this.scroll) {
         this.scroll.scrollTo(0, 0)
@@ -150,6 +152,7 @@ export default {
       this.getList()
     },
     async getList () {
+      const source = this.source
       if (this.finished) {
         return
       }
@@ -162,7 +165,7 @@ export default {
         const { status, data, msg } = await apiGoodsList({
           page: this.pagenum,
           page_size: this.pagesize,
-          source: this.source,
+          source: source,
           cat_id: this.catId
         })
         if (status) {
@@ -184,6 +187,7 @@ export default {
               this.finished = true
             }
             this.list = this.list.concat(list)
+            this.currentSource = source
 
             this.$nextTick(() => {
               if (!this.scroll) {

htmldev/cps/src/views/search/child/main.vue

@@ -141,6 +141,7 @@ export default {
       this.pagenum = 0
       this.pagesize = 20
       this.list = []
+      this.currentSource = ''
       if (this.scroll) {
         this.scroll.scrollTo(0, 0)
       }