前端gjy

pageD/identity/companyIdentity.vue

@@ -8,11 +8,12 @@
 			<!-- 公司营业执照上传 -->
 			<view v-if="license1 != ''">
 				<upload v-if="consentStatus == true" class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-					:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+					:size-type="['compressed']" @on-success="getImgUrl"  @on-remove="onRemove"
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions"
-					:custom="uploadCustom" @on-progress="onProgress"></upload>
+					:custom="uploadCustom" ></upload>
 			</view>
 			<view class="c-row b-b">
+				<text class="tit_red">*</text>
 				<text class="tit">公司名称</text>
 				<view class="con-list">
 					<input placeholder="请填写公司名称" name="input" v-model="identityAuthenticationInfo.compName"></input>
@@ -30,16 +31,17 @@
 			<view>
 				<!-- 个人身份证正面 -->
 				<upload class="upload" ref="upload1" :action="action" :max-size="maxSize" :max-count="1"
-					:size-type="['compressed']" @on-success="getImgUrl1" @on-error="onError" @on-remove="onRemove"
+					:size-type="['compressed']" @on-success="getImgUrl1" @on-remove="onRemove"
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
-					:custom="uploadCustom1" @on-progress="onProgress"></upload>
+					:custom="uploadCustom1" ></upload>
 				<!-- 个人身份证反面 -->
 				<upload class="upload" ref="upload2" :action="action" :max-size="maxSize" :max-count="1"
-					:size-type="['compressed']" @on-success="getImgUrl2" @on-error="onError" @on-remove="onRemove"
+					:size-type="['compressed']" @on-success="getImgUrl2"  @on-remove="onRemove"
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
-					:custom="uploadCustom2" @on-progress="onProgress"></upload>
+					:custom="uploadCustom2" ></upload>
 			</view>
 			<view class="c-row b-b">
+				<text class="tit_red">*</text>
 				<text class="tit">姓名</text>
 				<view class="con-list">
 					<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
@@ -218,20 +220,20 @@
 						this.$api.msg('公司名称输入错误')
 						return
 					}
-					if (!this.identityAuthenticationInfo.payTaxesCard) {
-						this.$api.msg('纳税人识别号不能为空')
-						return
-					}
-					if (this.identityAuthenticationInfo.payTaxesCard.length < 15 || this.identityAuthenticationInfo
-						.payTaxesCard.length > 20) {
-						this.$api.msg('纳税人识别号输入错误')
-						return
-					}
-					if (this.identityAuthenticationInfo.businessLicenseAddressUrl == "" || this.identityAuthenticationInfo
-						.businessLicenseAddressUrl == null) {
-						this.$api.msg('请上传营业执照')
-						return
-					}
+					// if (!this.identityAuthenticationInfo.payTaxesCard) {
+					// 	this.$api.msg('纳税人识别号不能为空')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.payTaxesCard.length < 15 || this.identityAuthenticationInfo
+					// 	.payTaxesCard.length > 20) {
+					// 	this.$api.msg('纳税人识别号输入错误')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.businessLicenseAddressUrl == "" || this.identityAuthenticationInfo
+					// 	.businessLicenseAddressUrl == null) {
+					// 	this.$api.msg('请上传营业执照')
+					// 	return
+					// }
 					this.identityAuthenticationInfo.customerTypeFlag = "2"
 					this.identityAuthenticationInfo.customerType = "企业"
 					var model = JSON.stringify(this.identityAuthenticationInfo);
