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

# Conflicts:
#	config/index.js

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&&options.bgc==''?'customStyle':'customStyleBgc'"
+		<view style="display: inline-block;" :style="{
+			background:custom?customBack:'transparent',
+			border:custom?customBorder:'1px solid transparent'
+		}" :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" name="plus" class="u-add-btn" size="40"></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],
@@ -720,4 +758,11 @@
 		height: 440rpx !important;
 		position: absolute;
 	}
+	.default{
+		
+		.u-list-item.u-add-wrap{
+			background:#fff;
+			border:1px dashed #AFB3BF;
+		}
+	}
 </style>

config/index.js

@@ -1,11 +1,17 @@
 const dev = {
+<<<<<<< HEAD
 	baseUrl: 'https://www.zthymaoyi.com',
 	baseUrlNew: 'http://api.eliangeyun.com',
 	// baseUrlNew: 'http://api.eliangeyun.com/',
+=======
+	// baseUrl: 'https://www.zthymaoyi.com',
+	baseUrlNew: 'http://192.168.1.110:8090/',
+	//baseUrlNew: 'http://api.eliangeyun.com/',
+>>>>>>> d303f3c786c9dc54ee027e83252cfac212a2d7e5
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }
 
 export function def() {
 	return dev
-}
+}

main.js

@@ -37,7 +37,7 @@ let urlAddress = 'liangxin.zthymaoyi.com'
 Vue.prototype.$url = 'https://'+urlAddress+'/upload/'
 Vue.prototype.$uploadUrl = 'https://'+urlAddress+'/file/upload'
 Vue.prototype.$ws = 'wss://'+urlAddress+'/chat'
-Vue.prototype.$ossUrl = 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/appData'
+Vue.prototype.$ossUrl = 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/'
 Vue.prototype.utils = utils
 
 // let urlAddress = 'localhost'

pageD/myRelease/buyDetails.vue

@@ -188,7 +188,6 @@
 			getList(id1){
 				this.$api.doRequest('get','/procurementPlanInfo/getProcurementPlan',{id:id1}).then(res => {
 					this.procurementPlanInfos = res.data.data
-					
 				})
 				.catch(res => {
 					if(res.errmsg){

pageD/myRelease/buyEdit.vue

@@ -501,11 +501,11 @@
 						}
 					}
 				}else if(this.deptList.procurementPlanType == '期货'){
-					if (!this.deptList.basisPrice) {
+					if (!String(this.deptList.basisPrice)) {
 						this.$api.msg('基差不能为空')
 						return
 					}
-					if (this.deptList.basisPrice>10000||this.deptList.basisPrice<1) {
+					if (this.deptList.basisPrice>10000||this.deptList.basisPrice<0) {
 						this.$api.msg('基差输入错误')
 						return
 					}

pageD/myRelease/buyGrain.vue

@@ -465,11 +465,11 @@
 						}
 					}
 				} else if (this.deptList.procurementPlanType == '期货') {
-					if (!this.deptList.basisPrice) {
+					if (!String(this.deptList.basisPrice)) {
 						this.$api.msg('基差（元/吨）不能为空')
 						return
 					}
-					if (this.deptList.basisPrice > 10000 || this.deptList.basisPrice < 1) {
+					if (this.deptList.basisPrice > 10000 || this.deptList.basisPrice < 0) {
 						this.$api.msg('基差输入错误')
 						return
 					}

pageD/myRelease/sellEdit.vue

@@ -497,7 +497,7 @@
 						}
 					}
 				} else if (this.deptList.salePlanType == '期货') {
-					if (!this.deptList.basisPrice) {
+					if (!String(this.deptList.basisPrice)) {
 						this.$api.msg('基差（元/吨）不能为空')
 						return
 					}

pageD/myRelease/sellGrain.vue

@@ -497,11 +497,11 @@
 						}
 					}
 				} else if (this.deptList.salePlanType == '期货') {
-					if (!this.deptList.basisPrice) {
+					if (!String(this.deptList.basisPrice)) {
 						this.$api.msg('基差（元/吨）不能为空')
 						return
 					}
-					if (this.deptList.basisPrice > 10000 || this.deptList.basisPrice < 1) {
+					if (this.deptList.basisPrice > 10000 || this.deptList.basisPrice < 0) {
 						this.$api.msg('基差输入错误')
 						return
 					}

pages.json

@@ -22,12 +22,12 @@
 				"selectedIconPath": "static/img/jiaoyi_check.png",
 				"text": "交易"
 			},
-			// {
-			// 	"pagePath": "pages/grain_pulse/home",
-			// 	"iconPath": "static/img/liangmai.png",
-			// 	"selectedIconPath": "static/img/liangmai_check.png",
-			// 	"text": "粮脉"
-			// },
+			{
+				"pagePath": "pages/grain_pulse/home",
+				"iconPath": "static/img/liangmai.png",
+				"selectedIconPath": "static/img/liangmai_check.png",
+				"text": "粮脉"
+			},
 			{
 				"pagePath": "pages/tran/tran",
 				"iconPath": "static/img/wuliu.png",
@@ -65,13 +65,6 @@
 				"navigationBarTitleText": "工厂价格"
 			}
 		},
-		{
-			"path": "pages/grain_pulse/friendcircle",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "动态"
-			}
-		},
 		{
 			"path": "pages/grain_pulse/details",
 			"style": {
@@ -113,6 +106,33 @@
 				"navigationBarTitleText": "完善信息"
 			}
 		},
+		{
+			"path": "pages/grain_pulse/dynamic",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "动态"
+			}
+		},
+		{
+			"path": "pages/grain_pulse/release",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "发布"
+			}
+		},
+		{
+			"path": "pages/grain_pulse/record",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "记录",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false,
+					"animationType": "slide-in-bottom",
+					"softinputMode": "adjustPan"
+				}
+			}
+		},
 		{
 			"path": "pages/grain_pulse/search",
 			"style": {
@@ -127,6 +147,13 @@
 				"navigationBarTitleText": "我的粮脉"
 			}
 		},
+		{
+			"path": "pages/task/details",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "详情"
+			}
+		},
 		{
 			"path": "pages/sale/portprice",
 			"style": {
@@ -544,74 +571,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/details.vue

@@ -1,12 +1,12 @@
 <template>
 	<view>
-		<view class='swiper'>
+		<view v-if='sitePhotoAddress.length>0' class='swiper'>
 			<swiper class="screen-swiper header-swiper" ::class="dotStyle?'square-dot':'round-dot'"
 				:indicator-dots="false" :circular="true"  interval="5000" 
 				 :current="status" @change="topSwiperTab">
-				<swiper-item class="swiper-item" v-for="(item,index) in imagelist" :key="index"
-					:class="status==index?'text-white':''" @click="naviageToPage(item.url)">
-					<image :src="item.url"></image>
+				<swiper-item class="swiper-item" v-for="(item,index) in sitePhotoAddress" :key="index"
+					:class="status==index?'text-white':''">
+					<image :src="item"></image>
 					<!-- 	<view style='position:absolute;top:50%;left:50%;transform: translate(-50%,-50%);'>11111</view> -->
 				</swiper-item>
 			</swiper>
@@ -15,28 +15,22 @@
 			</view>
 			<view class='functionality'>
 				<image @click='show=true' class='jubao' src="../../static/img/liangmai/jubao.png" mode=""></image>
-				<image class='collect' :src="iscollect?'../../static/img/liangmai/shoucang1.png':'../../static/img/liangmai/shoucang-2.png'" mode=""></image>
+				<image @click='collect' class='collect' :src="companylist.collectionCompanyList.length>0?'../../static/img/liangmai/shoucang1.png':'../../static/img/liangmai/shoucang-2.png'" mode=""></image>
 			</view>
 		</view>
 		<view class='company'>
-			<view style='padding:21px;'>
+			<view style='padding:21px;padding-bottom:0;'>
 				<view style='font-size:24px;' class='Medium'>{{companylist.compName}}</view>
 				<view style='margin-top:3px;' class='flex'>
 					<view class='aptitude'>
 						<image class='aptitudeImage' :src="aptiutudeStatus?'../../static/img/liangmai/bg_no_check.png':'../../static/img/liangmai/bg_check.png'" mode=""></image>
 						<text class='aptitudeText Medium'>资质</text>
 					</view>
-					<view class='Regular' style='font-size:13px;'>主营：<text v-for='item in mainBusiness'> {{item}} </text></view>
+					<view class='Regular' style='font-size:13px;'>主营：<text style='display:inline-block;margin:3px;' v-for='item in mainBusiness'> {{item}} </text></view>
 				</view>
 				<view style='margin:12.5px 0;' class='flex'>
-					<view class="tag Regular">
-						超大规模
-					</view>
-					<view class="tag Regular">
-						超大规模
-					</view>
-					<view class="tag Regular">
-						超大规模
+					<view v-for='item in label' class="tag Regular">
+						{{item}}
 					</view>
 				</view>
 				
@@ -86,6 +80,9 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 	    components: {
 	        
@@ -112,12 +109,15 @@
 				show:false,
 				mainBusiness:[],
 				label:[],
+				sitePhotoAddress:[],
 				selector:['纠错','举报'],
 				aptiutudeStatus:false,
 				iscollect:false
 			}
 		},
-		
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
 		onLoad(options){
 			this.id=options.id
 		},
@@ -131,6 +131,9 @@
 					if(res.data.data.label){
 						that.label=res.data.data.label.split(',')
 					}
+					if(res.data.data.sitePhotoAddress){
+						that.sitePhotoAddress=res.data.data.sitePhotoAddress.split(',')
+					}
 				}
 			})
 			})
