Merge branch 'master' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/activity/List1.vue

@@ -69,7 +69,8 @@ export default {
         beforeData() {
             return {
                 query: {
-                    del: false
+                    del: false,
+                    companyId: 1
                 }
             };
         },

src/views/order/ActivityOrders.vue

@@ -96,7 +96,8 @@ export default {
                     status: this.status,
                     // type: this.type,
                     hide: false,
-                    del: false
+                    del: false,
+                    companyId: 1
                 }
             };
         },