@@ -240,14 +242,14 @@
 					})
 				} else if (this.consentStatus1) {
 					this.identityAuthenticationInfo.cardAddressUrl = this.id.toString()
-					if (this.id[0] == '' || this.id[0] == null) {
-						this.$api.msg('请上传身份证正面')
-						return
-					}
-					if (this.id[1] == '' || this.id[1] == null) {
-						this.$api.msg('请上传身份证反面')
-						return
-					}
+					// if (this.id[0] == '' || this.id[0] == null) {
+					// 	this.$api.msg('请上传身份证正面')
+					// 	return
+					// }
+					// if (this.id[1] == '' || this.id[1] == null) {
+					// 	this.$api.msg('请上传身份证反面')
+					// 	return
+					// }
 					if (!this.identityAuthenticationInfo.customerName) {
 						this.$api.msg('姓名不能为空')
 						return
@@ -257,14 +259,14 @@
 						this.$api.msg('姓名输入错误')
 						return
 					}
-					if (!this.identityAuthenticationInfo.customerNumberCard) {
-						this.$api.msg('身份证号不能为空')
-						return
-					}
-					if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
-						this.$api.msg('身份证号输入错误')
-						return
-					}
+					// if (!this.identityAuthenticationInfo.customerNumberCard) {
+					// 	this.$api.msg('身份证号不能为空')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
+					// 	this.$api.msg('身份证号输入错误')
+					// 	return
+					// }
 					this.identityAuthenticationInfo.customerTypeFlag = "1"
 					this.identityAuthenticationInfo.customerType = "个人"
 					var model = JSON.stringify(this.identityAuthenticationInfo);
@@ -393,4 +395,7 @@
 	.upload {
 		margin: 20rpx 0;
 	}
+	.tit_red{
+		color: #E54D42;
+	}
 </style>

pageD/identity/companyIdentityThree.vue

@@ -53,6 +53,7 @@
 			</view>
 		</view>
 		<view class="c-row b-b">
+			<text class="tit_red">*</text>
 			<text class="tit">手机号</text>
 			<view class="con-list">
 				<input placeholder="请填写手机号" @input='phoneinput' type="number" maxlength="11"