@@ -141,15 +144,63 @@
 				var that = this;
 				this.status = Number(e.target.current);
 			},
+			collect(){
+				var that=this
+				if(this.companylist.collectionCompanyList.length>0){
+					this.$api.doRequest('post','/settledCompanyInfo/api/collectionNot',{id:this.companylist.id,loginPhone:this.userInfo.phone}).then(res => {
+						if(res.data.code==200){
+								uni.showToast({
+									title: '取消收藏',
+									icon: 'none',
+									duration: 2000
+								})
+							that.$api.doRequest('get','/settledCompanyInfo/getSettledCompanyInfo',{id:that.id,pcFlag:2}).then(res => {
+								if(res.data.code==200){
+									that.companylist=res.data.data
+									that.mainBusiness=res.data.data.mainBusinessType.split(',')
+									if(res.data.data.label){
+										that.label=res.data.data.label.split(',')
+									}
+									if(res.data.data.sitePhotoAddress){
+										that.sitePhotoAddress=res.data.data.sitePhotoAddress.split(',')
+									}
+								}
+							})
+						}
+					})
+				}else{
+					this.$api.doRequest('post','/settledCompanyInfo/api/collection',{id:this.companylist.id,compName:this.companylist.compName,loginPhone:this.userInfo.phone}).then(res => {
+						if(res.data.code==200){
+							uni.showToast({
+								title: '收藏成功',
+								icon: 'none',
+								duration: 2000
+							})
+							that.$api.doRequest('get','/settledCompanyInfo/getSettledCompanyInfo',{id:that.id,pcFlag:2}).then(res => {
+								if(res.data.code==200){
+									that.companylist=res.data.data
+									that.mainBusiness=res.data.data.mainBusinessType.split(',')
+									if(res.data.data.label){
+										that.label=res.data.data.label.split(',')
+									}
+									if(res.data.data.sitePhotoAddress){
+										that.sitePhotoAddress=res.data.data.sitePhotoAddress.split(',')
+									}
+								}
+							})
+						}
+					})
+				}	
+			},
 			selecttype(e){
 				console.log(e)
 				if(e[0]==1){
 					uni.navigateTo({
-						url:'/pages/grain_pulse/jubao'
+						url:'/pages/grain_pulse/jubao?id='+this.companylist.id+'&compName='+this.companylist.compName
 					})
 				}else{
 					uni.navigateTo({
-						url:'/pages/grain_pulse/errorcorrection'
+						url:'/pages/grain_pulse/errorcorrection?id='+this.companylist.id+'&compName='+this.companylist.compName
 					})
 				}
 			},

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/dynamic.vue

