فهرست منبع

删除console

zhengkaixin 3 سال پیش
والد
کامیت
570e31e377
13فایلهای تغییر یافته به همراه673 افزوده شده و 792 حذف شده
  1. 1 1
      .env.js
  2. 2 3
      main.js
  3. 1 2
      pages/friend/personal.vue
  4. 1 2
      pages/index/main.vue
  5. 110 198
      pages/user/edit.vue
  6. 33 44
      pages/user/index.vue
  7. 3 3
      pages/user/logout.vue
  8. 1 5
      pages/user/message.vue
  9. 98 98
      pagesB/pages/login/step1.vue
  10. 282 282
      pagesB/pages/login/step2.vue
  11. 137 137
      pagesB/pages/login/step3.vue
  12. 2 7
      pagesB/pages/login/step4.vue
  13. 2 10
      utils/init.js

+ 1 - 1
.env.js

@@ -3,7 +3,7 @@
     let ENV_VAR = null;  
 	 
 	var NODE_NAME=  process.env['NODE_NAME']
-	console.log(NODE_NAME)
+ 
     if (process.env.NODE_ENV === "development") {  
 
         if (NODE_ENV === 'dev') {  

+ 2 - 3
main.js

@@ -8,12 +8,11 @@ getOpenId.init()
 
 import  mixin from './utils/mixin.js'
 
-Vue.config.ignoredElements.push("wx-open-subscribe") ;
-Vue.prototype.carhelp=mixin 
+ Vue.prototype.carhelp=mixin 
 
 // import Vconsole from 'vconsole'
 //  //import './router' // 引入路由
-import router from './bobo-router'
+//import router from './bobo-router'
 
 
 // main.js

+ 1 - 2
pages/friend/personal.vue

@@ -314,8 +314,7 @@
 				}
 		},
 		onLoad(op) {	
-			console.log('op'+JSON.stringify(op))
-			if(op.id){
+ 			if(op.id){
 				this.id =op.id;
 			}
 			

+ 1 - 2
pages/index/main.vue

@@ -49,7 +49,7 @@
 			findByOpenId(){
 				var openId=this.carhelp.getOpenId()
 				if(openId==""){
-					console.log("------------------")
+					console.log("--------findByOpenId----------")
 					setTimeout(()=>{
 						this.findByOpenId()
 					},1000)
@@ -66,7 +66,6 @@
 						'X-Requested-With': 'XMLHttpRequest',
 					}
 				}).then((response) => {
-					console.log('findByOpenId')
 					let [error, res] = response;
 					
 					//var backImg="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"

+ 110 - 198
pages/user/edit.vue

@@ -480,12 +480,8 @@
 			_self = this;
 
 			_self.getOrgNameList(true);
-			//			console.log('省'+JSON.stringify(provinceData))
-
-			//let personalInfoPlus = this.carhelp.getPersonInfoPlus();
-			//console.log('personalInfoPlus'+JSON.stringify(personalInfoPlus))
 			this.personal_info = this.carhelp.getPersonInfo();
-			//			console.log('个人信息'+JSON.stringify(this.personal_info))
+			//			//('个人信息'+JSON.stringify(this.personal_info))
 			let subject = {
 				subject: ''
 			}
@@ -495,7 +491,7 @@
 			})
 			loginApi.getBaseDictionary(subject).then(function(data) {
 				uni.hideLoading();
-				//console.log('基础字典'+JSON.stringify(data));
+				////('基础字典'+JSON.stringify(data));
 				let personal_info = _self.carhelp.getPersonInfo();
 				if (data.data) {
 					_self.base_dictionary = data.data;
@@ -520,7 +516,7 @@
 						}*/
 					}
 
-					//console.log('住房情况'+JSON.stringify(_self.base_dictionary.zfqkList));
+					////('住房情况'+JSON.stringify(_self.base_dictionary.zfqkList));
 					if (_self.base_dictionary.yxList) {
 
 						for (let i = 0; i < _self.base_dictionary.yxList.length; i++) {
@@ -544,19 +540,10 @@
 								_self.personal_info.taIncomeRange = _self.base_dictionary.yxList[index].value;
 							}
 						}
-						/*
-						if(_self.personal_info.salaryRange!=null && _self.personal_info.salaryRange<= _self.base_dictionary.yxList.length)
-						{
-							_self.personal_info.salaryRangeN =_self.base_dictionary.yxList[_self.personal_info.salaryRange-1].label						
-						}
-						if(_self.personal_info.taIncomeRange!=null && _self.personal_info.taIncomeRange<= _self.base_dictionary.yxList.length)
-						{
-							_self.personal_info.taIncomeRangeN =_self.base_dictionary.yxList[_self.personal_info.taIncomeRange-1].label						
-						}*/
+					 
 					}
 
-					//console.log('月薪情况'+JSON.stringify(_self.base_dictionary.yxList));
-					if (_self.base_dictionary.znqkList) {
+ 					if (_self.base_dictionary.znqkList) {
 
 						for (let i = 0; i < _self.base_dictionary.znqkList.length; i++) {
 							_self.base_dictionary.znqkList[i].label = _self.base_dictionary.znqkList[i].name;
@@ -570,23 +557,9 @@
 								_self.personal_info.childStatus = _self.base_dictionary.znqkList[index].value;
 							}
 						}
-						/*
-						if(_self.personal_info.childStatus!=null && _self.personal_info.childStatus<= _self.base_dictionary.znqkList.length)
-						{
-							_self.personal_info.childStatusN =_self.base_dictionary.znqkList[_self.personal_info.childStatus-1].label						
-						}*/
+					
 					}
-					//console.log('子女情况'+JSON.stringify(_self.base_dictionary.znqkList));
-					/*
-					if(_self.base_dictionary.qyList){ 
-						
-						for(let i = 0;i< _self.base_dictionary.qyList.length;i++)
-						{
-							_self.base_dictionary.qyList[i].label = _self.base_dictionary.qyList[i].name;
-						}
-					}
-					console.log('区域'+JSON.stringify(_self.base_dictionary.qyList));
-					*/
+				
 					if (_self.base_dictionary.xlList) {
 
 						for (let i = 0; i < _self.base_dictionary.xlList.length; i++) {
@@ -611,20 +584,9 @@
 								_self.personal_info.taEdu = _self.base_dictionary.xlList[index].value;
 							}
 						}
-						//console.log('学历'+JSON.stringify(_self.base_dictionary.xlList.length))
-						/*						if(_self.personal_info.education!=null && _self.personal_info.education <= _self.base_dictionary.xlList.length)
-												{
-													//console.log('学历'+JSON.stringify(_self.personal_info.education))
-													_self.personal_info.educationN =_self.base_dictionary.xlList[Number(_self.personal_info.education)-1].label						
-													_self.defaultData.education = [Number(_self.personal_info.education)-1]
-												}
-												if(_self.personal_info.taEdu!=null && _self.personal_info.taEdu<= _self.base_dictionary.xlList.length)
-												{
-													_self.personal_info.taEduN =_self.base_dictionary.xlList[_self.personal_info.taEdu-1].label						
-												}*/
+			 
 					}
