前端gjy

pageD/identity/companyIdentity.vue

@@ -21,7 +21,7 @@
 			<view class="c-row b-b">
 				<text class="tit">纳税人识别号</text>
 				<view class="con-list">
-					<input placeholder="请填写纳税人识别号" name="input"
+					<input type='number' placeholder="请填写纳税人识别号" name="input"
 						v-model="identityAuthenticationInfo.payTaxesCard"></input>
 				</view>
 			</view>
@@ -48,7 +48,7 @@
 			<view class="c-row b-b">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写身份证号" name="input"
+					<input  type='number' placeholder="请填写身份证号" name="input"
 						v-model="identityAuthenticationInfo.customerNumberCard"></input>
 				</view>
 			</view>

pageD/identity/companyIdentityEdit.vue

@@ -19,7 +19,7 @@
 				<view class="c-row ">
 					<text class="tit">纳税人识别号</text>
 					<view class="con-list">
-						<input placeholder="请填写纳税人识别号" name="input" v-model="deptList.payTaxesCard"></input>
+						<input type='number' placeholder="请填写纳税人识别号" name="input" v-model="deptList.payTaxesCard"></input>
 					</view>
 				</view>
 			</view>
@@ -44,7 +44,7 @@
 				<view class="c-row ">
 					<text class="tit">身份证号</text>
 					<view class="con-list">
-						<input placeholder="请填写身份证号" name="input" v-model="deptList.customerNumberCard"></input>
+						<input type='number' placeholder="请填写身份证号" name="input" v-model="deptList.customerNumberCard"></input>
 					</view>
 				</view>
 			</view>
@@ -62,7 +62,7 @@
 				<view class="c-row b-b">
 					<text class="tit">银行卡号</text>
 					<view class="con-list">
-						<input placeholder="请填写银行卡号" name="input" v-model="deptList.bankCard"></input>
+						<input type='number' placeholder="请填写银行卡号" name="input" v-model="deptList.bankCard"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
@@ -80,7 +80,7 @@
 				<view class="c-row b-b">
 					<text class="tit">手机号</text>
 					<view class="con-list">
-						<input placeholder="请填写手机号" @input='phoneinput' v-model="deptList.customerPhone"></input>
+						<input type='number' placeholder="请填写手机号" @input='phoneinput' v-model="deptList.customerPhone"></input>
 					</view>
 				</view>
 				<view class="c-row ">
@@ -114,7 +114,7 @@
 				<view class="c-row b-b">
 					<text class="tit">身份证号</text>
 					<view class="con-list">
-						<input placeholder="请填写身份证号" name="input" v-model="deptList.customerNumberCard"></input>
+						<input type='number' placeholder="请填写身份证号" name="input" v-model="deptList.customerNumberCard"></input>
 					</view>
 				</view>
 			</view>
@@ -134,7 +134,7 @@
 				<view class="c-row b-b">
 					<text class="tit">银行卡号</text>
 					<view class="con-list">
-						<input placeholder="请填写银行卡号" name="input" v-model="deptList.bankCard"></input>
+						<input type='number' placeholder="请填写银行卡号" name="input" v-model="deptList.bankCard"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
@@ -158,13 +158,13 @@
 				<view class="c-row">
 					<text class="tit">收款人身份证号</text>
 					<view class="con-list">
-						<input placeholder="请填写收款身份证号" name="input" v-model="deptList.payeeNumberCard"></input>
+						<input type='number' placeholder="请填写收款身份证号" name="input" v-model="deptList.payeeNumberCard"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
 					<text class="tit">手机号</text>
 					<view class="con-list">
-						<input placeholder="请填写手机号" @input='phoneinput' v-model="deptList.customerPhone"></input>
+						<input  type='number' placeholder="请填写手机号" @input='phoneinput' v-model="deptList.customerPhone"></input>
 					</view>
 				</view>
 				<view class="c-row ">

pageD/identity/companyIdentityThree.vue