@@ -0,0 +1,213 @@
+<template>
+	<view class="center">
+		<u-search placeholder="请输入货名" v-model="keyword" @clear="searchClear" style="width: 96%; margin: 0 auto;"
+			@custom="getrelease"></u-search>
+		<view class="bottom flex">
+			<view class="bottonCss" @click="release">
+				<image src="../../static/img/liangmai/fabu-2@3x.png" mode="" style="width: 40rpx; height: 40rpx;">
+				</image>
+				<view style="color: #22C572;">发布</view>
+			</view>
+			<view class="bottonCss" @click="record">
+				<image src="../../static/img/liangmai/jilu-2@3x.png" mode="" style="width: 40rpx; height: 40rpx;">
+				</image>
+				<view style="color: #656765;">记录</view>
+			</view>
+		</view>
+		<view v-for="(item,index) in releaseList">
+			<view class="modular">
+				<view class="flex">
+					<view class="touxiang">
+						<image :src="portraits" mode="" style="height: 76rpx;border-radius: 8rpx;"></image>
+					</view>
+					<view class="" style="margin: 20rpx 30rpx;">
+						<view style="color: #333333;font-weight: 600;font-size: 34rpx;">{{item.compName}}</view>
+						<view style="color: #AFB3BF; margin-top: 4rpx;">{{item.updateDate}}</view>
+					</view>
+				</view>
+				<view class="title">{{item.title}}</view>
+				<view class="titleText">
+					<!-- {{item.content}} -->
+					<u-read-more show-height="200" :toggle="true" close-text="展开">
+						<!-- <rich-text :nodes="item.content"></rich-text> -->
+						 <!-- @load="parseLoaded" -->
+						<u-parse :html="item.content" ></u-parse>
+					</u-read-more>
+				</view>
+				<view class="imgList flex" v-if="item.address != ''">
+					<view v-for="(items,count) in item.imgList" style="width: 30%;margin-left: 20rpx;">
+						<image :src="items" style="height: 220rpx;border-radius: 16rpx;"></image>
+					</view>
+				</view>
+				<view class="flex">
+					<view class="address flex" style="margin: 30rpx;">
+						<image src='../../static/img/location.png'
+							style="width: 26rpx;height: 30rpx;top: 8rpx;margin: 0 10rpx;"></image>
+						{{item.city}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-show="isLoadMore">
+			<!-- <uni-load-more :status="loadStatus" icon icon-type></uni-load-more> -->
+			<u-loadmore :status="loadStatus" icon icon-type="circle" margin-bottom="200"/>
+		</view>
+		<view style='height:12vh;background:#F5F6FA;line-height:12vh;text-align:center;' v-if='releaseList.length == 0'>
+			当前暂无结果
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				keyword: "",
+				releaseList: [],
+				releaseInfo: [],
+				currentPage: 1,
+				pageSize: 10,
+				isLoadMore: false,
+				loadStatus: "loading"
+			}
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			this.getrelease()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onReachBottom() { //上拉触底函数
+		var that = this
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.isLoadMore = true
+				this.currentPage += 1
+				setTimeout(function() {
+					 uni.stopPullDownRefresh();
+					 that.getrelease()
+				}, 1000);
+				
+			}
+		},
+		onShow() {
+			this.userName = this.userInfo.userName
+			this.portraits = this.userInfo.avatarUrl
+			this.getrelease()
+		},
+		methods: {
+			// parseLoaded() {
+			// 	this.$refs.uReadMore.init();
+			// },
+			getrelease() {
+				this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
+						currentPage: this.currentPage,
+						pageSize: this.pageSize,
+						searchKeyWord: this.keyword
+					})
+					.then(res => {
+						if (res.data.code == 200) {
+							this.releaseInfo = res.data.data.records
+							if (this.releaseInfo.length > 0) {
+								this.releaseList = this.releaseList.concat(this.releaseInfo)
+								this.isLoadMore = false
+								for (let i = 0; i < this.releaseList.length; i++) {
+									if (this.releaseList[i].address != null) {
+										this.releaseList[i].imgList = this.releaseList[i].address.split(",")
+									}
+
+								}
+							} else {
+								this.loadStatus = 'nomore'
+							}
+
+						}
+					})
+			},
+			searchClear() {
+				this.keyword = ""
+			},
+			release() {
+				uni.navigateTo({
+					url: `/pages/grain_pulse/release`
+				})
+			},
+			record() {
+				uni.navigateTo({
+					url: `/pages/grain_pulse/record`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		padding: 10rpx 4rpx;
+	}
+
+	.bottom {
+		width: 100%;
+		height: 160rpx;
+		background-color: #FFFFFF;
+		position: fixed;
+		bottom: 0rpx;
+		z-index: 9999;
+	}
+
+	.bottonCss {
+		width: 50%;
+		height: 40rpx;
+		margin-top: 40rpx;
+		text-align: center;
+	}
+
+	.modular {
+		width: 94%;
+		margin: 40rpx auto;
+		background-color: #FFFFFF;
+		border-radius: 40rpx;
+		// margin-top: 40rpx;
+	}
+
+	.touxiang {
+		width: 76rpx;
+		height: 76rpx;
+		background-color: red;
+		margin: 20rpx 0 0 34rpx;
+	}
+
+	.title {
+		font-size: 38rpx;
+		font-weight: 600;
+		margin-left: 30rpx;
+	}
+
+	.titleText {
+		font-size: 30rpx;
+		margin-left: 30rpx;
+		margin-top: 10rpx;
+	}
+
+	.imgList {
+		width: 100%;
+		margin-top: 30rpx;
+		flex-wrap: wrap;
+	}
+
+	.address {
+		width: 60%;
+		height: 48rpx;
+		background-color: #F5F6FA;
+		border-radius: 24rpx;
+		margin-left: 30rpx;
+		text-align: center;
+		line-height: 48rpx;
+	}
+</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,12 +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" placeholder="请输入公司名称" />
+					<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> -->
@@ -23,17 +25,26 @@
 				</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">
-				<u-form-item  label="上传坐标" label-width="30%" class="title Regular">
+				<u-form-item label="上传坐标" label-width="30%" class="title Regular">
 					<text @click='naviageToPage("/pages/grain_pulse/localtion/coordinate")'
 						class="con-list Regular">{{deptList.buyer == null ? "未上传":deptList.buyer}}<text
 							class='tip_text cuIcon-right'></text></text>
@@ -48,17 +59,21 @@
 				</u-form-item>
 				<view>
 					<view class="title Regular" style="margin-top: 15rpx;">上传图片</view>
-		<view v-if="license1 != ''">
+					<view v-if="license1 != ''">
 						<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 != ''">
+					<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>
@@ -71,18 +86,19 @@
 					<image src="../../static/img/liangmai/tijiaochenggong@3x.png" mode=""
 						style="width: 180rpx;height: 180rpx;"></image>
 				</view>
-
 				<view class="successText">提交成功，等待平台审核。</view>
 				<u-button type="success" style="width: 400rpx; margin: 20rpx auto; " shape="circle" @click="perfect">
 					完善更多信息</u-button>
-				<view style="color: #AFB3BF;text-align: center;" @click="navBack">返回</view>
+				<view style="color: #AFB3BF;text-align: center;" @click="navBack1">返回</view>
 			</u-popup>
-
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	import upload from '@/components/upload.vue';
 	export default {
 		components: {
@@ -99,49 +115,81 @@
 					"text": "上传封面图片",
 					"bgc": ""
 				},
+				errorType: ['message'],
 				uploadOptions1: {
 					"text": "上传营业执照",
 					"bgc": ""
 				},
-				mainBusinessType:[],
+				mainBusinessType: [],
 				uploadCustom: true,
-				deptList: {},
-				management: [
-					{name:"粮库",checked:false},
-					{name:"加工厂",checked:false},
-					{name:"烘干厂",checked:false},
-					{name:"饲料厂",checked:false},
-					{name:"养殖场",checked:false},
-					{name:"粮贸",checked:false},
-					{name:"期货",checked:false},
-					 ],
+				deptList: {
+					companyProfile:''
+				},
+				management: [{
+						name: "粮库",
+						checked: false
+					},
+					{
+						name: "加工厂",
+						checked: false
+					},
+					{
+						name: "烘干塔",
+						checked: false
+					},
+					{
+						name: "饲料厂",
+						checked: false
+					},
+					{
+						name: "养殖场",
+						checked: false
+					},
+					{
+						name: "粮贸",
+						checked: false
+					},
+					{
+						name: "期货",
+						checked: false
+					},
+				],
 				types: [],
 				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'])
+		},
 		methods: {
-			getImgUrl(res){
+			getImgUrl(res) {
 				console.log(res)
-				this.deptList.attachmentAddress=res
+				this.deptList.attachmentAddress = res
 			},
-			naviageToPage(item){
+			naviageToPage(item) {
 				uni.navigateTo({
-					url:item
+					url: item
 				})
 			},
-			getImgUrl1(res){
+			getImgUrl1(res) {
 				console.log(res)
-				this.deptList.licenseAddress=res
+				this.deptList.licenseAddress = res
 			},
 			singleClick(item) {
-				if(this.mainBusinessType.indexOf(item)==-1){
+				if (this.mainBusinessType.indexOf(item) == -1) {
 					this.mainBusinessType.push(item.name)
-					item.checked=true
+					item.checked = true
 				}
 			},
 			filterFileType(index, lists) {
@@ -157,8 +205,11 @@
 				}
 			},
 			navBack() {
-				this.$api.doRequest('post','/settledCompanyInfo/api/addSettledCompanyInfo',this.deptList).then(res => {
-					if(res.data.code==200){
+				uni.navigateBack()
+			},
+			navBack1() {
+				this.$api.doRequest('post', '/settledCompanyInfo/api/addSettledCompanyInfo', this.deptList).then(res => {
+					if (res.data.code == 200) {
 						uni.navigateBack(1)
 					}
 				})
@@ -169,31 +220,77 @@
 				})
 			},
 			perfect() {
+				this.show=false
 				uni.navigateTo({
-					url: `/pages/grain_pulse/perfect`
+					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()
 				this.deptList.longitude='40.22077'
 				this.deptList.latitude='116.23128'
+				this.deptList.createPhone=this.userInfo.phone
 				uni.showModal({
 					content: "确定提交企业信息？？",
 					showCancel: true,
 					confirmText: '确定',
 					success: function(res) {
 						if (res.confirm) {
-							this.show = true
+							that.show = true
 							// that.$api.doRequest('post','/settledCompanyInfo/api/addSettledCompanyInfo',that.deptList).then(res => {
 							// 	if(res.data.code==200){
-									
+
 							// 	}
 							// })
 							// //成功后
@@ -218,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;
@@ -279,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;
 	}
 
@@ -321,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 {
@@ -334,6 +428,8 @@
 		font-size: 44rpx;
 		margin-top: 80px;
 		margin-left: 10px;
+		position: relative;
+		z-index:2;
 	}
 
 	.upload {
@@ -359,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/errorcorrection.vue

@@ -1,22 +1,19 @@
 <template>
 	<view>
-		<view class="Regular header-title">我是公司名称我是公司名称</view>
+		<view class="Regular header-title">{{jubaolist.compName}}</view>
 		<view class='content'>
 			<view class='matter'>
 				<view class="title Regular">纠错事项<text style='color:#FB1E1E;'>*</text></view>
 				<view style='position:relative;'>
-					<textarea class='textarea Regular' maxlength="150" v-model='status' placeholder="请输入举报事项" placeholder-style="color:#AFB3BF;" />
-					<view class='Regular words'>{{status.length}}/150个字</view>
+					<textarea class='textarea Regular' maxlength="150" v-model='jubaolist.error' placeholder="请输入举报事项" placeholder-style="color:#AFB3BF;" />
+					<view class='Regular words'>{{jubaolist.error.length}}/150个字</view>
 				</view>
 			</view>
 			<view class="uploading">
 				<view class="title Regular">上传图片</view>
-				<u-upload width='140' height='140' :file-list="fileList" :custom-btn="true"  :show-upload-list="showUploadList" ref="uUpload" :max-size="5 * 1024 * 1024" max-count="6" :action="$uploadUrl">
-					<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
-						<image style='width:23px;height:23px;margin-top:10px;' src="../../static/img/liangmai/xiangji-2.png" mode=""></image>
-						<view style='color:#AFB3BF;font-size:10px;' class='Medium'>上传图片</view>
-					</view>
-				</u-upload>
+				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="6"
+					: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>
 		<view class="commitwrap">
@@ -27,26 +24,106 @@
 </template>
 
 <script>
+		import upload from '@/components/upload.vue';
 	export default {
-	    components: {
-	        
-	    },
+	   components: {
+	   	upload
+	   },
 		data() {
 			return {
+				action: this.$uploadUrl,
+				maxSize: 5 * 1024 * 1024, //限制文件大小 5M
+				btnLoading: false, //防止重复点击
+				isAdd: true,
+				imgUrls: [],
 				status:'',
-				fileList:[]
+				fileList:[],
+				jubaolist:{
+					error:''
+				},
+				uploadOptions: {
+					"text": "",
+					"bgc": ""
+				},
 			}
 		},
 		onReady() {
 			// 得到整个组件对象，内部图片列表变量为"lists"
-			this.fileList = this.$refs.uUpload.lists;
+			// this.fileList = this.$refs.uUpload.lists;
 		},
-		onLoad(){
-			
+		onLoad(options){
+			this.jubaolist.id=options.id
+			this.jubaolist.compName=options.compName
 		},
 		methods: {
+			filterFileType(index, lists) {
+				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
+					lists.splice(index, 1);
+					// 当前文件不支持
+					uni.showModal({
+						title: '暂不支持当前图片类型',
+						showCancel: false
+					});
+				} else {
+					this.isAdd = false;
+				}
+			},
+			getImgUrl(res) {
+				console.log(res)
+				console.log('------------res-----------')
+				this.imgUrls.push(res);
+			},
 			commit(){
-				console.log(this.fileList)
+				var that=this
+				this.jubaolist.address=this.imgUrls.toString()
+				uni.showModal({
+					content: "确定提交纠错内容？",
+					showCancel: true,
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post','/settledCompanyInfo/api/addSettledCompanyError',that.jubaolist).then(res => {
+								if(res.data.code==200){
+									uni.showToast({
+									title: '感谢您的反馈，平台会尽快核实',
+									icon: 'none',
+									duration: 2000
+									})
+									uni.navigateBack({
+										
+									})
+								}else{
+									uni.showToast({
+									title: res.message,
+									icon: 'none',
+									duration: 2000
+									})
+								}
+							})
+						}
+					},
+				})
+			},
+				//删除一张图片的回调，lists这是成功删除一个图片后，还剩余的图片集合
+				onRemove(data, lists){
+				    //lists.length > 0说明删除之前已经上传了多余两张的图片
+					if(lists.length > 0 ){
+						var currentfileList = [];
+						//遍历this.fileList 与剩余的lists进行匹配，来组成一个新的格式合适的剩余图片集合
+						this.fileList.forEach((item, index)=>{
+							lists.forEach((item1, index1)=>{
+								if(item.name == JSON.parse(item1.response).name){
+									 currentfileList.push(item);
+								}
+							});
+						})
+						//删除后对图片集合及时冬天更新，即对this.fileList重新赋值
+						this.fileList = currentfileList;
+					}else{//说明删除之前只有一张图片，删除成功后把this.fileList清空即可
+						this.fileList = [];
+					}
+					this.form.pictureUrl = JSON.stringify(this.fileList)
+					//console.log("打印图片List：onRemove", this.fileList);
 			}
 		}
 	}

pages/grain_pulse/friendcircle.vue

@@ -1,9 +0,0 @@
-<template>
-	<view>11</view>
-</template>
-
-<script>
-</script>
-
-<style>
-</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',
@@ -136,16 +138,17 @@
 				success: (res) => {
 					console.log(res.data)
 					this.position = res.data
-					uni.removeStorage({
-						key: 'setLocaltion'
-					})
+					// uni.removeStorage({
+					// 	key: 'setLocaltion'
+					// })
 				},
 
 			})
 		},
 		onLoad(option) {
-			if (option.position)
+			if (option.position){
 				this.position = option.position
+			}
 		},
 		methods: {
 			mainBusinessTypecahnge(item) {
@@ -164,7 +167,7 @@
 			},
 			friendcircle() {
 				uni.navigateTo({
-					url: '/pages/grain_pulse/friendcircle'
+					url: '/pages/grain_pulse/dynamic'
 				})
 			},
 			todetails(item) {

pages/grain_pulse/jubao.vue

@@ -1,22 +1,19 @@
 <template>
 	<view>
-		<view class="Regular header-title">我是公司名称我是公司名称</view>
+		<view class="Regular header-title">{{jubaolist.compName}}</view>
 		<view class='content'>
 			<view class='matter'>
 				<view class="title Regular">举报事项<text style='color:#FB1E1E;'>*</text></view>
 				<view style='position:relative;'>
-					<textarea class='textarea Regular' maxlength="150" v-model='status' placeholder="请输入举报事项" placeholder-style="color:#AFB3BF;" />
-					<view class='Regular words'>{{status.length}}/150个字</view>
+					<textarea class='textarea Regular' maxlength="150" v-model='jubaolist.error' placeholder="请输入举报事项" placeholder-style="color:#AFB3BF;" />
+					<view class='Regular words'>{{jubaolist.error.length}}/150个字</view>
 				</view>
 			</view>
 			<view class="uploading">
 				<view class="title Regular">上传图片</view>
-				<u-upload width='140' height='140' :file-list="fileList" :custom-btn="true"  :show-upload-list="showUploadList" ref="uUpload" :max-size="5 * 1024 * 1024" max-count="6" :action="$uploadUrl">
-					<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
-						<image style='width:23px;height:23px;margin-top:10px;' src="../../static/img/liangmai/xiangji-2.png" mode=""></image>
-						<view style='color:#AFB3BF;font-size:10px;' class='Medium'>上传图片</view>
-					</view>
-				</u-upload>
+				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="6"
+					: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>
 		<view class="commitwrap">
@@ -27,26 +24,106 @@
 </template>
 
 <script>
+		import upload from '@/components/upload.vue';
 	export default {
-	    components: {
-	        
-	    },
+	   components: {
+	   	upload
+	   },
 		data() {
 			return {
+				action: this.$uploadUrl,
+				maxSize: 5 * 1024 * 1024, //限制文件大小 5M
+				btnLoading: false, //防止重复点击
+				isAdd: true,
+				imgUrls: [],
 				status:'',
-				fileList:[]
+				fileList:[],
+				jubaolist:{
+					error:''
+				},
+				uploadOptions: {
+					"text": "",
+					"bgc": ""
+				},
 			}
 		},
 		onReady() {
 			// 得到整个组件对象，内部图片列表变量为"lists"
-			this.fileList = this.$refs.uUpload.lists;
+			// this.fileList = this.$refs.uUpload.lists;
 		},
-		onLoad(){
-			
+		onLoad(options){
+			this.jubaolist.id=options.id
+			this.jubaolist.compName=options.compName
 		},
 		methods: {
+			filterFileType(index, lists) {
+				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
+					lists.splice(index, 1);
+					// 当前文件不支持
+					uni.showModal({
+						title: '暂不支持当前图片类型',
+						showCancel: false
+					});
+				} else {
+					this.isAdd = false;
+				}
+			},
+			getImgUrl(res) {
+				console.log(res)
+				console.log('------------res-----------')
+				this.imgUrls.push(res);
+			},
 			commit(){
-				console.log(this.fileList)
+				var that=this
+				this.jubaolist.address=this.imgUrls.toString()
+				uni.showModal({
+					content: "确定提交举报内容？",
+					showCancel: true,
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post','/settledCompanyInfo/api/addSettledCompanyError',that.jubaolist).then(res => {
+								if(res.data.code==200){
+									uni.showToast({
+									title: '感谢您的反馈，平台会尽快核实',
+									icon: 'none',
+									duration: 2000
+									})
+									uni.navigateBack({
+										
+									})
+								}else{
+									uni.showToast({
+									title: res.message,
+									icon: 'none',
+									duration: 2000
+									})
+								}
+							})
+						}
+					},
+				})
+			},
+				//删除一张图片的回调，lists这是成功删除一个图片后，还剩余的图片集合
+				onRemove(data, lists){
+				    //lists.length > 0说明删除之前已经上传了多余两张的图片
+					if(lists.length > 0 ){
+						var currentfileList = [];
+						//遍历this.fileList 与剩余的lists进行匹配，来组成一个新的格式合适的剩余图片集合
+						this.fileList.forEach((item, index)=>{
+							lists.forEach((item1, index1)=>{
+								if(item.name == JSON.parse(item1.response).name){
+									 currentfileList.push(item);
+								}
+							});
+						})
+						//删除后对图片集合及时冬天更新，即对this.fileList重新赋值
+						this.fileList = currentfileList;
+					}else{//说明删除之前只有一张图片，删除成功后把this.fileList清空即可
+						this.fileList = [];
+					}
+					this.form.pictureUrl = JSON.stringify(this.fileList)
+					//console.log("打印图片List：onRemove", this.fileList);
 			}
 		}
 	}

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/my_grain_pulse.vue

@@ -1,15 +1,17 @@
 <template>
-	<view>
+	<view style='margin-bottom:70px;'>
 		<scroll-view  scroll-x="true" scroll-with-animation="true" class='list-type'>
 			<view  v-for='item in searchTypes' @click='changetype(item)' :class='mainBusinessType==item.name?"Semibold active":"Regular"' class="typeitem">{{item.name}}</view>
 		</scroll-view>
-		<view v-for='item in datalist' class="listitem">
+		<view v-for='item in datalist' @click='todetails(item)' class="listitem">
 			<view class="flex" v-if='mainBusinessType=="我的企业"'>
 				<image class='listitem-left' :src="item.attachmentAddress" mode=""></image>
 				<view class="listitem-right">
 					<view class="flex justify-between">
 						<view class="companyname Medium">{{item.compName}}</view>
 						<view v-if='item.status=="待审核"' class='listitemStatus audit Regular'>审核中</view>
+						<view v-if='item.status=="已驳回"' class='listitemStatus notPass Regular'>未通过</view>
+						<view v-if='item.status=="已通过"' class='listitemStatus pass Regular'>已通过</view>
 					</view>
 					<view class='companylocation flex align-item-center Regular'>
 						<image class='location' src="../../static/img/liangmai/icon_ditu.png" mode=""></image>
@@ -18,13 +20,13 @@
 					<view>
 						<view class="button Regular">隐藏</view>
 						<view class="button Regular">编辑</view>
-						<view class="button Regular">删除</view>
+						<view @click='del(item)' class="button Regular">删除</view>
 					</view>
 				</view>
 			</view>
 			<view v-else>
 				<view class="flex">
-					<image class='listitem-left' src="../../static/img/authentication/bankup(2).png" mode=""></image>
+					<image class='listitem-left' :src="item.attachmentAddress" mode=""></image>
 					<view class="listitem-right">
 						<view class="flex justify-between">
 							<view class="companyname Medium">中天昊元粮库中天昊元粮库</view>
@@ -41,6 +43,9 @@
 					<view class='distance Regular'>50m</view>
 				</view>
 			</view>
+			<view v-if='mainBusinessType=="我的企业"' class='exitloginwrap'>
+				<button @click='enter()' class='exitlogin'>新增</button>
+			</view>
 		</view>
 	</view>
 </template>
@@ -86,7 +91,7 @@
 					}
 				})
 				}else{
-					this.$api.doRequest('get','/settledCompanyInfo/myCollection',{commonId:this.userInfo.id,phone:this.userInfo.phone,pageSize:this.pageSize,
+					this.$api.doRequest('get','/settledCompanyInfo/myCollection',{phone:this.userInfo.phone,pageSize:this.pageSize,
 							currentPage: this.currentPage,pcFlag:2}).then(res => {
 					if(res.data.code==200){
 						this.datalist=res.data.data.records
@@ -94,14 +99,23 @@
 					})
 				}
 			},
+			del(item){
+				this.$api.doRequest('post','/settledCompanyInfo/api/deleteSettledCompanyInfo',{id:item.id}).then(res => {
+					if(res.data.code==200){
+						this.$api.msg('删除成功')
+					}else{
+						this.$api.msg('删除失败')
+					}
+				})
+			},
 			friendcircle(){
 				uni.navigateTo({
 					url:'/pages/grain_pulse/friendcircle'
 				})
 			},
-			todetails(){
+			todetails(item) {
 				uni.navigateTo({
-					url:'/pages/grain_pulse/details'
+					url: '/pages/grain_pulse/details?id=' + item.id
 				})
 			},
 			naviageToPage(item){
@@ -109,6 +123,12 @@
 					url:item
 				})
 			},
+			enter(){
+				//入驻
+				uni.navigateTo({
+					url:'/pages/grain_pulse/enter'
+				})
+			},
 			changetype(item){
 				this.mainBusinessType=item.name
 				this.getList()
@@ -246,5 +266,22 @@
 	.listitemStatus.pass{
 		color:#22C572;
 	}
+	.exitloginwrap{
+		position:fixed;
+		bottom:0;
+		left:0;
+		width:100%;
+		padding-bottom:20px;
+	}
+	.exitlogin{
+		width:90%;
+		background:#22C572;
+		border-radius:30px;
+		color:#fff;
+		font-size:17px;
+	}
+	.exitlogin:after{
+		border:none;
+	}
 </style>
 

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 style='padding-bottom:10px;' 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">
@@ -20,31 +20,32 @@
 					<u-tag text="+" mode="plain" shape="circle" :show="show1" color="#2E2E2D" bg-color="#FFFFFF"
 						border-color="#F9F9FA" class="add" @click="add"></u-tag>
 				</view>
-				<view class="addinput flex" v-if="inputShow">
-					<u-input v-model="value" type="type" border focus v-if="inputShow"
-						style="border-radius: 50rpx;line-height: 70rpx;font-size: 10px;" placeholder="请输入标签内容，不超过6个字" />
+				<view class="addinput addlabel flex" v-if="inputShow">
+					<u-input class='label' v-model="value" type="type" border focus v-if="inputShow"
+					 placeholder="请输入标签内容，不超过6个字" />
 					<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>
-				<u-upload :action="action" :file-list="fileList" @on-success="uploadSuccess" @on-remove="imgRemove"
-					:max-count="9"></u-upload>
+				<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)">
@@ -60,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>
@@ -72,7 +73,11 @@
 </template>
 
 <script>
+	import upload from '@/components/upload.vue';
 	export default {
+	   components: {
+	   	upload
+	   },
 		data() {
 			return {
 				deptList: {},
@@ -86,13 +91,14 @@
 				action: 'https://www.zthymaoyi.com/upload/admin',
 				fileList: [],
 				imgList: [],
-				Persons: [{
-					name: "张良",
-					phone: "1365411111"
-				}],
+				Persons: [],
 				topBorder: false,
 			}
 		},
+		onLoad(options) {
+			this.deptList=JSON.parse(options.deptList)
+			console.log(this.deptList)
+		},
 		methods: {
 			add() {
 				if (this.label.length >= 6) {
@@ -101,6 +107,10 @@
 					this.inputShow = true
 				}
 			},
+			getImgUrl(res) {
+				console.log(res)
+				this.imgList.push(res);
+			},
 			addinput() {
 				if (!this.value) {
 					this.$api.msg('标签内容不能为空')
@@ -133,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)
+								}
+							})
 						}
 					}
 				})
