Merge remote-tracking branch 'origin/dev' into dev

pages/mine/marketDynamic/achievement-list.vue

@@ -141,6 +141,7 @@ export default {
           pageNum: this.page,
           pageSize: this.pageSize,
           keyWords: this.keyword,
+          queryType: 2,
         })
         if (res.code === 200 && res.data) {
           // 在刷新时，更新顶部特殊会员信息

pages/mine/marketDynamic/box-list.vue

@@ -144,7 +144,7 @@ export default {
           pageNum: this.page,
           pageSize: this.pageSize,
           keyWords: this.keyword,
-          type: 2, // 1=业绩 2=盒数
+          queryType: 2, // 1=业绩 2=盒数
         })
         if (res.code === 200 && res.data) {
           if (this.page === 1 && res.data.bigRange) {