Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

js_sdk/js-amap/amap-wx.130.js

@@ -0,0 +1,31 @@
+function AMapWX(a){this.key=a.key;this.requestConfig={key:a.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};this.MeRequestConfig={key:a.key,serviceName:"https://restapi.amap.com/rest/me"}}
+AMapWX.prototype.getWxLocation=function(a,b){wx.getLocation({type:"gcj02",success:function(c){c=c.longitude+","+c.latitude;wx.setStorage({key:"userLocation",data:c});b(c)},fail:function(c){wx.getStorage({key:"userLocation",success:function(d){d.data&&b(d.data)}});a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
+AMapWX.prototype.getMEKeywordsSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.city&&(d.city=b.city);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&(d.pageSize=b.pageSize);b.sig&&(d.sig=
+b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/local",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
+AMapWX.prototype.getMEIdSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.id&&(d.id=b.id);b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/id",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&
+0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
+AMapWX.prototype.getMEPolygonSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.polygon&&(d.polygon=b.polygon);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&(d.pageSize=b.pageSize);
+b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/polygon",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
+AMapWX.prototype.getMEaroundSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.center&&(d.center=b.center);b.radius&&(d.radius=b.radius);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&
+(d.pageSize=b.pageSize);b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/around",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
+AMapWX.prototype.getGeo=function(a){var b=this.requestConfig,c=a.options;b={key:this.key,extensions:"all",s:b.s,platform:b.platform,appname:this.key,sdkversion:b.sdkversion,logversion:b.logversion};c.address&&(b.address=c.address);c.city&&(b.city=c.city);c.batch&&(b.batch=c.batch);c.sig&&(b.sig=c.sig);wx.request({url:"https://restapi.amap.com/v3/geocode/geo",data:b,method:"GET",header:{"content-type":"application/json"},success:function(d){(d=d.data)&&d.status&&"1"===d.status?a.success(d):a.fail({errCode:"0",
+errMsg:d})},fail:function(d){a.fail({errCode:"0",errMsg:d.errMsg||""})}})};
+AMapWX.prototype.getRegeo=function(a){function b(d){var e=c.requestConfig;wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:c.key,location:d,extensions:"all",s:e.s,platform:e.platform,appname:c.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(g){if(g.data.status&&"1"==g.data.status){g=g.data.regeocode;var h=g.addressComponent,f=[],k=g.roads[0].name+"\u9644\u8fd1",m=d.split(",")[0],n=d.split(",")[1];if(g.pois&&
+g.pois[0]){k=g.pois[0].name+"\u9644\u8fd1";var l=g.pois[0].location;l&&(m=parseFloat(l.split(",")[0]),n=parseFloat(l.split(",")[1]))}h.provice&&f.push(h.provice);h.city&&f.push(h.city);h.district&&f.push(h.district);h.streetNumber&&h.streetNumber.street&&h.streetNumber.number?(f.push(h.streetNumber.street),f.push(h.streetNumber.number)):f.push(g.roads[0].name);f=f.join("");a.success([{iconPath:a.iconPath,width:a.iconWidth,height:a.iconHeight,name:f,desc:k,longitude:m,latitude:n,id:0,regeocodeData:g}])}else a.fail({errCode:g.data.infocode,
+errMsg:g.data.info})},fail:function(g){a.fail({errCode:"0",errMsg:g.errMsg||""})}})}var c=this;a.location?b(a.location):c.getWxLocation(a,function(d){b(d)})};
+AMapWX.prototype.getWeather=function(a){function b(g){var h="base";a.type&&"forecast"==a.type&&(h="all");wx.request({url:"https://restapi.amap.com/v3/weather/weatherInfo",data:{key:d.key,city:g,extensions:h,s:e.s,platform:e.platform,appname:d.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(f){if(f.data.status&&"1"==f.data.status)if(f.data.lives){if((f=f.data.lives)&&0<f.length){f=f[0];var k={city:{text:"\u57ce\u5e02",data:f.city},
+weather:{text:"\u5929\u6c14",data:f.weather},temperature:{text:"\u6e29\u5ea6",data:f.temperature},winddirection:{text:"\u98ce\u5411",data:f.winddirection+"\u98ce"},windpower:{text:"\u98ce\u529b",data:f.windpower+"\u7ea7"},humidity:{text:"\u6e7f\u5ea6",data:f.humidity+"%"}};k.liveData=f;a.success(k)}}else f.data.forecasts&&f.data.forecasts[0]&&a.success({forecast:f.data.forecasts[0]});else a.fail({errCode:f.data.infocode,errMsg:f.data.info})},fail:function(f){a.fail({errCode:"0",errMsg:f.errMsg||""})}})}
+function c(g){wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:d.key,location:g,extensions:"all",s:e.s,platform:e.platform,appname:d.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(h){if(h.data.status&&"1"==h.data.status){h=h.data.regeocode;if(h.addressComponent)var f=h.addressComponent.adcode;else h.aois&&0<h.aois.length&&(f=h.aois[0].adcode);b(f)}else a.fail({errCode:h.data.infocode,errMsg:h.data.info})},
+fail:function(h){a.fail({errCode:"0",errMsg:h.errMsg||""})}})}var d=this,e=d.requestConfig;a.city?b(a.city):d.getWxLocation(a,function(g){c(g)})};
+AMapWX.prototype.getPoiAround=function(a){function b(e){e={key:c.key,location:e,s:d.s,platform:d.platform,appname:c.key,sdkversion:d.sdkversion,logversion:d.logversion};a.querytypes&&(e.types=a.querytypes);a.querykeywords&&(e.keywords=a.querykeywords);wx.request({url:"https://restapi.amap.com/v3/place/around",data:e,method:"GET",header:{"content-type":"application/json"},success:function(g){if(g.data.status&&"1"==g.data.status){if((g=g.data)&&g.pois){for(var h=[],f=0;f<g.pois.length;f++){var k=0==
+f?a.iconPathSelected:a.iconPath;h.push({latitude:parseFloat(g.pois[f].location.split(",")[1]),longitude:parseFloat(g.pois[f].location.split(",")[0]),iconPath:k,width:22,height:32,id:f,name:g.pois[f].name,address:g.pois[f].address})}a.success({markers:h,poisData:g.pois})}}else a.fail({errCode:g.data.infocode,errMsg:g.data.info})},fail:function(g){a.fail({errCode:"0",errMsg:g.errMsg||""})}})}var c=this,d=c.requestConfig;a.location?b(a.location):c.getWxLocation(a,function(e){b(e)})};
+AMapWX.prototype.getStaticmap=function(a){function b(e){c.push("location="+e);a.zoom&&c.push("zoom="+a.zoom);a.size&&c.push("size="+a.size);a.scale&&c.push("scale="+a.scale);a.markers&&c.push("markers="+a.markers);a.labels&&c.push("labels="+a.labels);a.paths&&c.push("paths="+a.paths);a.traffic&&c.push("traffic="+a.traffic);e="https://restapi.amap.com/v3/staticmap?"+c.join("&");a.success({url:e})}var c=[];c.push("key="+this.key);var d=this.requestConfig;c.push("s="+d.s);c.push("platform="+d.platform);
+c.push("appname="+d.appname);c.push("sdkversion="+d.sdkversion);c.push("logversion="+d.logversion);a.location?b(a.location):this.getWxLocation(a,function(e){b(e)})};
+AMapWX.prototype.getInputtips=function(a){var b=Object.assign({},this.requestConfig);a.location&&(b.location=a.location);a.keywords&&(b.keywords=a.keywords);a.type&&(b.type=a.type);a.city&&(b.city=a.city);a.citylimit&&(b.citylimit=a.citylimit);wx.request({url:"https://restapi.amap.com/v3/assistant/inputtips",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.tips&&a.success({tips:c.data.tips})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||
+""})}})};
+AMapWX.prototype.getDrivingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);a.strategy&&(b.strategy=a.strategy);a.waypoints&&(b.waypoints=a.waypoints);a.avoidpolygons&&(b.avoidpolygons=a.avoidpolygons);a.avoidroad&&(b.avoidroad=a.avoidroad);wx.request({url:"https://restapi.amap.com/v3/direction/driving",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths,
+taxi_cost:c.data.route.taxi_cost||""})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
+AMapWX.prototype.getWalkingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);wx.request({url:"https://restapi.amap.com/v3/direction/walking",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
+AMapWX.prototype.getTransitRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);a.strategy&&(b.strategy=a.strategy);a.city&&(b.city=a.city);a.cityd&&(b.cityd=a.cityd);wx.request({url:"https://restapi.amap.com/v3/direction/transit/integrated",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&(c=c.data.route,a.success({distance:c.distance||"",taxi_cost:c.taxi_cost||
+"",transits:c.transits}))},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
+AMapWX.prototype.getRidingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);wx.request({url:"https://restapi.amap.com/v3/direction/riding",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};module.exports.AMapWX=AMapWX;

pageD/identity/companyIdentity.vue

@@ -72,7 +72,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 2M
+				maxSize: 5 * 1024 * 1024, //限制文件大小 5M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pages.json

@@ -528,8 +528,22 @@
             "path" : "pages/grain_pulse/distribution/distribution",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "分布图",
-                "enablePullDownRefresh": false
+                "navigationBarTitleText": "分布",
+                "enablePullDownRefresh": false,
+				"app-plus": {  
+				                "subNVues":[{  
+				                    "id": "popup", 
+				                    "path": "pages/grain_pulse/distribution/popup",
+				                    "type": "popup",
+				                    "style": {  
+				                        "position": "absolute",  
+				                        "dock": "bottom",  
+				                        "width": "100upx",  
+				                        "height": "150upx",  
+				                        "background": "transparent"  
+				                    }  
+				                }]  
+				            } 
             }
             
         }