@@ -152,7 +170,10 @@
 	.center {
 		padding: 10rpx 20rpx;
 	}
-
+.label{
+	padding-right:30px;
+	border:none;
+}
 	.title {
 		margin-left: 20rpx;
 		color: #333333;
@@ -167,11 +188,11 @@
 	.modular {
 		background-color: #FFFFFF;
 		border-radius: 12px;
-		margin-top: 20px;
+		margin-top: 10px;
 	}
 
 	.areaText {
-		width: 90%;
+		width: 83%;
 		padding: 30rpx;
 		border: 2rpx solid #F9F9FA;
 		background-color: #F9F9FA;
@@ -190,6 +211,7 @@
 		font-size: 30rpx;
 		font-weight: 600;
 		margin-bottom: 10rpx;
+		border:1px solid #DCDDDC;
 	}
 
 	.forLists {
@@ -210,15 +232,24 @@
 		margin: 20rpx auto;
 		border-radius: 50rpx;
 	}
-
+.addlabel{
+	background:#F6F6F6;
+	position:relative;
+	border-radius: 50rpx;height: 70rpx;font-size: 10px;
+	padding-right:40px;
+	line-height: 52rpx;
+	margin-bottom:10px;
+}
 	.inputOk {
 		width: 100rpx;
 		border-radius: 40rpx;
 		background-color: #E9EAE9;
 		color: #FFFFFF;
+		height:70rpx;
 		border: none;
+		position:absolute;
+		right:0;
 	}
-
 	.picture {
 		width: 144rpx;
 		height: 144rpx;
@@ -226,10 +257,9 @@
 	}
 
 	.upload {
-		height: 140rpx;
 		text-align: center;
-		margin: 20px 0;
-		margin-bottom: 20px;
+		margin: 0px 0;
+		margin-bottom: 10px;
 	}
 
 	.addPerson {

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/record.vue

@@ -0,0 +1,388 @@
+<template>
+	<view class="center">
+		<view class="topCss">
+			<view class="back-btn cuIcon-back" @click="navBack"></view>
+			<view class="introduce">
+				<view class="portrait">
+					<image :src="portraits" mode="" style="height: 120rpx;border-radius: 14rpx;"></image>
+				</view>
+				<view class="name">{{userName}}</view>
+				<view class="dongtai">
+					{{count}}
+					<text style="color: #AFB3BF;">条动态</text>
+				</view>
+				<view class="flex">
+					<view v-for="(item,index) in choices" class="labels">
+						<view :class="item.changeCss" @click="querys(item)">{{item.name}}</view>
+						<view style="width: 40rpx;height: 6rpx;background-color: #22C572;margin: 16rpx auto 0;"
+							v-if="item.check == true"></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-for="(item,index) in release">
+			<view class="modular">
+				<view class="flex">
+					<view class="touxiang">
+						<image :src="portraits" mode="" style="height: 76rpx;border-radius: 8rpx;"></image>
+					</view>
+					<view class="" style="margin: 20rpx 30rpx;">
+						<view style="color: #333333;font-weight: 600;font-size: 34rpx;">{{item.compName}}</view>
+						<view style="color: #AFB3BF; margin-top: 4rpx;">{{item.updateDate}}</view>
+					</view>
+					<view class="flex" style="width: 40%; justify-content: flex-end;margin: 40rpx;">
+						<view style="color: #FE6430;"
+							v-if="item.status == '审核中' || item.status == '未审核'|| item.status == '待审核'">{{item.status}}
+						</view>
+						<view style="color: #22C572;" v-if="item.status == '已通过'">{{item.status}}</view>
+						<view style="color: #FB1E1E;" v-if="item.status == '已驳回'">{{item.status}}</view>
+
+					</view>
+				</view>
+				<view class="title">{{item.title}}</view>
+				<view class="titleText">
+					{{item.content}}
+				</view>
+				<view class="imgList flex" v-if="item.address != ''">
+					<view v-for="(items,count) in item.imgList" style="width: 30%;margin-left: 20rpx;">
+						<image :src="items" style="height: 220rpx;border-radius: 16rpx;"></image>
+					</view>
+				</view>
+				<view class="flex">
+					<view class="address flex">
+						<image src='../../static/img/location.png'
+							style="width: 26rpx;height: 30rpx;top: 8rpx;margin: 0 10rpx;"></image>
+						{{item.city}}
+					</view>
+					<view style="width: 30%;justify-content: flex-end;margin: 30rpx;" class="flex">
+						<view @click="delRecord(item)">
+							<image src='../../static/img/jiaoyi/shanchu@3x.png'
+								style="width: 32rpx;height: 32rpx;margin-right: 20rpx;top: 4rpx;"></image>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-show="isLoadMore">
+			<!-- <uni-load-more :status="loadStatus"></uni-load-more> -->
+			<!-- <u-loadmore :status="status" /> -->
+			<u-loadmore :status="loadStatus" icon icon-type="circle" margin-bottom="80" margin-top="60rpx" />
+		</view>
+		<view style='height:12vh;background:#F5F6FA;line-height:12vh;text-align:center;' v-if='release.length == 0'>
+			当前暂无结果
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				count: 0,
+				portraits: "",
+				choices: [{
+						name: "全部",
+						check: true,
+						changeCss: "label2",
+					},
+					{
+						name: "审核中",
+						check: false,
+						changeCss: "label",
+					},
+					{
+						name: "已通过",
+						check: false,
+						changeCss: "label",
+					},
+					{
+						name: "未通过",
+						check: false,
+						changeCss: "label",
+					},
+					{
+						name: "已过期",
+						check: false,
+						changeCss: "label",
+					}
+				],
+				release: [],
+				releaseInfo: [],
+				currentPage: 1,
+				pageSize: 10,
+				imgList: [],
+				userName: "",
+				searchType: "",
+				searchTypeInfo: "",
+				isLoadMore: false,
+				loadStatus: "loading",
+
+			}
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		onShow() {
+			this.userName = this.userInfo.userName
+			this.portraits = this.userInfo.avatarUrl
+			this.getRelease()
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			this.getRelease()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onReachBottom() { //上拉触底函数
+			var that = this
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.isLoadMore = true
+				this.currentPage += 1
+				setTimeout(function() {
+					uni.stopPullDownRefresh();
+					that.getRelease()
+				}, 1000);
+				// this.getRelease()
+			}
+		},
+		methods: {
+			navBack() {
+				uni.navigateBack(1)
+			},
+			querys(item) {
+				for (var i = 0; i < this.choices.length; i++) {
+					if (this.choices[i].name == item.name) {
+						this.choices[i].check = true
+						this.choices[i].changeCss = "label2"
+					} else {
+						this.choices[i].check = false
+						this.choices[i].changeCss = "label"
+					}
+				}
+				if (item.name == "审核中") {
+					this.searchType = "1"
+				} else if (item.name == "已通过") {
+					this.searchType = "2"
+				} else if (item.name == "未通过") {
+					this.searchType = "3"
+				} else {
+					this.searchType = ""
+				}
+				this.getRelease()
+			},
+			getRelease() {
+				this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
+						currentPage: this.currentPage,
+						pageSize: this.pageSize,
+						loginPhone: this.userInfo.phone,
+						searchType: this.searchType
+					})
+					.then(res => {
+						if (res.data.code == 200) {
+							if (!this.searchType) {
+								this.releaseInfo = res.data.data.records
+								if (this.releaseInfo.length > 0) {
+									this.release = this.release.concat(this.releaseInfo)
+									this.count = this.release.length
+									this.isLoadMore = false
+									for (let i = 0; i < this.release.length; i++) {
+										this.release[i].imgList = this.release[i].address.split(",")
+									}
+								} else {
+									this.loadStatus = 'nomore'
+								}
+							} else {
+								debugger
+								if (this.searchTypeInfo == this.searchType) {
+									this.releaseInfo = res.data.data.records
+									if (this.releaseInfo.length > 0) {
+										this.release = this.release.concat(this.releaseInfo)
+										this.count = this.release.length
+										this.isLoadMore = false
+										for (let i = 0; i < this.release.length; i++) {
+											this.release[i].imgList = this.release[i].address.split(",")
+										}
+									} else {
+										this.loadStatus = 'nomore'
+									}
+								}else{
+										this.release = []
+										this.releaseInfo = res.data.data.records
+										if (this.releaseInfo.length > 0) {
+											this.release = this.release.concat(this.releaseInfo)
+											this.count = this.release.length
+											this.isLoadMore = false
+											for (let i = 0; i < this.release.length; i++) {
+												this.release[i].imgList = this.release[i].address.split(",")
+											}
+										} else {
+											this.loadStatus = 'nomore'
+										}
+								}
+								this.searchTypeInfo = this.searchType
+
+							}
+
+
+
+
+						}
+					})
+			},
+			delRecord(item) {
+				var that = this
+				uni.showModal({
+					content: "确定删除该动态？",
+					showCancel: true,
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post',
+									'/settledCompanyDynamics/api/deleteSettledCompanyInfo', {
+										id: item.id,
+										phone: item.phone
+									})
+								.then(res => {
+									if (res.data.code == 200) {
+										uni.showToast({
+											title: '删除成功！',
+											icon: 'none',
+											duration: 2000,
+											success() {
+												setTimeout(function() {
+													that.getRelease()
+												}, 1000);
+											}
+										})
+
+									}
+								})
+						}
+					}
+				})
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		overflow: scroll;
+	}
+
+	.topCss {
+		overflow: scroll;
+		background: url(../../static/img/liangmai/record@3x.png);
+		background-size: 100%;
+		background-repeat: no-repeat;
+	}
+
+	.back-btn {
+		position: absolute;
+		left: 40upx;
+		z-index: 9999;
+		padding-top: var(--status-bar-height);
+		top: 40upx;
+		font-size: 40upx;
+		color: #fff;
+	}
+
+	.modular {
+		width: 94%;
+		margin: 40rpx auto;
+		background-color: #FFFFFF;
+		border-radius: 40rpx;
+		// margin-top: 40rpx;
+	}
+
+	.modular {
+		width: 94%;
+		margin: 20rpx auto;
+		background-color: #FFFFFF;
+		border-radius: 40rpx;
+		margin-top: 40rpx;
+	}
+
+	.introduce {
+		// height: 300rpx;
+		background-color: #FFFFFF;
+		border-top-right-radius: 40rpx;
+		border-top-left-radius: 40rpx;
+		margin-top: 250rpx;
+	}
+
+	.portrait {
+		width: 120rpx;
+		height: 120rpx;
+		margin: 0 auto 0;
+		position: relative;
+		top: -70rpx;
+	}
+
+	.name {
+		text-align: center;
+		color: #333333;
+		font-size: 40rpx;
+		margin-top: -30rpx;
+	}
+
+	.dongtai {
+		text-align: center;
+	}
+
+	.labels {
+		width: 140rpx;
+		text-align: center;
+		margin-top: 60rpx;
+	}
+
+	.label {
+		color: #333333;
+		font-size: 32rpx;
+	}
+
+	.label2 {
+		color: #333333;
+		font-size: 36rpx;
+		font-weight: 600;
+	}
+
+	.touxiang {
+		width: 76rpx;
+		height: 76rpx;
+		margin: 20rpx 0 0 34rpx;
+	}
+
+	.title {
+		font-size: 38rpx;
+		font-weight: 600;
+		margin-left: 30rpx;
+	}
+
+	.titleText {
+		font-size: 30rpx;
+		margin-left: 30rpx;
+		margin-top: 10rpx;
+	}
+
+	.imgList {
+		width: 100%;
+		margin-top: 30rpx;
+		flex-wrap: wrap;
+	}
+
+	.address {
+		width: 60%;
+		height: 48rpx;
+		background-color: #F5F6FA;
+		border-radius: 24rpx;
+		margin-left: 30rpx;
+		line-height: 48rpx;
+		margin: 30rpx;
+	}
+</style>