@@ -246,41 +247,41 @@
 			},
 			commit() {
 				var that = this
-				if (this.bankid[0] == '' || this.bankid[0] == null) {
-					this.$api.msg('请上传银行卡正面')
-					return
-				}
-				if (this.bankid[1] == '' || this.bankid[1] == null) {
-					this.$api.msg('请上传银行卡反面')
-					return
-				}
-				if (!this.identityAuthenticationInfo.bankCard) {
-					this.$api.msg('银行卡号不能为空')
-					return
-				}
-				if (this.identityAuthenticationInfo.bankCard.length < 16 || this.identityAuthenticationInfo.bankCard
-					.length > 19) {
-					this.$api.msg('银行卡号输入错误')
-					return
-				}
-				if (!this.identityAuthenticationInfo.bankDeposit) {
-					this.$api.msg('开户行不能为空')
-					return
-				}
-				if (this.identityAuthenticationInfo.bankDeposit.length < 4 || this.identityAuthenticationInfo.bankDeposit
-					.length > 15) {
-					this.$api.msg('开户行输入错误')
-					return
-				}
-				if (!this.identityAuthenticationInfo.bankDepositBranch) {
-					this.$api.msg('开户支行不能为空')
-					return
-				}
-				if (this.identityAuthenticationInfo.bankDepositBranch.length < 4 || this.identityAuthenticationInfo
-					.bankDepositBranch.length > 30) {
-					this.$api.msg('开户支行输入错误')
-					return
-				}
+				// if (this.bankid[0] == '' || this.bankid[0] == null) {
+				// 	this.$api.msg('请上传银行卡正面')
+				// 	return
+				// }
+				// if (this.bankid[1] == '' || this.bankid[1] == null) {
+				// 	this.$api.msg('请上传银行卡反面')
+				// 	return
+				// }
+				// if (!this.identityAuthenticationInfo.bankCard) {
+				// 	this.$api.msg('银行卡号不能为空')
+				// 	return
+				// }
+				// if (this.identityAuthenticationInfo.bankCard.length < 16 || this.identityAuthenticationInfo.bankCard
+				// 	.length > 19) {
+				// 	this.$api.msg('银行卡号输入错误')
+				// 	return
+				// }
+				// if (!this.identityAuthenticationInfo.bankDeposit) {
+				// 	this.$api.msg('开户行不能为空')
+				// 	return
+				// }
+				// if (this.identityAuthenticationInfo.bankDeposit.length < 4 || this.identityAuthenticationInfo.bankDeposit
+				// 	.length > 15) {
+				// 	this.$api.msg('开户行输入错误')
+				// 	return
+				// }
+				// if (!this.identityAuthenticationInfo.bankDepositBranch) {
+				// 	this.$api.msg('开户支行不能为空')
+				// 	return
+				// }
+				// if (this.identityAuthenticationInfo.bankDepositBranch.length < 4 || this.identityAuthenticationInfo
+				// 	.bankDepositBranch.length > 30) {
+				// 	this.$api.msg('开户支行输入错误')
+				// 	return
+				// }
 				if (!this.identityAuthenticationInfo.customerPhone) {
 					this.$api.msg('手机号不能为空')
 					return
@@ -294,41 +295,41 @@
 					return
 				}
 				if (this.identityAuthenticationInfo.customerTypeFlag == 1) {
-					if (!this.identityAuthenticationInfo.payeeName) {
-						this.$api.msg('收款人姓名不能为空')
-						return
-					}
-					if (this.identityAuthenticationInfo.payeeName < 2 || this.identityAuthenticationInfo.payeeName > 10) {
-						this.$api.msg('收款人姓名输入错误')
-						return
-					}
-					if (!this.identityAuthenticationInfo.payeeNumberCard) {
-						this.$api.msg('收款人身份证号不能为空')
-						return
-					}
-					if (this.identityAuthenticationInfo.payeeNumberCard.length != 18) {
-						this.$api.msg('收款人身份证号输入错误')
-						return
-					}
-					if (!this.identityAuthenticationInfo.compAddress) {
-						this.$api.msg('联系地址不能为空')
-						return
-					}
-					if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
-						.compAddress.length > 20) {
-						this.$api.msg('联系地址输入错误')
-						return
-					}
+					// if (!this.identityAuthenticationInfo.payeeName) {
+					// 	this.$api.msg('收款人姓名不能为空')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.payeeName < 2 || this.identityAuthenticationInfo.payeeName > 10) {
+					// 	this.$api.msg('收款人姓名输入错误')
+					// 	return
+					// }
+					// if (!this.identityAuthenticationInfo.payeeNumberCard) {
+					// 	this.$api.msg('收款人身份证号不能为空')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.payeeNumberCard.length != 18) {
+					// 	this.$api.msg('收款人身份证号输入错误')
+					// 	return
+					// }
+					// if (!this.identityAuthenticationInfo.compAddress) {
+					// 	this.$api.msg('联系地址不能为空')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
+					// 	.compAddress.length > 20) {
+					// 	this.$api.msg('联系地址输入错误')
+					// 	return
+					// }
 				} else if (this.identityAuthenticationInfo.customerTypeFlag == 2) {
-					if (!this.identityAuthenticationInfo.compAddress) {
-						this.$api.msg('公司地址不能为空')
-						return
-					}
-					if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
-						.compAddress.length > 20) {
-						this.$api.msg('公司地址输入错误')
-						return
-					}
+					// if (!this.identityAuthenticationInfo.compAddress) {
+					// 	this.$api.msg('公司地址不能为空')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
+					// 	.compAddress.length > 20) {
+					// 	this.$api.msg('公司地址输入错误')
+					// 	return
+					// }
 				}
 				this.amendprice()
 
@@ -364,7 +365,7 @@
 											that.identityAuthenticationInfo.commonId = res.data.data.id
 										}
 										that.identityAuthenticationInfo.payeeAddressUrl = that.bankid.toString()
