Merge branch 'dev4.6.1.8' of http://192.168.3.207:8080/qmx/jy into dev4.6.1.8

src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -645,13 +645,23 @@
         } else {
           document.title = '完善信息'
         }
+
         if (source == 'bid_document_Introduction_page') {
           var hideType = ['email', 'class', 'companyType', 'workScope', 'partnerNeeds', 'agree']
           for (var k in this.moduleShow) {
-            if (hideType.indexOf(k) !== -1)
+            if (hideType.indexOf(k) !== -1) {
+              this.moduleShow[k] = false
+            }
+          }
+        } else if (source === 'doubleEleven') {
+          var hideType = ['area', 'class', 'companyType', 'workScope', 'partnerNeeds', 'agree']
+          for (var k in this.moduleShow) {
+            if (hideType.indexOf(k) !== -1) {
               this.moduleShow[k] = false
+            }
           }
         }
+
         return infoText || ''
       },
       getPopHeight () {
@@ -1124,7 +1134,11 @@
                   location.replace(sessionData.url)
                 } else {
                   sessionStorage.setItem('salesBackStatus', 'true')
-                  history.back()
+                  if (r.url) {
+                    location.replace(r.url)
+                  } else {
+                    history.back()
+                  }
                 }
               }
             } else {