pages/grain_pulse/release.vue

@@ -0,0 +1,253 @@
+<template>
+	<view class="center">
+		<u-form class="forList">
+			<view class="modular">
+				<view class="c-row b-b ">
+					<view style="width: 30%;color: #71747C;font-size: 30rpx;">发布主体</view>
+					<view class="flex" style="width: 70%;justify-content: flex-end;">
+						<picker :range="companyType" @change="companyChange($event)"
+							style="margin-right: 6rpx;font-size: 30rpx;">
+							<view>{{companyIndex > -1?companyType[companyIndex] :'请选择发布主体'}}</view>
+						</picker>
+						<u-icon name="arrow-right" color="#AFB3BF" :custom-style="{'marginRight':'10rpx'}"></u-icon>
+					</view>
+				</view>
+				<view class="c-row" @click="location">
+					<view style="width: 30%;color: #71747C;font-size: 30rpx;">城市</view>
+					<view class="flex"
+						style="width: 70%;justify-content: flex-end;margin-right: 6rpx;font-size: 30rpx;">
+						{{release.city == null || release.city == "" ? "请选择城市": release.city}}
+					</view>
+					<u-icon name="arrow-right" color="#AFB3BF" :custom-style="{'marginRight':'10rpx'}"></u-icon>
+				</view>
+			</view>
+			<view class="modular">
+				<view style="margin: 20rpx 30rpx 0;border-bottom: 1px solid #C5CAD4;">
+					<input type="text" placeholder="标题(2-16个字)" style="font-size: 44rpx;" maxlength="16"
+						v-model="release.title" />
+				</view>
+				<view class="inputText">
+					<u-input v-model="release.content" type="textarea" :border="border" :height="height"
+						:auto-height="autoHeight" maxlength="200" placeholder="请发布粮食类商品交易信息，建议包含联系方式、地址等信息，不超过200个字"
+						@input="wordJiSuan" :clearable="clear" />
+				</view>
+				<view style="text-align: right;color: #C5CAD4;font-size: 30rpx;margin-right: 20rpx;">{{wordCount}}/200字
+				</view>
+				<upload class="upload" ref="upload" :action="action" :max-count="9" :size-type="['compressed']"
+					@on-success="getImgUrl" @on-error="onError" @on-remove="onRemove" :options="uploadOptions"
+					@on-uploaded="isAdd = true" @on-progress="onProgress" :before-upload="filterFileType"></upload>
+			</view>
+		</u-form>
+		<u-button type="success" shape="circle" style="margin-top: 40rpx;" @click="submit">发布</u-button>
+	</view>
+</template>
+
+<script>
+	import upload from '@/components/upload.vue';
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		components: {
+			upload
+		},
+		data() {
+			return {
+				deptList: {},
+				chengshi: [], //城市
+				clear: false,
+				border: false,
+				height: 300,
+				autoHeight: true,
+				wordCount: 0,
+				action: "https://www.zthymaoyi.com/upload/admin",
+				uploadOptions: {
+					"text": "上传照片",
+					"bgc": ""
+				},
+				companyIndex: 0,
+				companyType: [],
+				release: {},
+				address: [],
+				getCompany: {},
+				companyType1: [],
+			}
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		onShow() {
+			this.chengshi = uni.getStorageSync("Visit_key")
+			if (this.chengshi.length > 0) {
+				this.release.city = this.chengshi[0].cityName
+			}
+			this.companyList()
+		},
+
+		methods: {
+			companyList() {
+				this.getCompany.loginPhone = this.userInfo.phone
+				this.$api.doRequest('get', '/settledCompanyInfo/companyList', this.getCompany)
+					.then(res => {
+						if (res.data.code == 200) {
+							this.release.compName = res.data.data[0].compName
+							for (let i = 0; i < res.data.data.length; i++) {
+								this.companyType.push(res.data.data[i].compName)
+							}
+						}
+					})
+			},
+			wordJiSuan() {
+				this.wordCount = this.release.content.length
+			},
+			filterFileType(index, lists) {
+				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
+					lists.splice(index, 1);
+					// 当前文件不支持
+					uni.showModal({
+						title: '暂不支持当前图片类型',
+						showCancel: false
+					});
+				} else {
+					this.isAdd = false;
+				}
+			},
+			companyChange(e) {
+				this.companyIndex = e.detail.value
+				this.release.compName = this.companyType[this.companyIndex]
+			},
+			getImgUrl(e) {
+				this.address.push(e)
+			},
+			onRemove(e) {
+				this.address.splice(e, 1)
+			},
+			submit() {
+				if (!this.release.compName) {
+					this.$api.msg('发布主体不能为空')
+					return
+				}
+				if (!this.release.city) {
+					this.$api.msg('城市不能为空,功能没完成')
+					// return
+				}
+				if (!this.release.title) {
+					this.$api.msg('标题不能为空')
+					return
+				}
+				if (this.release.title.length < 2 || this.release.title.length > 16) {
+					this.$api.msg('标题长度2-16个字')
+					return
+				}
+				if (this.release.content != null) {
+					if (this.release.content.length > 200) {
+						this.$api.msg('动态内容不能超过200字')
+						return
+					}
+				}
+				if (!this.release.content && this.address.length == 0) {
+					this.$api.msg("动态内容和图片不能同时为空")
+					return
+				}
+				if (this.companyType.length == 0) {
+					uni.showModal({
+						content: "您还没有入驻粮脉，不能发布，是否前去完善入驻信息！",
+						showCancel: true,
+						confirmText: '前往',
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: `/pages/grain_pulse/enter`
+								})
+							}
+						}
+					})
+					return
+				} else {
+					this.release.address = this.address.toString()
+					this.release.phone = this.userInfo.phone
+					var that = this
+					uni.showModal({
+						content: "确定发布动态？",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.$api.doRequest('post',
+										'/settledCompanyDynamics/api/addSettledCompanyDynamics', that.release)
+									.then(res => {
+										if (res.data.code == 200) {
+											uni.showToast({
+												title: '发布成功！',
+												icon: 'none',
+												duration: 2000,
+												success() {
+													setTimeout(function() {
+														uni.navigateBack(1)
+													}, 1000);
+												}
+											})
+
+										}
+									})
+							}
+						}
+					})
+				}
+
+
+			},
+			location() {
+				uni.navigateTo({
+					url: `/pages/grain_pulse/position/position`
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.center {
+		padding: 10rpx 20rpx;
+	}
+
+	.modular {
+		padding-top: 10rpx;
+		background-color: #FFFFFF;
+		border-radius: 20px;
+		margin-top: 20px;
+	}
+
+	.title {
+		margin-left: 20rpx;
+		color: #71747C;
+	}
+
+	.titles {
+		font-size: 44rpx;
+		color: #C5CAD4;
+	}
+
+	.write {
+		margin-right: 20px;
+		color: #71747C;
+	}
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+
+	.inputText {
+		padding: 2rpx 32rpx;
+		font-size: 30rpx;
+		color: #C5CAD4;
+		margin-top: 20rpx;
+	}
+</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/public/code.vue

@@ -171,10 +171,16 @@
 					})
 					this.$api.doRequest('get','/commonUser/loginVerifyCode',{phone:this.phone,verifyCode:this.inputList,cid:this.clientId}).then(res => {
 					    if(res.data.code==200){
-							this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "易粮易运",
-password: "y123456",
-username: "13333333333"}).then(res1 => {
-								uni.setStorageSync('pcUserInfo', res1.data.data)
+							this.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: this.phone,
+							veriCode: "123456",}).then(res1 => {
+								if(res1.data.code==200){
+									uni.setStorageSync('pcUserInfo', res1.data.data)
+								}else{
+									that.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: '13333333333',
+									veriCode: "123456",}).then(res2 => {
+										uni.setStorageSync('pcUserInfo', res2.data.data)
+									})
+								}
 							})
 							uni.setStorageSync('userInfo', res.data.data)
 					        that.$store.commit('login', res.data.data)