pages/grain_pulse/distribution/distribution.vue

@@ -1,24 +1,26 @@
 <template>
 	<view class="container">
-		<view class="header">
+<!-- 		<view class="header">
 			<view class="now-location">
 				<u-icon name="map" size="36" class="icon"></u-icon>
 				<view class="text Medium">{{address}}</view>
 			</view>
 			<view class="selectType">
 				<view @click="selectType" class="header-type Regular">{{typeStr}}</view>
-				<u-icon :style="{transform:(showType?'rotate(180deg)':'')}" name="arrow-down-fill" size="8" color="#AFB3BF" class="icon"></u-icon>
+				<u-icon :style="{transform:(showType?'rotate(180deg)':'')}" name="arrow-down-fill" size="8"
+					color="#AFB3BF" class="icon"></u-icon>
 			</view>
 			<u-picker mode="selector" v-model="showType" @confirm='typeConfirm' confirm-color='#22C572'
 				:range="typeList" range-key="name" :default-selector="[0]"></u-picker>
-		</view>
+		</view> -->
 		<view class="uni-common-mt">
 			<view class="content">
-				<map class="map" @markertap="markertap" :latitude="nowLocation.latitude" :longitude="nowLocation.longitude" :markers="covers">
+				<map class="map" @markertap="markertap" :latitude="nowLocation.latitude"
+					:longitude="nowLocation.longitude" :markers="covers" :enable-poi="true">
 				</map>
 			</view>
 		</view>
