更新

components/linzq-citySelect/linzq-citySelect.vue

@@ -14,7 +14,7 @@
 						当前城市
 					</view>
 					<view class="dingwei_citytop">
-						<view class="" style="margin-bottom: 0;">
+						<view class="" style="margin-bottom: 0;" @click="back_city(position)">
 							{{position}}
 						</view>
 						<view class="dingweis_div" @click="getWarpweft">
@@ -197,7 +197,9 @@
 					this.positionObj.positionName = item
 					this.$emit('back_city', this.positionObj);
 					//unshift 把数据插入到首位，与push相反
-					this.Visit.unshift(item)
+					if(item){
+						this.Visit.unshift(item)
+					}
 					this.searchValue = "";
 					this.disdingwei = true
 					var arr = this.Visit

config/index.js

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

pages/grain_pulse/details.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="main_content">
 		<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" 
@@ -11,7 +11,7 @@
 				</swiper-item>
 			</swiper>
 			<view class="dots">
-				<text class='Regular'>{{status+1}} / {{imagelist.length}}</text>
+				<text class='Regular'>{{status+1}} / {{sitePhotoAddress.length}}</text>
 			</view>
 			<view class='functionality'>
 				<image @click='show=true' class='jubao' src="../../static/img/liangmai/jubao.png" mode=""></image>
@@ -49,7 +49,9 @@
 						<view style='flex:1;' class='title Regular'>联系人</view>
 						<view style='flex:3;'>
 							<view class='Regular linkmanItem' v-for='item in companylist.settledCompanyContacts'>
-								{{item.contacts}} <a :href="item.contactsPhone"><image class="phone" src="../../static/img/liangmai/dianhau.png" mode=""></image></a>
+								<view @click="contactUs(item)">
+									{{item.contacts}} <image class="phone" src="../../static/img/liangmai/dianhau.png" mode=""></image>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -59,7 +61,7 @@
 							{{companylist.email}}
 						</view>
 					</view>
-					<view class="flex fax">
+					<view v-show="companylist.fax" class="flex fax">
 						<view style='flex:1;' class='title Regular'>传真</view>
 						<view class='Regular' style='font-size:14px;flex:3;'>
 							{{companylist.fax}}
@@ -132,7 +134,14 @@
 						that.label=res.data.data.label.split(',')
 					}
 					if(res.data.data.sitePhotoAddress){
-						that.sitePhotoAddress=res.data.data.sitePhotoAddress.split(',')
+						var tmp=res.data.data.sitePhotoAddress.split(',')
+						that.sitePhotoAddress = []
+						for(var i=0;i<tmp.length;i++){
+							if(tmp[i]){
+								that.sitePhotoAddress.push(tmp[i])
+							}
+						}
+						console.log("that.sitePhotoAddress",that.sitePhotoAddress)
 					}
 				}
 			})
@@ -140,6 +149,23 @@
 			
 		},
 		methods: {
+			contactUs(item) {
+				const that = this
+				uni.makePhoneCall({
+				 	// 手机号
+				    phoneNumber: item.contactsPhone, 
+				
+					// 成功回调
+					success: (res) => {
+						console.log('调用成功!')	
+					},
+					// 失败回调
+					fail: (res) => {
+						console.log('调用失败!')
+						that.contactUs()
+					}
+				  });		
+			},
 			topSwiperTab(e) {
 				var that = this;
 				this.status = Number(e.target.current);
@@ -162,7 +188,13 @@
 										that.label=res.data.data.label.split(',')
 									}
 									if(res.data.data.sitePhotoAddress){
-										that.sitePhotoAddress=res.data.data.sitePhotoAddress.split(',')
+										var tmp=res.data.data.sitePhotoAddress.split(',')
+										that.sitePhotoAddress = []
+										for(var i=0;i<tmp.length;i++){
+											if(tmp[i]){
+												that.sitePhotoAddress.push(tmp[i])
+											}
+										}
 									}
 								}
 							})
