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

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrlNew: 'http://192.168.1.120:8090/',
-	// baseUrlNew: 'http://192.168.1.109:9100/',
+	// baseUrlNew: 'http://192.168.1.103:9100/',
 	baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages/grain_pulse/details.vue

@@ -133,11 +133,14 @@
 					if(res.data.data.label){
 						that.label=res.data.data.label.split(',')
 					}
+					that.sitePhotoAddress = []
+					if(res.data.data.attachmentAddress){
+						that.sitePhotoAddress.push(res.data.data.attachmentAddress)
+					}
 					if(res.data.data.sitePhotoAddress){
 						var tmp=res.data.data.sitePhotoAddress.split(',')
-						that.sitePhotoAddress = []
 						for(var i=0;i<tmp.length;i++){
-							if(tmp[i]){
+							if(tmp[i] && tmp[i] != res.data.data.attachmentAddress){
 								that.sitePhotoAddress.push(tmp[i])
 							}
 						}
@@ -187,11 +190,14 @@
 									if(res.data.data.label){
 										that.label=res.data.data.label.split(',')
 									}
+									that.sitePhotoAddress = []
+									if(res.data.data.attachmentAddress){
+										that.sitePhotoAddress.push(res.data.data.attachmentAddress)
+									}
 									if(res.data.data.sitePhotoAddress){
 										var tmp=res.data.data.sitePhotoAddress.split(',')
-										that.sitePhotoAddress = []
 										for(var i=0;i<tmp.length;i++){
-											if(tmp[i]){
+											if(tmp[i] && tmp[i] != res.data.data.attachmentAddress){
 												that.sitePhotoAddress.push(tmp[i])
 											}
 										}
@@ -215,11 +221,14 @@
 									if(res.data.data.label){
 										that.label=res.data.data.label.split(',')
 									}
+									that.sitePhotoAddress = []
+									if(res.data.data.attachmentAddress){
+										that.sitePhotoAddress.push(res.data.data.attachmentAddress)
+									}
 									if(res.data.data.sitePhotoAddress){
 										var tmp=res.data.data.sitePhotoAddress.split(',')
-										that.sitePhotoAddress = []
 										for(var i=0;i<tmp.length;i++){
-											if(tmp[i]){
+											if(tmp[i] && tmp[i] != res.data.data.attachmentAddress){
 												that.sitePhotoAddress.push(tmp[i])
 											}
 										}

pages/grain_pulse/dynamic.vue

@@ -29,7 +29,7 @@
 				<view class="title">{{item.title}}</view>
 				<view class="titleText">
 					<!-- {{item.content}} -->
-					<u-read-more show-height="200" :toggle="true" close-text="展开">
+					<u-read-more show-height="200" :shadow-style="shadowStyle" :toggle="true" close-text="展开">
 						<rich-text :nodes="item.content"></rich-text>
 						 <!-- @load="parseLoaded" -->
 						<!-- <u-parse :html="item.content" ></u-parse> -->
@@ -74,6 +74,11 @@
 				isLoadMore: false,
 				loadStatus: "loading",
 				getCompany:{},
+				shadowStyle: {
+					backgroundImage: "none",
+					paddingTop: "0",
+					marginTop: "20rpx"
+				}
 			}
 		},
 		computed: {
@@ -164,6 +169,7 @@
 				this.$api.doRequest('get', '/settledCompanyInfo/companyList', this.getCompany)
 					.then(res => {
 						if (res.data.code == 200) {
+							console.log("companyList",res)
 							if(res.data.data.length > 0){
 								uni.navigateTo({
 									url: `/pages/grain_pulse/release`

pages/grain_pulse/home.vue

@@ -59,9 +59,13 @@
 					<view v-if='position.name!="未设置"' class='distance Regular'>{{item._metre}}</view>
 				</view>
 			</view>
+			
 			<view style='padding:10px;text-align:center;' v-if='datalist.length==0'>
 				当前暂无数据
 			</view>
+			<view v-else-if="isLoadMore" >
+				<uni-load-more :status="loadStatus"></uni-load-more>
+			</view>
 		</view>
 		<view  class="enter" @click="enterUrl">
 			<image style='width:56.5px;height:28px;' src="../../static/img/liangmai/ruzhu.png" mode=""></image>
@@ -90,6 +94,8 @@
 				pageSize: 10,
 				releaseInfo:[],
 				currentPage: 1,
+				isLoadMore: false, //是否加载中
+				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				searchTypes: [{
 						name: '全部',
 						value: '0'
@@ -127,12 +133,20 @@
 		},
 		onPullDownRefresh() {
 		    this.getList()
+			this.isLoadMore = false
+			this.loadStatus = 'loading'
 		     setTimeout(function () {
 		         uni.stopPullDownRefresh();  //关闭下拉刷新
 		     }, 1000);
 		 },
+		 onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.isLoadMore = true
+				this.currentPage += 1
+				this.getData()
+			}
+		 },
 		onShow(val) {
-			this.getList()
 			uni.hideKeyboard()
 			uni.getStorage({
 				key: 'setLocaltion',
@@ -143,13 +157,39 @@
 					// 	key: 'setLocaltion'
 					// })
 				},
-
 			})
+			if(this.position.name == "未设置"){
+				let that = this;
+				uni.getLocation({
+					type: 'gcj02',
+					geocode: true,
+					success: function(res) {
+						console.log('获取位置数据：', res);
+						console.log('当前位置的经度：' + res.longitude);
+						console.log('当前位置的纬度：' + res.latitude);
+						//拼接当前定位回显地址
+						// #ifdef APP-PLUS
+						that.position.name = res.address.poiName
+						that.position.location = res.longitude + "," +  res.latitude
+						uni.setStorage({
+							key: 'setLocaltion',
+							data: that.position
+						})
+						// #endif
+						that.getList()
+					},
+					fail:function(req){
+						console.log(req)
+					}
+				});
+			}
+			else{
+				this.getList()
+			}
 		},
 		onLoad(option) {
 			if (option.position){
 				this.position = option.position
-				
 			}
 		},
 		methods: {
@@ -167,7 +207,8 @@
 					})
 				this.getInfo()
 			},
-			getInfo(){
+			getData(){
+				var that = this
 				uni.showLoading({
 					title:"正在加载"
 				})
@@ -177,6 +218,51 @@
 					currentPage: this.currentPage,
 					pcFlag: 2,
 					searchType: 2
+				}).then(res => {
+					if (res.data.code == 200) {
+						var data = res.data.data.records
+						if(data.length > 0){
+							this.datalist = this.datalist.concat(data)
+							console.log(this.position)
+							let lat2 =this.position.location.split(',')[1];
+							let lng2 = this.position.location.split(',')[0];
+							for(var i=0;i<this.datalist.length;i++){
+								this.datalist[i]._metre=this.utils.getDistance(this.datalist[i].latitude,this.datalist[i].longitude,lat2,lng2)
+							}
+							if(this.currentPage==1&&this.datalist.length==0){
+								this.notlist=true
+							}else{
+								this.notlist=false
+							}
+							console.log("this.datalist",this.datalist)
+							that.isLoadMore=false
+						}
+						else{
+							if(that.currentPage>1){that.currentPage-=1}						
+							that.isLoadMore=true
+							that.loadStatus = 'nomore'
+						}
+						
+						// let _metre = this.utils.getDistance(lat1,lng1,lat2,lng2) +"千米"
+					}
+					uni.hideLoading()
+				}).catch(res => {
+					that.isLoadMore=false
+					that.loadStatus = 'nomore'
+					if(that.currentPage>1){that.currentPage=1}
+					uni.hideLoading()
+				})
+			},
+			getInfo(){
+				uni.showLoading({
+					title:"正在加载"
+				})
+				this.$api.doRequest('get', '/settledCompanyInfo/selectSettledCompanyInfo', {
+					mainBusinessType: this.mainBusinessType,
+					pageSize: this.pageSize,
+					currentPage: 1,
+					pcFlag: 2,
+					searchType: 2
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.datalist = res.data.data.records

pages/grain_pulse/my_grain_pulse.vue

@@ -31,7 +31,7 @@
 					<view style='flex:2;' class="listitem-right">
 						<view class="flex justify-between">
 							<view class="companyname Medium">{{item.compName}}</view>
-							<image style='width:25rpx;height:25rpx;position:relative;top:5px;' :src="status1?'../../static/img/liangmai/shoucang1.png':'../../static/img/liangmai/my_shoucang.png'" mode=""></image>
+							<image style='width:35rpx;height:25rpx;position:relative;top:5px;' :src="status1?'../../static/img/liangmai/shoucang1.png':'../../static/img/liangmai/my_shoucang.png'" mode=""></image>
 						</view>
 						<view class='Regular introduce'>{{item.companyProfile}}</view>
 					</view>
@@ -124,6 +124,7 @@
 				}else{
 					this.$api.doRequest('get','/settledCompanyInfo/myCollection',{loginPhone:this.userInfo.phone,pageSize:this.pageSize,
 							currentPage: this.currentPage,pcFlag:2}).then(res => {
+					console.log("myCollection",res)	
 					if(res.data.code==200){
 						this.datalist=this.datalist.concat(res.data.data.records)
 						let lat2 =this.position.location.split(',')[1];
@@ -147,16 +148,17 @@
 					}
 				})
 				}else{
-					this.$api.doRequest('get','/settledCompanyInfo/myCollection',{phone:this.userInfo.phone,pageSize:this.pageSize,
+					this.$api.doRequest('get','/settledCompanyInfo/myCollection',{loginPhone:this.userInfo.phone,pageSize:this.pageSize,
 							currentPage: this.currentPage,pcFlag:2}).then(res => {
-					if(res.data.code==200){
-						this.datalist=res.data.data.records
-						let lat2 =this.position.location.split(',')[1];
-						let lng2 = this.position.location.split(',')[0];
-						for(var i=0;i<this.datalist.length;i++){
-							this.datalist[i]._metre=this.utils.getDistance(this.datalist[i].latitude,this.datalist[i].longitude,lat2,lng2)
+						console.log("myCollection",res)	
+						if(res.data.code==200){
+							this.datalist=res.data.data.records
+							let lat2 =this.position.location.split(',')[1];
+							let lng2 = this.position.location.split(',')[0];
+							for(var i=0;i<this.datalist.length;i++){
+								this.datalist[i]._metre=this.utils.getDistance(this.datalist[i].latitude,this.datalist[i].longitude,lat2,lng2)
+							}
 						}
-					}
 					})
 				}
 			},

pages/grain_pulse/position/position.vue

@@ -129,27 +129,21 @@
 						data: this.list
 					});
 				}
-				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({
+									
+								})
+							},
+						})
+					}
+				})
 			},
 			// 排序
 			compare(property) {
@@ -196,7 +190,7 @@
 						// #ifdef APP-PLUS
 						that.location = res
 						let _address = res.address
-						// that.city = _address.city
+						that.city = _address.city
 						that.seach.longitude = res.longitude
 						that.seach.latitude = res.latitude
 						that.address = _address.province + _address.city + _address.district + _address

pages/grain_pulse/record.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="center">
-		<view class="bottom flex">
+		<!-- <view class="bottom flex">
 			<view class="bottonCss" @click="releaseclick">
 				<image src="../../static/img/liangmai/fabu-2@3x.png" mode="" style="width: 40rpx; height: 40rpx;">
 				</image>
@@ -11,7 +11,7 @@
 				</image>
 				<view>记录</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="topCss">
 			<view class="back-btn cuIcon-back" @click="navBack"></view>
 			<view class="introduce">

pages/grain_pulse/release.vue

@@ -77,7 +77,7 @@
 		},
 		onShow() {
 			var city = uni.getStorageSync("nowRegion")
-			if(city.positionName.cityName){
+			if(city.positionName && city.positionName.cityName){
 				this.release.city = city.positionName.cityName
 			}
 			this.companyList()

pages/sale/information.vue

@@ -218,26 +218,26 @@
 				});
 			}
 			var that = this
-			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
-				console.log("checkSession",res)
-				if (res.data.data == "INVALID") {
-					uni.showModal({
-						title: '登录提示',
-						content: 'Session过期需要重新登录，是否立即登录？',
-						showCancel: true,
-						confirmText: '登录',
-						success: (e) => {
-							if (e.confirm) {
-								uni.navigateTo({
-									url: '/pages/public/login'
-								})
-							}
-						},
-						fail: () => {},
-						complete: () => {}
-					})
-				}
-			})
+			// this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
+			// 	console.log("checkSession",res)
+			// 	if (res.data.data == "INVALID") {
+			// 		uni.showModal({
+			// 			title: '登录提示',
+			// 			content: 'Session过期需要重新登录，是否立即登录？',
+			// 			showCancel: true,
+			// 			confirmText: '登录',
+			// 			success: (e) => {
+			// 				if (e.confirm) {
+			// 					uni.navigateTo({
+			// 						url: '/pages/public/login'
+			// 					})
+			// 				}
+			// 			},
+			// 			fail: () => {},
+			// 			complete: () => {}
+			// 		})
+			// 	}
+			// })
 			uni.getSystemInfo({
 				success: function(res) {
 					console.log("statusBarHeight", res.statusBarHeight)