@@ -15,7 +15,7 @@
 		<view class="c-row b-b">
 			<text class="tit">银行卡号</text>
 			<view class="con-list">
-				<input placeholder="请填写银行卡号" name="input" v-model="identityAuthenticationInfo.bankCard"></input>
+				<input type='number' placeholder="请填写银行卡号" name="input" v-model="identityAuthenticationInfo.bankCard"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
@@ -48,7 +48,7 @@
 		<view class="c-row b-b" v-if="identityAuthenticationInfo.customerTypeFlag == 1">
 			<text class="tit">收款人身份证号</text>
 			<view class="con-list">
-				<input placeholder="请填写收款人身份证号" name="input"
+				<input type='number' placeholder="请填写收款人身份证号" name="input"
 					v-model="identityAuthenticationInfo.payeeNumberCard"></input>
 			</view>
 		</view>

pageD/identity/companyIdentityTwo.vue

@@ -21,7 +21,7 @@
 		<view class="c-row b-b">
 			<text class="tit">身份证号</text>
 			<view class="con-list">
-				<input placeholder="请填写身份证号" name="input"
+				<input type='number' placeholder="请填写身份证号" name="input"
 					v-model="identityAuthenticationInfo.customerNumberCard"></input>
 			</view>
 		</view>

pageD/identity/driverIdentity.vue

@@ -22,13 +22,13 @@
 			<view class="c-row b-b">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写身份证号" name="input" v-model="DriverViewInfo.numberCard"></input>
+					<input type='number' placeholder="请填写身份证号" name="input" v-model="DriverViewInfo.numberCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
-					<input placeholder="请填写手机号" maxlength="11" @input='phoneinput' name="input"
+					<input type='number' placeholder="请填写手机号" maxlength="11" @input='phoneinput' name="input"
 						v-model="DriverViewInfo.driverPhone"></input>
 				</view>
 			</view>

pageD/identity/driverIdentityEdit.vue

@@ -30,13 +30,13 @@
 				<view class="c-row ">
 					<text class="tit">身份证号</text>
 					<view class="con-list">
-						<input placeholder="请填写身份证号" name="input" v-model="DriverViewInfo.numberCard"></input>
+						<input type='number' placeholder="请填写身份证号" name="input" v-model="DriverViewInfo.numberCard"></input>
 					</view>
 				</view>
 				<view class="c-row ">
 					<text class="tit">手机号</text>
 					<view class="con-list">
-						<input placeholder="请填写手机号" name="input" v-model="DriverViewInfo.driverPhone"></input>
+						<input type='number' placeholder="请填写手机号" name="input" v-model="DriverViewInfo.driverPhone"></input>
 					</view>
 				</view>
 				<view style='width:100%;position:relative;padding:10px;' class="flex">
@@ -167,7 +167,7 @@
 			<view class="c-row ">
 				<text class="tit">银行卡号</text>
 				<view class="con-list">
-					<input placeholder="请输入银行卡号" name="input" v-model="items.bankCard"></input>
+					<input type='number' placeholder="请输入银行卡号" name="input" v-model="items.bankCard"></input>
 				</view>
 			</view>
 			<view class="c-row ">
@@ -193,7 +193,7 @@
 			<view class="c-row ">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
-					<input placeholder="请输入收款人身份证号" name="input" v-model="items.payeeNumberCard"></input>
+					<input type='number' placeholder="请输入收款人身份证号" name="input" v-model="items.payeeNumberCard"></input>
 				</view>
 			</view>
 		</view>

pageD/identity/driverIdentityTwo.vue

@@ -51,7 +51,7 @@
 			<view class="c-row b-b">
 				<text class="tit">载重（吨）</text>
 				<view class="con-list">
-					<input placeholder="请填写载重（吨）"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="item.carLoad"></input>
+					<input  type='number' placeholder="请填写载重（吨）"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="item.carLoad"></input>
 				</view>
 			</view>
 			<view class="c-row ">
