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

components/linzq-citySelect/linzq-citySelect.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="wrapper">
+	<div class="">
 		<div class="header">
 <!-- 			<view class="back_div">
 				<image class="back_img" @click="back_city()" src="../../static/img/login/logo@2x.png" mode=""></image>
@@ -101,6 +101,7 @@
 				latitude: '', //纬度
 				seconds: 3,
 				po_tips: '重新定位',
+				positionObj:{}
 			}
 		},
 
@@ -193,7 +194,8 @@
 
 			back_city(item) {
 				if (item) {
-					this.$emit('back_city', item);
+					this.positionObj.positionName = item
+					this.$emit('back_city', this.positionObj);
 					//unshift 把数据插入到首位，与push相反
 					this.Visit.unshift(item)
 					this.searchValue = "";
@@ -227,12 +229,15 @@
 					that.seconds--;
 					uni.getLocation({
 						type: 'gcj02',
+						geocode: true,
 						success: function(res) {
-							console.log('当前位置的经度：' + res.longitude);
-							console.log('当前位置的纬度：' + res.latitude);
+							// console.log('当前位置的经度：' + res.longitude);
+							// console.log('当前位置的纬度：' + res.latitude);
+							// console.log(res)
+							that.positionObj = res;
 							that.longitude = res.longitude
 							that.latitude = res.latitude
-							that.position = res.address.city
+							// that.position = res.address.city
 						}
 					});
 					if (that.seconds <= 0) {

components/upload.vue

@@ -17,7 +17,10 @@
 				:src="item.url || item.path" :mode="imageMode"></image>
 		</view>
 		<slot name="file" :file="lists"></slot>
-		<view style="display: inline-block;" :class="custom?'customStyle':'default'"
+		<view style="display: inline-block;" :style="{
+			background:customBack,
+			border:customBorder
+		}" :class="custom?'customStyle':'default'"
 			@tap="selectFile" v-if="maxCount > lists.length">
 			<slot name="addBtn"></slot>
 			<img v-if="custom&&options.bgc!=''" :src="options.bgc" alt="" class="imgstyle">
@@ -25,10 +28,17 @@
 					width: width + 'rpx',
 					height: width + 'rpx'
 				}">
-				<u-icon v-if="custom" name="camera-fill" class="" size="100" color="#617E8B"></u-icon>
+				<u-icon v-if="custom&&!customBtn" name="camera-fill" class="" size="100" color="#617E8B"></u-icon>
+				<image v-if="custom&&customBtn" :style="{
+				width: customBtnWidth + 'px',
+				height: customBtnHeight + 'px'
+			}" :src="customBtnImage" mode=""></image>
 				<image v-if="!custom" style='width:23px;height:23px;' src="../static/img/liangmai/xiangji-2.png" mode=""></image>
 				<view v-if="!custom" class="u-add-tips">{{ uploadText }}</view>
-				<view v-if="custom" class="u-add-tips">{{ options.text }}</view>
+				<view v-if="custom" :style="{
+				color: customBtnColor,
+				'font-size':customBtnFontSize+'px',
+			}" class="u-add-tips">{{ options.text }}</view>
 			</view>
 		</view>
 		<!-- <view class="custom-style" v-if="custom"
@@ -95,8 +105,8 @@
 			// 最大上传数量
 			maxCount: {
 				type: [String, Number],
-				default: 52
-			},
+				default: 52,
+				},
 			//  是否显示进度条
 			showProgress: {
 				type: Boolean,
@@ -191,6 +201,34 @@
 				type: Boolean,
 				default: false
 			},
+			customBtnImage: {
+				type: String,
+				default: ''
+			},
+			customBtnWidth: {
+				type: Number,
+				default: 0
+			},
+			customBtnHeight: {
+				type: Number,
+				default: 0
+			},
+			customBtnColor: {
+				type: String,
+				default: '#617E8B'
+			},
+			customBack:{
+				type: String,
+				default: '#F5F6FA'
+			},
+			customBorder:{
+				type: String,
+				default: '2px dashed #C6CBCE'
+			},
+			customBtnFontSize:{
+				type: String,
+				default: '18'
+			},
 			// 内部预览图片区域和选择图片按钮的区域宽度，高等于宽
 			width: {
 				type: [String, Number],

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
 	// baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.120:8090/',
+	baseUrlNew: 'http://192.168.1.110:8090/',
 	//baseUrlNew: 'http://api.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages.json

@@ -564,74 +564,74 @@
             
         }
 
-	 //    ,{
-  //           "path" : "pages/grain_pulse/distribution/distribution",
-  //           "style" :                                                                                    
-  //           {
-  //               "navigationBarTitleText": "分布",
-  //               "enablePullDownRefresh": false
-		// 		// "app-plus": {  
-		// 		//                 "subNVues":[{  
-		// 		//                     "id": "popup", 
-		// 		//                     "path": "pages/grain_pulse/distribution/subNvue/popup.nvue",
-		// 		//                     "type": "popup",
-		// 		//                     "style": {  
-		// 		//                         "position": "absolute",  
-		// 		//                         "dock": "bottom",  
-		// 		//                         "width": "100upx",  
-		// 		//                         "height": "150upx",  
-		// 		//                         "background": "red"  
-		// 		//                     }  
-		// 		//                 }]  
-		// 		//             } 
-  //   //             "enablePullDownRefresh": false
-  //           }
-  //       }
-  //       ,{
-  //           "path" : "pages/grain_pulse/position/position",
-  //           "style" :                                                                                    
-  //           {
-  //               "navigationBarTitleText": "定位",
-  //               "enablePullDownRefresh": false
-  //           }
+	    ,{
+            "path" : "pages/grain_pulse/distribution/distribution",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "分布",
+                "enablePullDownRefresh": false
+				// "app-plus": {  
+				//                 "subNVues":[{  
+				//                     "id": "popup", 
+				//                     "path": "pages/grain_pulse/distribution/subNvue/popup.nvue",
+				//                     "type": "popup",
+				//                     "style": {  
+				//                         "position": "absolute",  
+				//                         "dock": "bottom",  
+				//                         "width": "100upx",  
+				//                         "height": "150upx",  
+				//                         "background": "red"  
+				//                     }  
+				//                 }]  
+				//             } 
+    //             "enablePullDownRefresh": false
+            }
+        }
+        ,{
+            "path" : "pages/grain_pulse/position/position",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "定位",
+                "enablePullDownRefresh": false
+            }
             
-  //       }
-  //       ,{
-  //           "path" : "pages/grain_pulse/selectCity/selectCity",
-  //           "style" :                                                                                    
-  //           {
-  //               "navigationBarTitleText": "城市",
-  //               "enablePullDownRefresh": false
-  //           }
+        }
+        ,{
+            "path" : "pages/grain_pulse/selectCity/selectCity",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "城市",
+                "enablePullDownRefresh": false
+            }
             
-  //       }
-  //       ,{
-  //           "path" : "pages/grain_pulse/localtion/localtion",
-  //           "style" :                                                                                    
-  //           {
-  //               "navigationBarTitleText": "位置",
-  //               "enablePullDownRefresh": false
-  //           }
+        }
+        ,{
+            "path" : "pages/grain_pulse/localtion/localtion",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "位置",
+                "enablePullDownRefresh": false
+            }
             
-  //       }
-		// ,{
-		//     "path" : "pages/grain_pulse/localtion/coordinate",
-		//     "style" :                                                                                    
-		//     {
-		//         "navigationBarTitleText": "坐标",
-		//         "enablePullDownRefresh": false
-		//     }
+        }
+		,{
+		    "path" : "pages/grain_pulse/localtion/coordinate",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "坐标",
+		        "enablePullDownRefresh": false
+		    }
 		    