@@ -184,7 +216,13 @@
 										that.label=res.data.data.label.split(',')
 									}
 									if(res.data.data.sitePhotoAddress){
-										that.sitePhotoAddress=res.data.data.sitePhotoAddress.split(',')
+										var tmp=res.data.data.sitePhotoAddress.split(',')
+										that.sitePhotoAddress = []
+										for(var i=0;i<tmp.length;i++){
+											if(tmp[i]){
+												that.sitePhotoAddress.push(tmp[i])
+											}
+										}
 									}
 								}
 							})
@@ -212,6 +250,9 @@
 </script>
 
 <style lang='scss' scoped>
+	.main_content{
+		margin-top: 60rpx;
+	}
 	/* 《--轮播 */
 	.swiper{
 		position:relative;

pages/grain_pulse/distribution/distribution.nvue

@@ -171,7 +171,7 @@
 			bindPickerChange: function(e) {
 				console.log('picker发送选择改变，携带值为', e.detail)
 				
-				if(e.detail.value=='全部类型'){
+				if(e.detail.value=='0'){
 					this.mainBusinessType=''
 				}else{
 					this.mainBusinessType=this.typeList[this.index]
@@ -430,6 +430,6 @@
 	}
 
 	.scroll-style {
-		height: 130rpx;
+		height: 230rpx;
 	}
 </style>

pages/grain_pulse/dynamic.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="center">
 		<u-search placeholder="请输入货名" v-model="keyword" @clear="searchClear" style="width: 96%; margin: 0 auto;"
-			@custom="getrelease"></u-search>
+			@custom="getData"></u-search>
 		<view class="bottom flex">
 			<view class="bottonCss" @click="release">
 				<image src="../../static/img/liangmai/fabu-2-check@3x.png" mode="" style="width: 40rpx; height: 40rpx;">
@@ -30,9 +30,9 @@
 				<view class="titleText">
 					<!-- {{item.content}} -->
 					<u-read-more show-height="200" :toggle="true" close-text="展开">
-						<!-- <rich-text :nodes="item.content"></rich-text> -->
+						<rich-text :nodes="item.content"></rich-text>
 						 <!-- @load="parseLoaded" -->
-						<u-parse :html="item.content" ></u-parse>
+						<!-- <u-parse :html="item.content" ></u-parse> -->
 					</u-read-more>
 				</view>
 				<view class="imgList flex" v-if="item.address != ''">
@@ -81,7 +81,7 @@
 		},
 		//下拉刷新
 		onPullDownRefresh() {
-			this.getrelease()
+			this.getData()
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
@@ -101,9 +101,35 @@
 		onShow() {
 			this.userName = this.userInfo.userName
 			this.portraits = this.userInfo.avatarUrl
-			this.getrelease()
+			this.getData()
 		},
 		methods: {
+			getData() {
+				this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
+						currentPage: 1,
+						pageSize:10,
+						searchKeyWord: this.keyword
+					})
+					.then(res => {
+						if (res.data.code == 200) {
+							this.releaseInfo = res.data.data.records
+							if (this.releaseInfo.length > 0) {
+								this.releaseList = this.releaseInfo
+								for (let i = 0; i < this.releaseList.length; i++) {
+									if (this.releaseList[i].address != null) {
+										if(this.releaseList[i].address.indexOf(',')!=-1){
+											this.releaseList[i].imgList = this.releaseList[i].address.split(",")
+										}else{
+											this.releaseList[i].imgList =[this.releaseList[i].address]
+										}
+										
+									}
+
+								}
+							}
+						}
+					})
+			},
 			getrelease() {
 				this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
 						currentPage: this.currentPage,
@@ -125,12 +151,12 @@
 										}
 										
 									}
-
+			
 								}
 							} else {
 								this.loadStatus = 'nomore'
 							}
-
+			
 						}
 					})
 			},

pages/grain_pulse/editcompany.vue

@@ -325,8 +325,11 @@
 							this.imgList=[this.deptList.sitePhotoAddress]
 						}
 						
+						console.log("this.imgList",this.imgList)
 						for(var i=0;i<this.imgList.length;i++){
-							this.fileList2.push({url:this.imgList[i]})
+							if(this.imgList[i]){
+								this.fileList2.push({url:this.imgList[i]})
+							}
 						}
 						this.Persons=this.deptList.settledCompanyContacts
 					}