-										that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+										// that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 										that.identityAuthenticationInfos.customerPhone = that
 											.identityAuthenticationInfo.customerPhone
 										that.$api.doRequest('get',
@@ -593,4 +594,7 @@
 	.upload {
 		margin: 20rpx 0;
 	}
+	.tit_red{
+		color: #E54D42;
+	}
 </style>

pageD/identity/companyIdentityTwo.vue

@@ -13,6 +13,7 @@
 				:custom="uploadCustom1" ></upload>
 		</view>
 		<view class="c-row b-b">
+			<text class="tit_red">*</text>
 			<text class="tit">姓名</text>
 			<view class="con-list">
 				<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
@@ -152,14 +153,14 @@
 			},
 			jumpUrl() {
 				this.identityAuthenticationInfo.cardAddressUrl = this.id.toString()
-				if (this.id[0] == '' || this.id[0] == null) {
-					this.$api.msg('请上传身份证正面')
-					return
-				}
-				if (this.id[1] == '' || this.id[1] == null) {
-					this.$api.msg('请上传身份证反面')
-					return
-				}
+				// if (this.id[0] == '' || this.id[0] == null) {
+				// 	this.$api.msg('请上传身份证正面')
+				// 	return
+				// }
+				// if (this.id[1] == '' || this.id[1] == null) {
+				// 	this.$api.msg('请上传身份证反面')
+				// 	return
+				// }
 				if (!this.identityAuthenticationInfo.customerName) {
 					this.$api.msg('姓名不能为空')
 					return
@@ -169,14 +170,14 @@
 					this.$api.msg('姓名输入错误')
 					return
 				}
-				if (!this.identityAuthenticationInfo.customerNumberCard) {
-					this.$api.msg('身份证号不能为空')
-					return
-				}
-				if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
-					this.$api.msg('身份证号输入错误')
-					return
-				}
+				// if (!this.identityAuthenticationInfo.customerNumberCard) {
+				// 	this.$api.msg('身份证号不能为空')
+				// 	return
+				// }
+				// if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
+				// 	this.$api.msg('身份证号输入错误')
+				// 	return
+				// }
 				var model = JSON.stringify(this.identityAuthenticationInfo);
 				uni.navigateTo({
 					url: `/pageD/identity/companyIdentityThree?identityAuthenticationInfo=` + model,
@@ -255,4 +256,7 @@
 	.upload {
 		margin: 20rpx 0;
 	}
+	.tit_red{
+		color: #E54D42;
+	}
 </style>

pageD/identity/driverIdentity.vue

@@ -354,7 +354,7 @@
 				this.DriverViewInfo.commonId = this.userInfo.id
 				this.DriverViewInfo.cardAddressUrl = this.id.toString()
 				this.DriverViewInfo.pcFlag = 0
-				this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+				// this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				this.$api.doRequest('post', '/driverViewInfo/api/addInfo', this.DriverViewInfo).then(res => {}).catch(
 					res => {
 						uni.showToast({

pageD/identity/driverIdentityEdit.vue

@@ -466,7 +466,7 @@
 				this.DriverViewInfo.commonId = this.userInfo.id
 				this.DriverViewInfo.cardAddressUrl = this.id.toString()
 				this.DriverViewInfo.pcFlag = 0
-				this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+				// this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				console.log(this.DriverViewInfo, "司机对象")
 				this.$api.doRequest('post', '/driverViewInfo/api/editInfo', this.DriverViewInfo).then(res => {}).catch(
 					res => {

pageD/identity/driverIdentityThree.vue

@@ -198,7 +198,7 @@
 				this.DriverViewInfo.addressUrl = this.addressUrl.toString()
 				this.DriverViewInfo.commonId = this.userInfo.id
 				this.DriverViewInfo.pcFlag = 0
-				this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+				// this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 
 				var that = this
 				that.identityAuthenticationInfo.driverPhone = that.DriverViewInfo.driverPhone

pages/erpbusiness/edit_quality_testing.vue

@@ -137,7 +137,7 @@
 			</view>
 		</view>
 		<view class="footer">
-			<view class="button">提交</view>
+			<view @click='submit' class="button">提交</view>
 		</view>
 	</view>
 </template>
@@ -253,6 +253,103 @@
 				})
 		},
 		methods: {
+			submit(){
+				var that = this
+				if (!this.gridList.qualityNo) {
+					this.$api.msg('编号不能为空')
+					return
+				}
+				if (!this.gridList.binNumber) {
+					this.$api.msg('仓位不能为空')
+					return
+				}
+				if (!this.gridList.customerName) {
+					this.$api.msg('客户不能为空')
+					return
+				}
+				if (!this.gridList.storageTagNo) {
+					this.$api.msg('囤位号不能为空')
+					return
+				}
+				if (this.gridList.storageTagNo.length > 10) {
+					this.$api.msg('囤位号不能为空')
+					return
+				}
+				if (!this.gridList.carNumber) {
+					this.$api.msg('车牌号不能为空')
+					return
+				}
+				if (this.gridList.carNumber.length > 7) {
+					this.$api.msg('车牌号输入错误')
+					return
+				}
+				if (!this.gridList.goodsName) {
+					this.$api.msg('货名不能为空')
+					return
+				}
+				if (this.gridList.buckleWeightRatio < 0 ||this.gridList.buckleWeightRatio > 2) {
+					this.$api.msg('扣重比输入错误')
+					return
+				}
+				if (
+					String(this.gridList.buckleWeightRatio).indexOf('.') != -1 &&
+					String(this.gridList.buckleWeightRatio).length -
+					(String(this.gridList.buckleWeightRatio).indexOf('.') + 1) > 2) 
+					{
+						this.$api.msg('扣重比输入错误')
+						return
+				}
+				if (!this.gridList.type) {
+					this.$api.msg('类型不能为空')
+					return
+				}
+				if (!this.gridList.natureOfGrainPurchase) {
+					this.$api.msg('购粮性质不能为空')
+					return
+				}
+				if (!this.gridList.grade) {
+					this.$api.msg('等级不能为空')
+					return
+				}
+				if (!this.gridList.impurity) {
+					this.$api.msg('杂质不能为空')
+					return
+				}
+				if (!this.gridList.waterContent) {
+					this.$api.msg('水分不能为空')
+					return
+				}
+				if (!this.gridList.mildewGrain) {
+					this.$api.msg('霉变粒不能为空')
+					return
+				}
+				if (!this.gridList.bulkDensity) {
+					this.$api.msg('容重不能为空')
+					return
+				}
+				if (!this.gridList.jiaorenli) {
+					this.$api.msg('热损伤不能为空')
+					return
+				}
+				if (!this.gridList.imperfectGrain) {
+					this.$api.msg('不完整粒不能为空')
+					return
+				}
+				uni.showModal({
+					content: "是否确定通过审核？",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection',{
+								id:this.id
+							}).then(res => {
+								
+							})
+						}
+					}
+				})
+			},
 			gradepicker(e){
 				console.log(e)
 				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)

pages/grain_pulse/details.vue

@@ -375,7 +375,7 @@
 				margin-bottom:10px;
 			}
 			.phone{
-				width:14px;height:14px;margin-left:6px;
+				width:22rpx;height:22rpx;margin-left:6px;
 			}
 		}
 	}