-		// }
-  //       ,{
-  //           "path" : "pages/grain_pulse/distribution/distribution",
-  //           "style" :                                                                                    
-  //           {
-  //               "navigationBarTitleText": "",
-  //               "enablePullDownRefresh": false
-  //           }
+		}
+        ,{
+            "path" : "pages/grain_pulse/distribution/distribution",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
             
-  //       }
+        }
     ],
 	"subpackages": [{
 			"root": "pageA",

pages/grain_pulse/distribution/distribution.nvue

@@ -3,13 +3,15 @@
 		<view class="header">
 			<view class="now-location">
 				<u-icon name="map" size="36" class="icon"></u-icon>
-				<text class="text Medium title">{{address}}</text>
+				<text class="text Medium title">{{position.name}}</text>
 			</view>
 			<view class="selectType">
-				<text @click="selectType" class="header-type Regular">{{typeStr}}</text>
-				<!-- 				<u-icon :style="{transform:(showType?'rotate(180deg)':'')}" name="arrow-down-fill" size="8"
-					color="#AFB3BF" class="icon"></u-icon> -->
+				<picker @change="bindPickerChange" :value="index" :range="typeList">
+					<text class="uni-input header-type">{{typeList[index]}}</text>
+				</picker>
 			</view>
+
+
 		</view>
 		<view class="uni-common-mt">
 			<view class="content">
@@ -18,57 +20,142 @@
 				</map>
 			</view>
 		</view>
-		<view class="alert">
-			<view class="select-alert" v-if="showType">
-				<view class="select-top">
-					<text class="cancel" @click="cancel">取消</text>
-					<text class="confirm" @click="confirm">确定</text>
-				</view>
-				<view class="select">
-					<text class="select-item" v-for="(item,index) in typeList" :key="index">
-						{{item.name}}
-					</text>
-				</view>
-			</view>
-		</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 class="line-style"  @click="lineClick">
+					<text class="top-line"></text>
+				</view>
+				<scroll-view :scroll-top="scrollTop" :scroll-y="isscroll" @scrolltoupper="upper" @scrolltolower="lower"
+					@scroll="scroll" :class="{'active':isActive}" class="scroll-style">
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
 					</view>
-					<view class="line"></view>
-					<view class="right">
-						<view class="top">
-							<img src="../../../static/img/location.png" alt="">
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
 						</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 class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
 					</view>
-					<view class="line"></view>
-					<view class="right">
-						<view class="top">
-							<img src="../../../static/img/location.png" alt="">
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
 						</view>
-						<view class="bottom Regular">500m</view>
 					</view>
-				</view>
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
+					</view>
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
+					</view>
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
+					</view>
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
+					</view>
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
+					</view>
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
+					</view>
+				</scroll-view>
+
 			</view>
 
 		</view>
+
 	</view>
 </template>
 <script>
@@ -76,27 +163,23 @@
 	export default {
 		data() {
 			return {
-				address: {},
+				isscroll: true,
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+				"isActive": false,
+				position: {},
 				nowLocation: {
-					longitude: '',
-					latitude: ''
+					latitude: 39.9085,
+					longitude: 116.39747,
 				},
 				showType: false,
 				enterpriseList: [],
-				typeStr: '全部类型',
-				typeList: [{
-						name: "全部"
-					},
-					{
-						name: "粮库"
-					},
-					{
-						name: "加工厂"
-					}
-				],
+				// typeStr: '全部类型',
+				index: 0,
+				typeList: ['全部类型', '粮仓', '加工厂'],
 				title: 'map',
-				latitude: 39.909,
-				longitude: 116.39742,
 				covers: [{
 					id: 0,
 					latitude: 39.9085,
@@ -108,16 +191,44 @@
 		onShow() {
 
 		},
-		onLoad() {
-			//获取当前位置
-			this.getLocation()
-			// var subnvue = uni.getSubNVueById('popup') // 获取nvue
-			// 	subnvue.show()  // 显示nvue
-			// uni.$on('popup', (data) => {
-			// 	console.log(data)
-			// })  
+		onLoad(e) {
+			this.position =  JSON.parse(e.position)
+			console.log("地点",this.position)
+			this.nowLocation.latitude = this.position.location.split(',')[1]
+			this.nowLocation.longitude = this.position.location.split(',')[0]
+			//获取标记点
+			this.getMarkers()
 		},
 		methods: {
+			getMarkers(){
+				//点击列表标记改变颜色，显示气泡提示
+				// this.$api.doRequest('get', '/settledCompanyInfo/selectSettledCompanyInfo', {
+				// 	pageSize: this.pageSize,
+				// 	currentPage: this.currentPage,
+				// }).then(res => {
+				// 	if (res.data.code == 200) {
+				// 		this.datalist = res.data.data.records
+				// 	}
+				// })
+			},
+			lineClick(){
+				this.isActive= !this.isActive
+				// this.isscroll = !this.isscroll
+			},
+			upper: function(e) {
+				console.log(e)
+			},
+			lower: function(e) {
+				console.log(e)
+			},
+			scroll: function(e) {
+				console.log(e)
+				this.old.scrollTop = e.detail.scrollTop
+			},
+			bindPickerChange: function(e) {
+				console.log('picker发送选择改变，携带值为', e.target)
+				this.index = e.detail.value
+			},
 			confirm() {
 				console.log('确定')
 				this.showType = false
@@ -130,53 +241,55 @@
 				this.showType = true
 				console.log(1)
 			},
-			typeConfirm(e) {
-				console.log(e)
-				this.typeStr = this.typeList[e[0]].name
+			// 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',
-								width:30,
-								height:30,
-								callout: {
-									content: '中天昊元粮库',
-									color: '#333333',
-									fontSize: 24,
-									borderRadius: 20,
-									padding:10,
-									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
-
-						that.address = _address.province + _address.city + _address.district + _address.poiName
-						console.log(that.address)
-					}
-				});
+				// 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',
+				// 				width: 30,
+				// 				height: 30,
+				// 				callout: {
+				// 					content: '中天昊元粮库',
+				// 					color: '#333333',
+				// 					fontSize: 12,
+				// 					borderRadius: 20,
+				// 					padding: 4,
+				// 					bgColor: 'white',
+				// 					display: 'ALWAYS',
+				// 				},
+				// 			}
+				// 			_coverrsData.push(_obj)
+				// 		}
+				// 		that.covers = _coverrsData
+				// 		console.log('获取位置数据：', res);
+				// 		console.log('当前位置的经度：' + res.longitude);
+				// 		console.log('当前位置的纬度：' + res.latitude);
+				// 		//拼接当前定位回显地址
+
+				// 		// #ifdef APP-PLUS
+				// 		let _address = res.address
+				// 		that.address = _address.province + _address.city + _address.district + _address.poiName
+				// 		console.log(that.address)
+				// 		// #endif
+				// 	}
+				// });
 			},
 			markertap(e) {
 				console.log(e)
@@ -185,12 +298,19 @@
 					icon: 'none',
 					duration: 2000
 				})
+			},
+			getLst() {
+				console.log("加载数据")
 			}
 
 		}
 	}
 </script>
 <style scoped>
+	.active {
+		height: 583rpx!important;
+	}
+
 	.header {
 		flex-direction: row;
 		justify-content: space-between;
@@ -200,6 +320,8 @@
 
 	.title {
 		font-size: 32rpx;
+		font-weight: 500;
+		color: #333333;
 	}
 
 	.content {
@@ -216,12 +338,21 @@
 		bottom: 0;
 		width: 750rpx;
 		flex: 1;
-		font-size: 34px;
-		background: pink;
+		font-size: 34rpx;
+		background: white;
+		border-top-left-radius: 20rpx;
+		border-top-right-radius: 20rpx;
+	}
+
+	.warp {
+		/* 		flex-direction: row;
+		justify-content: center; */
 	}
 
 	.header-type {
 		font-size: 26rpx;
+		font-weight: 400;
+		color: #333333;
 	}
 
 	.alert {
@@ -253,17 +384,94 @@
 		align-items: center;
 		background: white;
 	}
-	.cancel{
+
+	.cancel {
 		font-size: 24rpx;
 		color: white;
 		font-weight: bold;
 	}
-	.confirm{
+
+	.confirm {
 		font-size: 24rpx;
 		color: green;
 		font-weight: bold;
 	}
-	.select-item{
+
+	.select-item {
+		font-size: 24rpx;
+	}
+
+	.warp {}
+
+	.bottom-list-item {
+		flex-direction: row;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+		padding-bottom: 20rpx;
+		margin-top: 20rpx;
+		border-bottom: 1px solid #EEEEEE;
+	}
+
+	.left {}
+
+	.left-img {
+		width: 102rpx;
+		height: 106rpx;
+	}
+
+	.localtion {
 		font-size: 24rpx;
+		font-weight: 400;
+		color: #AFB3BF;
+	}
+
+	.localtion {
+
+		flex-direction: column;
+	}
+
+	.right-img {
+		width: 21rpx;
+		height: 26rpx;
+		background: #AFB3BF;
+	}
+
+	.right {
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.middle {
+		flex-direction: column;
+		justify-content: center;
+	}
+
+	.warp {
+		padding: 20rpx;
+	}
+
+	.right-bottom {
+		font-size: 24rpx;
+		font-weight: 400;
+		color: #AFB3BF;
+	}
+
+	.top-line {
+		width: 68px;
+		height: 8px;
+		background: #B4B7C3;
+		border-radius: 4px;
+		flex-direction: row;
+		margin-bottom: 30rpx;
+	}
+
+	.line-style {
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.scroll-style {
+		height: 130rpx;
 	}
 </style>

pages/grain_pulse/distribution/distribution.vue

@@ -3,13 +3,15 @@
 		<view class="header">
 			<view class="now-location">
 				<u-icon name="map" size="36" class="icon"></u-icon>
-				<text class="text Medium title">{{address}}</text>
+				<text class="text Medium title">{{position.name}}</text>
 			</view>
 			<view class="selectType">
-				<text @click="selectType" class="header-type Regular">{{typeStr}}</text>
-				<!-- 				<u-icon :style="{transform:(showType?'rotate(180deg)':'')}" name="arrow-down-fill" size="8"
-					color="#AFB3BF" class="icon"></u-icon> -->
+				<picker @change="bindPickerChange" :value="index" :range="typeList">
+					<text class="uni-input header-type">{{typeList[index]}}</text>
+				</picker>
 			</view>
+
+
 		</view>
 		<view class="uni-common-mt">
 			<view class="content">
@@ -18,57 +20,142 @@
 				</map>
 			</view>
 		</view>
-		<view class="alert">
-			<view class="select-alert" v-if="showType">
-				<view class="select-top">
-					<text class="cancel" @click="cancel">取消</text>
-					<text class="confirm" @click="confirm">确定</text>
-				</view>
-				<view class="select">
-					<text class="select-item" v-for="(item,index) in typeList" :key="index">
-						{{item.name}}
-					</text>
-				</view>
-			</view>
-		</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 class="line-style"  @click="lineClick">
+					<text class="top-line"></text>
+				</view>
+				<scroll-view :scroll-top="scrollTop" :scroll-y="isscroll" @scrolltoupper="upper" @scrolltolower="lower"
+					@scroll="scroll" :class="{'active':isActive}" class="scroll-style">
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
 					</view>
-					<view class="line"></view>
-					<view class="right">
-						<view class="top">
-							<img src="../../../static/img/location.png" alt="">
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
 						</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 class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
 					</view>
-					<view class="line"></view>
-					<view class="right">
-						<view class="top">
-							<img src="../../../static/img/location.png" alt="">
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
 						</view>
-						<view class="bottom Regular">500m</view>
 					</view>
-				</view>
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
+					</view>
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
+					</view>
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
+					</view>
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
+					</view>
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
+					</view>
+					<view class="bottom-list-item">
+						<img class="left-img" src="/static/location.png" alt="">
+						<view class="middle">
+							<text class="title Medium">中天昊元粮库中天昊元粮库</text>
+							<text class="localtion Regular">辽宁省营口市鲅鱼圈区xx路108号</text>
+						</view>
+						<text class="line"></text>
+						<view class="right">
+							<img class="right-img" src="/static/location.png" alt="">
+							<text class="right-bottom Regular">500m</text>
+						</view>
+					</view>
+				</scroll-view>
+
 			</view>
 
 		</view>
+
 	</view>
 </template>
 <script>
@@ -76,27 +163,23 @@
 	export default {
 		data() {
 			return {
-				address: {},
+				isscroll: true,
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+				"isActive": false,
+				position: {},
 				nowLocation: {
-					longitude: '',
-					latitude: ''
+					latitude: 39.9085,
+					longitude: 116.39747,
 				},
 				showType: false,
 				enterpriseList: [],
-				typeStr: '全部类型',
-				typeList: [{
-						name: "全部"
-					},
-					{
-						name: "粮库"
-					},
-					{
-						name: "加工厂"
-					}
-				],
+				// typeStr: '全部类型',
+				index: 0,
+				typeList: ['全部类型', '粮仓', '加工厂'],
 				title: 'map',
-				latitude: 39.909,
-				longitude: 116.39742,
 				covers: [{
 					id: 0,
 					latitude: 39.9085,
@@ -108,16 +191,46 @@
 		onShow() {
 
 		},
-		onLoad() {
-			//获取当前位置
-			this.getLocation()
-			// var subnvue = uni.getSubNVueById('popup') // 获取nvue
-			// 	subnvue.show()  // 显示nvue
-			// uni.$on('popup', (data) => {
-			// 	console.log(data)
-			// })  
+		onLoad(e) {
+			if(e.position){
+				this.position =  JSON.parse(e.position)
+				console.log("地点",this.position)
+				this.nowLocation.latitude = this.position.location.split(',')[1]
+				this.nowLocation.longitude = this.position.location.split(',')[0]
+			}
+			//获取标记点
+			this.getMarkers()
 		},
 		methods: {
+			getMarkers(){
+				//点击列表标记改变颜色，显示气泡提示
+				// this.$api.doRequest('get', '/settledCompanyInfo/selectSettledCompanyInfo', {
+				// 	pageSize: this.pageSize,
+				// 	currentPage: this.currentPage,
+				// }).then(res => {
+				// 	if (res.data.code == 200) {
+				// 		this.datalist = res.data.data.records
+				// 	}
+				// })
+			},
+			lineClick(){
+				this.isActive= !this.isActive
+				// this.isscroll = !this.isscroll
+			},
+			upper: function(e) {
+				console.log(e)
+			},
+			lower: function(e) {
+				console.log(e)
+			},
+			scroll: function(e) {
+				console.log(e)
+				this.old.scrollTop = e.detail.scrollTop
+			},
+			bindPickerChange: function(e) {
+				console.log('picker发送选择改变，携带值为', e.target)
+				this.index = e.detail.value
+			},
 			confirm() {
 				console.log('确定')
 				this.showType = false
@@ -130,53 +243,55 @@
 				this.showType = true
 				console.log(1)
 			},
-			typeConfirm(e) {
-				console.log(e)
-				this.typeStr = this.typeList[e[0]].name
+			// 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',
-								width:30,
-								height:30,
-								callout: {
-									content: '中天昊元粮库',
-									color: '#333333',
-									fontSize: 24,
-									borderRadius: 20,
-									padding:10,
-									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
-
-						that.address = _address.province + _address.city + _address.district + _address.poiName
-						console.log(that.address)
-					}
-				});
+				// 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',
+				// 				width: 30,
+				// 				height: 30,
+				// 				callout: {
+				// 					content: '中天昊元粮库',
+				// 					color: '#333333',
+				// 					fontSize: 12,
+				// 					borderRadius: 20,
+				// 					padding: 4,
+				// 					bgColor: 'white',
+				// 					display: 'ALWAYS',
+				// 				},
+				// 			}
+				// 			_coverrsData.push(_obj)
+				// 		}
+				// 		that.covers = _coverrsData
+				// 		console.log('获取位置数据：', res);
+				// 		console.log('当前位置的经度：' + res.longitude);
+				// 		console.log('当前位置的纬度：' + res.latitude);
+				// 		//拼接当前定位回显地址
+
+				// 		// #ifdef APP-PLUS
+				// 		let _address = res.address
+				// 		that.address = _address.province + _address.city + _address.district + _address.poiName
+				// 		console.log(that.address)
+				// 		// #endif
+				// 	}
+				// });
 			},
 			markertap(e) {
 				console.log(e)
@@ -185,12 +300,19 @@
 					icon: 'none',
 					duration: 2000
 				})
+			},
+			getLst() {
+				console.log("加载数据")
 			}
 
 		}
 	}
 </script>
 <style scoped>
+	.active {
+		height: 583rpx!important;
+	}
+
 	.header {
 		flex-direction: row;
 		justify-content: space-between;
@@ -200,6 +322,8 @@
 
 	.title {
 		font-size: 32rpx;
+		font-weight: 500;
+		color: #333333;
 	}
 
 	.content {
@@ -216,12 +340,21 @@
 		bottom: 0;
 		width: 750rpx;
 		flex: 1;
-		font-size: 34px;
-		background: pink;
+		font-size: 34rpx;
+		background: white;
+		border-top-left-radius: 20rpx;
+		border-top-right-radius: 20rpx;
+	}
+
+	.warp {
+		/* 		flex-direction: row;
+		justify-content: center; */
 	}
 
 	.header-type {
 		font-size: 26rpx;
+		font-weight: 400;
+		color: #333333;
 	}
 
 	.alert {
@@ -253,17 +386,94 @@
 		align-items: center;
 		background: white;
 	}
-	.cancel{
+
+	.cancel {
 		font-size: 24rpx;
 		color: white;
 		font-weight: bold;
 	}
-	.confirm{
+
+	.confirm {
 		font-size: 24rpx;
 		color: green;
 		font-weight: bold;
 	}
-	.select-item{
+
+	.select-item {
+		font-size: 24rpx;
+	}
+
+	.warp {}
+
+	.bottom-list-item {
+		flex-direction: row;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+		padding-bottom: 20rpx;
+		margin-top: 20rpx;
+		border-bottom: 1px solid #EEEEEE;
+	}
+
+	.left {}
+
+	.left-img {
+		width: 102rpx;
+		height: 106rpx;
+	}
+
+	.localtion {
 		font-size: 24rpx;
+		font-weight: 400;
+		color: #AFB3BF;
+	}
+
+	.localtion {
+
+		flex-direction: column;
+	}
+
+	.right-img {
+		width: 21rpx;
+		height: 26rpx;
+		background: #AFB3BF;
+	}
+
+	.right {
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.middle {
+		flex-direction: column;
+		justify-content: center;
+	}
+
+	.warp {
+		padding: 20rpx;
+	}
+
+	.right-bottom {
+		font-size: 24rpx;
+		font-weight: 400;
+		color: #AFB3BF;
+	}
+
+	.top-line {
+		width: 68px;
+		height: 8px;
+		background: #B4B7C3;
+		border-radius: 4px;
+		flex-direction: row;
+		margin-bottom: 30rpx;
+	}
+
+	.line-style {
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.scroll-style {
+		height: 130rpx;
 	}
 </style>

pages/grain_pulse/enter.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="center">
+		<image class='bg' src='../../static/img/liangmai/bg@3x.png'></image>
 		<!-- 	<view class=""> -->
 		<view class="back-btn cuIcon-back" @click="navBack"></view>
 		<!-- <view class='title1'>入驻</view> -->
@@ -7,13 +8,13 @@
 			请完善入驻信息
 		</view>
 		<u-form class="forList">
-			<view class="modular">
+			<view style='padding-bottom:20px;' class="modular">
 				<u-form-item label="公司名称" label-width="30%" class="title Regular">
-					<u-input v-model="deptList.compName" input-align="right" class="write Medium"
+					<u-input maxlength='25' v-model="deptList.compName" input-align="right" class="write Medium"
 						placeholder="请输入公司名称" />
 				</u-form-item>
 				<view>
-					<view class="title Regular" style="margin-top: 15rpx;">主要类型（可多选，必须为真实经营类型）</view>
+					<view class="title Regular" style="margin-top: 15rpx;">主营类型（可多选，必须为真实经营类型）</view>
 					<view v-for="(item,index) in management" class="choice">
 						<!-- 	<u-tag :type="types[index] == null ? 'info' : types[index]" :text="item" show="show"
 							@click="singleClick(index)"></u-tag> -->
@@ -24,13 +25,22 @@
 				</view>
 			</view>
 			<view class="modular">
-				<u-form-item label="标题" label-width="30%" class="title Regular">
-					<u-input v-model="deptList.title" input-align="right" class="write Regular"
+				<u-form-item label="标题" label-width="30%" prop="title" class="title Regular">
+					<u-input maxlength="16" v-model="deptList.title" input-align="right" class="write Regular"
 						placeholder="用于封面展示，2-16个字" />
 				</u-form-item>
-				<u-form-item label="公司简介" label-width="30%" class="title Regular">
-					<u-input v-model="deptList.companyProfile" input-align="right" class="write Regular" type="textarea"
-						placeholder="请输入企业简介，如经营项目、产品类型、企业规模等，10-60个字" />
+				<u-form-item label-position='top' label="公司简介" label-width="30%" class="title Regular">
+					<!-- <u-input  input-align="right"  type="textarea"
+						 /> -->
+						 <view class='companyProfilewrap'>
+							 <textarea class="write Regular companyProfile" 
+							 maxlength="60" 
+							 placeholder="请输入企业简介，如经营项目、产品类型、企业规模等，10-60个字"
+							  v-model="deptList.companyProfile" name="" id="" cols="10" rows="3">
+							  </textarea>
+							  <view class='companyProfilecontent'>{{deptList.companyProfile.length}}/60个字</view>
+						 </view>
+						
 				</u-form-item>
 			</view>
 			<view class="modular">
@@ -53,13 +63,17 @@
 						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
 							:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
 							@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
-							:options="uploadOptions" :custom="uploadCustom" @on-progress="onProgress"></upload>
+							:options="uploadOptions" customBorder='2px dashed #D8DEF7' customBtnFontSize="14" customBtnColor="#6A7282" :customBtnHeight='custombtnheight'
+							 :customBtnWidth='custombtnwidth' customBack='#F9FAFE' :customBtnImage="custombtnimage" :customBtn='custombtn'
+							  :custom="uploadCustom" @on-progress="onProgress"></upload>
 					</view>
 					<view v-if="license2 != ''">
 						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
 							:size-type="['compressed']" @on-success="getImgUrl1" @on-error="onError"
 							@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
-							:options="uploadOptions1" :custom="uploadCustom" @on-progress="onProgress"></upload>
+							:options="uploadOptions1"  customBack='#FEF9FA' customBorder='2px dashed #F9D5DC' customBtnFontSize="14" customBtnColor="#6A7282" :customBtnHeight='custombtnheight'
+							 :customBtnWidth='custombtnwidth' :customBtnImage="custombtnimage" :customBtn='custombtn'
+							  :custom="uploadCustom" @on-progress="onProgress"></upload>
 					</view>
 				</view>
 			</view>
@@ -101,13 +115,16 @@
 					"text": "上传封面图片",
 					"bgc": ""
 				},
+				errorType: ['message'],
 				uploadOptions1: {
 					"text": "上传营业执照",
 					"bgc": ""
 				},
 				mainBusinessType: [],
 				uploadCustom: true,
-				deptList: {},
+				deptList: {
+					companyProfile:''
+				},
 				management: [{
 						name: "粮库",
 						checked: false
@@ -117,7 +134,7 @@
 						checked: false
 					},
 					{
-						name: "烘干厂",
+						name: "烘干塔",
 						checked: false
 					},
 					{
@@ -141,11 +158,17 @@
 				show: false,
 				// anNiuCss:"types",
 				anNiuCss: [],
+				custombtn:true,
+				custombtnimage:'../../static/img/liangmai/ic_shanchuan@3x.png',
+				custombtnwidth:50,
+				custombtnheight:50,
 				license1: "../../static/img/authentication/business@3x.png",
 				license2: "../../static/img/authentication/business@3x.png",
 
 			}
 		},
+		onLoad() {
+		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
@@ -197,16 +220,61 @@
 				})
 			},
 			perfect() {
+				this.show=false
 				uni.navigateTo({
 					url: `/pages/grain_pulse/perfect?deptList=`+JSON.stringify(this.deptList)
 				})
 			},
 			submit() {
 				var that = this
-				// if (!this.deptList.title) {
-				// 	this.$api.msg('标题不能为空')
-				// 	return
-				// }
+				if (!this.deptList.compName) {
+					this.$api.msg('公司名称不能为空')
+					return
+				}
+				if (this.mainBusinessType.length==0) {
+					this.$api.msg('至少选择一个主营类型')
+					return
+				}
+				if (!this.deptList.title) {
+					this.$api.msg('标题不能为空')
+					return
+				}
+				if (!this.deptList.companyProfile) {
+					this.$api.msg('企业简介不能为空')
+					return
+				}
+				if (!this.deptList.longitude&&!this.deptList.longitude) {
+					this.$api.msg('上传坐标不能为空')
+					return
+				}
+				if (!this.deptList.detailedAddress) {
+					this.$api.msg('详细地址不能为空')
+					return
+				}
+				if (!this.deptList.attachmentAddress) {
+					this.$api.msg('封面照片不能为空')
+					return
+				}
+				if (!this.deptList.licenseAddress) {
+					this.$api.msg('营业执照不能为空')
+					return
+				}
+				if (this.deptList.compName.length<2||this.deptList.compName.length>25) {
+					this.$api.msg('公司名称输入错误')
+					return
+				}
+				if (this.deptList.title.length<2||this.deptList.title.length>16) {
+					this.$api.msg('标题长度2-16个字')
+					return
+				}
+				if (this.deptList.companyProfile.length<10||this.deptList.companyProfile.length>60) {
+					this.$api.msg('简介长度10-60个字')
+					return
+				}
+				if (this.deptList.detailedAddress.length<2||this.deptList.detailedAddress.length>12) {
+					this.$api.msg('详细地址2-12个字')
+					return
+				}
 				// this.show = true
 				// return
 				this.deptList.mainBusinessType=this.mainBusinessType.toString()
@@ -247,11 +315,14 @@
 		width: 100vw;
 		height: 100vh;
 		overflow: scroll;
-		background: url(../../static/img/liangmai/bg@3x.png);
-		background-size: 100%;
-		background-repeat: no-repeat;
+		position:relative;z-index:2;
+	}
+	.bg{
+		position:absolute;
+		width:100%;
+		left: 0;
+		top:0;
 	}
-
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -308,32 +379,24 @@
 	.choice {
 		margin-top: 10px;
 		display: inline-block;
-		margin-bottom: 6px;
 	}
 
 	.title {
-		margin-left: 20rpx;
 		color: #71747C;
 	}
 
 	.types {
-		width: 55px;
-		height: 30px;
 		background-color: #F4FAF8;
 		text-align: center;
-		line-height: 32px;
 		border-radius: 20px;
-		margin-left: 14px;
+		margin-left: 5px;
+		padding:8px 19px;
 	}
 
 	.types1 {
-		width: 55px;
-		height: 30px;
 		background-color: #22C572;
 		text-align: center;
-		line-height: 32px;
 		border-radius: 20px;
-		margin-left: 14px;
 		color: #FFFFFF;
 	}
 
@@ -350,12 +413,14 @@
 
 	.modular {
 		background-color: #FFFFFF;
-		border-radius: 20px;
-		margin-top: 20px;
+		border-radius: 10px;
+		margin-top: 10px;
+		position:relative;z-index:2;
+		padding:0 12.5px;
 	}
 
 	.forList {
-		margin-top: 40px;
+		margin-top: 20px;
 	}
 
 	.titleUp {
@@ -363,6 +428,8 @@
 		font-size: 44rpx;
 		margin-top: 80px;
 		margin-left: 10px;
+		position: relative;
+		z-index:2;
 	}
 
 	.upload {
@@ -388,4 +455,21 @@
 		margin: 0 auto;
 		font-size: 16px;
 	}
+	.companyProfilewrap{
+		position:relative;
+		width:100%;
+	}
+	.companyProfile{
+		width:90%;height:138px;
+		background:#F9F9FA;
+		font-size:13px;
+		padding:13px;
+		border-radius:5px;
+	}
+	.companyProfilecontent{
+		position:absolute;
+		bottom:10px;
+		right:15px;
+		font-size:13px;
+	}
 </style>

pages/grain_pulse/home.vue

@@ -5,9 +5,9 @@
 				<view class='Medium flex align-item-center locationwrap'
 					@click='naviageToPage("/pages/grain_pulse/position/position")'>
 					<image class='location' src="../../static/img/liangmai/icon_ditu.png" mode=""></image>
-					{{position}}
+					{{position.name}}
 				</view>
-				<view @click='naviageToPage("/pages/grain_pulse/distribution/distribution")'
+				<view @click='naviageToPage("/pages/grain_pulse/distribution/distribution?position="+JSON.stringify(position))'
 					class='Regular flex align-item-center distribution justify-center'>
 					<image class='cangku' src="../../static/img/liangmai/cangku.png" mode=""></image>
 					分布
@@ -82,7 +82,9 @@
 		},
 		data() {
 			return {
-				position: "未设置",
+				position:{
+					name:"未设置"
+				} ,
 				status: 0,
 				mainBusinessType: '',
 				mainBusinessTypeKey: '0',

pages/grain_pulse/localtion/coordinate.nvue

@@ -8,10 +8,11 @@
 			</map>
 		</view>
 		<view class="bottom">
-			<text>
-				{{longitude}},{{latitude}}
-			</text>
-			<view class="" @click="config">确定</view>
+			<view class="bottom-left">
+				<text class="bottom-content">经度：{{longitude}}</text>
+				<text class="bottom-content">纬度：{{latitude}}</text>
+			</view>
+			<text class="config-btn" @click="config">确定</text>
 		</view>
 	</view>
 </template>
@@ -23,24 +24,21 @@
 				nowMapIndex: true,
 				phoneHeight: '', //屏幕高
 				phoneWidth: '', //屏幕宽
-				detail: {
-					longitude: '',
-					latitude: ''
-				},
 				nowLocation: {
-					longitude: '',
-					latitude: '',
+					longitude: 116.39747,
+					latitude: 39.9085,
 					address: '山海广场'
 				},
 				title: 'map',
 				latitude: 39.909,
 				longitude: 116.39742,
-				covers: [{
-					id: 0,
-					latitude: 39.9085,
-					longitude: 116.39747,
-					iconPath: '../../../static/img/location.png',
-				}]
+				// covers: [{
+				// 	id: 0,
+				// 	latitude: 39.9085,
+				// 	longitude: 116.39747,
+				// 	iconPath: '../../../static/img/location.png',
+				// }],
+				covers: []
 			}
 		},
 		onReady() {
@@ -54,9 +52,9 @@
 			});
 		},
 		computed: { //计算
-			nintyPercentScreenHeight() { //百分之九十的屏幕高
+			nintyPercentScreenHeight() { //百分之百的屏幕高
 				if (this.phoneHeight !== '' && this.phoneWidth !== '') {
-					return 750 / (this.phoneWidth) * (this.phoneHeight) * 0.9 + 'rpx'
+					return 750 / (this.phoneWidth) * (this.phoneHeight) + 'rpx'
 				} else {
 					return '1250rpx'
 				}
@@ -72,7 +70,7 @@
 			},
 		},
 		onLoad() {
-			this.getLocation()
+			// this.getLocation()
 		},
 		methods: {
 			getLocation() {
@@ -95,15 +93,25 @@
 				});
 			},
 			tap(e) {
+					let newmarker =[];
+							var id=1;
 				this.longitude = e.detail.longitude;
 				this.latitude = e.detail.latitude;
 				console.log(this.longitude)
 				console.log(this.latitude)
+				let maker= {
+					id: id++,
+					latitude: this.latitude,
+					longitude:this.longitude,
+					iconPath: '../../../static/img/location.png',
+				}
+				newmarker.push(maker)
+				this.covers = newmarker
 
 			},
-			config(){
+			config() {
 				uni.navigateTo({
-					
+
 				})
 			}
 		}
@@ -112,19 +120,23 @@
 
 <style scoped>
 	.content {
-flex: 1;
-width: 750rpx;
+		flex: 1;
+		width: 750rpx;
 	}
-	
+
 	.bottom {
-		width: 96%;
-		background: white;
 		position: fixed;
 		bottom: 54rpx;
-		left: 0;
+		left: 25rpx;
 		right: 0;
-		margin: auto;
-		padding: 27rpx 37rpx;
+		width:700rpx;
+		background: white;
+		flex-direction: row;
+		flex: 1;
+		justify-content: space-between;
+		align-items: center;
+		padding: 22rpx 20rpx 22rpx 49rpx;
+		border-radius: 20rpx;
 	}
 
 	.title-style {
@@ -132,4 +144,17 @@ width: 750rpx;
 		font-weight: 500;
 		color: #333333;
 	}
+	.config-btn{
+		width: 144rpx;
+		height: 67rpx;
+		line-height: 67rpx;
+		background: #22C572;
+		border-radius: 10rpx;
+		color: white;
+		text-align: center;
+		font-size: 28rpx;
+	}
+	.bottom-content{
+		font-size: 28rpx;
+	}
 </style>

pages/grain_pulse/localtion/localtion.nvue

@@ -119,11 +119,9 @@
 			margin-top: 15rpx;
 
 			.left {
-				display: flex;
 				flex-wrap: nowrap;
 			}
 			.metre{
-				display: flex;
 				justify-content: space-between;
 				align-items: center;
 				.line{

pages/grain_pulse/perfect.vue

@@ -3,14 +3,14 @@
 		<u-form>
 			<view class="modular">
 				<u-form-item label="公司名称" label-width="30%" class="title Medium" :border-bottom="topBorder">
-					<u-input v-model="deptList.name" input-align="right" class="write Regular" placeholder="请输入公司名称" />
+					<view style='width:100%;text-align:right;margin-right:10px;'>{{deptList.compName}}</view>
 				</u-form-item>
 			</view>
 			<view class="modular">
 				<view class="title Medium">企业概况</view>
 				<!-- <u-input v-model="value" :type="type"  :height="height" :auto-height="autoHeight" placeholder="请输入企业概况，如经营项目、产品类型、企业规模等，不超过300个字" /> -->
 				<textarea value="" placeholder="请输入企业概况，如经营项目、产品类型、企业规模等，不超过300个字" class="areaText Regular"
-					v-model="deptList.a" placeholder-style="color:#AFB3BF"/>
+					v-model="deptList.companyContant" placeholder-style="color:#AFB3BF"/>
 				<view class="title Regular">添加标签（标签应突出企业特色，最多6个）</view>
 				<view class="flex" style="width: 100%;">
 					<view class="forLists" v-for="(item,index) in label" :Key="index">
@@ -26,26 +26,26 @@
 					<u-button :type="types" class="inputOk" shape="circle" @click="addinput">确定</u-button>
 				</view>
 			</view>
-			<view class="modular">
+			<view style='padding-bottom:10px;' class="modular">
 				<view class="title Regular">场地照片（图片清晰，最多9张）</view>
 				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="9"
 					:size-type="['compressed']" :options="uploadOptions" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
 			</view>
-			<view class="modular">
+			<view  style='padding-bottom:10px;' class="modular">
 				<view class="title Medium">联系方式</view>
 				<view v-for="(item,index) in Persons">
 					<view class="information flex">
 						<view class="xinxi">
 							<u-form-item label="姓名" label-width="30%" class="Regular" label-position="top"
 								style="font-size: 28rpx; color: #71747C;" :border-bottom="topBorder">
-								<u-input v-model="item.name" class="Regular" placeholder="请输入姓名" />
+								<u-input v-model="item.contacts" class="Regular" placeholder="请输入姓名" />
 							</u-form-item>
 						</view>
 						<view class="xinxi">
 							<u-form-item label="电话" label-width="30%" class="Regular" label-position="top"
 								style="font-size: 28rpx; color: #71747C;" :border-bottom="topBorder">
-								<u-input v-model="item.phone" class="Regular" placeholder="请输入电话" />
+								<u-input v-model="item.contactsPhone" class="Regular" placeholder="请输入电话" />
 							</u-form-item>
 						</view>
 						<div class="del" @click="delPerson(index)">
@@ -61,10 +61,10 @@
 			</view>
 			<view class="modular">
 				<u-form-item label="邮箱" label-width="30%" class="title Regular">
-					<u-input v-model="deptList.name" input-align="right" class="write Regular" placeholder="请输入电子邮箱" />
+					<u-input v-model="deptList.email" input-align="right" class="write Regular" placeholder="请输入电子邮箱" />
 				</u-form-item>
 				<u-form-item label="传真" label-width="30%" class="title Regular" :border-bottom="topBorder">
-					<u-input v-model="deptList.name" input-align="right" class="write Regular" placeholder="请输入传真号" />
+					<u-input v-model="deptList.fax" input-align="right" class="write Regular" placeholder="请输入传真号" />
 				</u-form-item>
 			</view>
 		</u-form>
@@ -91,15 +91,13 @@
 				action: 'https://www.zthymaoyi.com/upload/admin',
 				fileList: [],
 				imgList: [],
-				Persons: [{
-					name: "张良",
-					phone: "1365411111"
-				}],
+				Persons: [],
 				topBorder: false,
 			}
 		},
 		onLoad(options) {
-			console.log(options)
+			this.deptList=JSON.parse(options.deptList)
+			console.log(this.deptList)
 		},
 		methods: {
 			add() {
@@ -109,6 +107,10 @@
 					this.inputShow = true
 				}
 			},
+			getImgUrl(res) {
+				console.log(res)
+				this.imgList.push(res);
+			},
 			addinput() {
 				if (!this.value) {
 					this.$api.msg('标签内容不能为空')
@@ -141,13 +143,21 @@
 				this.imgList.push(e.url)
 			},
 			submit() {
+				var that=this
+				this.deptList.label=this.label.toString()
+				this.deptList.sitePhotoAddress=this.imgList.toString()
+				this.deptList.settledCompanyContacts=this.Persons
 				uni.showModal({
 					content: "详细的企业信息有助于客户了解您的企业，是否确定提交？",
 					showCancel: true,
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-
+							that.$api.doRequest('post', '/settledCompanyInfo/api/addSettledCompanyInfo', that.deptList).then(res => {
+								if (res.data.code == 200) {
+									uni.navigateBack(1)
+								}
+							})
 						}
 					}
 				})
@@ -234,7 +244,6 @@
 	}
 
 	.upload {
-		height: 250rpx;
 		text-align: center;
 		margin: 0px 0;
 		margin-bottom: 10px;
@@ -262,9 +271,6 @@
 
 	.xinxi {
 		margin-left: 70rpx;
-		.u-input input{
-			font-size:17px;
-		}
 	}
 
 	.del {

pages/grain_pulse/position/position.vue

@@ -2,11 +2,11 @@
 	<view class="">
 		<view class="header">
 			<view class="city Medium">
-				<text class="select-city" @click="loadCity">{{city}}</text>
+				<view class="select-city" @click="loadCity">{{city}}</view>
 				<u-icon name="arrow-down"></u-icon>
 			</view>
-			<u-search input-align="left" :disabled="true" @click="searchAddress" :show-action="false" height="70"
-				placeholder="请输入位置信息" v-model="addressName"></u-search>
+			<u-search input-align="left" @change="searchAddress" :show-action="false" height="70" placeholder="请输入位置信息"
+				v-model="addressName"></u-search>
 		</view>
 		<view class="header2">
 			<view class="header2-tip Regular">
@@ -20,17 +20,27 @@
 				</view>
 				<view class="reposition Regular" @click="reloadPosition">{{po_tips}}</view>
 			</view>
-
 		</view>
-
-		<view class="position-list Regular">
+		<view class="position-list Regular" v-if="addressName==''">
 			<view class="search">
 				<view>最近搜索</view>
 				<u-icon name="trash-fill" color="#AFB3BF" size="28" @click="delList"></u-icon>
 			</view>
 			<view class="search-list">
 				<view v-for="(item,index) in list" class="search-list-item" @click="toHome(item)">
-					{{item}}
+					{{item.name}}
+				</view>
+			</view>
+
+		</view>
+		<view class="search-content" v-if="addressName!=''">
+			<view v-for="(item,index) in searchList" :key="index" class="search-contnet-item" @click="addressClick(item)">
+				<view class="top">
+					<view v-html="item.newName" class="content"></view>
+					<view class="distance" v-if="address!='定位失败,请点击重新定位'">{{item.distance}}千米</view>
+				</view>
+				<view class="bottom">
+					{{item.adname}}{{item.address}}
 				</view>
 			</view>
 
@@ -41,6 +51,7 @@
 
 <script>
 	import permision from "@/js_sdk/wa-permission/permission.js"
+	import amap from '@/js_sdk/js-amap/amap-wx.130.js'
 	import uniSegmentedControl from "@/components/uni-segmented-control/uni-segmented-control.vue"
 	export default {
 		components: {
@@ -48,22 +59,44 @@
 		},
 		data() {
 			return {
+				searchList: [],
+				nowRegion: {},
 				addressName: "",
 				isposition: false,
 				isIos: true,
 				address: "定位失败,请点击重新定位",
-				city: '营口市',
+				city: '北京',
 				list: [],
 				position: '',
 				addressObj: {},
 				seconds: 3,
 				po_tips: '重新定位',
+				seach: {
+					latitude: 39.92,
+					longitude: 116.46,
+				}
 			}
 		},
+		onShow() {
+			let that = this
+			uni.getStorage({
+				key: 'nowRegion',
+				success: (res) => {
+					console.log("nowRegion", res.data)
+					that.nowRegion = res.data
+					this.seach.longitude = res.data.longitude
+					this.seach.latitude = res.data.latitude
+					that.city = res.data.positionName.cityName
+					// console.log("city", that.city)
+					uni.removeStorage({
+						key: 'nowRegion'
+					})
+				},
+			})
+		},
 		onLoad(e) {
-			if (e.city) {
-				this.city = e.city
-			}
+			// var p1 = [116.434027, 39.941037];
+			// var p2 = [116.461665, 39.941564];
 			let that = this
 			uni.getStorage({
 				key: 'SearchList_key',
@@ -72,31 +105,50 @@
 				}
 			});
 			this.getLocation()
-			// 获取定位
-			// this.utils.getLocation().then(function(res) {
-			// 	debugger
-			// 	console.log("定位信息",res)
-			// 	this.city = res.address.city
-			// 	this.address = res.address.poiName
-			// 	console.log('city',this.city)
-			// 	console.log('poiName',this.address)
-			// 	if (res.errMsg != "getLocation:ok") {
-			// 		// 定位权限未开启，引导设置
-			// 		uni.showModal({
-			// 			title: '温馨提示',
-			// 			content: '您已拒绝定位,请开启',
-			// 			confirmText: '去设置',
-			// 			success(res) {
-			// 				if (res.confirm) {
-			// 					//打开授权设置
-			// 					this.utils.openSetting()
-			// 				}
-			// 			}
-			// 		})
-			// 	}
-			// })
 		},
 		methods: {
+			addressClick(item){
+				this.list.push(item)
+				uni.setStorage({
+					key: 'SearchList_key',
+					data: this.list
+				});
+				uni.setStorage({
+					key: 'setLocaltion',
+					data: item,
+					success: (res) => {
+						uni.switchTab({
+							url:'../home'
+						})
+					},
+				
+				})
+				
+			},
+			// 排序
+			compare(property) {
+				return function(a, b) {
+					var value1 = a[property];
+					var value2 = b[property];
+					return value1 - value2;
+				}
+			},
+			// 经纬度计算距离
+			getDistance(lat1, lng1, lat2, lng2) {
+				lat2 = parseFloat(lat2)
+				lng2 = parseFloat(lng2)
+				console.log(lat1, lng1, lat2, lng2)
+				var radLat1 = lat1 * Math.PI / 180.0;
+				var radLat2 = lat2 * Math.PI / 180.0;
+				var a = radLat1 - radLat2;
+				var b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
+				var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
+					Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+				s = s * 6378.137; // EARTH_RADIUS;
+				s = Math.round(s * 10000) / 10000;
+				console.log("计算结果", s, 'KM');
+				return s
+			},
 			// 删除最近搜索
 			delList() {
 				uni.setStorage({
@@ -110,14 +162,17 @@
 					type: 'gcj02',
 					geocode: true,
 					success: function(res) {
-						console.log('获取位置数据：', res);
-						console.log('当前位置的经度：' + res.longitude);
-						console.log('当前位置的纬度：' + res.latitude);
+						// console.log('获取位置数据：', res);
+						// console.log('当前位置的经度：' + res.longitude);
+						// console.log('当前位置的纬度：' + res.latitude);
 						//拼接当前定位回显地址
 						// #ifdef APP-PLUS
 						let _address = res.address
 						that.city = _address.city
-						that.address = _address.province + _address.city + _address.district + _address.poiName
+						that.seach.longitude = res.longitude
+						that.seach.latitude = res.latitude
+						that.address = _address.province + _address.city + _address.district + _address
+							.poiName
 						console.log(that.address)
 						// #endif
 					}
@@ -131,15 +186,17 @@
 					that.seconds--;
 					uni.getLocation({
 						type: 'gcj02',
+						geocode: true,
 						success: function(res) {
 							console.log('当前位置的经度：' + res.longitude);
 							console.log('当前位置的纬度：' + res.latitude);
 							// #ifdef APP-PLUS
 							let _address = res.address
 							that.city = _address.city
-							that.longitude = res.longitude
-							that.latitude = res.latitude
-							that.address = _address.province + _address.city + _address.district +
+							that.seach.longitude = res.longitude
+							that.seach.latitude = res.latitude
+							that.address = _address.province + _address.city + _address
+								.district +
 								_address.poiName
 							// #endif
 						}
@@ -171,7 +228,7 @@
 			// 跳转ios权限界面
 			judgeIosPermission: function(permisionID) {
 				var result = permision.judgeIosPermission(permisionID)
-				console.log(result);
+				// console.log(result);
 				var strStatus = (result) ? "已" : "未"
 				uni.showModal({
 					content: permisionID + '权限' + strStatus + "获得授权",
@@ -194,36 +251,38 @@
 					showCancel: false
 				});
 			},
-			// 搜索
+			//设置搜索关键字颜色
+			getStringColorReplace(val, val1) {
+				let _lat1 = this.seach.latitude
+				let _lng1 = this.seach.longitude
+				for (let j = 0; j < val.length; j++) {
+					var replaceString = '<view style="color:#22C572' + ';">' + val1 + "</view>";
+					val[j].newName = val[j].name.replace(RegExp(val1, 'g'), replaceString);
+					let _lat2 = val[j].location.split(',')[1];
+					let _lng2 = val[j].location.split(',')[0];
+					val[j].distance = this.getDistance(_lat1, _lng1, _lat2, _lng2)
+				}
+				//排序
+				this.searchList.sort(this.compare("distance"))
+			},
+			// 关键字搜索
 			searchAddress(val) {
-				// console.log(val)
-				let that = this;
-				uni.chooseLocation({
-					success: function(res) {
-						console.log(res)
-						// console.log('位置名称：' + res.name);
-						// console.log('详细地址：' + res.address);
-						// console.log('纬度：' + res.latitude);
-						// console.log('经度：' + res.longitude);
-						that.list.push(res.name)
-						this.position = res.name
-						uni.setStorage({
-							key: 'SearchList_key',
-							data: that.list
-						});
-						uni.setStorage({
-							key: 'setLocaltion',
-							data: res.name,
-							success() {
-								uni.switchTab({
-									url: "../home"
-								});
-							}
-
-						})
+				console.log(1222)
+				let parameters = {
+					key: 'dd701d394d116b50268dc16470ddd615',
+					keywords: val,
+					region: this.city,
+					page_size: 25
+				}
+				uni.request({
+					url: 'https://restapi.amap.com/v5/place/text',
+					data: parameters,
+					success: (res) => {
+						console.log(res.data);
+						this.searchList = res.data.pois
+						this.getStringColorReplace(res.data.pois, val)
 					}
 				});
-
 			},
 			// 切换城市
 			loadCity() {
@@ -333,4 +392,34 @@
 		padding: 16rpx 24rpx;
 		margin: 0 20rpx 20rpx 0;
 	}
+	.search-content{
+		border-radius: 20rpx 20rpx 0 0;
+		margin-top: 20rpx;
+		padding:10rpx 20rpx;
+		background: white;
+		.search-contnet-item{
+			border-bottom:1px solid #EEEEEE;
+			padding-bottom: 10rpx;
+			margin-top: 20rpx;
+			.top{
+				display: flex;
+				justify-content: space-between;
+				.content{
+					font-size: 28rpx;
+					font-weight: 400;
+				}
+				.distance{
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #AFB3BF;
+				}
+			}
+			.bottom{
+				margin-top: 6rpx;
+				font-size: 24rpx;
+				font-weight: 400;
+				color: #AFB3BF;
+			}
+		}
+	}
 </style>

pages/grain_pulse/selectCity/selectCity.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container">
+	<view class="">
 		<citySelect @back_city="back_city"></citySelect>
 	</view>
 </template>
@@ -16,6 +16,7 @@
 			}
 		},
 		onLoad() {
+			let that = this
 			uni.getSystemInfo({
 				success: function(res) {
 					console.log("statusBarHeight", res.statusBarHeight)
@@ -25,12 +26,19 @@
 		},
 		methods: {
 			back_city(e) {
-				if (e !== 'no') {
-					this.region = e.cityName 
+				if (e.positionName !== 'no') {
+					this.region = e.positionName.cityName 
 					// this.$refs.popupRef.close();
-					uni.navigateTo({
-						url:"../position/position?city="+this.region
-					})
+					uni.setStorage({
+						key: 'nowRegion',
+						data: e,
+						success() {
+							uni.navigateTo({
+								url:"../position/position"
+							})
+						}
+					});
+				
 					
 				} else {
 					// this.$refs.popupRef.close();

pages/task/my_task.vue

@@ -15,18 +15,24 @@
 		<view class="introduce-section">
 			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<view class="title flex">
-					<text>
+					<text v-if='statusFlag==1'>
 						{{item.carNo}}({{item.tranCarNo}})
 					</text>
+					<text v-else>{{item.messageTitle}}</text>
 					<view  class="title-tip-a" v-if="item.statusFlag==3">已完成</view>
 					<view  class="title-tip" v-if="item.statusFlag==1">未完成</view>
 				</view>
-				<view class="flex title_b">
+				<view v-if='statusFlag==1' class="flex title_b">
 					<view class="title-tip">
 						{{item.contractNo}}
 					</view>
 					<view class="title-tip-b">{{item.inOutDate}}</view>
 				</view>
+				<view v-else class="flex title_b">
+					<view class="title">
+						{{item.messageContent}}
+					</view>
+				</view>
 				<u-tag :text="item.taskType" type="success" v-if="item.taskType == '出库任务'"/>
 				<u-tag :text="item.taskType" type="primary" v-if="item.taskType == '入库任务'"/>
 			</view>
@@ -62,6 +68,10 @@
 					pageSize: 10,
 					currentPage: 1
 				},
+				data: {
+					pageSize: 10,
+					currentPage: 1
+				},
 				keyword:""
 			};
 		},
@@ -153,23 +163,37 @@
 					uni.hideLoading()
 				})
 			},
-			getIndexBuyData() {
+			getIndexBuyData(status) {
 				const that = this
 				var pages = that.pages
 				var limit = that.limit
+				var url=''
 				uni.showLoading({
 					title:"正在加载"
 				})
+			   var data={}
 				this.warehouseInOutInfo.statusFlag = this.statusFlag
 				this.warehouseInOutInfo.phone = this.userInfo.phone
 				this.warehouseInOutInfo.pcFlag = 0
+				if(this.statusFlag==1){
+					data=this.warehouseInOutInfo
+					url='/warehouseInOutInfo/selectInfo'
+				}else{
+					data=this.data
+					url='/commonUser/query/findHisPageNoticeTasks'
+				}
 				//this.warehouseInOutInfo.status = this.status
-				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfo', this.warehouseInOutInfo).then(res => {
+				this.$api.doRequest('get', url, data).then(res => {
 					if (res.data.code == 200) {
 						let data = res.data.data.records
 						//采购信息
 						if (data.length > 0) {
-							that.taskInfo = that.taskInfo.concat(data)
+							if(status){
+								that.taskInfo=data
+							}else{
+								that.taskInfo = that.taskInfo.concat(data)
+							}
+							
 							
 						} else {
 							if (that.pages > 1) {
@@ -185,7 +209,6 @@
 							that.isSole=false
 						}
 						uni.hideLoading()
-						this.taskInfo = res.data.data.records
 					} else {
 						uni.showToast({
 							title: res.data.message,
@@ -204,7 +227,7 @@
 			tabcarchange(statusFlag) {
 				this.statusFlag = statusFlag
 				this.pageSize = 1
-				this.getIndexBuyData()
+				this.getIndexBuyData(1)
 			},
 			navToDetailPage(item) {
 				if(item.taskType == "入库任务"){
@@ -250,6 +273,12 @@
 		line-height: 40px;
 		flex: 2.5;
 	}
+	.introduce-section .title_b .title{
+		font-size: 13px;
+		height:40px;
+		padding:10px 0;
+		flex: 2.5;
+	}
 	.introduce-section .title_b .title-tip-b{
 		flex: 1;
 		font-size: 13px;

pages/user/user.vue

@@ -104,15 +104,6 @@
 					},
 					{
 						num: 1,
-						name: '我的粮脉',
-						// icon: 'cuIcon-apps',
-						src:'../../static/img/sign/authentication@2x.png',
-						tips: 0,
-						url: '/pages/grain_pulse/my_grain_pulse',
-						show: true
-					},
-					{
-						num: 2,
 						name: '我的合同',
 						// icon: 'cuIcon-calendar',
 						src:'../../static/img/sign/myContract@2x.png',
@@ -121,7 +112,7 @@
 						show: true
 					},
 					{
-						num: 3,
+						num: 2,
 						name: '我的任务',
 						// icon: 'cuIcon-copy',
 						src:'../../static/img/sign/myTask@2x.png',
@@ -129,6 +120,15 @@
 						url: '/pages/task/my_task',
 						show: true
 					},
+					{
+						num: 3,
+						name: '我的粮脉',
+						// icon: 'cuIcon-apps',
+						src:'../../static/img/sign/authentication@2x.png',
+						tips: 0,
+						url: '/pages/grain_pulse/my_grain_pulse',
+						show: true
+					},
 					{
 						num: 4,
 						name: '我的发布',