-		<view class="content2">
+<!-- 		<view class="content2">
 			<view class="no-enterprise Regular" v-if="enterpriseList.length!=0">
 				附近暂无相关企业
 			</view>
@@ -54,14 +56,15 @@
 				</view>
 			</view>
 
-		</view>
+		</view> -->
 	</view>
 </template>
 <script>
+	// import amap from '@/js_sdk/js-amap/amap-wx.130.js'
 	export default {
 		data() {
 			return {
-				address:"黑龙江中天...",
+				address: "黑龙江中天...",
 				nowLocation: {
 					longitude: '',
 					latitude: ''
@@ -90,6 +93,10 @@
 				}]
 			}
 		},
+		onShow() {
+		const subnvue = uni.getSubNVueById('popup') // 获取nvue
+					subnvue.show()  // 显示nvue
+		},
 		onLoad() {
 			//获取当前位置
 			this.getLocation()
@@ -107,7 +114,7 @@
 				let that = this;
 				uni.getLocation({
 					type: 'gcj02',
-					geocode:true,
+					geocode: true,
 					success: function(res) {
 						that.nowLocation.longitude = res.longitude
 						that.nowLocation.latitude = res.latitude
@@ -132,7 +139,7 @@
 							_coverrsData.push(_obj)
 						}
 						that.covers = _coverrsData
-						console.log('获取位置数据：',res);
+						console.log('获取位置数据：', res);
 						console.log('当前位置的经度：' + res.longitude);
 						console.log('当前位置的纬度：' + res.latitude);
 						//拼接当前定位回显地址
@@ -141,10 +148,10 @@
 					}
 				});
 			},