pages/grain_pulse/distribution/distribution.nvue

@@ -111,6 +111,7 @@
 			},
 			getList(val) {
 				this.metreList = []
+				let that = this;
 				let detailedAddress = ""
 				if (val) {
 					detailedAddress = this.position.name
@@ -120,12 +121,14 @@
 					pageSize: 10000,
 					currentPage: 1,
 					detailedAddress:detailedAddress,
-					mainBusinessType:this.mainBusinessType
+					mainBusinessType:this.mainBusinessType,
+					searchType: 2,
+					location:that.position.cityname
 				}).then(res => {
 					let newmarker =[];
 					var id=1;
 						console.log('res',res)
-					if (res.data.code == 200) {debugger
+					if (res.data.code == 200) {
 					
 						this.datalist = res.data.data.records
 						let lat1 = this.nowLocation.latitude

pages/grain_pulse/dynamic.vue

@@ -179,37 +179,74 @@
 				this.keyword = ""
 			},
 			release() {
-				this.getCompany.loginPhone = this.userInfo.phone
-				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){
+				if (!this.hasLogin) {
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录，是否立即登录？',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
 								uni.navigateTo({
-									url: `/pages/grain_pulse/release`
-								})
-							}else{
-								uni.showModal({
-									content: "您还没有入驻粮脉，不能发布，是否前去完善入驻信息！",
-									showCancel: true,
-									confirmText: '前往',
-									success: function(res) {
-										if (res.confirm) {
-											uni.navigateTo({
-												url: `/pages/grain_pulse/enter`
-											})
-										}
-									}
+									url: '/pages/public/login'
 								})
 							}
-						}
+						},
+						fail: () => {},
+						complete: () => {}
 					})