@@ -511,7 +514,7 @@
 						this.$api.msg('邮箱输入错误')
 						return
 					}
-					if(this.deptList.fax.length<6||this.deptList.fax.length>20){
+					if(this.deptList.fax && (this.deptList.fax.length<6||this.deptList.fax.length>20)){
 						this.$api.msg('传真输入错误')
 						return
 					}
@@ -777,7 +780,7 @@
 		.inputOk {
 			width: 100rpx;
 			border-radius: 40rpx;
-			background-color: #E9EAE9;
+			background-color: #22C572;
 			color: #FFFFFF;
 			height:70rpx;
 			border: none;

pages/grain_pulse/enter.vue

@@ -100,7 +100,7 @@
 				<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="navBack1">返回</view>
+				<view style="color: #AFB3BF;text-align: center;" @click="navBack">返回</view>
 			</u-popup>
 		</view>
 	</view>
@@ -195,9 +195,33 @@
 			}
 		},
 		onShow() {
-			if(this.$store.state.enter){
+			var that = this
+			uni.getStorage({
+				key: 'setPosition',
+				success: (res) => {
+					console.log(res.data)
+					that.position = res.data
+					that.position.longitude = res.data.location.split(',')[0];
+					that.position.latitude = res.data.location.split(',')[1];
+					
+					console.log(that.position.longitude)
+					console.log(that.position.latitude)
+					// uni.removeStorage({
+					// 	key: 'setLocaltion'
+					// })
+				},
+			
+			})
+			if(this.$store.state.enter.companyProfile){
+				this.deptList.companyProfile=this.$store.state.enter.companyProfile
+			}
+			if(this.$store.state.enter.compName){
 				this.deptList.compName=this.$store.state.enter.compName
+			}
+			if(this.$store.state.enter.title){
 				this.deptList.title=this.$store.state.enter.title
+			}
+			if(this.$store.state.enter.mainBusinessType){
 				this.mainBusinessType=this.$store.state.enter.mainBusinessType.split(',')
 				if(this.mainBusinessType.length>0){
 					for(var i=0;i<this.management.length;i++){
@@ -206,7 +230,6 @@
 						}
 					}
 				}
-				this.deptList.companyProfile=this.$store.state.enter.companyProfile
 			}
 			console.log(this.$store.state.enter)
 		},
@@ -261,22 +284,22 @@
 			navBack() {
 				uni.navigateBack()
 			},
