Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/views/mallManagement/setActivity/index.vue

@@ -545,6 +545,9 @@ export default {
           }
         },
         createActivity: {
+          conditions: ({ row, index, column }) => {
+            return !!~[0, 2].indexOf(row.status) || !!~['待生效','生效中'].indexOf(row.statusText)
+          },
           click: ({ row, index, column }) => {
             this.$router.push({
               name: "activityOrder",