Merge branch 'feature_05210' into feature/20200514_version

src/pages/recruit/CheckList.vue

@@ -315,7 +315,7 @@ export default {
           title: "提交时间",
           width: 120,
           render: (h, params) => {
-            return h("span", formatDate(params.row.joinTime));
+            return h("span", params.row.joinTime);
           }
         },
         {
@@ -397,14 +397,14 @@ export default {
           title: "提交时间",
           width: 120,
           render: (h, params) => {
-            return h("span", formatDate(params.row.joinTime));
+            return h("span", params.row.joinTime);
           }
         },
         {
           title: "审核时间",
           width: 120,
           render: (h, params) => {
-            return h("span", formatDate(params.row.updateTime));
+            return h("span", params.row.updateTime);
           }
         }
       ],
@@ -482,14 +482,14 @@ export default {
           title: "提交时间",
           width: 120,
           render: (h, params) => {
-            return h("span", formatDate(params.row.joinTime));
+            return h("span", params.row.joinTime);
           }
         },
         {
           title: "审核时间",
           width: 120,
           render: (h, params) => {
-            return h("span", formatDate(params.row.updateTime));
+            return h("span", params.row.updateTime);
           }
         },
         {

src/pages/recruit/PromoterList.vue

@@ -234,7 +234,7 @@ export default {
           key: 'submitDate',
           width: 120,
           render: (h, params) => {
-            return h('span', formatDate(params.row.joinTime));
+            return h('span', params.row.joinTime);
           }
         },
         {

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