-					//console.log('学历情况'+JSON.stringify(_self.base_dictionary.xlList));
-
+ 
 					if (_self.base_dictionary.hyList) {
 
 						for (let i = 0; i < _self.base_dictionary.hyList.length; i++) {
@@ -646,7 +608,7 @@
 						}*/
 
 					}
-					//					console.log('行业情况'+JSON.stringify(_self.base_dictionary.hyList));
+					//					//('行业情况'+JSON.stringify(_self.base_dictionary.hyList));
 					if (_self.base_dictionary.nlfwList) {
 
 						for (let i = 0; i < _self.base_dictionary.nlfwList.length; i++) {
@@ -667,7 +629,7 @@
 							_self.personal_info.taAgeRangeN =_self.base_dictionary.nlfwList[_self.personal_info.taAgeRange-1].label						
 						}*/
 					}
-					//console.log('年龄范围'+JSON.stringify(_self.base_dictionary.nlfwList));
+					////('年龄范围'+JSON.stringify(_self.base_dictionary.nlfwList));
 					if (_self.base_dictionary.hyqkList) {
 
 						for (let i = 0; i < _self.base_dictionary.hyqkList.length; i++) {
@@ -688,7 +650,7 @@
 							_self.personal_info.maritalStatusN =_self.base_dictionary.hyqkList[_self.personal_info.maritalStatus-1].label						
 						}*/
 					}
-					//console.log('婚姻情况'+JSON.stringify(_self.base_dictionary.hyqkList));
+					////('婚姻情况'+JSON.stringify(_self.base_dictionary.hyqkList));
 					if (_self.base_dictionary.hobbyInfoList) {
 
 						for (let i = 0; i < _self.base_dictionary.hobbyInfoList.length; i++) {
@@ -696,19 +658,19 @@
 							_self.base_dictionary.hobbyInfoList[i].label = _self.base_dictionary.hobbyInfoList[i]
 								.name;
 							if (_self.personal_info.hobby != null) {
-								//								console.log('hobby'+JSON.stringify(_self.personal_info.hobby))
+								//								//('hobby'+JSON.stringify(_self.personal_info.hobby))
 								if (_self.personal_info.hobby.indexOf(_self.base_dictionary.hobbyInfoList[i].id) >=
 									0) {
 									_self.base_dictionary.hobbyInfoList[i].isMemberSelect = true;
-									//									console.log('选中'+JSON.stringify(_self.base_dictionary.hobbyInfoList[i]))
+									//									//('选中'+JSON.stringify(_self.base_dictionary.hobbyInfoList[i]))
 								}
 							}
 						}
 					}
-					//					console.log('兴趣爱好'+JSON.stringify(_self.base_dictionary.hobbyInfoList));
+					//					//('兴趣爱好'+JSON.stringify(_self.base_dictionary.hobbyInfoList));
 					if (_self.personal_info.birthplace != null) {
 						_self.personal_info.birthplaceN = getCityData(Number(_self.personal_info.birthplace));
-						//						console.log('address'+JSON.stringify(_self.form.addressId))
+						//						//('address'+JSON.stringify(_self.form.addressId))
 					}
 					if (_self.personal_info.registeredResidence != null) {
 						_self.personal_info.registeredResidenceN = getCityData(Number(_self.personal_info
@@ -724,9 +686,9 @@
 					}
 				}
 				_self.personalInfoChange = Object.assign({}, _self.personal_info);
-				console.log(_self.personalInfoChange)
+				//(_self.personalInfoChange)
 			}, function(err) {
-				console.log('获取基础字典错误' + JSON.stringify(err))
+				//('获取基础字典错误' + JSON.stringify(err))
 				uni.hideLoading();
 			})
 
