修改长图和定位

pages/mainPages/Settled/Settled.vue

@@ -1942,7 +1942,8 @@
 					icon:'none',
 					title:'请先选择定位'
 				})
-			},
+			},
+			
 			// 获取定位
 			getLocation() {
 				let _this = this;
@@ -1958,11 +1959,19 @@
 						// console.log('AAAAAAA',e);
 						_this.onkoc = 0;
 						_this.addressDisabled = false;
-						_this.getloctions(_this.lblis)
+						_this.getloctions(_this.lblis)
+						console.log(_this.userInfo,1111);
+						console.log(_this.lblis,2222);
+						// console.log(_this.getloctions(),3333);
+						console.log(e,4444);
 					},
-					// fail(err){
+					fail(err){
+						// uni.getPrivacySetting({
+						// 	success: res => {
+						// 	console.log("getPrivacySetting",res)
+						// }})
 						// console.log('-----',err);
-					// }
+					}
 				});
 				// #endif
 				//#ifdef APP-PLUS

pages/subPages2/hirePlatform/companyDetails/companyDetails.vue

@@ -79,7 +79,7 @@
 					<view style="flex:0 0 30%;height:210upx;padding-bottom: 30upx;" v-for="(item,index) in detailsData.album">
 						<image style="width: 100%;height: 100%;border-radius: 15upx;" :src="item" mode="aspectFill" @click="lookimg(detailsData.album,index)"></image>
 					</view>
-					<nonemores v-if="detailsData.album.length == 0"></nonemores>
+					<nonemores v-if="detailsData.album && detailsData.album.length == 0"></nonemores>
 				</view>
 			</view>
 			<view class="content-content" style="padding: 30upx;" v-if="sort == 1">
@@ -150,10 +150,9 @@
 		},
 		onLoad(e) {
 			this.pageId = e.id;
-			
+			const pages = getCurrentPages();
-			const eventChannel = this.getOpenerEventChannel();
+				const eventChannel = this.getOpenerEventChannel();
-			eventChannel.emit('acceptDataFromOpenedPageA', {data: 'to detail'});
+				eventChannel.emit('acceptDataFromOpenedPageA', {data: 'to detail'});
-			
 		},
 		onShow(){
 			this.page = 1;
@@ -221,7 +220,7 @@
 						`&p=recruit&do=enterpriseDesc&id=${this.pageId}`,
 						{},
 						res => {
-							console.log(res)
+							console.log(res,111111)
 							this.detailsData = res.data;
 						},
 						false,

pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails.vue

@@ -113,19 +113,26 @@
 							<view class="title dis-il-block" style="display: inline-block;">企业简介</view>
 						</view>
 						<view class="psition-tag" v-if="recruitmentDetails.introduction">
-							<text v-html="recruitmentDetails.introduction"></text>
+							<scroll-view  scroll-y="true" style="height: 100px;">
+								<view style="height: 100px;" v-html="recruitmentDetails.introduction"></view>
+							</scroll-view>
+							
 						</view>
 						<view class="psition-title" v-if="recruitmentDetails.business">
 							<view class="title dis-il-block" style="display: inline-block;">经营业务</view>
 						</view>
 						<view class="psition-tag" v-if="recruitmentDetails.business">
-							<text v-html="recruitmentDetails.business"></text>
+							<scroll-view  scroll-y="true" style="height: 100px;">
+								<view v-html="recruitmentDetails.business"></view>
+							</scroll-view>
 						</view>
 						<view class="psition-title" v-if="recruitmentDetails.advantage">
 							<view class="title dis-il-block" style="display: inline-block;">企业优势</view>
 						</view>
 						<view class="psition-tag" v-if="recruitmentDetails.advantage">
-							<text v-html="recruitmentDetails.advantage"></text>
+							<scroll-view  scroll-y="true" style="height: 100px;">
+								<view v-html="recruitmentDetails.advantage"></view>
+							</scroll-view>
 						</view>
 					</template>
 				</view>
@@ -268,7 +275,7 @@ export default {
 		},
 		openNavigation() {
 			let detailsData = this.recruitmentDetails;
-			console.log(detailsData, '--detailsData-----');
+			// console.log(detailsData, '--detailsData-----');
 			detailsData.location = {
 				lat: detailsData.work_lat,
 				lng: detailsData.work_lng
@@ -333,7 +340,8 @@ export default {
 			App._post_form(
 				`&p=recruit&do=recruitDesc`,
 				{ id: this.pageId },
-				res => {
+				res => {
+					console.log(res,1111);
 					this.recruitmentDetails = res.data;
 					if(!this.recruitmentDetails.video_link){
 						this.showVideo = false;
@@ -342,7 +350,7 @@ export default {
 						setTimeout(()=>{
 							uni.createSelectorQuery().in(_this).select('.entry-text').boundingClientRect(data => {
 								_this.dataHeight = data.height;
-								console.log(data,_this.dataHeight,2333333)
+								// console.log(data,_this.dataHeight,2333333)
 							}).exec();
 						})
 					})