-			navBack1() {
-				this.$api.doRequest('post', '/settledCompanyInfo/api/addSettledCompanyInfo', this.deptList).then(res => {
-					if (res.data.code == 200) {
-						var data={
-							compName:'',
-							title:'',
-							mainBusinessType:'',
-							companyProfile:'',
-						}
-						that.$store.commit('enterchange',data)
-						uni.switchTab({
-							url:'/pages/grain_pulse/home'
-						})
-					}
-				})
-			},
+			// navBack1() {
+			// 	this.$api.doRequest('post', '/settledCompanyInfo/api/addSettledCompanyInfo', this.deptList).then(res => {
+			// 		if (res.data.code == 200) {
+			// 			var data={
+			// 				compName:'',
+			// 				title:'',
+			// 				mainBusinessType:'',
+			// 				companyProfile:'',
+			// 			}
+			// 			that.$store.commit('enterchange',data)
+			// 			uni.switchTab({
+			// 				url:'/pages/grain_pulse/home'
+			// 			})
+			// 		}
+			// 	})
+			// },
 			upload() {
 				uni.navigateTo({
 					url: `/`
@@ -360,20 +383,35 @@
 					confirmText: '确定',
 					success: function(res) {
 						if (res.confirm) {
-							that.show = true
-							// that.$api.doRequest('post','/settledCompanyInfo/api/addSettledCompanyInfo',that.deptList).then(res => {
-							// 	if(res.data.code==200){
-
-							// 	}
-							// })
-							// //成功后
-							// if (res.data.code == 200) {
-							// 	uni.showToast({
-							// 		title: '提交成功',
-							// 		icon: 'none',
-							// 		duration: 2000
-							// 	})
-							// }
+							uni.showLoading({
+								title:"正在提交",
+								mask:true
+							})
+							that.$api.doRequest('post','/settledCompanyInfo/api/addSettledCompanyInfo',that.deptList).then(res => {
+								//成功后
+								console.log("提交企业信息",res)
+								if (res.data.code == 200) {
+									var data={
+										compName:'',
+										title:'',
+										mainBusinessType:'',
+										companyProfile:'',
+									}
+									that.$store.commit('enterchange',data)
+									that.show = true
+								}
+								uni.hideLoading()
+							})
+							.catch(res => {
+								console.log("系统异常",res)
+								uni.hideLoading()
+								uni.showToast({
+									title: "系统异常，请联系管理员",
+									icon: 'none',
+									duration: 2000
+								})
+							})
+							
 						}
 					},
 				})

pages/grain_pulse/home.vue

@@ -127,6 +127,7 @@
 		 },
 		onShow(val) {
 			this.getList()
+			uni.hideKeyboard()
 			uni.getStorage({
 				key: 'setLocaltion',
 				success: (res) => {
@@ -233,8 +234,8 @@
 	/* 头部--》 */
 	/* 《--定位 */
 	.location {
-		width: 15.5px;
-		height: 17.5px;
+		width: 30rpx;
+		height: 30rpx;
 		margin-right: 2.5px;
 	}
 
@@ -303,8 +304,8 @@
 	}
 
 	.bg {
-		width: 110px;
-		height: 124px;
+		width: 200rpx;
+		height: 200rpx;
 	}
 
 	.friendcircle-content {
@@ -317,9 +318,9 @@
 
 	.friendcircle-content-right-item {
 		background: linear-gradient(90deg, #F5F6FA 0%, #FFFFFF 100%);
-		border-radius: 12.5px;
-		margin-bottom: 10px;
-		width: 205.5px;
+		border-radius: 15rpx;
+		margin-bottom: 20rpx;
+		width: 420rpx;
 		font-size: 12px;
 		padding: 3px 0;
 	}
@@ -375,8 +376,8 @@
 	}
 
 	.listitem-left {
-		width: 98.5px;
-		height: 96.5px;
+		width: 400rpx;
+		height: 200rpx;
 		margin-right: 8px;
 		border-radius: 5px;
 	}
@@ -397,12 +398,14 @@
 		margin-top: 8px;
 		padding: 4px 10px;
 		border-radius: 15px;
+		font-size: 12px;
 	}
 
 	.distance {
 		color: #AFB3BF;
 		padding: 4px;
 		margin-top: 8px;
+		font-size: 12px;
 	}
 
 	/* 数据--》 */

pages/grain_pulse/localtion/coordinate.nvue

@@ -3,7 +3,8 @@
 		<view class="content">
 			<view class='address' @click='naviageToPage("/pages/grain_pulse/position/position")'>
 				<image class='location' src="@/static/img/liangmai/icon_ditu.png" mode=""></image>
-				<text class="title-style">{{position.name}}</text>
+				<text v-if="position.name" class="title-style">{{position.name}}</text>
+				<text v-else class="title-style">点击定位</text>
 			</view>
 			<map class="map" @tap="tap" @markertap="markertap" :latitude="position.latitude"
 				:longitude="position.longitude" :markers="covers"
@@ -193,6 +194,7 @@
 		font-size: 32rpx;
 		font-weight: 500;
 		color: #333333;
+		padding-left: 20rpx;
 	}
 	.config-btn{
 		width: 144rpx;
@@ -213,5 +215,8 @@
 	}
 	.address{
 		flex-direction: row;
+		margin-left: 80rpx;
+		margin-top: 10rpx;
+		margin-bottom: 20rpx;
 	}
 </style>

pages/grain_pulse/my_grain_pulse.vue

@@ -31,7 +31,7 @@
 					<view class="listitem-right">
 						<view class="flex justify-between">
 							<view class="companyname Medium">{{item.compName}}</view>
-							<image style='width:12px;height:12px;' :src="status1?'../../static/img/liangmai/my_shoucang1.png':'../../static/img/liangmai/my_shoucang.png'" mode=""></image>
+							<image style='width:12px;height:12px;' :src="status1?'../../static/img/liangmai/shoucang1.png':'../../static/img/liangmai/my_shoucang.png'" mode=""></image>
 						</view>
 						<view class='Regular introduce'>{{item.companyProfile}}</view>
 					</view>
@@ -46,7 +46,7 @@
 			</view>
 		</view>
 		<view style='padding:10px;text-align:center;' v-if='datalist.length==0'>
-			当前暂无入驻的粮脉
+			当前暂无信息
 		</view>
 		<view v-show='mainBusinessType=="我的企业"' class='exitloginwrap'>
 			<button @click.stop='enterclick()' class='exitlogin'>新增</button>
@@ -321,6 +321,7 @@
 	}
 	.listitemStatus{
 		margin-left:2px;
+		width: 120rpx;
 	}
 	.listitemStatus.audit{
 		color:#FE6430;

pages/grain_pulse/position/position.vue

@@ -121,12 +121,13 @@
 		},
 		methods: {
 			addressClick(item) {
-				debugger
-				this.list.push(item)
-				uni.setStorage({
-					key: 'SearchList_key',
-					data: this.list
-				});
+				if(item){
+					this.list.push(item)
+					uni.setStorage({
+						key: 'SearchList_key',
+						data: this.list
+					});
+				}
 				if (this.positionType.type == 1) {
 					uni.setStorage({
 						key: 'setPosition',
@@ -320,29 +321,22 @@
 				})
 			},
 			toHome(item) {
-				if (this.positionType.type == 1) {
-					uni.setStorage({
-						key: 'setPosition',
-						data: item,
-						success: (res) => {
-							uni.navigateBack({
-								
-							})
-						}
-					})
-				} else {
-
-					uni.setStorage({
-						key: 'setLocaltion',
-						data: item,
-						success: (res) => {
-							uni.switchTab({
-								url: '../home'
-							})
-						},
-
-					})
-				}
+				uni.setStorage({
+					key: 'setPosition',
+					data: item,
+					success: (res) => {
+						uni.setStorage({
+							key: 'setLocaltion',
+							data: item,
+							success: (res) => {
+								uni.navigateBack({
+									
+								})
+							},
+						})
+					}
+				})
+				
 			}
 		}
 	}

pages/grain_pulse/record.vue

@@ -60,7 +60,7 @@
 						<image :src="items" style="height: 220rpx;border-radius: 16rpx;"></image>
 					</view>
 				</view>
-				<view class="flex">
+				<view class=" addressTitle flex">
 					<view class="address flex">
 						<image src='../../static/img/location.png'
 							style="width: 26rpx;height: 30rpx;top: 8rpx;margin: 0 10rpx;"></image>
@@ -141,11 +141,11 @@
 			console.log(this.userInfo.avatarUrl)
 			this.userName = this.userInfo.userName
 			this.portraits = this.userInfo.avatarUrl?this.userInfo.avatarUrl:'../../static/img/myimg/YongHu@3x.png'
-			this.getRelease()
+			this.getData()
 		},
 		//下拉刷新
 		onPullDownRefresh() {
-			this.getRelease()
+			this.getData()
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
@@ -214,10 +214,34 @@
 					this.searchType = "2"
 				} else if (item.name == "未通过") {
 					this.searchType = "3"
+				}else if (item.name == "已过期") {
+					this.searchType = "4"
 				} else {
 					this.searchType = ""
 				}
