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

src/web/staticres/js/pc-collect-user-info.js

@@ -219,7 +219,7 @@ var vm = new Vue({
       }
     }
     var validEmail = function(rule,value,callback) {
-      var status = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(value)
+      var status = /\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)
       if (value === '') {
         return callback(new Error('邮箱为必填项'));
       } else {
@@ -446,7 +446,7 @@ var vm = new Vue({
         // hireType: this.form.mold, // 受雇类型值
         company: this.form.companyName, // 公司名称
         companyType: this.form.companyType.join(','), 
-        position: this.form.job == '其他' ? this.form.otherJob : this.form.job, 
+        position: this.form.job == '其他' ? ('其他/' + this.form.otherJob) : this.form.job,
         // company_size: this.form.scale,
         workScope: this.form.business,
         partnerNeeds: this.form.need, 
@@ -511,7 +511,7 @@ var vm = new Vue({
             if (res.data.position) {
               if (jobJson.indexOf(res.data.position) == -1) {
                 _this.form.job = '其他'
-                _this.form.otherJob = res.data.position
+                _this.form.otherJob = res.data.position.replace('其他/', '')
               } else {
                 _this.form.job = res.data.position
               }

src/web/templates/pc/biddetail_rec.html

@@ -2209,7 +2209,7 @@ $(function(){
     //企业画像跳转
 	$(".portrait_img").hover(function (){
 		if (!$(this).next().hasClass("portrait_tip")){
-			var tipMsg=$(this).attr("tip-data");
+			var tipMsg=$(this).attr("tip-data") || $(this).parents('.tab-cont').children('.cont-cont.portrait_img').attr("tip-data");
 			if (!tipMsg){
 				tipMsg="暂无画像数据"
 			}