Merge branch 'dev-majunjie' into dev

pages/frontend/requirements/components/Form_recommend.vue

@@ -102,11 +102,16 @@ export default {
             firstUser: {},
             secondUser: {},
             recommend: {},
-            isShow: true,
+            isShow: false,
+        }
+    },
+    watch: {
+        'projectid': function () {
+            this.fetchData()
         }
     },
     mounted() {
-        this.fetchData()
+
     },
     computed: {
         RateUser() {
@@ -157,8 +162,11 @@ export default {
         close() {
             this.isShow = false
         },
+        show() {
+            this.isShow = true
+        },
         submit() {
-            if(!this.firstUser.uid && !this.secondUser.uid){
+            if (!this.firstUser.uid && !this.secondUser.uid) {
                 this.$message.error("请选择开发者")
                 return
             }

pages/frontend/requirements/components/Form_yunduan.vue

@@ -332,7 +332,6 @@ export default {
                 .then(res => {
                     // console.log(res)
                     let aa = cityDataParse(res.data.list);
-                    console.log(aa)
                     this.cityData = [...aa]
                 })
         },

pages/frontend/requirements/index.vue

@@ -46,7 +46,7 @@
         <FormYunDuan v-if="isFormYunDuanShow" v-on:formChange="formChange" v-on:formSubmit="formSubmit"></FormYunDuan>
         <StepEnd v-if="isStepEndShow"></StepEnd>
 
-        <FormRecomment v-if="isShowFormRecomment" :projectid="projectid"></FormRecomment>
+        <FormRecomment ref="FormRecomment"  :projectid="projectid"></FormRecomment>
     </div>
 </div>
 </template>
@@ -93,7 +93,6 @@ export default {
             // wait process finish
             activeStatus: "wait",
 
-            isShowFormRecomment: false,
             projectid: ""
         };
     },
@@ -231,6 +230,14 @@ export default {
             } else {
                 this.type = 0;
             }
+
+            if (val.type == 1 && val.step == 3 && val.projectid) {
+                this.projectid = val.projectid
+                this.$nextTick(() => {
+                    this.$refs['FormRecomment'].show()
+                })
+            }
+
             this.activeStatus = "wait";
         }
     },
@@ -246,10 +253,11 @@ export default {
         } else {
             this.type = 0;
         }
-
         if (query.type == 1 && query.step == 3 && query.projectid) {
-            this.isShowFormRecomment = true
             this.projectid = query.projectid
+            this.$nextTick(() => {
+                this.$refs['FormRecomment'].show()
+            })
         }
         this.baseUrl = this.$store.state.domainConfig.siteUrl;
         this.isWeixinApp = navigator.userAgent.indexOf("miniProgram") > -1;