-				this.getRelease()
+				this.getData()
+			},
+			getData() {
+				this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
+					currentPage: 1,
+					pageSize: 10,
+					loginPhone: this.userInfo.phone,
+					searchType: this.searchType
+				})
+				.then(res => {
+					console.log("res",res)
+					if (res.data.code == 200) {
+						this.release = res.data.data.records
+						if (this.release.length > 0) {
+							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(",")
+							}
+						} 
+					}
+				})
+
 			},
 			getRelease() {
 				if (!this.searchType) {
@@ -229,12 +253,8 @@
 						})
 						.then(res => {
 							if (res.data.code == 200) {
-									if(this.currentPage = 1 ){
-										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
@@ -272,8 +292,6 @@
 								}
 							})
 					} else {
-						this.release = []
-						this.currentPage = 1
 						this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
 								currentPage: this.currentPage,
 								pageSize: this.pageSize,
@@ -322,7 +340,7 @@
 											duration: 2000,
 											success() {
 												setTimeout(function() {
-													that.getRelease()
+													that.getData()
 												}, 1000);
 											}
 										})
@@ -341,6 +359,7 @@
 <style lang="scss" scoped>
 	.center {
 		overflow: scroll;
+		margin-bottom: 100rpx;
 	}
 
 	.topCss {
@@ -453,6 +472,11 @@
 		line-height: 48rpx;
 		margin: 30rpx;
 	}