pages/public/login_account_number.vue

@@ -110,10 +110,17 @@
 				this.$api.doRequest('get','/commonUser/login',{phone:this.phone,password:this.password,cid:this.clientId}).then(res => {
 					if(res.data.code==200){
 						uni.setStorageSync('userInfo', res.data.data)
-						this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "易粮易运",
-password: "y123456",
-username: "13333333333"}).then(res1 => {
-							uni.setStorageSync('pcUserInfo', res1.data.data)
+						this.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: this.phone,
+						veriCode: "123456",}).then(res1 => {
+							if(res1.data.code==200){
+								uni.setStorageSync('pcUserInfo', res1.data.data)
+							}else{
+								that.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: '13333333333',
+								veriCode: "123456",}).then(res2 => {
+									uni.setStorageSync('pcUserInfo', res2.data.data)
+								})
+							}
+							
 						})
 						that.$store.commit('login', res.data.data)
 						var name = 'userInfo';

pages/public/register.vue

@@ -223,10 +223,16 @@
 							
 							if(res.data.code==200){
 								// pc登录
-								this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "易粮易运",
-password: "y123456",
-username: "13333333333"}).then(res1 => {
-									uni.setStorageSync('pcUserInfo', res1.data.data)
+							this.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: this.phone,
+							veriCode: "123456",}).then(res1 => {
+									if(res1.data.code==200){
+										uni.setStorageSync('pcUserInfo', res1.data.data)
+									}else{
+										that.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: '13333333333',
+										veriCode: "123456",}).then(res2 => {
+											uni.setStorageSync('pcUserInfo', res2.data.data)
+										})
+									}
 								})
 								uni.setStorageSync('userInfo', res.data)
 								that.$store.commit('login', res.data)