-			markertap(e){
+			markertap(e) {
 				console.log(e)
 				uni.showToast({
-					title:"点击id为"+e.detail.markerId+"的坐标",
+					title: "点击id为" + e.detail.markerId + "的坐标",
 					icon: 'none',
 					duration: 2000
 				})
@@ -154,40 +161,46 @@
 	}
 </script>
 <style lang="scss" scoped>
-	.header{
+	.header {
 		display: flex;
-		padding:20rpx 35rpx;
+		padding: 20rpx 35rpx;
 		background: white;
 		justify-content: space-between;
 		align-items: center;
-		
-		.selectType{
+
+		.selectType {
 			display: flex;
 			justify-content: center;
 			align-items: flex-end;
-			.icon{
+
+			.icon {
 				position: relative;
 				top: -4rpx
-				}
+			}
 		}
-		.header-type{
+
+		.header-type {
 			font-size: 26rpx;
 			color: #333333;
 			margin-right: 10rpx;
-			
+
 		}
-		.now-location{
+
+		.now-location {
 			display: flex;
 			align-items: center;
-			.icon{
+
+			.icon {
 				margin-right: 10rpx;
 			}
-			.text{
+
+			.text {
 				font-size: 32rpx;
 				color: #333333;
 			}
 		}
 	}
+
 	.content {
 		height: calc(100vh - 100px);
 
@@ -242,42 +255,50 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: flex-start;
-				border-bottom:1px solid #EEEEEE;
+				border-bottom: 1px solid #EEEEEE;
 				padding: 20rpx 0;
-				.left{
-					img{
+
+				.left {
+					img {
 						width: 102rpx;
 						border-radius: 10px;
 						background: red;
 					}
 				}
-				.middle{
+
+				.middle {
 					position: relative;
 					left: -10rpx;
-					.title{
+
+					.title {
 						font-size: 32rpx;
 						color: #333333;
 						margin-bottom: 6rpx;
 					}
-					.location{
+
+					.location {
 						font-size: 24rpx;
 						color: #AFB3BF;
 					}
 				}
-				.line{
+
+				.line {
 					width: 1px;
 					height: 80rpx;
 					border: 1px solid #EEEEEE;
 				}
-				.right{
+
+				.right {
 					display: flex;
 					flex-direction: column;
 					justify-content: center;
 					align-items: center;
-					img{
+
+					img {
 						width: 21px;
 					}
-					.bottom{
+
+					.bottom {
 						font-size: 24rpx;
 						color: #AFB3BF;
 					}

pages/grain_pulse/distribution/popup.nvue

@@ -0,0 +1,300 @@
+<template>
+	<view class="container">
+		<text>12123321321213312132123132</text>
+		<!-- <view class="header">
+			<view class="now-location">
+				<u-icon name="map" size="36" class="icon"></u-icon>
+				<view class="text Medium">{{address}}</view>
+			</view>
+			<view class="selectType">
+				<view @click="selectType" class="header-type Regular">{{typeStr}}</view>
+				<u-icon :style="{transform:(showType?'rotate(180deg)':'')}" name="arrow-down-fill" size="8"
+					color="#AFB3BF" class="icon"></u-icon>
+			</view>
+			<u-picker mode="selector" v-model="showType" @confirm='typeConfirm' confirm-color='#22C572'
+				:range="typeList" range-key="name" :default-selector="[0]"></u-picker>
+		</view>
+
+		<view class="content2">
+			<view class="no-enterprise Regular" v-if="enterpriseList.length!=0">
+				附近暂无相关企业
+			</view>
+			<view class="warp">
+				<view class="top-line"></view>
+				<view class="bottom-list-item">
+					<view class="left"><img src="../../../static/img/location.png" alt=""></view>
+					<view class="middle">
+						<view class="title Medium">中天昊元粮库中天昊元粮库</view>
+						<view class="location Regular">辽宁省营口市鲅鱼圈区xx路108号</view>
+					</view>
+					<view class="line"></view>
+					<view class="right">
+						<view class="top">
+							<img src="../../../static/img/location.png" alt="">
+						</view>
+						<view class="bottom Regular">500m</view>
+					</view>
+				</view>
+				<view class="bottom-list-item">
+					<view class="left"><img src="../../../static/img/location.png" alt=""></view>
+					<view class="middle">
+						<view class="title Medium">中天昊元粮库中天昊元粮库</view>
+						<view class="location Regular">辽宁省营口市鲅鱼圈区xx路108号</view>
+					</view>
+					<view class="line"></view>
+					<view class="right">
+						<view class="top">
+							<img src="../../../static/img/location.png" alt="">
+						</view>
+						<view class="bottom Regular">500m</view>
+					</view>
+				</view>
+			</view>
+
+		</view> -->
+	</view>
+</template>
+<script>
+	import amap from '@/js_sdk/js-amap/amap-wx.130.js'
+	export default {
+		data() {
+			return {
+				address: "黑龙江中天...",
+				nowLocation: {
+					longitude: '',
+					latitude: ''
+				},
+				showType: false,
+				enterpriseList: [],
+				typeStr: '全部类型',
+				typeList: [{
+						name: "全部"
+					},
+					{
+						name: "粮库"
+					},
+					{
+						name: "加工厂"
+					}
+				],
+				title: 'map',
+				latitude: 39.909,
+				longitude: 116.39742,
+				covers: [{
+					id: 0,
+					latitude: 39.9085,
+					longitude: 116.39747,
+					iconPath: '../../../static/img/location.png',
+				}]
+			}
+		},
+		onLoad() {
+			//获取当前位置
+			// this.getLocation()
+		},
+		methods: {
+			selectType() {
+				this.showType = true
+			},
+			typeConfirm(e) {
+				console.log(e)
+				this.typeStr = this.typeList[e[0]].name
+
+			},
+			getLocation() {
+				let that = this;
+				uni.getLocation({
+					type: 'gcj02',
+					geocode: true,
+					success: function(res) {
+						that.nowLocation.longitude = res.longitude
+						that.nowLocation.latitude = res.latitude
+						that.covers[0].longitude = res.longitude
+						that.covers[0].latitude = res.latitude
+						let _coverrsData = []
+						for (let i = 0; i < 50; i++) {
+							let _obj = {
+								id: i,
+								latitude: res.latitude += 0.00150,
+								longitude: res.longitude + 0.00150,
+								iconPath: '../../../static/img/location.png',
+								callout: {
+									content: '中天昊元粮库',
+									color: '#333333',
+									fontSize: 12,
+									borderRadius: 20,
+									bgColor: 'white',
+									display: 'ALWAYS',
+								},
+							}
+							_coverrsData.push(_obj)
+						}
+						that.covers = _coverrsData
+						console.log('获取位置数据：', res);
+						console.log('当前位置的经度：' + res.longitude);
+						console.log('当前位置的纬度：' + res.latitude);
+						//拼接当前定位回显地址
+						// let _address = res.address
+						// this.address = _address
+					}
+				});
+			},
+			markertap(e) {
+				console.log(e)
+				uni.showToast({
+					title: "点击id为" + e.detail.markerId + "的坐标",
+					icon: 'none',
+					duration: 2000
+				})
+			}
+
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	// .header {
+	// 	display: flex;
+	// 	padding: 20rpx 35rpx;
+	// 	background: white;
+	// 	justify-content: space-between;
+	// 	align-items: center;
+
+	// 	.selectType {
+	// 		display: flex;
+	// 		justify-content: center;
+	// 		align-items: flex-end;
+
+	// 		.icon {
+	// 			position: relative;
+	// 			top: -4rpx
+	// 		}
+	// 	}
+
+	// 	.header-type {
+	// 		font-size: 26rpx;
+	// 		color: #333333;
+	// 		margin-right: 10rpx;
+
+	// 	}
+
+	// 	.now-location {
+	// 		display: flex;
+	// 		align-items: center;
+
+	// 		.icon {
+	// 			margin-right: 10rpx;
+	// 		}
+
+	// 		.text {
+	// 			font-size: 32rpx;
+	// 			color: #333333;
+	// 		}
+	// 	}
+	// }
+
+	// .content {
+	// 	height: calc(100vh - 100px);
+
+	// 	.map {
+	// 		width: 100%;
+	// 		height: 100%;
+	// 	}
+	// }
+
+	// .no-enterprise {
+	// 	position: fixed;
+	// 	bottom: 20px;
+	// 	height: 84rpx;
+	// 	width: 94%;
+	// 	left: 0;
+	// 	right: 0;
+	// 	margin: auto;
+	// 	background: #FFFFFF;
+	// 	font-size: 26rpx;
+	// 	color: #333333;
+	// 	display: flex;
+	// 	justify-content: center;
+	// 	align-items: center;
+	// 	border-radius: 20rpx;
+	// }
+
+	// .content2 {
+
+	// 	position: fixed;
+	// 	bottom: 0;
+	// 	width: 100%;
+	// 	background: white;
+	// 	border-radius: 20px 20px 0 0;
+	// 	padding: 37rpx 35rpx 20rpx 35rpx;
+
+	// 	.warp {
+	// 		.top-line {
+	// 			width: 68rpx;
+	// 			height: 8rpx;
+	// 			background: #B4B7C3;
+	// 			border-radius: 4px;
+	// 			content: '';
+	// 			display: block;
+	// 			position: absolute;
+	// 			top: 16rpx;
+	// 			left: 0;
+	// 			right: 0;
+	// 			margin: auto;
+	// 		}
+
+	// 		.bottom-list-item {
+	// 			display: flex;
+	// 			justify-content: space-between;
+	// 			align-items: flex-start;
+	// 			border-bottom: 1px solid #EEEEEE;
+	// 			padding: 20rpx 0;
+
+	// 			.left {
+	// 				img {
+	// 					width: 102rpx;
+	// 					border-radius: 10px;
+	// 					background: red;
+	// 				}
+	// 			}
+
+	// 			.middle {
+	// 				position: relative;
+	// 				left: -10rpx;
+
+	// 				.title {
+	// 					font-size: 32rpx;
+	// 					color: #333333;
+	// 					margin-bottom: 6rpx;
+	// 				}
+
+	// 				.location {
+	// 					font-size: 24rpx;
+	// 					color: #AFB3BF;
+	// 				}
+	// 			}
+
+	// 			.line {
+	// 				width: 1px;
+	// 				height: 80rpx;
+	// 				border: 1px solid #EEEEEE;
+	// 			}
+
+	// 			.right {
+	// 				display: flex;
+	// 				flex-direction: column;
+	// 				justify-content: center;
+	// 				align-items: center;
+
+	// 				img {
+	// 					width: 21px;
+	// 				}
+
+	// 				.bottom {
+	// 					font-size: 24rpx;
+	// 					color: #AFB3BF;
+	// 				}
+	// 			}
+	// 		}
+	// 	}
+	// }
+</style>

pages/grain_pulse/localtion/localtion.vue

@@ -1,22 +1,30 @@
 <template>
 	<view class="container">
 		<view class="content">
-			<map class="map" @markertap="markertap" :latitude="nowLocation.latitude" :longitude="nowLocation.longitude" :markers="covers">
+			<map class="map" @markertap="markertap" :latitude="nowLocation.latitude" :longitude="nowLocation.longitude"
+				:markers="covers">
 			</map>
 		</view>
-<!-- 		<view class="bottom">
-			<view class="title">
+		<view class="bottom">
+			<view class="title Medium">
 				{{dataList.title}}
 			</view>
-			<view class="bottom-content">
+			<view class="bottom-content Regular">
 				{{dataList.content}}
 			</view>
-			<view>
+			<view class="Regular location">
+				<view class="left">
 					<u-icon name="map" size="36" class="icon"></u-icon>
 					<view>{{dataList.localtion}}</view>
-					<view>{{dataList.rice}}</view>
+				</view>
+				
+				<view class="metre">
+				<u-line color="#A3A9B8" direction='col' length="20rpx"/>
+				<text  class="line" >
+				{{dataList.rice}}</text>
+				</view>
 			</view>
-		</view> -->
+		</view>
 	</view>
 </template>
 
@@ -24,12 +32,11 @@
 	export default {
 		data() {
 			return {
-				dataList:{
-					title:'中天昊元粮库中天昊元粮库',
-					content:'我是企业介绍我是企业介绍我是企业介绍我是企业介绍我是企业介绍…',
-					localtion:"辽宁省营口市鲅鱼圈区熊岳镇火车站…",
-					rice:'500m'
-					
+				dataList: {
+					title: '中天昊元粮库中天昊元粮库',
+					content: '我是企业介绍我是企业介绍我是企业介绍我是企业介绍我是企业介绍…',
+					localtion: "辽宁省营口市鲅鱼圈区熊岳镇火车站…",
+					rice: '500m'
 				},
 				nowLocation: {
 					longitude: '',
@@ -47,20 +54,20 @@
 			}
 		},
 		onLoad() {
-				this.getLocation()
+			this.getLocation()
 		},
 		methods: {
 			getLocation() {
 				let that = this;
 				uni.getLocation({
 					type: 'gcj02',
-					geocode:true,
+					geocode: true,
 					success: function(res) {
 						that.nowLocation.longitude = res.longitude
 						that.nowLocation.latitude = res.latitude
 						that.covers[0].longitude = res.longitude
 						that.covers[0].latitude = res.latitude
-						console.log('获取位置数据：',res);
+						console.log('获取位置数据：', res);
 						console.log('当前位置的经度：' + res.longitude);
 						console.log('当前位置的纬度：' + res.latitude);
 						//拼接当前定位回显地址
@@ -74,16 +81,55 @@
 </script>
 
 <style lang="scss" scoped>
-	.content{
+	.content {
 		width: 100vw;
 		height: 100vh;
 	}
+
 	.map {
-			width: 100%;
-			height: 100%;
+		width: 100%;
+		height: 100%;
+	}
+
+	.bottom {
+		width: 96%;
+		background: white;
+		position: fixed;
+		bottom: 54rpx;
+		left: 0;
+		right: 0;
+		margin: auto;
+		padding: 27rpx 37rpx;
+
+		.title {
+			font-size: 30rpx;
+			color: #333333;
+			margin-bottom: 12rpx;
+		}
+
+		.bottom-content {
+			font-size: 22rpx;
 		}
-		.bottom{
-			width: 80%;
-			background: white;
+
+		.location {
+			color: #AFB3BF;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 15rpx;
+
+			.left {
+				display: flex;
+				flex-wrap: nowrap;
+			}
+			.metre{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				.line{
+					margin-left:13rpx ;
+				}
+			}
 		}
+	}
 </style>

pages/grain_pulse/position/position.vue

@@ -1,64 +1,110 @@
 <template>
-	<view class="container">
+	<view class="">
 		<view class="header">
-			<view class="city">
-				<text>全国</text>
+			<view class="city Medium">
+				<text class="select-city">营口市</text>
 				<u-icon name="arrow-down"></u-icon>
 			</view>
 			<u-search input-align="left" :show-action="false" height="70" placeholder="请输入位置信息"></u-search>
 		</view>
 		<view class="header2">
-			<view>山海广场</view>
-			<view class="">
-				重新定位
+			<view class="header2-tip Regular">
+				当前定位
 			</view>
+			<view class="header2-content">
+				<view class="left Medium">
+					<u-icon name="arrow-down"></u-icon>
+					<view class="">山海广场</view>
+				</view>
+				<view class="reposition Regular">重新定位</view>
+			</view>
+
 		</view>
-		<view class="pposition">
-			<view>
-				<view>
+		<view class="position-list Regular">
+			<view class="list-item">
+				<view class="row row1">
+					<view>
+						山海广场
+					</view>
+					<view>4.2千米</view>
+				</view>
+				<view class="row row2">
 					山海广场
 				</view>
-				<view>4.2千米</view>
-			</view>
-			<view>
-				山海广场
 			</view>
 		</view>
+
 	</view>
 </template>
 
 <script>
 	export default {
-		components: {
-		},
+		components: {},
 		data() {
-			return {
-			}
+			return {}
 		},
-		methods: {
-		}
+		methods: {}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.container{
-		padding: 0 35rpx;
+	/deep/.u-content {
+		padding-left: 170rpx;
 	}
-	/deep/.u-content{
-		padding-left: 140rpx;
-	}
-.header{
-	position: relative;
-	display: flex;
-	.city{
-		top: 0;
-		bottom: 0;
-		left: 20rpx;
-		margin: auto;
-		position: absolute;
+
+	.header {
+		position: relative;
 		display: flex;
-		align-items: center;
+		background: white;
+		padding: 20rpx;
+
+		.city {
+			top: 0;
+			bottom: 0;
+			left: 50rpx;
+			margin: auto;
+			position: absolute;
+			display: flex;
+			align-items: center;
+
+			.select-city {
+				margin-right: 4rpx;
+			}
+
+		}
+	}
+
+	.header2 {
+		background: white;
+		border-radius: 0 0 20rpx 20rpx;
+		padding: 0 20rpx 34rpx 20rpx;
+
+		.header2-tip {
+			font-size: 28rpx;
+			color: #AFB3BF;
+		}
+
+		.header2-content {
+			font-size: 32rpx;
+			color: #333333;
+			display: flex;
+			justify-content: space-between;
+			margin-top: 12rpx;
+
+			.left {
+				display: flex;
+			}
+
+			.reposition {
+				font-size: 28rpx;
+				color: #22C572;
+			}
+		}
+	}
+	.position-list{
+		background: pink;
+		border-radius: 20rpx;
+		
 		
 	}
-}
 </style>

pages/task/my_task.vue

@@ -162,6 +162,7 @@
 				})
 				this.warehouseInOutInfo.statusFlag = this.statusFlag
 				this.warehouseInOutInfo.phone = this.userInfo.phone
+				this.warehouseInOutInfo.pcFlag = 0
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfo', this.warehouseInOutInfo).then(res => {
 					if (res.data.code == 200) {