merge master

src/assets/js/httpApi.js

@@ -566,7 +566,7 @@ var reqApis = function(){
 				Dict: {
 					baseInfo: {
 						"companyName": {name:"企业名称", must:true },
-						"incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
+						// "incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
 						"technicalField": {name:"所属技术领域", must:true, 'type':'select', key:'name', },
 
 						"entryDate": {
@@ -623,7 +623,7 @@ var reqApis = function(){
 											// 添加标记
 											cmap.addMarker({
 												lnglat: [lnglat.lng, lnglat.lat],
-												title: '',
+												title: '', 
 												draggable: true,
 												dragend: function (e) {
 													var lnglat = e.lnglat;
@@ -855,7 +855,7 @@ var reqApis = function(){
 							}
 						},
 						{
-							type: 'primary', icon: 'el-icon-folder-add', name: '导入企业经营信息', showYN: !Tools.isHighTech(), 'callback':function(){
+							type: 'primary', icon: 'el-icon-folder-add', name: '导入企业经营信息', 'callback':function(){
 								var m = this;
 								m.uploadView = qf.UI.popWindow({
 									cover:true,
@@ -1160,7 +1160,7 @@ var reqApis = function(){
 				Dict: {
 					baseInfo: {
 						"mentorName": {name:"导师姓名", must:true},
-						"incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
+						// "incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
 						"education": {name:"学历", must:true },
 						"graduationSchool": {name:"毕业学校",  },
 						"contactPhone": {name:"联系电话",  },