@@ -109,7 +109,7 @@
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
 				<view class="con-list">
-					<input placeholder="请输入银行卡号"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="items.bankCard"></input>
+					<input type='number' placeholder="请输入银行卡号"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="items.bankCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -141,7 +141,7 @@
 			<view class="c-row " v-if="items.accountType == '个人账户'">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
-					<input placeholder="请输入收款人身份证号"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="items.payeeNumberCard"></input>
+					<input type='number' placeholder="请输入收款人身份证号"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="items.payeeNumberCard"></input>
 				</view>
 			</view>	
 			<view class="c-row " v-if="items.accountType == '企业账户'">

pageD/warehousings/warehousings.vue

@@ -1,5 +1,14 @@
 <template>
 	<view class="container">
+		<view class='header flex'>
+			<view style='flex:1.5;' class="cuIcon-back" @click="navBack"></view>
+			<view style='flex:2;' v-if='WarehouseInOutInfo.taskType=="入库任务"'>
+				入库
+			</view>
+			<view style='flex:2;' v-if='WarehouseInOutInfo.taskType=="出库任务"'>
+				出库
+			</view>
+		</view>
 		<view class="center">
 			<view class="title_b ">发运信息</view>
 			<view class="c-row ">
@@ -28,7 +37,8 @@
 			</view>
 		</view>
 		<view class="center">
-			<view class="title_c ">入库信息</view>
+			<view v-if='WarehouseInOutInfo.taskType=="入库任务"' class="title_c ">入库信息</view>
+			<view v-if='WarehouseInOutInfo.taskType=="出库任务"' class="title_c ">出库信息</view>
 			<view class="c-list">
 				<view class="c-row b-b">
 					<text class="tit">毛重（吨）</text>
@@ -76,12 +86,18 @@
 				</view>
 			
 				<view class="c-row b-b">
-					<text class="tit">入库类型 </text>
-					<picker @change="ruChange" :value="ruIndex" :range="ruType" class="con-list">
+					<text v-if='WarehouseInOutInfo.taskType=="入库任务"' class="tit">入库类型 </text>
+					<text v-if='WarehouseInOutInfo.taskType=="出库任务"' class="tit">出库类型 </text>
+					<picker v-if='WarehouseInOutInfo.taskType=="入库任务"' @change="ruChange" :value="ruIndex" :range="ruType" class="con-list">
 						<view v-model="WarehouseInOutInfo.inOutType">
 							 {{ruIndex > -1?ruType[ruIndex]:'请选择入库类型'}} 
 						</view>
 					</picker>
+					<picker v-if='WarehouseInOutInfo.taskType=="出库任务"' @change="chuChange" :value="chuIndex" :range="chuType" class="con-list">
+						<view v-model="WarehouseInOutInfo.inOutType">
+							 {{chuIndex > -1?chuType[chuIndex]:'请选择入库类型'}} 
+						</view>
+					</picker>
 				</view>
 				<view class="c-row b-b">
 					<view class="title">扣款金额</view>
@@ -96,8 +112,8 @@
 					</view>
 				</view>
 				<view class="c-row b-b">
-					<text class="tit">入库日期</text>
-					
+					<text v-if='WarehouseInOutInfo.taskType=="入库任务"' class="tit">入库日期</text>
+					<text v-if='WarehouseInOutInfo.taskType=="出库任务"' class="tit">出库日期</text>
 					<view class="con-list" @click="show = true">{{WarehouseInOutInfo.inOutDate!=null?WarehouseInOutInfo.inOutDate:time1}}</view>
 					<u-picker  :params='params' :default-time='time' @confirm="DateChange" v-model="show" mode="time"></u-picker>
 					
@@ -228,6 +244,9 @@ import upload from '@/components/upload.vue';
 				warehouse1:[],
 				warehouseIndex1:-1,
 				ruType: ['采购入库', '移库入库', '暂存入库', '贸易服务入库', '退库'],