+	.addressTitle{
+		height: 90rpx;
+		background-color: #F5F6FA;
+		border-radius: 24rpx;
+	}
 	.bottom {
 		width: 100%;
 		height: 160rpx;

pages/grain_pulse/release.vue

@@ -28,14 +28,14 @@
 				</view>
 				<view class="inputText">
 					<u-input v-model="release.content" type="textarea" :border="border" :height="height"
-						:auto-height="autoHeight" maxlength="200" placeholder="请发布粮食类商品交易信息，建议包含联系方式、地址等信息，不超过200个字"
+						:auto-height="autoHeight" maxlength="1000" placeholder="请发布粮食类商品交易信息，建议包含联系方式、地址等信息，不超过1000个字"
 						@input="wordJiSuan" :clearable="clear" />
 				</view>
-				<view style="text-align: right;color: #C5CAD4;font-size: 30rpx;margin-right: 20rpx;">{{wordCount}}/200字
+				<view style="text-align: right;color: #C5CAD4;font-size: 30rpx;margin-right: 20rpx;">{{wordCount}}/1000字
 				</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>
+					@on-success="getImgUrl"  @on-remove="onRemove" :options="uploadOptions"
+					@on-uploaded="isAdd = true"  :before-upload="filterFileType"></upload>
 			</view>
 		</u-form>
 		<u-button type="success" shape="circle" style="margin-top: 40rpx;" @click="submit">发布</u-button>
@@ -54,7 +54,6 @@
 		data() {
 			return {
 				deptList: {},
-				chengshi: [], //城市
 				clear: false,
 				border: false,
 				height: 300,
@@ -77,9 +76,9 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onShow() {
-			this.chengshi = uni.getStorageSync("Visit_key")
-			if (this.chengshi.length > 0) {
-				this.release.city = this.chengshi[0].cityName
+			var city = uni.getStorageSync("nowRegion")
+			if(city.positionName.cityName){
+				this.release.city = city.positionName.cityName
 			}
 			this.companyList()
 		},
@@ -139,8 +138,8 @@
 					return
 				}
 				if (this.release.content != null) {
-					if (this.release.content.length > 200) {
-						this.$api.msg('动态内容不能超过200字')
+					if (this.release.content.length > 1000) {
+						this.$api.msg('动态内容不能超过1000字')
 						return
 					}
 				}
@@ -195,8 +194,11 @@
 					})
 			},
 			location() {
+				// uni.navigateTo({
+				// 	url: `/pages/grain_pulse/position/position`
+				// })
 				uni.navigateTo({
-					url: `/pages/grain_pulse/position/position`
+					url: "/pages/grain_pulse/selectCity/selectCity"
 				})
 			}
 		}

pages/grain_pulse/selectCity/selectCity.vue

@@ -28,21 +28,22 @@
 			back_city(e) {
 				if (e.positionName !== 'no') {
 					this.region = e.positionName.cityName 
-					// this.$refs.popupRef.close();
-					uni.setStorage({
-						key: 'nowRegion',
-						data: e,
-						success() {
-							uni.navigateTo({
-								url:"../position/position"
-							})
-						}
-					});
-				
-					
-				} else {
-					// this.$refs.popupRef.close();
+				} 
+				if(!e.positionName.cityName){
+					var tmp = e.positionName
+					e.positionName = {}
+					e.positionName.cityName = tmp
 				}
+				console.log("city:",e)
+				uni.setStorage({
+					key: 'nowRegion',
+					data: e,
+					success() {
+						uni.navigateBack({
+							
+						})
+					}
+				});
 			}
 		}
 	}