Merge branch 'master' into dev-cym

src/views/AIDesign/result.vue

@@ -546,11 +546,12 @@ export default class extends Vue {
     let that = this;
     // 实现重新生成逻辑
     const F_ID = this.$route.query.F_id || "";
+    let projectId = this.allRes.WecomType == 2 && that.projectId ? that.projectId : null;
     this.$router.push({
       path: this.designPageApi[this.wallType],
       query: {
         F_id: F_ID,
-        projectId: that.projectId
+        projectId
       }
     });
   }