+				chuIndex: 0,
+				chutypes: '',
+				chuType: ['销售出库', '移库出库', '暂存出库', '贸易服务出库', '采购出库'],
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
@@ -267,9 +286,7 @@ import upload from '@/components/upload.vue';
 				}
 			},
 			onShow(){
-				this.$api.doRequest('get', '/warehouseInOutInfo/selectCompId', {contractNo:this.WarehouseInOutInfo.contractNo,warehouseType:1,}).then(res => {
-					 if(res.data.code==200){
-						 this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {compId:res.data.data,warehouseType:1,}).then(res => {
+						 this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {compId:this.WarehouseInOutInfo.compId,warehouseType:1,}).then(res => {
 						 	 if(res.data.code==200){
 						 		 var arr=[]
 						 		 for(var i=0;i<res.data.data.length;i++){
@@ -300,11 +317,9 @@ import upload from '@/components/upload.vue';
 						 		 // this.warehouse=arr
 						 	 }
 						 })
-					 }
-				})	
 			},
 		onLoad(option) {
-			this.WarehouseInOutInfo.contractNo = option.contractNo
+			this.WarehouseInOutInfo.compId = option.compId
 			this.WarehouseInOutInfo.goodsName = option.goodsName
 			this.WarehouseInOutInfo.startWeight = option.startWeight
 			this.WarehouseInOutInfo1.carNo = option.carNo + '(' + option.tranCarNo + ')'
@@ -326,6 +341,9 @@ import upload from '@/components/upload.vue';
 			this.getList(this.WarehouseInOutInfo.id)
 		},
 		methods: {
+			navBack() {
+				uni.navigateBack();
+			},
 			getList(id1){
 				var that=this
 				this.$api.doRequest('get','/warehouseInOutInfo/getInfo',{id:id1}).then(res => {
@@ -743,6 +761,11 @@ import upload from '@/components/upload.vue';
 				this.WarehouseInOutInfo.inOutTypeKey = e.detail.value
 				this.WarehouseInOutInfo.inOutType = this.ruType[this.ruIndex];
 			},
+			chuChange(e) {
+				this.chuIndex = e.detail.value
+				this.WarehouseInOutInfo.inOutTypeKey = e.detail.value
+				this.WarehouseInOutInfo.inOutType = this.chuType[this.chuIndex];
+			},
 			pinChange(e) {
 				this.pinIndex = e.detail.value
 				this.WarehouseInOutInfo.gradeKey = e.detail.value
@@ -762,6 +785,7 @@ import upload from '@/components/upload.vue';
 	.center{
 		margin: 15rpx 15rpx 10rpx 15rpx;
 		padding:0rpx 10rpx 30rpx 10rpx;
+		padding-top: 40px;
 		background-color: #FFFFFF;
 		border-radius: 15px;
 	}
@@ -900,4 +924,14 @@ import upload from '@/components/upload.vue';
 		border-radius: 10px;
 		margin-left: 16px;
 	}
+	.header{
+		position: absolute;
+		left:0;
+		z-index: 9999;
+		padding-top: var(--status-bar-height);
+		top: 40upx;
+		width:100%;
+		font-size: 40upx;
+		color: $font-color-dark;
+	}
 </style>

pages.json

@@ -1399,6 +1399,7 @@
 					"path": "warehousings/warehousings",
 					"style": {
 						"navigationBarTitleText": "入库",
+						"navigationStyle": "custom",
 						"enablePullDownRefresh": false
 					}
 

pages/grain_pulse/dynamic.vue

@@ -18,7 +18,8 @@
 			<view class="modular">
 				<view class="flex">
 					<view class="touxiang">
-						<image :src="portraits" mode="" style="height: 76rpx;border-radius: 8rpx;"></image>
+						<image v-if='item.avatarUrl' :src="item.avatarUrl" mode="" style="height: 76rpx;border-radius: 8rpx;"></image>
+						<image v-else src="../../static/img/myimg/YongHu@3x.png" 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>
@@ -117,7 +118,12 @@
 								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(",")
+										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]
+										}
+										
 									}
 
 								}