-				
+				}
+				else{
+					this.getCompany.loginPhone = this.userInfo.phone
+					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`
+									})
+								}else{
+									uni.showModal({
+										content: "您还没有入驻粮脉，不能发布，是否前去完善入驻信息！",
+										showCancel: true,
+										confirmText: '前往',
+										success: function(res) {
+											if (res.confirm) {
+												uni.navigateTo({
+													url: `/pages/grain_pulse/enter`
+												})
+											}
+										}
+									})
+								}
+							}
+						})
+				}
 			},
 			record() {
-				uni.navigateTo({
-					url: `/pages/grain_pulse/record`
-				})
+				if (!this.hasLogin) {
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录，是否立即登录？',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}
+				else{
+					uni.navigateTo({
+						url: `/pages/grain_pulse/record`
+					})
+				}
 			}
 		}
 	}

pages/grain_pulse/home.vue

@@ -174,6 +174,7 @@
 						//拼接当前定位回显地址
 						// #ifdef APP-PLUS
 						that.position.name = res.address.poiName
+						that.position.cityname = res.address.city
 						that.position.location = res.longitude + "," +  res.latitude
 						uni.setStorage({
 							key: 'setLocaltion',
@@ -216,13 +217,14 @@
 				var that = this
 				uni.showLoading({
 					title:"正在加载"
-				})
+				}) 
 				this.$api.doRequest('get', '/settledCompanyInfo/selectSettledCompanyInfo', {
 					mainBusinessType: this.mainBusinessType,
 					pageSize: this.pageSize,
 					currentPage: this.currentPage,
 					pcFlag: 2,
-					searchType: 2
+					searchType: 2,
+					location:that.position.cityname
 				}).then(res => {
 					if (res.data.code == 200) {
 						var data = res.data.data.records
@@ -259,6 +261,7 @@
 				})
 			},
 			getInfo(){
+				var that = this
 				uni.showLoading({
 					title:"正在加载"
 				})
@@ -267,7 +270,8 @@
 					pageSize: this.pageSize,
 					currentPage: 1,
 					pcFlag: 2,
-					searchType: 2
+					searchType: 2,
+					location:that.position.cityname
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.datalist = res.data.data.records

pages/grain_pulse/release.vue

@@ -88,8 +88,10 @@
 				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++) {
+								if(i ==0 && !this.release.compName){
+									this.release.compName = res.data.data[i].compName
+								}
 								this.companyType.push(res.data.data[i].compName)
 							}
 						}
@@ -111,8 +113,10 @@
 				}
 			},
 			companyChange(e) {
+				
 				this.companyIndex = e.detail.value
 				this.release.compName = this.companyType[this.companyIndex]
+				console.log("companyChange",e,this.release.compName)
 			},
 			getImgUrl(e) {
 				this.address.push(e)
@@ -172,6 +176,7 @@
 											uni.showLoading({
 												title:"正在提交"
 											})
+											console.log("addSettledCompanyDynamics",that.release)
 											that.$api.doRequest('post',
 													'/settledCompanyDynamics/api/addSettledCompanyDynamics',
 													that.release)

pages/sale/information.vue

@@ -219,26 +219,7 @@
 				});
 			}
 			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: () => {}
-			// 		})
-			// 	}
-			// })
+			
 			uni.getSystemInfo({
 				success: function(res) {
 					console.log("statusBarHeight", res.statusBarHeight)

pages/task/my_task.vue

@@ -76,6 +76,26 @@
 			this.taskInfo=[]
 			this.getIndexBuyData()
 			this.pcUserInfo =  uni.getStorageSync("pcUserInfo")
+			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.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		onReachBottom() { //上拉触底函数