Merge branch 'feature_0521' of http://jdxdev.5gzvip.idcfengye.com/web/ic/kiisoo-ic-ui into feature_0521

src/pages/activity/useActivityStepThree.vue

@@ -29,6 +29,7 @@
           </CheckboxGroup>
         </Row>
       </div>
+      <Spin size="large" fix v-if="loading"></Spin>
     </div>
   </div>
 </template>
@@ -41,6 +42,7 @@ export default {
     return {
       indeterminate: false,
       allSelect: false,
+      selected: [],
       shopList: [],
       isSelect: [],
       selectValue: [],
@@ -59,6 +61,14 @@ export default {
       });
     }
   },
+  computed: {
+    userData() {
+      return store.getters.userData || {};
+    },
+    store() {
+      return store.getters.store || [];
+    },
+  },
   methods: {
     handleCheckAll() {
       if (this.indeterminate) {

src/pages/activity/useActivityStepTwo.vue

@@ -33,6 +33,7 @@
           </CheckboxGroup>
         </Row>
       </div>
+      <Spin size="large" fix v-if="loading"></Spin>
     </div>
   </div>
 </template>