@@ -199,7 +205,6 @@
 	.touxiang {
 		width: 76rpx;
 		height: 76rpx;
-		background-color: red;
 		margin: 20rpx 0 0 34rpx;
 	}
 
@@ -230,4 +235,7 @@
 		text-align: center;
 		line-height: 48rpx;
 	}
+	/deep/.u-content {
+		text-indent:0 !important;	
+	}
 </style>

pages/grain_pulse/editcompany.vue

@@ -253,35 +253,33 @@
 		onLoad(options) {
 			if(options.id){
 				this.id=options.id
-			}else if(this.$store.state.enter.id){
-				this.id=this.$store.state.enter.id
-			}
-			if(options.position){
-				this.position=JSON.parse(options.position)
-				this.position.city=this.position.city.toString()
 			}
 			this.getList()
 			
 		},
 		onShow() {
-			console.log(11111)
-			if(this.$store.state.enter){
-				this.deptList.compName=this.$store.state.enter.compName
-				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++){
-							if(this.mainBusinessType.indexOf(this.management[i].name)!=-1){
-								this.management[i].checked=true
-							}
-						}
-					}
-				}
-				if(this.$store.state.enter.companyProfile){
-					this.deptList.companyProfile=this.$store.state.enter.companyProfile
-				}
+			console.log(uni.getStorageSync('position'))
+			if(uni.getStorageSync('position')!=''){
+				this.position=uni.getStorageSync('position')
+				this.position.city=this.position.city.toString()
 			}
+			// if(this.$store.state.enter){
+			// 	this.deptList.compName=this.$store.state.enter.compName
+			// 	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++){
+			// 				if(this.mainBusinessType.indexOf(this.management[i].name)!=-1){
+			// 					this.management[i].checked=true
+			// 				}
+			// 			}
+			// 		}
+			// 	}
+			// 	if(this.$store.state.enter.companyProfile){
+			// 		this.deptList.companyProfile=this.$store.state.enter.companyProfile
+			// 	}
+			// }
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
@@ -378,22 +376,6 @@
 			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'