pages/public/reset.vue

@@ -153,10 +153,16 @@
 						})
 						this.$api.doRequest('get','/commonUser/login',{phone:this.phone,password:this.password}).then(req => {
 						if(res.data.code==200){
-							this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "易粮易运",
-password: "y123456",
-username: "13333333333"}).then(res1 => {
-								uni.setStorageSync('pcUserInfo', res1.data.data)
+					this.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: this.phone,
+					veriCode: "123456",}).then(res1 => {
+								if(res1.data.code==200){
+									uni.setStorageSync('pcUserInfo', res1.data.data)
+								}else{
+									that.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: '13333333333',
+									veriCode: "123456",}).then(res2 => {
+										uni.setStorageSync('pcUserInfo', res2.data.data)
+									})
+								}
 							})
 							uni.setStorageSync('userInfo', req.data.data)
 							that.$store.commit('login', req.data.data)

pages/task/details.vue

@@ -0,0 +1,107 @@
+<template name="task">
+	<view class="content">
+	<u-form :model="form" ref="uForm">
+			<u-form-item label-align='right' label-width='260' label="合同编号"><u-input v-model="form.name" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="货名"><u-input v-model="form.intro" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="仓位号"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="车牌号"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="入库日期"><u-input v-model="form.name" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="蛋白(%)>="><u-input v-model="form.intro" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="水分(%)<="><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="单价(元/吨)"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="基差(元/吨)"><u-input v-model="form.name" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="卸车费(元/吨)"><u-input v-model="form.intro" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="发票费(元/吨)"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="扣款(元/吨)"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="结算单价(元/吨)"><u-input v-model="form.name" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="净重(吨)"><u-input v-model="form.intro" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="应付金额(元)"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="已付金额(元)"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="未付金额(元)"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="付款日期"><u-input v-model="form.name" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="结转"><u-input v-model="form.intro" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="客户确认"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="客户"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="库点"><u-input v-model="form.name" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="发票类型"><u-input v-model="form.intro" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="状态"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="已开发票(元)"><u-input v-model="form.sex" /></u-form-item>
+			
+		</u-form>
+		<view style='padding:10px;' class='flex'><u-button type="error">驳回</u-button><u-button  type="success">通过</u-button></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "task",
+		
+		data() {
+			return {
+				form: {
+								name: '',
+								intro: '',
+								sex: ''
+							},
+							checkboxList: [
+								{
+									name: '苹果',
+									checked: false,
+									disabled: false
+								},
+								{
+									name: '雪梨',
+									checked: false,
+									disabled: false
+								},
+								{
+									name: '柠檬',
+									checked: false,
+									disabled: false
+								}
+							],
+							radioList: [
+								{
+									name: '鲜甜',
+									disabled: false
+								},
+								{
+									name: '麻辣',
+									disabled: false
+								}
+							],
+							radio: '',
+							switchVal: false
+			};
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		onShow() {
+			this.getIndexBuyData()
+			// this.userInfo =  uni.getStorageSync("userInfo")
+			this.warehouseInOutInfo.phone = this.userInfo.phone
+		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.warehouseInOutInfo.currentPage += 1
+				this.getIndexBuyData()
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background: #fff;
+	}
+	.content{
+		padding:10px;
+	}
+</style>

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>
-					<view  class="title-tip-a" v-if="item.statusFlag==3">已完成</view>
+					<text v-else>{{item.messageTitle}}</text>
+					<view  class="title-tip-a" v-if="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:""
 			};
 		},
