Merge remote-tracking branch 'base/feature_0521' into feature_05210

活动池页面优化
1 changed files with 3 additions and 1 deletions
--- a/src/pages/shop/IncreaseWelcomeEdit.vue
+++ b/src/pages/shop/IncreaseWelcomeEdit.vue
@ -283,7 +283,9 @@ export default {
          instanceId
        },
        res => {
-          _this.welcome = res.data.results;
+          let data = res.data.results || {};
          data.params = data.params || [];
          _this.welcome = data;
          store.commit("SET_useData", {
            ...store.getters.useData,
            ...this.welcome
Author	SHA1	Message	Date
cuijie	05e96e97a9	Merge remote-tracking branch 'base/feature_0521' into feature_05210	6 years ago
cuijie	631c48c13f	活动池页面优化	6 years ago