-						})
-					}
-				})
-			},
 			upload() {
 				uni.navigateTo({
 					url: `/`
@@ -544,9 +526,13 @@
 						if (res.confirm) {
 							that.$api.doRequest('post','/settledCompanyInfo/api/editSettledCompanyInfo',that.deptList).then(res => {
 								if(res.data.code==200){
-									this.$api.msg('提交成功')
+									that.$api.msg('提交成功')
+									uni.navigateBack({
+										
+									})
 								}else{
-									this.$api.msg(res.data.message)
+									
+									that.$api.msg(res.data.message)
 								}
 							})
 						}

pages/grain_pulse/home.vue

@@ -29,27 +29,20 @@
 				<view class='friendcircle-content flex justify-between'>
 					<image class='bg' src="../../static/img/liangmai/bg.png" mode=""></image>
 					<view class='friendcircle-content-right'>
-						<view class='friendcircle-content-right-item Regular flex align-item-center'>
-							<image class='headportrait' src="../../static/img/add@3x.png" mode=""></image>中天昊元粮库中天昊元…
-						</view>
-						<view class='friendcircle-content-right-item Regular flex align-item-center'>
-							<image class='headportrait' src="../../static/img/add@3x.png" mode=""></image>中天昊元粮库中天昊元…
-						</view>
-						<view class='friendcircle-content-right-item Regular flex align-item-center'>
-							<image class='headportrait' src="../../static/img/add@3x.png" mode=""></image>中天昊元粮库中天昊元…
-						</view>
-						<view class='friendcircle-content-right-item Regular flex align-item-center'>
-							<image class='headportrait' src="../../static/img/add@3x.png" mode=""></image>中天昊元粮库中天昊元…
+						<view v-for='item in releaseInfo' class='friendcircle-content-right-item Regular flex align-item-center'>
+							<image class='headportrait' v-if='item.avatarUrl' :src="item.avatarUrl" mode=""></image>
+							<image class='headportrait' v-else src="../../static/img/myimg/YongHu@3x.png" mode=""></image>
+							{{item.title}}
 						</view>
 					</view>
 				</view>
 			</view>
 			<scroll-view scroll-x="true" scroll-with-animation="true" class='list-type'>
-				<view v-for='item in searchTypes' @click='mainBusinessTypecahnge(item)'
+				<view v-for='item in searchTypes' @click='mainBusinessTypechange(item)'
 					:class='mainBusinessTypeKey==item.value?"Semibold active":"Regular"' class="typeitem">{{item.name}}
 				</view>
 			</scroll-view>
-			<view v-for='item in datalist' @click='todetails(item)' class="listitem">
+			<view v-if='datalist.length>0' v-for='item in datalist' @click='todetails(item)' class="listitem">
 				<view class="flex">
 					<image class='listitem-left' :src="item.attachmentAddress" mode=""></image>
 					<view class="listitem-right">
@@ -58,7 +51,7 @@
 					</view>
 				</view>
 				<view class="flex  align-item-center justify-between">
-					<view @click.stop='naviageToPage("/pages/grain_pulse/localtion/localtion")'
+					<view @click.stop='naviageToPage1(item,"/pages/grain_pulse/localtion/localtion")'
 						class='companylocation flex align-item-center Regular'>
 						<image class='location' src="../../static/img/liangmai/icon_ditu.png" mode=""></image>
 						{{item.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}
@@ -66,6 +59,9 @@
 					<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>
 		<view v-if='datalist.length==0' class="enter" @click="enter">
 			<image style='width:56.5px;height:28px;' src="../../static/img/liangmai/ruzhu.png" mode=""></image>
@@ -89,6 +85,7 @@
 				mainBusinessType: '',
 				mainBusinessTypeKey: '0',
 				pageSize: 10,
+				releaseInfo:[],
 				currentPage: 1,
 				searchTypes: [{
 						name: '全部',
@@ -118,29 +115,12 @@
 						value: '7'
 					}
 				],
+				notlist:false,
 				datalist: []
 			}
 		},
 		onShow(val) {
-
-			this.$api.doRequest('get', '/settledCompanyInfo/selectSettledCompanyInfo', {
-				mainBusinessType: this.mainBusinessType,
-				pageSize: this.pageSize,
-				currentPage: this.currentPage,
-				pcFlag: 2
-			}).then(res => {
-				if (res.data.code == 200) {
-					this.datalist = res.data.data.records
-					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)
-					}
-					console.log(this.datalist)
-					// let _metre = this.utils.getDistance(lat1,lng1,lat2,lng2) +"千米"
-				}
-			})
+			this.getList()
 			uni.getStorage({
 				key: 'setLocaltion',
 				success: (res) => {
@@ -160,12 +140,48 @@
 			}
 		},
 		methods: {
-			mainBusinessTypecahnge(item) {
+			getList(){
+				this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
+						currentPage: 1,
+						pageSize: 4,
+						searchKeyWord: this.keyword
+					})
+					.then(res => {
+						if (res.data.code == 200) {
+							this.releaseInfo = res.data.data.records
+						}
+					})
+				this.$api.doRequest('get', '/settledCompanyInfo/selectSettledCompanyInfo', {
+					mainBusinessType: this.mainBusinessType,
+					pageSize: this.pageSize,
+					currentPage: this.currentPage,
+					pcFlag: 2
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.datalist = res.data.data.records
+						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)
+						// let _metre = this.utils.getDistance(lat1,lng1,lat2,lng2) +"千米"
+					}
+				})
+			},
+			mainBusinessTypechange(item) {
 				if (item.name != '全部') {
 					this.mainBusinessType = item.name
 				} else {
 					this.mainBusinessType = ''
 				}
+				this.getList()
 				this.mainBusinessTypeKey = item.value
 			},
 			enter() {
@@ -189,6 +205,12 @@
 				uni.navigateTo({
 					url: item
 				})
+			},
+			naviageToPage1(item,url) {
+				uni.setStorageSync('location', item)
+				uni.navigateTo({
+					url: url
+				})
 			}
 		}
 	}