@@ -75,7 +85,12 @@
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+			if(this.statusFlag==1){
 				this.warehouseInOutInfo.currentPage += 1
+			}else{
+				this.data.currentPage+=1
+			}
+				
 				this.getIndexBuyData()
 			}
 		},
@@ -153,23 +168,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) {
@@ -179,13 +208,39 @@
 							that.isLoadMore = false
 							that.loadStatus = 'nomore'
 						}
+						if(this.statusFlag==3){
+							for(var i=0;i<this.taskInfo.length;i++){
+								if(this.taskInfo[i].businessType=='WAREHOUSE'){
+									if(this.taskInfo[i].businessCode=='INOUTTASK-TASK-APPROVE'){
+										this.taskInfo[i].messageTitle='出入库任务'
+									}
+								}else if(this.taskInfo[i].businessType=='REPORT'){
+									if(this.taskInfo[i].businessCode=='PROCUREMENT-RECEIPT-REPORT'){
+										this.taskInfo[i].messageTitle='采购入库统计'
+									}else if(this.taskInfo[i].businessCode=='PROCUREMENT-CLOSE-REPORT'){
+										this.taskInfo[i].messageTitle='采购平仓统计'
+									}else if(this.taskInfo[i].businessCode=='SALE-RECEIPT-REPORT'){
+										this.taskInfo[i].messageTitle='销售出库统计'
+									}else if(this.taskInfo[i].businessCode=='SALE-CLOSE-REPORT'){
+										this.taskInfo[i].messageTitle='销售平仓统计'
+									}
+								}else if(this.taskInfo[i].businessType=='PROCUREMENT'){
+									if(this.taskInfo[i].businessCode=='PROCUREMENT-ORDER-APPROVE'){
+										this.taskInfo[i].messageTitle='采购订单'
+									}
+								}else if(this.taskInfo[i].businessType=='SALE'){
+									if(this.taskInfo[i].businessCode=='SALE-ORDER-APPROVE'){
+										this.taskInfo[i].messageTitle='采购订单'
+									}
+								}
+							}
+						}
 						if(res.data.data.records.length==0){
 							that.isSole=true
 						}else{
 							that.isSole=false
 						}
 						uni.hideLoading()
-						this.taskInfo = res.data.data.records
 					} else {
 						uni.showToast({
 							title: res.data.message,
@@ -204,7 +259,7 @@
 			tabcarchange(statusFlag) {
 				this.statusFlag = statusFlag
 				this.pageSize = 1
-				this.getIndexBuyData()
+				this.getIndexBuyData(1)
 			},
 			navToDetailPage(item) {
 				if(item.taskType == "入库任务"){
@@ -250,6 +305,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: '我的发布',