Merge branch 'dev-majunjie' into dev

components/header.vue

@@ -159,15 +159,6 @@
                 </div>
               </a>
             </el-dropdown-item>
-            <el-dropdown-item>
-              <a class="more-item fuwu-item" @click="cnzz('导航栏目','开源充电','')" :href="`${baseUrl}/opensource/?from=top_nav`">
-                <img src="@/assets/img/header/new/fuwu4@2x.png" alt="开源充电" >
-                <div class="text">
-                  <span class="big">开源充电</span>
-                  <span class="small">程序员开源社区</span>
-                </div>
-              </a>
-            </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
 
@@ -222,7 +213,7 @@
 
       </div>
       <div class="header-right">
-         
+
         <div @click="goToCompanyHome" v-if="isCompanyAccount || !myInfo.nickname" class="nav-button nav-button-type1">
           发布需求
         </div>
@@ -440,13 +431,13 @@
           <a
             class="account-ctrl"
              style="margin-left: 20px;margin-right:35px;"
-            
+
             @click="cnzz('导航栏目','注册','')"
             :href="baseUrl + '/user/register'"
             >注册</a
           >
           <a class="account-ctrl" @click="cnzz('导航栏目','登录','')" style="margin-right:37px;" :href="loginUrl">登录</a>
-          
+
         </div>
       </div>
     </div>
@@ -583,7 +574,7 @@ export default {
       if(this.myInfo.nickname){
         location.href = "/frontend/requirements"
       }else{
-        location.href = this.loginUrl 
+        location.href = this.loginUrl
       }
     },
     goToPersonalHome(){
@@ -592,7 +583,7 @@ export default {
       if(this.myInfo.nickname){
 
       }else{
-        location.href = this.loginUrl 
+        location.href = this.loginUrl
       }
     },
     async clickQuit() {
@@ -963,7 +954,7 @@ font-weight: 400;
 }
 .more-dropdown {
   padding:0 20px;
-  
+
 }
 .el-icon-search {
   position: absolute;
@@ -1189,7 +1180,7 @@ span.other-icon {
 .account-change{
   color: #308EFF;
   font-size: 14px;
-  
+
 }
 
 #proginn-header a {
@@ -1242,7 +1233,7 @@ span.other-icon {
   margin-right:14px;
 }
 .nav-button-type2{
-  
+
   background: #FF7640;
   border-radius: 2px;
   margin-right:20px;

pages/frontend/requirements/components/Form_recommend.vue

@@ -86,7 +86,7 @@
                 <div class="recommend-submit-btn" @click="submit">确认选择</div>
                 <div class="recommend-submit-btn pass">
                     <span>跳过选择</span>
-                    <span class="recommend-submit-btn-tips">客户经理为您选择</span>
+                    <span @click="close" class="recommend-submit-btn-tips">客户经理为您选择</span>
                 </div>
             </div>
         </div>
@@ -186,7 +186,7 @@ export default {
                 )
                 .then((res) => {
                     if (res.status == 1) {
-
+                        this.close();
                     } else {
                         this.$message.error(res.info)
                     }

pages/frontend/requirements/index.vue

@@ -93,7 +93,7 @@ export default {
             // wait process finish
             activeStatus: "wait",
 
-            projectid: ""
+            projectid: "",
         };
     },
     head() {
@@ -256,7 +256,14 @@ export default {
         if (query.type == 1 && query.step == 3 && query.projectid) {
             this.projectid = query.projectid
             this.$nextTick(() => {
-                this.$refs['FormRecomment'].show()
+                if(query.show)
+                {
+                  this.$refs['FormRecomment'].show();
+                }
+                else
+                {
+                  this.$refs['FormRecomment'].hide();
+                }
             })
         }
         this.baseUrl = this.$store.state.domainConfig.siteUrl;
@@ -266,6 +273,7 @@ export default {
         formSubmit(step, data) {
             this.checkLogin(true);
             let query = {};
+            query["show"]=false;
             if (step == 1) {
                 this.type = data;
                 query["type"] = this.type;
@@ -274,6 +282,10 @@ export default {
                 query["projectid"] = data;
                 query["type"] = this.type;
             }
+            if(step==3)
+            {
+              query["show"]=true;
+            }
             // 进入下一步
             step++;
             this.active = step;