@@ -300,6 +322,7 @@
 		width: 22.5px;
 		height: 22.5px;
 		margin-right: 8.5px;
+		border-radius:10px;
 	}
 
 	/* 圈友说--》 */

pages/grain_pulse/localtion/coordinate.nvue

@@ -159,18 +159,7 @@
 				});
 			},
 			config() {
-				// console.log("this.position",this.position)
-					// this.position.selectLocation = this.position.longitude+","+this.position.latitude
-					// console.log("this.position",this.position)
-					// if(this.$store.state.enter.id){
-					// 	uni.navigateTo({
-					// 		url:"/pages/grain_pulse/editcompany?position="+JSON.stringify(this.position)
-					// 	})
-					// }else{
-					// 	uni.navigateTo({
-					// 		url:"/pages/grain_pulse/enter?position="+JSON.stringify(this.position)
-					// 	})
-					// }
+				uni.setStorageSync('position', this.position);
 				uni.navigateBack({
 					
 				})

pages/grain_pulse/localtion/localtion.nvue

@@ -12,12 +12,11 @@
 			<view class="bottom-content Regular">
 				{{dataList.content}}
 			</view>
-			<view class="Regular location">
+			<view class="Regular bottom-list-item">
 				<view class="left">
 					<u-icon name="map" size="36" class="icon"></u-icon>
 					<view>{{dataList.localtion}}</view>
 				</view>
-				
 				<view class="metre">
 				<u-line color="#A3A9B8" direction='col' length="20rpx"/>
 				<text  class="line" >
@@ -54,8 +53,16 @@
 			}
 		},
 		onLoad() {
+			
 			this.getLocation()
 		},
