Merge branch 'master' into ljyBranch

pages/index/cloud/product.vue

@@ -118,7 +118,9 @@ export default {
             this.tabs3 = [];
             this.tabs3Active = 0;
 
-            return this.getList(true);
+            return new Promise((resolve, reject) => {
+                this.getList(true).then(res => resolve())
+            });
         },
         changeClass2(index) {
             let item = this.tabs2[index];