@@ -770,19 +732,19 @@
 				})
 				loginApi.getCityList().then(function(data) {
 					uni.hideLoading();
-					//					console.log('获取城市成功'+JSON.stringify(data));
+					//					//('获取城市成功'+JSON.stringify(data));
 					if (data.result && data.data) {
 						setCityData(data.data);
 						_self.init_city_data();
 
 						//_self.$refs.mpvuebirtydayCityPicker.setCityData(data.data);		
-						//console.log('province data '+JSON.stringify(provinceData))
+						////('province data '+JSON.stringify(provinceData))
 						if (_self.personal_info.birthplace != null) {
 							_self.personal_info.birthplaceN = getCityData(Number(_self.personal_info.birthplace));
 							_self.defaultData.address = getCityPosition(Number(_self.personal_info.birthplace));
 							//this.defaultData.registered_residence = this.defaultData.address;
 							//this.defaultData.work_address = this.defaultData.address;	//		
-							console.log('address' + JSON.stringify(_self.defaultData.address))
+							//('address' + JSON.stringify(_self.defaultData.address))
 						}
 						if (_self.personal_info.registeredResidence != null) {
 							_self.personal_info.registeredResidenceN = getCityData(Number(_self.personal_info
@@ -806,7 +768,7 @@
 					}
 
 				}, function(err) {
-					console.log('获取城市列表错误' + JSON.stringify(err))
+					//('获取城市列表错误' + JSON.stringify(err))
 					uni.hideLoading();
 				})
 			} else {
@@ -816,7 +778,7 @@
 					_self.defaultData.address = getCityPosition(Number(_self.personal_info.birthplace));
 					//this.defaultData.registered_residence = this.defaultData.address;
 					//this.defaultData.work_address = this.defaultData.address;	//		
-					console.log('address' + JSON.stringify(_self.defaultData.address))
+					//('address' + JSON.stringify(_self.defaultData.address))
 				}
 				if (_self.personal_info.registeredResidence != null) {
 					_self.personal_info.registeredResidenceN = getCityData(Number(_self.personal_info
@@ -838,13 +800,13 @@
 			//	_self.personalInfoChange =new  Object(_self.personal_info);
 
 			_self.personalInfoChange = Object.assign({}, _self.personal_info);
-			console.log(_self.personalInfoChange)
-			//			console.log('个人信息'+JSON.stringify(this.personal_info))
+			//(_self.personalInfoChange)
+			//			//('个人信息'+JSON.stringify(this.personal_info))
 		},
 		onShow() {
 			var item = this.carhelp.get("searchOrgItem")
 			if (item) {
-				console.log(item)
+				//(item)
 				this.personal_info.orgName = item.name;
 				this.personal_info.orgId = item.id;
 			}
@@ -912,7 +874,7 @@
 			saveSelfEvaluation() {
 				this.showSelfEvaluation = false;
 				this.personal_info.selfEvaluation = this.selfEvaluation;
-				console.log('自我评价' + JSON.stringify(this.selfEvaluation))
+				//('自我评价' + JSON.stringify(this.selfEvaluation))
 			},
 			saveTaOther() {
 				this.showTaOther = false;
@@ -926,7 +888,7 @@
 				}
 				this.showSelfEvaluation = true
 
-				console.log('editSelfEvaluation')
+				//('editSelfEvaluation')
 			},
 			editTaOther(){
 				if(this.personal_info.taOther!=null)
@@ -938,14 +900,14 @@
 				}
 				this.showTaOther = true
 
-				console.log('editTaOther')
+				//('editTaOther')
 			},
 			open() {
-				console.log('open');
+				//('open');
 			},
 			close() {
 				this.showSelfEvaluation = false
-				console.log('close');
+				//('close');
 			},
 			closeTaOther() {
 				this.showTaOther = false;
@@ -954,11 +916,11 @@
 				//				let interest = this.interests;
 				this.base_dictionary.hobbyInfoList[index].isMemberSelect = !this.base_dictionary.hobbyInfoList[index]
 					.isMemberSelect;
-				console.log('item' + JSON.stringify(this.base_dictionary.hobbyInfoList[index]))
+				//('item' + JSON.stringify(this.base_dictionary.hobbyInfoList[index]))
 			},
 			birthdayAddressChange() {
 				_self.show_birthday_address = true;
-				//				console.log('birthdayAddress change')
+				//				//('birthdayAddress change')
 				//				this.$refs.mpvuebirtydayCityPicker.show()
 			},
 			registeredResidenceAddressChange() {
@@ -974,7 +936,7 @@
 				//				this.$refs.mpvueTaWorkCityPicker.show()
 			},
 			onBirthdayCityConfirm(e) {
-				//				console.log('e'+JSON.stringify(e))
+				//				//('e'+JSON.stringify(e))
 				//this.defaultData.address = [this.base_dictionary.znqkList.findIndex(item => item.value === e[0].value)]
 				//this.defaultData.address = [17,1,1]
 				let province = e[0];
@@ -984,7 +946,7 @@
 				this.defaultData.address = getCityPosition(area.value);
 				this.defaultData.registered_residence = this.defaultData.address;
 				this.defaultData.work_address = this.defaultData.address;
-				//				console.log('address '+JSON.stringify(this.defaultData.address))
+				//				//('address '+JSON.stringify(this.defaultData.address))
 				this.personal_info.birthplaceN = '';
 				e.map((val, index) => {
 					// this.result += this.result == '' ? val.label : '-' + val.label;
@@ -999,7 +961,7 @@
 					_self.personal_info.workplaceN = _self.personal_info.birthplaceN;
 					_self.personal_info.workplace = _self.personal_info.birthplace;
 				})
-				//				console.log('地址选择'+JSON.stringify(_self.form.addressId))
+				//				//('地址选择'+JSON.stringify(_self.form.addressId))
 			},
 			onResidenceRegisteredCityConfirm(e) {
 				let province = e[0];
@@ -1007,7 +969,7 @@
 				let area = e[2];
 
 				this.defaultData.registered_residence = getCityPosition(area.value);
-				//				console.log('address '+JSON.stringify(this.defaultData.address))
+				//				//('address '+JSON.stringify(this.defaultData.address))
 				this.personal_info.registeredResidenceN = '';
 				e.map((val, index) => {
 					// this.result += this.result == '' ? val.label : '-' + val.label;
@@ -1023,7 +985,7 @@
 				let area = e[2];
 
 				this.defaultData.work_address = getCityPosition(area.value);
-				//				console.log('address '+JSON.stringify(this.defaultData.address))
+				//				//('address '+JSON.stringify(this.defaultData.address))
 				this.personal_info.workplaceN = '';
 				e.map((val, index) => {
 					// this.result += this.result == '' ? val.label : '-' + val.label;
@@ -1039,7 +1001,7 @@
 				let area = e[2];
 
 				this.defaultData.ta_work_address = getCityPosition(area.value);
-				//				console.log('address '+JSON.stringify(this.defaultData.address))
+				//				//('address '+JSON.stringify(this.defaultData.address))
 				this.personal_info.taWorkplaceN = '';
 				e.map((val, index) => {
 					// this.result += this.result == '' ? val.label : '-' + val.label;
@@ -1060,13 +1022,13 @@
 						this.personal_info.hobby += this.base_dictionary.hobbyInfoList[i].id;
 					}
 				}
-				// console.log(this.personalInfoChange)
-				// console.log(this.personal_info)
+				// //(this.personalInfoChange)
+				// //(this.personal_info)
 				for (var item in this.personal_info) {
 					if (this.personalInfoChange[item] != this.personal_info[item]) {
 						this.change = true;
-						// console.log(this.personalInfoChange[item])
-						// console.log(this.personal_info[item])
+						// //(this.personalInfoChange[item])
+						// //(this.personal_info[item])
 					}
 				}
 
@@ -1079,7 +1041,7 @@
 				}
 			},
 			confirm() {
-				console.log('确认保存')
+				//('确认保存')
 				let personal_info = {
 					type: 1,
 					id: this.personal_info.id
@@ -1087,7 +1049,7 @@
 				let _personal_info = this.personal_info;
 				if (_personal_info.faceImage) {
 					personal_info.faceImage = _personal_info.faceImage;
-					console.log('faceImage' + personal_info.faceImage)
+					//('faceImage' + personal_info.faceImage)
 				}
 				personal_info.hobby = ''
 				for (let i = 0; i < _self.base_dictionary.hobbyInfoList.length; i++) {
@@ -1100,186 +1062,186 @@
 				}
 				if (_personal_info.selfEvaluation) {
 					personal_info.selfEvaluation = _personal_info.selfEvaluation;
-					console.log('selfEvaluation' + personal_info.selfEvaluation);
+					//('selfEvaluation' + personal_info.selfEvaluation);
 				}
 				if (_personal_info.orgId) {
 					personal_info.orgId = _personal_info.orgId;
-					console.log('orgId' + personal_info.orgId)
+					//('orgId' + personal_info.orgId)
 				}
 				if (_personal_info.weight) {
 					personal_info.weight = _personal_info.weight;
-					console.log('weight' + personal_info.weight)
+					//('weight' + personal_info.weight)
 				}
 				if (_personal_info.height) {
 					personal_info.height = _personal_info.height;
-					console.log('height' + personal_info.height)
+					//('height' + personal_info.height)
 				}
 				if (_personal_info.education) {
 					personal_info.education = _personal_info.education;
-					console.log('education' + personal_info.education)
+					//('education' + personal_info.education)
 				}
 				/*
 				if(_personal_info.educationN)
 				{
 					personal_info.educationN = _personal_info.educationN;
-					console.log('education'+personal_info.educationN)
+					//('education'+personal_info.educationN)
 				} */
 				if (_personal_info.workUnit) {
 					personal_info.workUnit = _personal_info.workUnit;
-					console.log('workUnit' + personal_info.workUnit)
+					//('workUnit' + personal_info.workUnit)
 				}
 				if (_personal_info.post) {
 					personal_info.post = _personal_info.post;
-					console.log('post' + personal_info.post)
+					//('post' + personal_info.post)
 				}
 
 				if (_personal_info.industry) {
 					personal_info.industry = _personal_info.industry;
-					console.log('industry' + personal_info.industry)
+					//('industry' + personal_info.industry)
 				}
 				/*
 				if(_personal_info.industryN)
 				{
 					personal_info.industryN = _personal_info.industryN;
-					console.log('industryN'+personal_info.industryN)
+					//('industryN'+personal_info.industryN)
 				} */
 				if (_personal_info.salaryRange) {
 					personal_info.salaryRange = _personal_info.salaryRange;
-					console.log('salaryRange' + personal_info.salaryRange)
+					//('salaryRange' + personal_info.salaryRange)
 				}
 				/*
 				if(_personal_info.salaryRangeN)
 				{
 					personal_info.salaryRangeN = _personal_info.salaryRangeN;
-					console.log('salaryRangeN'+personal_info.salaryRangeN)
+					//('salaryRangeN'+personal_info.salaryRangeN)
 				} */
 				if (_personal_info.housingSituation) {
 					personal_info.housingSituation = _personal_info.housingSituation;
-					console.log('housingSituation' + personal_info.housingSituation)
+					//('housingSituation' + personal_info.housingSituation)
 				}
 				/*
 				if(_personal_info.housingSituationN)
 				{
 					personal_info.housingSituationN = _personal_info.housingSituationN;
-					console.log('housingSituationN'+personal_info.housingSituationN)
+					//('housingSituationN'+personal_info.housingSituationN)
 				} */
 
 				if (_personal_info.maritalStatus) {
 					personal_info.maritalStatus = _personal_info.maritalStatus;
-					console.log('maritalStatus' + personal_info.maritalStatus)
+					//('maritalStatus' + personal_info.maritalStatus)
 				}
 				/*
 				if(_personal_info.maritalStatusN)
 				{
 					personal_info.maritalStatusN = _personal_info.maritalStatusN;
-					console.log('maritalStatusN'+personal_info.maritalStatusN)
+					//('maritalStatusN'+personal_info.maritalStatusN)
 				} */
 				if (_personal_info.childStatus) {
 					personal_info.childStatus = _personal_info.childStatus;
-					console.log('childStatus' + personal_info.childStatus)
+					//('childStatus' + personal_info.childStatus)
 				}
 				/*
 				if(_personal_info.childStatusN)
 				{
 					personal_info.childStatusN = _personal_info.childStatusN;
-					console.log('childStatusN'+personal_info.childStatusN)
+					//('childStatusN'+personal_info.childStatusN)
 				} */
 				if (_personal_info.taIncomeRange) {
 					personal_info.taIncomeRange = _personal_info.taIncomeRange;
-					console.log('taIncomeRange' + personal_info.taIncomeRange)
+					//('taIncomeRange' + personal_info.taIncomeRange)
 				}
 				/*
 				if(_personal_info.taIncomeRangeN)
 				{
 					personal_info.taIncomeRangeN = _personal_info.taIncomeRangeN;
-					console.log('taIncomeRangeN'+personal_info.taIncomeRangeN)
+					//('taIncomeRangeN'+personal_info.taIncomeRangeN)
 				} */
 				if (_personal_info.birthplace) {
 					personal_info.birthplace = _personal_info.birthplace;
-					console.log('birthplace' + personal_info.birthplace)
+					//('birthplace' + personal_info.birthplace)
 				}
 				/*
 				if(_personal_info.birthplaceN)
 				{
 					personal_info.birthplaceN = _personal_info.birthplaceN;
-					console.log('birthplaceN'+personal_info.birthplaceN)
+					//('birthplaceN'+personal_info.birthplaceN)
 				} */
 				if (_personal_info.registeredResidence) {
 					personal_info.registeredResidence = _personal_info.registeredResidence;
-					console.log('registeredResidence' + personal_info.registeredResidence)
+					//('registeredResidence' + personal_info.registeredResidence)
 				}
 				/*
 				if(_personal_info.registeredResidenceN)
 				{
 					personal_info.registeredResidenceN = _personal_info.registeredResidenceN;
-					console.log('registeredResidenceN'+personal_info.registeredResidenceN)
+					//('registeredResidenceN'+personal_info.registeredResidenceN)
 				} */
 				if (_personal_info.workplace) {
 					personal_info.workplace = _personal_info.workplace;
-					console.log('workplace' + personal_info.workplace)
+					//('workplace' + personal_info.workplace)
 				}
 				/*
 				if(_personal_info.workplaceN)
 				{
 					personal_info.workplaceN = _personal_info.workplaceN;
-					console.log('workplaceN'+personal_info.workplaceN)
+					//('workplaceN'+personal_info.workplaceN)
 				} */
 
 				if (_personal_info.taWorkplace) {
 					personal_info.taWorkplace = _personal_info.taWorkplace;
-					console.log('taWorkplace' + personal_info.taWorkplace)
+					//('taWorkplace' + personal_info.taWorkplace)
 				}
 				/*
 				if(_personal_info.taWorkplaceN)
 				{
 					personal_info.taWorkplaceN = _personal_info.taWorkplaceN;
-					console.log('taWorkplaceN'+personal_info.taWorkplaceN)
+					//('taWorkplaceN'+personal_info.taWorkplaceN)
 				} */
 				if (_personal_info.taAgeRange) {
 					personal_info.taAgeRange = _personal_info.taAgeRange;
-					console.log('taAgeRange' + personal_info.taAgeRange)
+					//('taAgeRange' + personal_info.taAgeRange)
 				}
 				/*
 				if(_personal_info.taAgeRangeN)
 				{
 					personal_info.taAgeRangeN = _personal_info.taAgeRangeN;
-					console.log('taAgeRangeN'+personal_info.taAgeRangeN)
+					//('taAgeRangeN'+personal_info.taAgeRangeN)
 				} */
 				if (_personal_info.taEdu) {
 					personal_info.taEdu = _personal_info.taEdu;
-					console.log('taEdu' + personal_info.taEdu)
+					//('taEdu' + personal_info.taEdu)
 				}
 				/*
 				if(_personal_info.taEduN)
 				{
 					personal_info.taEduN = _personal_info.taEduN;
-					console.log('education'+personal_info.taEduN)
+					//('education'+personal_info.taEduN)
 				} */
 
 				if (_personal_info.taOccupation) {
 					personal_info.taOccupation = _personal_info.taOccupation;
-					console.log('taOccupation' + personal_info.taOccupation)
+					//('taOccupation' + personal_info.taOccupation)
 				}
 				/*
 				if(_personal_info.taOccupationN)
 				{
 					personal_info.taOccupationN = _personal_info.taOccupationN;
-					console.log('education'+personal_info.taOccupationN)
+					//('education'+personal_info.taOccupationN)
 				} */
 				if (_personal_info.taOther) {
 					personal_info.taOther = _personal_info.taOther;
-					console.log('taOther' + personal_info.taOther)
+					//('taOther' + personal_info.taOther)
 				}
 				/*
 				if(_personal_info.taOccupationN)
 				{
 					personal_info.taOccupationN = _personal_info.taOccupationN;
-					console.log('education'+personal_info.taOccupationN)
+					//('education'+personal_info.taOccupationN)
 				} */
-				console.log('xxxx')
+				//('xxxx')
 
 				loginApi.save_personal_info(personal_info).then((data) => {
-					console.log('保存成功' + JSON.stringify(data));
+					//('保存成功' + JSON.stringify(data));
 					if (data.result) {
 						if (data.data) {
 							_self.submitShow = false;
@@ -1309,7 +1271,7 @@
 
 			},
 			childrenConfirm(e) {
-				console.log('e' + JSON.stringify(e))
+				//('e' + JSON.stringify(e))
 				this.defaultData.children_status = [this.base_dictionary.znqkList.findIndex(item => item.value === e[0]
 					.value)]
 
@@ -1322,7 +1284,7 @@
 				})
 			},
 			marriageConfirm(e) {
-				console.log('e' + JSON.stringify(e))
+				//('e' + JSON.stringify(e))
 				this.defaultData.marriage_status = [this.base_dictionary.hyqkList.findIndex(item => item.value === e[0]
 					.value)]
 
@@ -1330,13 +1292,13 @@
 				e.map((val, index) => {
 					// this.result += this.result == '' ? val.label : '-' + val.label;
 					let result = val.label
-					console.log('val' + JSON.stringify(val))
+					//('val' + JSON.stringify(val))
 					_self.personal_info.maritalStatus = val.value;
 					this.personal_info.maritalStatusN += result;
 				})
 			},
 			houseConfirm(e) {
-				console.log('e' + JSON.stringify(e))
+				//('e' + JSON.stringify(e))
 				this.defaultData.house_status = [this.base_dictionary.zfqkList.findIndex(item => item.value === e[0]
 					.value)]
 
@@ -1349,7 +1311,7 @@
 				})
 			},
 			orgNameConfirm(e) {
-				console.log('e' + JSON.stringify(e))
+				//('e' + JSON.stringify(e))
 				this.defaultData.orgId = [this.orgNameList.findIndex(item => item.value === e[0].value)]
 
 				this.personal_info.orgName = '';
@@ -1361,7 +1323,7 @@
 				})
 			},
 			educationConfirm(e) {
-				console.log('e' + JSON.stringify(e))
+				//('e' + JSON.stringify(e))
 				this.defaultData.education = [this.base_dictionary.xlList.findIndex(item => item.value === e[0].value)]
 
 				this.personal_info.educationN = '';
@@ -1373,7 +1335,7 @@
 				})
 			},
 			professionConfirm(e) {
-				console.log('e' + JSON.stringify(e))
+				//('e' + JSON.stringify(e))
 				this.defaultData.profession = [this.base_dictionary.hyList.findIndex(item => item.value === e[0].value)]
 
 				this.personal_info.industryN = '';
@@ -1385,7 +1347,7 @@
 				})
 			},
 			salaryConfirm(e) {
-				console.log('e' + JSON.stringify(e))
+				//('e' + JSON.stringify(e))
 				this.defaultData.salary_range = [this.base_dictionary.yxList.findIndex(item => item.value === e[0].value)]
 
 				this.personal_info.salaryRangeN = '';
@@ -1397,27 +1359,27 @@
 				})
 			},
 			taSalaryRangeConfirm(e) {
-				console.log('e111' + JSON.stringify(e))
+				//('e111' + JSON.stringify(e))
 				this.defaultData.ta_salary_range = [this.base_dictionary.yxList.findIndex(item => item.value === e[0]
 					.value)]
 
 				this.personal_info.taIncomeRangeN = '';
 				e.map((val, index) => {
 					// this.result += this.result == '' ? val.label : '-' + val.label;
-					console.log('val' + val + 'index ' + index)
+					//('val' + val + 'index ' + index)
 					let result = val.label
 					_self.personal_info.taIncomeRange = val.value;
 					_self.personal_info.taIncomeRangeN += result;
 				})
 			},
 			taAgeRangeConfirm(e) {
-				console.log('e' + JSON.stringify(e))
+				//('e' + JSON.stringify(e))
 				this.defaultData.ta_age_range = [this.base_dictionary.nlfwList.findIndex(item => item.value === e[0]
 					.value)]
 
 				this.personal_info.taAgeRangeN = '';
 				e.map((val, index) => {
-					console.log('val' + val + 'index ' + index)
+					//('val' + val + 'index ' + index)
 					// this.result += this.result == '' ? val.label : '-' + val.label;
 					let result = val.label
 					_self.personal_info.taAgeRange = val.value;
@@ -1425,66 +1387,21 @@
 				})
 			},
 			taEducationConfirm(e) {
-				console.log('e' + JSON.stringify(e))
+				//('e' + JSON.stringify(e))
 				this.defaultData.ta_education = [this.base_dictionary.xlList.findIndex(item => item.value === e[0].value)]
 
 				this.personal_info.taEduN = '';
 				e.map((val, index) => {
-					console.log('val' + val + 'index ' + index)
+					//('val' + val + 'index ' + index)
 					// this.result += this.result == '' ? val.label : '-' + val.label;
 					let result = val.label
 					_self.personal_info.taEdu = val.value;
 					_self.personal_info.taEduN += result;
 				})
 			},