+		onShow() {
+			var data=uni.getStorageSync('location')
+			this.dataList.title=data.title
+			this.dataList.content=data.companyProfile
+			this.dataList.localtion=data.province+data.city+data.area
+			this.datalist.rice=data._metre
+		},
 		methods: {
 			getLocation() {
 				let that = this;
@@ -81,53 +88,183 @@
 </script>
 
 <style lang="scss" scoped>
-	.content {
-		width: 100vw;
-		height: 100vh;
+.active {
+		height: 583rpx !important;
+		
+	}
+
+	.header {
+		flex-direction: row;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+		padding: 20rpx;
 	}
 
+	.title {
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #333333;
+	}
+	.bottom-content {
+		font-size: 11px;
+	}
+	.content {
+		width: 750px;
+		flex: 1;
+	}
 	.map {
-		width: 100%;
-		height: 100%;
+		height: 1350rpx;
 	}
 
-	.bottom {
-		width: 96%;
+	.content2 {
+		position: fixed;
+		bottom: 0;
+		width: 750rpx;
+		flex: 1;
+		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 {
+		flex: 1;
+	}
+
+	.select-alert {
+		background-color: green;
 		position: fixed;
-		bottom: 54rpx;
-		left: 0;
-		right: 0;
-		margin: auto;
-		padding: 27rpx 37rpx;
-
-		.title {
-			font-size: 30rpx;
-			color: #333333;
-			margin-bottom: 12rpx;
-		}
+		bottom: 0;
+		width: 750rpx;
+		flex: 1;
+	}
 
-		.bottom-content {
-			font-size: 22rpx;
-		}
+	.select-top {
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-around;
+		background: yellow;
+		height: 80rpx;
+	}
 
-		.location {
-			color: #AFB3BF;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-top: 15rpx;
 
-			.left {
-				flex-wrap: nowrap;
-			}
-			.metre{
-				justify-content: space-between;
-				align-items: center;
-				.line{
-					margin-left:13rpx ;
-				}
-			}
-		}
+	.select {
+		width: 750rpx;
+		flex: 1;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		background: white;
+	}
+
+	.cancel {
+		font-size: 24rpx;
+		color: white;
+		font-weight: bold;
+	}
+
+	.confirm {
+		font-size: 24rpx;
+		color: green;
+		font-weight: bold;
+	}
+
+	.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;
+	}
+	.bottom{
+		position: fixed;
+		bottom: 0;
+		width: 750rpx;
+		flex: 1;
+		font-size: 34rpx;
+		background: white;
+		border-top-left-radius: 20rpx;
+		border-top-right-radius: 20rpx;
 	}
 </style>

pages/grain_pulse/my_grain_pulse.vue

@@ -3,7 +3,7 @@
 		<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' @click='todetails(item)' class="listitem">
+		<view v-if='datalist.length>0' 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">
@@ -44,9 +44,12 @@
 					<view class='distance Regular'>50m</view>
 				</view>
 			</view>
-			<view v-if='mainBusinessType=="我的企业"' class='exitloginwrap'>
-				<button @click.stop='enterclick()' class='exitlogin'>新增</button>
-			</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>
 		</view>
 	</view>
 </template>
@@ -94,7 +97,7 @@
 				this.isLoadMore=true
 				if(this.mainBusinessType=='我的企业'){
 					this.$api.doRequest('get','/settledCompanyInfo/selectSettledCompanyInfo',{mainBusinessType:'',pageSize: this.pageSize,
-							currentPage: this.currentPage,pcFlag:2}).then(res => {
+							currentPage: this.currentPage,pcFlag:2,createPhone:this.userInfo.phone}).then(res => {
 					if(res.data.code==200){
 						this.isLoadMore=false
 						this.datalist=res.data.data.records

pages/task/my_task.vue

@@ -166,9 +166,6 @@
 					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='/noticeTask/query/noticeTasks'
@@ -227,6 +224,10 @@
 						}else{
 							that.isSole=false
 						}
+						if(res.data.data.records.length==0&&this.data.currentPage==1
+						||res.data.data.records.length==0&&this.warehouseInOutInfo.currentPage==1){
+							this.taskInfo=[]
+						}
 						uni.hideLoading()
 					} else {
 						uni.showToast({
@@ -273,6 +274,17 @@
 					uni.navigateTo({
 						url:'/pages/task/sale_close_details?id='+item.businessId
 					})
+				}else if(item.businessCode=='INOUTTASK-TASK-APPROVE'){
+					if(this.statusFlag==3){
+						uni.navigateTo({
+							url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
+						})
+					}else{
+						uni.navigateTo({
+							url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
+						})
+					}
+					
 				}
 				
 			// 	if(item.taskType == "入库任务"){

pages/task/procurement_close_details.vue

@@ -182,6 +182,6 @@
 		background: #fff;
 	}
 	.content{
-		padding:10px;
+		padding:30px;
 	}
 </style>

pages/task/procurement_details.vue

@@ -168,6 +168,6 @@
 		background: #fff;
 	}
 	.content{
-		padding:10px;
+		padding:30px;
 	}
 </style>

pages/task/procurement_report_details.vue

@@ -215,6 +215,6 @@
 		background: #fff;
 	}
 	.content{
-		padding:10px;
+		padding:30px;
 	}
 </style>

pages/task/sale_close_details.vue

@@ -182,6 +182,6 @@
 		background: #fff;
 	}
 	.content{
-		padding:10px;
+		padding:30px;
 	}
 </style>

pages/task/sale_details.vue

@@ -168,6 +168,6 @@
 		background: #fff;
 	}
 	.content{
-		padding:10px;
+		padding:30px;
 	}
 </style>

pages/task/sale_report_details.vue

@@ -215,6 +215,6 @@
 		background: #fff;
 	}
 	.content{
-		padding:10px;
+		padding:30px;
 	}
 </style>