-			/*
-			educationSelect(e) {
-				this.personal_info.education = e.value;
-				this.personal_info.educationN = e.name;
-				//this.$refs.uForm.validateField('personal_info.education')
-			},
-			salarySelect(e) {
-				this.personal_info.salaryRange = e.value;
-				this.personal_info.salaryRangeN = e.name;
-				//this.$refs.uForm.validateField('personal_info.salaryRange')
-			},
-			professionSelect(e) {
-				this.personal_info.industry = e.value;
-				this.personal_info.industryN = e.name;
-				//this.$refs.uForm.validateField('personal_info.industry')
-			},
-			houseSelect(e) {
-				this.personal_info.housingSituation = e.value;
-				this.personal_info.housingSituationN = e.name;
-				//this.$refs.uForm.validateField('personal_info.housingSituation')
-			},   
-			childrenSelect(e) {
-				this.personal_info.childStatus = e.value;
-				this.personal_info.childStatusN = e.name;
-				//this.$refs.uForm.validateField('personal_info.childStatus')
-			},   
-			marriageSelect(e) {
-				this.personal_info.maritalStatus = e.value;
-				this.personal_info.maritalStatusN = e.name;
-				//this.$refs.uForm.validateField('personal_info.maritalStatus')
-			},  
-			taAgeRangeSelect(e) {
-				this.personal_info.taAgeRange = e.value;
-				this.personal_info.taAgeRangeN = e.name;
-				//this.$refs.uForm.validateField('personal_info.taAgeRange')
-			},   
-			taEducationSelect(e) {
-				this.personal_info.taEdu = e.value;
-				this.personal_info.taEduN = e.name;
-				//this.$refs.uForm.validateField('personal_info.taEdu')
-			},   
-			taSalarySelect(e) {
-				this.personal_info.taIncomeRange = e.value;
-				this.personal_info.taIncomeRangeN = e.name;
-				//this.$refs.uForm.validateField('personal_info.taIncomeRange')
-			},*/
+			 
 			heightConfirm(e) {
-				console.log('e' + JSON.stringify(e))
+				//('e' + JSON.stringify(e))
 				this.defaultData.height = [this.height_ranges.findIndex(item => item.value === e[0].value)]
 				this.form.height = '';
 				e.map((val, index) => {
@@ -1495,7 +1412,7 @@
 				})
 			},
 			weightConfirm(e) {
-				console.log('e' + JSON.stringify(e))
+				//('e' + JSON.stringify(e))
 				this.defaultData.weight = [this.weight_ranges.findIndex(item => item.value === e[0].value)]
 				this.form.weight = '';
 				e.map((val, index) => {
@@ -1508,8 +1425,8 @@
 			uploadPhoto() {
 				// 上传图片
 				//const ctx = uni.createCanvasContext('myCanvas');
-				//console.log('url'+this.uploadUrl)
-				//console.log(this.carhelp.getToken())
+				////('url'+this.uploadUrl)
+				////(this.carhelp.getToken())
 				let _this = this;
 				uni.chooseImage({
 					count: 1, //默认9
@@ -1517,11 +1434,11 @@
 					sourceType: ['album', 'camera'], //从相册选择
 					success: (res) => {
 						let imgFile = res.tempFilePaths;
-						console.log(process.car.BASE_URL + "mobile/member/uploadBase64")
-						console.log(imgFile)
-						console.log(process.car.NODE_ENV)
+						//(process.car.BASE_URL + "mobile/member/uploadBase64")
+						//(imgFile)
+						//(process.car.NODE_ENV)
 
-						console.log()
+						//()
 						var token = this.carhelp.getToken()
 						for (let i = 0; i < imgFile.length; i++) {
 
@@ -1531,14 +1448,9 @@
 								// url:process.car.BASE_URL+"mobile/member/uploadBase64",
 								name: 'photoFile',
 								header: {
-
-									//   'appId': process.car.VUE_APP_WXAPPID ,
-
+ 
 									'Authorization': token,
-
-									//   'openId': "wxa8954f417fa7c32f" ,
-
-
+ 
 									'accept': 'application/json',
 									//#ifdef MP-WEIXIN
 									"Content-Type": "multipart/form-data", //记得设置
@@ -1566,7 +1478,7 @@
 			findByOpenId() {
 				var openId = this.carhelp.getOpenId()
 				if (openId == "") {
-					console.log("------------------")
+					//("------------------")
 					setTimeout(() => {
 						this.findByOpenId()
 					}, 1000)
@@ -1583,7 +1495,7 @@
 						'X-Requested-With': 'XMLHttpRequest',
 					}
 				}).then((response) => {
-					//					console.log('findByOpenId' +JSON.stringify(response))
+					//					//('findByOpenId' +JSON.stringify(response))
 					let [error, res] = response;
 
 					if (res.data.code == 200 && res.data.result) {

+ 33 - 44
pages/user/index.vue

@@ -143,29 +143,18 @@
 				});
 			},
 			change(status) {
-				console.log(status);
+			
 			},
 			updatePublicNot(e){
-				console.log('updatePublicNot'+JSON.stringify(_self.personalInfo.publicNot))
-				 
-				//_self.personalInfo.publicNot = !_self.personalInfo.publicNot;
-				console.log('publicNotx1 '+_self.personalInfo.publicNot)
 				let personal_info = {};
 				//personal_info.type = 1;
 				personal_info.subject = '';
 				personal_info.status = _self.personalInfo.publicNot?1:0;
-				console.log('publicNotx2 '+_self.personalInfo.publicNot)
-				
-				//let personalInfo = this.carhelp.getPersonInfo();
-				//personal_info.id = _self.personalInfo.id;
-				console.log('提交结果'+JSON.stringify(personal_info))
 				loginApi.changePublicNot(personal_info).then(function(data){
-					console.log('状态保存成功'+JSON.stringify(data));
-						
-					
+ 					
 				},function(err){
 					_self.personalInfo.publicNot = !_self.personalInfo.publicNot;
-					console.log('保存失败'+JSON.stringify(err));
+					console.log('保存失败');
 				});
 			},
 			changePhone(){
@@ -230,13 +219,13 @@
 			improvePersonalInfo(){
 				if(!_self.logined)
 					return;
-//				console.log('完善个人资料')
+
 				uni.navigateTo({
 					url: '../../pagesB/pages/login/step1'
 				})
 			},
 			findByOpenId(){
-				//console.log('findByOpenId')
+	 
 				var openId=this.carhelp.getOpenId()
 				if(openId==""){
 					console.log("------------------")
@@ -260,13 +249,13 @@
 						'X-Requested-With': 'XMLHttpRequest',
 					}
 				}).then((response) => {
-//					console.log('findByOpenId')
+//					 
 					let [error, res] = response;
-					console.log('res'+JSON.stringify(res))
+				 
 					if (res.data.code == 200 && res.data.result) {									 
 						var token = res ? res.data.data.token : '';			
-						//console.log('token'+JSON.stringify(token))
-						this.carhelp.setPersonInfo(res.data.data.memberInfo );
+ 
+						 this.carhelp.setPersonInfo(res.data.data.memberInfo );
 						this.carhelp.setToken(token);
 						this.carhelp.setPersonInfoPlus(res.data.data);
 						_self.logined = true; 
@@ -281,8 +270,8 @@
 			},
 			preparedPersonalData(){
 				let personalInfo = this.carhelp.getPersonInfo();
-				console.log('个人信息'+JSON.stringify(personalInfo));
-				this.personalInfo = personalInfo;
+ 
+				 this.personalInfo = personalInfo;
 				/*if(this.personalInfo.publicNot!=null){
 					this.checked = this.personalInfo.publicNot;
 				}*/
@@ -304,22 +293,22 @@
 					{
 						total_count++;
 						if(personal_info.birthday && personal_info.birthday.length>0){
-//							console.log('已填写birthday')
+//('已填写birthday')
 							count++;
 						}
 						total_count++;
 						if(personal_info.height != null){
-//							console.log('已填写height')
+//('已填写height')
 							count++;
 						}
 						total_count++;
 						if(personal_info.weight != null){
-//							console.log('已填写weight')
+//('已填写weight')
 							count++;
 						}
 						total_count++;
 						if(personal_info.gender != null){
-//							console.log('已填写gender')
+//('已填写gender')
 							count++;
 						}
 						
@@ -327,21 +316,21 @@
 						total_count++;
 						if(personal_info.birthplace && personal_info.birthplace.length>0)
 						{ 
-//							console.log('已填写birthplace')
+//('已填写birthplace')
 							count++;
 						}
 						//
 						total_count++;
 						if(personal_info.registeredResidence  && personal_info.registeredResidence .length>0)
 						{
-//							console.log('已填写birthday')
+//('已填写birthday')
 							count++;
 						}
 						///
 						total_count++;
 						if(personal_info.workplace && personal_info.workplace.length>0)
 						{ 
-//							console.log('已填写workplace')
+//('已填写workplace')
 							count++;
 						}
 						
@@ -354,92 +343,92 @@
 						total_count++;
 						if(personal_info.workUnit && personal_info.workUnit.length>0)
 						{ 
-//							console.log('已填写workUnit')
+//('已填写workUnit')
 							count++;
 						}
 						total_count++;
 						if(personal_info.post && personal_info.post.length>0)
 						{						 		
-//							console.log('已填写post')
+//('已填写post')
 							count++;
 						}
 						total_count++;
 						if(personal_info.industry && personal_info.industry.length>0)
 						{ 
-//							console.log('已填写industry')
+//('已填写industry')
 							count++;
 						}
 						total_count++;
 						if(personal_info.salaryRange && personal_info.salaryRange.length>0)
 						{ 
-//							console.log('已填写salaryRange')
+//('已填写salaryRange')
 							count++;
 						}
 						total_count++;
 						if(personal_info.housingSituation && personal_info.housingSituation.length>0)
 						{ 
-//							console.log('已填写housingSituation')
+//('已填写housingSituation')
 							count++;
 						}
 						total_count++;
 						if(personal_info.maritalStatus && personal_info.maritalStatus.length>0)
 						{ 
-//							console.log('已填写maritalStatus')
+//('已填写maritalStatus')
 							count++;
 						}
 						total_count++;
 						if(personal_info.childStatus && personal_info.childStatus.length>0)
 						{ 
-//							console.log('已填写childStatus')
+//('已填写childStatus')
 							count++;
 						}
 						total_count++;
 						if(personal_info.selfEvaluation  && personal_info.selfEvaluation .length>0)
 						{ 
-//							console.log('已填写selfEvaluation')
+//('已填写selfEvaluation')
 							count++;
 						}
 						total_count++;
 						if(personal_info.taAgeRange.length>0)
 						{ 
-//							console.log('已填写taAgeRange')
+//('已填写taAgeRange')
 							count++;
 						}
 						total_count++;
 						if(personal_info.taEdu && personal_info.taEdu.length>0)
 						{ 				
-//							console.log('已填写taEdu')
+//('已填写taEdu')
 							count++;
 						}
 						total_count++;
 						if(personal_info.taIncomeRange && personal_info.taIncomeRange.length>0)
 						{ 
-//							console.log('已填写taIncomeRange')
+//('已填写taIncomeRange')
 							count++;
 						}
 						///
 						total_count++;
 						if(personal_info.taWorkplace  && personal_info.taWorkplace .length>0)
 						{ 
-//							console.log('已填写taWorkplace')
+//('已填写taWorkplace')
 							count++;
 						}
 						
 						total_count++;
 						if(personal_info.taOccupation && personal_info.taOccupation.length>0)
 						{ 
-//							console.log('已填写taOccupation')
+//('已填写taOccupation')
 							count++;
 						}
 						total_count++;
 						if(personal_info.taOther && personal_info.taOther.length>0){ 
-//							console.log('已填写taOther')
+//('已填写taOther')
 							count++;
 						}
 						total_count++;
 						if(personal_info.faceImage && personal_info.faceImage.length>0)
 						{
-//							console.log('已填写faceImage')
+//('已填写faceImage')
 							count++;
 						}
 //						console.log('计数'+JSON.stringify(count))

+ 3 - 3
pages/user/logout.vue

@@ -48,16 +48,16 @@
 				let data = {subject:personalInfo.id};
 				
 				loginApi.logout(data).then(function(data){
-					console.log('注销成功'+JSON.stringify(data)); 
+					console.log('注销成功'); 
 					uni.switchTab({
 						url:'../index/index'
 					})
 				},function(err){
-					console.log('注销失败'+JSON.stringify(err))
+					console.log('注销失败')
 				})
 			},
 			thinkAgain(){
-				console.log('thinkAgain')
+				
 				uni.navigateBack({
 					delta:1
 				})

+ 1 - 5
pages/user/message.vue

@@ -124,8 +124,7 @@
 					res[0].forEach((rect) => that.style.mitemHeight = that.style.mitemHeight + rect.height + 40) //获取所有内部子元素的高度
 					// 因为vue的虚拟DOM 每次生成的新消息都是之前的,所以采用异步setTimeout    主要就是添加了这定时器
 					setTimeout(() => {
-					// console.log("111",that.style.mitemHeight);
-					// console.log("222",that.style.contentViewHeight);
+					
 						if (that.style.mitemHeight > (that.style.contentViewHeight - 100)) { //判断子元素高度是否大于显示高度
 						    that.scrollTop = that.style.mitemHeight - that.style.contentViewHeight //用子元素的高度减去显示的高度就获益获得序言滚动的高度
 					    }
@@ -191,9 +190,6 @@
 						 }
 					}
 					
-					console.log(this.list)
-					
-					
 					this.$nextTick(()=>{
 						this.scrollToBottom(); //创建后调用回到底部方法
 						

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 98 - 98
pagesB/pages/login/step1.vue


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 282 - 282
pagesB/pages/login/step2.vue


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 137 - 137
pagesB/pages/login/step3.vue


+ 2 - 7
pagesB/pages/login/step4.vue

@@ -104,14 +104,9 @@
 								// url:process.car.BASE_URL+"mobile/member/uploadBase64",
 								 name: 'photoFile',
 								     header: {
-								 
-								         //   'appId': process.car.VUE_APP_WXAPPID ,
-								 
+								  
 								             'Authorization':token ,
-								 
-								          //   'openId': "wxa8954f417fa7c32f" ,
-								 
-								 
+								  
 								               'accept': 'application/json',
 								 //#ifdef MP-WEIXIN
 								                "Content-Type": "multipart/form-data",//记得设置

+ 2 - 10
utils/init.js

@@ -1,11 +1,6 @@
 import carhelp from '@/utils/mixin.js'
 import * as API_WeiXin from '@/apis/weixin.js'
-
-import {
-	getUrlParam,
-	getWeixinRedirectURI,
-	isWeiXin
-} from '@/utils'
+ 
  var openId = carhelp.getOpenId();
 
 var app = {
@@ -28,10 +23,7 @@ var app = {
 			}
 			
 		// #endif
-		 //原代码 。判断是否是微信, 为了支持小程序调整
-		
-		
-		
+
 	},
 	 	
 	getOpenId() {

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است