前端更新sdy

pages/erp/index.vue

@@ -1,5 +1,11 @@
 <template>
 	<view class="wrap">
+		<view class="comp" @click='show0=true'>
+			<view>{{compName}}</view>
+			<u-icon name="arrow-right" color=""></u-icon>
+			<u-picker @confirm="compChange" range-key='compName' mode="selector" v-model="show0"
+				:range="compList"></u-picker>
+		</view>
 		<view class='title'>仓库管理</view>
 		<view class="dropdown">
 			<view class="left" @click='show1=true'>
@@ -9,7 +15,7 @@
 					:range="warehouseList"></u-picker>
 			</view>
 			<view class="right" @click='show2=true'>
-				<view>{{binNumber}}</view>
+				<view>{{binNumber}}仓位</view>
 				<u-icon name="arrow-right" color=""></u-icon>
 				<u-picker @confirm="warehouseCWchange" range-key='binNumber' mode="selector" v-model="show2"
 					:range="warehouseCWList"></u-picker>
@@ -41,9 +47,15 @@ import helper from '@/common/helper.js';
 		},
 		data() {
 			return {
+				show0: false,
 				show1: false,
 				show2: false,
 				isShowAlert: false,
+				compName:'黑龙江中天昊元贸易有限公司',
+				compList:[{
+						compName:'黑龙江中天昊元贸易有限公司'
+				}
+				],
 				content: '易粮易运ERP系统包含合同管理、仓库管理、运输管理、结算管理等多个模块，可为粮企提供粮食贸易的全流程服务，平台诚邀您的加入。',
 				warehouseName: '暂无仓库',
 				binNumber: '暂无',
@@ -88,24 +100,24 @@ import helper from '@/common/helper.js';
 						url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
 						show: true
 					},
-					{
-						num: 4,
-						name: '开通业务',
-						// icon: 'cuIcon-edit',
-						src: '../../static/img/erp/shougouzhijian@3x.png',
-						tips: 0,
-						url: `/pages/erp/openService/openService`,
-						show: true
-					},
-					{
-						num: 5,
-						name: '联系客服',
-						// icon: 'cuIcon-edit',
-						src: '../../static/img/erp/shougouzhijian@3x.png',
-						tips: 0,
-						url: `/pages/erp/contactCustomerService/contactCustomerService`,
-						show: true
-					}
+					// {
+					// 	num: 4,
+					// 	name: '开通业务',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
+					// 	tips: 0,
+					// 	url: `/pages/erp/openService/openService`,
+					// 	show: true
+					// },
+					// {
+					// 	num: 5,
+					// 	name: '联系客服',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
+					// 	tips: 0,
+					// 	url: `/pages/erp/contactCustomerService/contactCustomerService`,
+					// 	show: true
+					// }
 				],
 			}
 		},
@@ -194,7 +206,8 @@ import helper from '@/common/helper.js';
 						helper.erpWarehouse = {
 							warehouseName:this.warehouseName,
 							binNumber:this.binNumber,
-							compId:this.compId
+							compId:this.compId,
+							agent:this.agent
 							
 						}
 						uni.navigateTo({
@@ -205,6 +218,7 @@ import helper from '@/common/helper.js';
 			},
 			confirmWarehouse() {},
 			confirmPositon() {},
+			compChange(){},
 			init() {
 				console.log(this.userInfo)
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
@@ -218,6 +232,7 @@ import helper from '@/common/helper.js';
 							this.warehouseName = res.data.data[0].warehouseName
 							this.warehouseList = res.data.data;
 							this.compId = res.data.data[0].compId
+							this.agent = res.data.data[0].agent
 							this.binNumber = res.data.data[0].positionInfos[0].binNumber
 							this.warehouseCWList = res.data.data[0].positionInfos
 							console.log('this.warehouseCWList',this.warehouseCWList)
@@ -232,6 +247,7 @@ import helper from '@/common/helper.js';
 			warehousechange(e) {
 				this.warehouseName = this.warehouseList[e[0]].warehouseName
 				this.compId = this.warehouseList[e[0]].compId
+				this.agent = this.warehouseList[e[0]].agent
 				this.warehouseCWList = this.warehouseList[e[0]].positionInfos
 				console.log(e)
 			},
@@ -344,4 +360,11 @@ import helper from '@/common/helper.js';
 			display: flex;
 		}
 	}
+	.comp{
+		display: flex;
+		font-size: 36rpx;
+		font-weight: 500;
+		color: #333333;
+		margin-bottom: 20rpx;
+	}
 </style>

pages/erp/warehousing/selectContractNo.vue

@@ -40,7 +40,13 @@
 				compId: ''
 			}
 		},
-		onShow() {},
+
+		// onShow() {},
+		// onLoad(options) {
+
+		onShow() {
+			this.newSelectList =  uni.getStorageSync('erpContractNoList');
+		},
 		onLoad(options) {
 			this.compId = options.compId
 			console.log(helper.selectContractNo); 
@@ -48,8 +54,9 @@
 		},
 		watch: {
 			inputKeyword(val) {
+				console.log(this.newList)
 				this.filterNewList = this.newList.filter(function(item) {
-					if (item.contractNo.indexOf(val) > -1&&item.flag==7) {
+					if (item.contractNo.indexOf(val) > -1) {
 						return item
 					}
 				})
@@ -57,35 +64,42 @@
 		},
 		methods: {
 			confirm(item){
-				let _list = uni.setStorageSync('erpContractNoList');
+				let _list = uni.getStorageSync('erpContractNoList');
+				if(_list==''){
+					_list=[]
+				}
 				if(_list.length<=20){
-					_list.unshift()
+					_list.unshift(item)
 				}else{
-					_list.unshift().pop()
+					_list.unshift(item).pop(item)
 				}
 				uni.setStorageSync('erpContractNoList', _list);
+				uni.setStorageSync('erpContractNo', item);
 				uni.navigateBack({})
 			},
-			makeMoreList(){
-				let _data = this.newList
-				for(let i=0;i<_data;i++){
-					if(_data[i].status=='执行中'&&_data[i].flag==6){
-						this.moreList.push(_data[i])
-					}
-				}
-			},
 			getContractNoList() {
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 					compId: this.compId,
-					flag: 5,
+					flag: 7,
 				}).then(res => {
 					if (res.data.code == 200) {
 						console.log(res)
 						this.newList = res.data.data
-						this.makeMoreList()
+						// this.makeMoreList()
+					}
+				})
+				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
+					compId: this.compId,
+					flag: 6,
+				}).then(res => {
+					if (res.data.code == 200) {
+						console.log(res)
+						this.moreList = res.data.data
+						// this.makeMoreList()
 					}
 				})
 			},
+		
 		}
 	}
 </script>

pages/erp/warehousing/warehousing.vue

@@ -15,7 +15,7 @@
 			</view>
 			<view class="row">
 				<view class="left">类型</view>
-				<view @click='show1=true'>请选择类型</view>
+				<view @click='show1=true'>{{detailData.type}}</view>
 				<u-picker :range="typeList" range-key="type" @confirm='typePicker($event)' v-model="show1"
 					mode="selector">
 				</u-picker>
@@ -27,75 +27,79 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">皮重（吨）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+				<input @input='calculate' v-model='detailData.tare' class="right-bottom"
 					placeholder="输入皮重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">扣重（吨）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="0"></input>
+				<input @input='calculate' v-model='detailData.deductionWeight' class="right-bottom" placeholder="0"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">净重（吨）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
-					placeholder="不可编辑,自动计算"></input>
+				<input @input='calculate' v-model='detailData.netWeight' class="right-bottom"
+					placeholder="不可编辑,自动计算" :disabled="true"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">扣款（元/吨）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="0"></input>
+				<input @input='calculate' v-model='detailData.deductionAmount' class="right-bottom" placeholder="0"></input>
 			</view>
-			<view class="row row-bottom">
+			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">扣重比</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="输入扣重比"></input>
+				<input @input='calculate' v-model='detailData.buckleWeightRatio' class="right-bottom" placeholder="输入扣重比"></input>
 			</view>
-			<view class="row row-bottom">
+			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">干粮水分（%）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="输入干粮水分占比"></input>
+				<input @input='calculate' v-model='detailData.solidGrainWater' class="right-bottom" placeholder="输入干粮水分占比"></input>
 			</view>
-			<view class="row row-bottom">
+			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">潮粮水分（%）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="输入潮粮水分占比"></input>
+				<input @input='calculate' v-model='detailData.tidalGrainWater' class="right-bottom" placeholder="输入潮粮水分占比"></input>
 			</view>
-			<view class="row row-bottom">
+			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">纯重（吨）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
-					placeholder="不可编辑,自动计算"></input>
+				<input @input='calculate' v-model='detailData.pureWeight' class="right-bottom"
+					placeholder="不可编辑,自动计算" :disabled="true"></input>
 			</view>
 			<view class="row">
 				<view class="left">品级</view>
-				<view @click='show3=true'>请选择品级</view>
-				<u-picker :range="pjList" range-key="name" @confirm='handlerPicker($event)' v-model="show3" mode="selector">
+				<view @click='show3=true'>{{detailData.grade}}</view>
+				<u-picker :range="pjList" range-key="grade" @confirm='handlerPicker($event)' v-model="show3" mode="selector">
 				</u-picker>
 			</view>
 			<view class="row">
 				<view class="left">经办人</view>
-				<view @click='show6=true'>请选择经办人</view>
-				<u-picker :range="handlerList" range-key="name" @confirm='handlerPicker($event)' v-model="show6" mode="selector">
+				<view @click='show6=true'>{{detailData.agent}}</view>
+				<u-picker :range="handlerList" range-key="agent" @confirm='handlerPicker($event)' v-model="show6" mode="selector">
 				</u-picker>
 			</view>
 			<view class="row">
-				<view class="left">入库日期</view>
-				<view @click='show4=true'>请选择日期</view>
-				<u-calendar v-model="show4" mode="date" @change='dateChange'></u-calendar>
-			</view>
+			    <view class="left">入库日期</view>
+			    <view @click='show4=true'>{{detailData.inOutDate}}</view>
+			    <u-picker v-model="show4" mode="time" @confirm='dateChange($event)' :params="params">
+			     <!-- <view >{{detailData.inOutDate ? detailData.inOutDate:"请选择日期" }}</view> -->
+			    </u-picker>
+			    <!-- <u-calendar v-model="show4" mode="date" @change='dateChange'></u-calendar> -->
+			   </view>
 			<view class="row">
 				<view class="left">入库类型</view>
-				<view @click='show5=true'>请选择入库类型</view>
-				<u-picker :range="warehousingTypeList" range-key="type" @confirm='warehousingTypePicker($event)' v-model="show5" mode="selector">
+				<view @click='show5=true'>{{detailData.inOutType}}</view>
+				<u-picker :range="warehousingTypeList" range-key="constValue" @confirm='warehousingTypePicker($event)' v-model="show5" mode="selector">
 				</u-picker>
 			</view>
-			<view class="row">
+			<view class="row row-bottom">
 				<view class="left">车牌号</view>
-				<view @click='slectCarNo'>{{detailData.carNo}}</view>
+				<input v-if="true" @input='' v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
+				<view @click='slectCarNo' v-if="false">{{detailData.carNo}}</view>
 			</view>
 			<view class="row row-bottom has-btn">
 				<view class="left">成本（元/吨）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
-					placeholder="自动获取"></input>
+				<input @input='' v-model='detailData.grossWeight' class="right-bottom"
+					placeholder="自动获取" disabled="isEditCB"></input>
 					<u-button class="edit-btn">编辑</u-button>
 			</view>
 			<view class="row row-bottom has-btn">
 				<view class="left">运费（元/吨）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+				<input @input='' v-model='detailData.grossWeight' disabled="isEditYF" class="right-bottom"
 					placeholder="自动获取"></input>
 					<u-button class="edit-btn">编辑</u-button>
 			</view>
@@ -169,6 +173,16 @@
 				show4: false,
 				show5: false,
 				show6: false,
+				params: {
+				     year: true,
+				     month: true,
+				     day: true,
+				     hour: true,
+				     minute: true,
+				     second: true
+				    },
+					isEditCB:'false',
+					isEditYF:'false',
 				warehouseName:'',
 				binNumber:'',
 				contractNoList: [{
@@ -182,44 +196,32 @@
 					}
 				],
 				pjList: [{
-						type: "一等"
+						grade: "一等品"
 					},
 					{
-						type: "二等"
+						grade: "二等品"
 					},
 					{
-						type: "三等"
+						grade: "三等品"
 					},
 					{
-						type: "等外"
+						grade: "等外"
 					}
 				],
 				handlerList: [{
-						name: "张三"
+						agent: "张三"
 					},
 					{
-						name: "二等"
+						agent: "二等"
 					},
 					{
-						name: "三等"
+						agent: "三等"
 					},
 					{
-						name: "等外"
-					}
-				],
-				warehousingTypeList: [{
-						type: "采购入库"
-					},
-					{
-						type: "采购入库"
-					},
-					{
-						type: "采购入库"
-					},
-					{
-						type: "采购入库"
+						agent: "等外"
 					}
 				],
+				warehousingTypeList: [],
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
@@ -227,8 +229,12 @@
 				detailData: {
 					contractNo: "请选择合同编号",
 					carNo:'辽H12345',
-					name: "",
+					type: "干粮",
 					goodsName: "123",
+					inOutDate:'请输入入库日期',
+					grade:"一等品",
+					agent:'张三',
+					inOutType:'请选择入库类型',
 					qualityInspectionManagement: {}
 				}
 			}
@@ -237,15 +243,31 @@
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
 			this.compId = helper.erpWarehouse.compId
+			//获取经办人
+			// this.detailData.agent = helper.erpWarehouse.agent
 			console.log(helper.erpWarehouse)
 		},
 		onShow() {
-			// this.getWeighingManagement()
+			this.detailData.goodsName = uni.getStorageSync('erpContractNo').goodsName;
+			this.detailData.contractNo = uni.getStorageSync('erpContractNo').contractNo;
+			// 获取入库类型
+			this.getrkType()
+			
 		},
 		methods: {
+			getrkType(){
+				this.$api.doRequest('get', '/commonSysParameter/getInfo', {
+				    constId: 'CON5'
+				   }).then(res => {
+				    this.warehousingTypeList = res.data.data
+				   })
+			},
 			contractNopicker(e) {},
 			typePicker(e) {
 				console.log(e)
+				this.detailData.type = this.typeList[e].type
+				
+				
 			},
 			pjPicker(e) {
 				console.log(e)
@@ -255,6 +277,7 @@
 			},
 			dateChange(e){
 				console.log(e)
+				this.detailData.inOutDate = e.year + "-" + e.month + "-" + e.day
 			},
 			warehousingTypePicker(e) {
 				console.log(e)

pages/erpbusiness/sm/sm.vue

@@ -158,21 +158,21 @@
 						}
 					});
 			},
-			submit() {
+			submit() {debugger
 				if(this.flag) return
-				// let _isAllCheck = false
-				// for (let i = 0; i < this.grainMerchantList.length; i++) {
-				// 	if (this.grainMerchantList[i].check) {
-				// 		_isAllCheck = true
-				// 	}
-				// }
-				// if (!_isAllCheck) {
-				// 	this.$refs.uToast.show({
-				// 		title: '至少选择一个身份',
-				// 		type: "error",
-				// 		icon: false
-				// 	})
-				// }
+				let _isAllCheck = false
+				for (let i = 0; i < this.grainMerchantList.length; i++) {
+					if (this.grainMerchantList[i].check) {
+						_isAllCheck = true
+					}
+				}
+				if (!_isAllCheck) {
+					this.$refs.uToast.show({
+						title: '至少选择一个身份',
+						type: "error",
+						icon: false
+					})
+				}
 				console.log("this.user.compId",this.user.companyId,this.selectID)
 				this.$api.doRequest('get', '/identityAuthenticationInfo/saveCompanyIdentity', {
 						id: this.selectID,
@@ -180,7 +180,8 @@
 					}, 'application/json;charset=UTF-8').then(res => {
 						console.log(res);
 						if (res.data.code == 200) {
-							this.getList()
+							// this.getList()
+							uni.navigateBack(-1)
 							
 						}
 

pages/grain_pulse/enter.vue

@@ -294,6 +294,13 @@
 				}
 			},
 			navBack() {
+				uni.setStorage({
+					key: 'setPosition',
+					data:{},
+					success: (res) => {
+					}
+				
+				})
 				uni.navigateBack()
 			},
 			// navBack1() {

pages/grain_pulse/home.vue

@@ -274,7 +274,7 @@
 				this.$api.doRequest('get', '/settledCompanyInfo/selectSettledCompanyInfo', {
 					mainBusinessType: this.mainBusinessType,
 					pageSize: this.pageSize,
-					currentPage: 1,
+					currentPage: this.currentPage,
 					pcFlag: 2,
 					searchType: 2,
 					location:that.position.cityname
@@ -306,6 +306,7 @@
 				} else {
 					this.mainBusinessType = ''
 				}
+				this.currentPage=1
 				this.getInfo()
 				this.mainBusinessTypeKey = item.value
 			},

pages/grain_pulse/my_grain_pulse.vue

@@ -163,12 +163,21 @@
 				}
 			},
 			del(item){
-				this.$api.doRequest('post','/settledCompanyInfo/api/deleteSettledCompanyInfo',{id:item.id}).then(res => {
-					if(res.data.code==200){
-						this.$api.msg('删除成功')
-					}else{
-						this.$api.msg('删除失败')
-					}
+				uni.showModal({
+					content: "确定删除该企业？",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							this.$api.doRequest('post','/settledCompanyInfo/api/deleteSettledCompanyInfo',{id:item.id}).then(res => {
+								if(res.data.code==200){
+									this.$api.msg('删除成功')
+								}else{
+									this.$api.msg('删除失败')
+								}
+							})
+						}
+					},
 				})
 			},
 			edit(item){

pages/grain_pulse/perfect.vue

@@ -24,7 +24,7 @@
 				<view class="addinput addlabel flex" v-if="inputShow">
 					<u-input class='label' v-model="value" type="type" border focus v-if="inputShow"
 					 placeholder="请输入标签内容，不超过6个字" />
-					<u-button :type="types" class="inputOk" shape="circle" @click="addinput">确定</u-button>
+					<u-button :type="types" class="inputOk" :class="{active:value.length>0}" shape="circle" @click="addinput">确定</u-button>
 				</view>
 			</view>
 			<view style='padding-bottom:10px;' class="modular">
@@ -298,6 +298,9 @@
 	padding-right:40px;
 	line-height: 52rpx;
 	margin-bottom:10px;
+}
+.inputOk.active{
+	background:#22C572;
 }
 	.inputOk {
 		width: 100rpx;

pages/grain_pulse/record.vue

@@ -248,7 +248,7 @@
 					this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
 							currentPage: this.currentPage,
 							pageSize: this.pageSize,
-							loginPhone: this.userInfo.phone,
+							phone: this.userInfo.phone,
 							searchType: this.searchType
 						})
 						.then(res => {

pages/user/user.vue

@@ -1,23 +1,9 @@
 <template>
 	<view class="container">
-		<!-- <view class="user-section">
-			<view class="bg">
-				<image class="bg_ware" src="https://moyv.top/wechat/images/bg_wave.gif"></image>
-			</view>
-			<view class="user-info-box">
-				<view class="portrait-box">
-					<image v-if="userInfo" class="portrait" :src="userInfo.avatarUrl"></image>
-					<u-avatar v-else class="portrait" text=""></u-avatar>
-				</view>
-				<view class="info-box">
-					<view @click="toLogin" class="username">{{hasLogin? (userInfo.userName || '点击修改昵称') : '立即登录' }}</view>
-				</view>
-			</view>
-		</view> -->
-		
 		<view style="position: absolute;padding-left: 80%; display: flex;">
-			<image @click='smBtnClick' style='width:21px;height:21px;' src="../../static/img/saoma.png" ></image>
-			<image @click='setting' style='width:21px;height:21px;margin-left: 20rpx;' src="../../static/img/sign/shezhi@3x.png" ></image>
+			<image @click='smBtnClick' style='width:21px;height:21px;' src="../../static/img/saoma.png"></image>
+			<image @click='setting' style='width:21px;height:21px;margin-left: 20rpx;'
+				src="../../static/img/sign/shezhi@3x.png"></image>
 		</view>
 		<view class="indexUp flex justify-between">
 			<view class='flex'>
@@ -29,40 +15,33 @@
 			</view>
 
 		</view>
-		<view style='background:transparent;margin-bottom:0;padding:0;' class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
-						<view class="cu-item"  v-for="(item,index) in gridList" :key="index" @click="gridClick(item, index)" v-if="index<gridCol*2">
-							<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
-								<image :src="item.src" class="sign"></image>
-								
-								<text>{{item.name}}</text>
-							</view>
-						</view>
-					</view>
+		<view style='background:transparent;margin-bottom:0;padding:0;' class="cu-list grid"
+			:class="['col-' + gridCol,gridBorder?'':'no-border']">
+			<view class="cu-item" v-for="(item,index) in gridList" :key="index" @click="gridClick(item, index)"
+				v-if="index<gridCol*2">
+				<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
+					<image :src="item.src" class="sign"></image>
+
+					<text>{{item.name}}</text>
+				</view>
+			</view>
+		</view>
 		<view class="cover-container">
-			
 			<view class='cover-container-item'>
 				<view style='font-size:16px;padding-left:14px;'>我的功能</view>
 				<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
-				<view class="cu-item" style='text-align:center;' v-for="(item,index) in gridList1" :key="index" @click="gridClick(item, index)" v-if="index<gridCol*2">
-					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
-						<text v-if='item.num==1&&taskTip' class='badge_user'>{{taskTip}}</text>
-						<image :src="item.src" class="sign1"></image>
-					</view>		
-					<text>{{item.name}}</text>
+					<view class="cu-item" style='text-align:center;' v-for="(item,index) in gridList1" :key="index"
+						@click="gridClick(item, index)" v-if="index<gridCol*2">
+						<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
+							<text v-if='item.num==1&&taskTip' class='badge_user'>{{taskTip}}</text>
+							<image :src="item.src" class="sign1"></image>
+						</view>
+						<text>{{item.name}}</text>
+					</view>
 				</view>
 			</view>
-			</view>
-			
-		
-				<!-- <view class='cu-item' @click='scanCode'>
-							<view>
-								<text class="cuIcon-scan icon text-grey"></text>
-							    <text class="text-grey">扫一扫</text>
-							</view>
-							<view class = 'tip_text cuIcon-right' ></view>
-						</view> -->
-			</view>
-			<!-- <view style='text-align:center;'>
+		</view>
+		<!-- <view style='text-align:center;'>
 				<navigator
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
 					class="path" hover-class="navigator-hover">《服务协议》</navigator>
@@ -70,7 +49,27 @@
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/screctAgreement.html"
 					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
 			</view> -->
+		<view class="guess-section-wrap">
+			<view class='flex justify-between'>
+				<view class='title Medium'>工厂价格</view>
+			</view>
+			<view class=' guess-section-wrap-item clearfix' v-for='(item,index1) in plantList' :key="index1">
+				<view class='factory'>{{item.factory}}</view>
+				<view class='wrap'>{{item.city}} {{item.factoryType}}</view>
+				<view class='price'>
+					<text class='currectprice '>{{item.price}}</text>
+					较昨日
+					<image v-if='item.comparePrice>0' style="width:7.5px;height:9px;"
+						src='../../static/img/homepage/shangsheng.png'></image>
+					<image v-if='item.comparePrice<0' style="width:7.5px;height:9px;"
+						src='../../static/img/homepage/xiajiang.png'></image>
+					<text v-if='item.comparePrice>0' class='yesterday up'>{{item.comparePrice}}</text>
+					<text v-if='item.comparePrice<0' class='yesterday down'>{{-item.comparePrice}}</text>
+					<text v-if='item.comparePrice==0' class='yesterday'>-</text>
+				</view>
+			</view>
 		</view>
+		<u-back-top :scroll-top="scrollTop" mode="circle" icon="arrow-upward"></u-back-top>
 	</view>
 </template>
 <script>
@@ -87,6 +86,7 @@
 		},
 		data() {
 			return {
+				scrollTop: 0,
 				inputShow: false,
 				modalName: '',
 				mycarStyle: '',
@@ -100,17 +100,17 @@
 				userInfoTmp: [],
 				inputStatus: 'none',
 				carInfo: [],
-				headUrl:"../../static/img/myimg/YongHu@3x.png",
-				userphone:"",
+				plantList: [],
+				headUrl: "../../static/img/myimg/YongHu@3x.png",
+				userphone: "",
 				gridCol: 4,
 				gridBorder: false,
-				username:"请更改昵称",
-				gridList: [
-					{
+				username: "请更改昵称",
+				gridList: [{
 						num: 0,
 						name: '认证',
 						// icon: 'cuIcon-apps',
-						src:'../../static/img/myimg/renzheng@3x.png',
+						src: '../../static/img/myimg/renzheng@3x.png',
 						tips: 0,
 						url: '/pages/attestation/index',
 						show: true
@@ -119,7 +119,7 @@
 						num: 1,
 						name: '粮脉',
 						// icon: 'cuIcon-apps',
-						src:'../../static/img/myimg/liangmai@3x.png',
+						src: '../../static/img/myimg/liangmai@3x.png',
 						tips: 0,
 						url: '/pages/grain_pulse/my_grain_pulse',
 						show: true
@@ -128,85 +128,75 @@
 						num: 2,
 						name: '发布',
 						// icon: 'cuIcon-news',
-						src:'../../static/img/myimg/fabu@3x.png',
+						src: '../../static/img/myimg/fabu@3x.png',
 						tips: 0,
 						url: `/pages/release/release`,
 						show: true
 					},
 					{
 						num: 3,
-						name: '收购业务',
+						name: '货运收发',
 						// icon: 'cuIcon-copy',
-						src:'../../static/img/myimg/erp.png',
+						src: '../../static/img/sign/receiveGoods@2x.png',
 						tips: 0,
-						url: `/pages/erpbusiness/index`,
+						url: `/pageA/freightTransport/index`,
 						show: true
 					},
-					{
-						num: 4,
+				],
+				gridList1: [{
+						num: 0,
 						name: 'ERP业务',
 						// icon: 'cuIcon-copy',
-						src:'../../static/img/myimg/erp.png',
+						src: '../../static/img/myimg/erp.png',
 						tips: 0,
 						url: `/pages/erp/index`,
 						show: true
 					},
-					// {
-					// 	num: 5,
-					// 	name: '设置',
-					// 	// icon: 'cuIcon-edit',
-					// 	src:'../../static/img/sign/shezhi@2x.png',
-					// 	tips: 0,
-					// 	url: `/pages/user/setUp`,
-					// 	show: true
-					// }
-				],
-				gridList1: [
-
 					{
-						num: 0,
+						num: 1,
+						name: '收购业务',
+						// icon: 'cuIcon-copy',
+						src: '../../static/img/myimg/sg.png',
+						tips: 0,
+						url: `/pages/erpbusiness/index`,
+						show: true
+					},
+					{
+						num: 2,
+						name: '我的票据',
+						// icon: 'cuIcon-news',
+						src: '../../static/img/sign/piaoju@3x.png',
+						tips: 0,
+						url: `/pages/bill/index`,
+						show: true
+					},
+					{
+						num: 3,
 						name: '我的合同',
 						// icon: 'cuIcon-calendar',
-						src:'../../static/img/sign/myContract@2x.png',
+						src: '../../static/img/sign/myContract@2x.png',
 						tips: 0,
 						url: '/pageB/contract/contract',
 						show: true
 					},
 					{
-						num: 1,
+						num: 4,
 						name: '我的任务',
 						// icon: 'cuIcon-copy',
-						src:'../../static/img/sign/myTask@2x.png',
+						src: '../../static/img/sign/myTask@2x.png',
 						tips: 0,
 						url: '/pages/task/my_task',
 						show: true
 					},
 					{
-						num: 2,
-						name: '货运收发',
-						// icon: 'cuIcon-copy',
-						src:'../../static/img/sign/receiveGoods@2x.png',
+						num: 5,
+						name: '联系客服',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/service.png',
 						tips: 0,
-						url: `/pageA/freightTransport/index`,
-						show: true
-					},{
-						num: 3,
-						name: '我的票据',
-						// icon: 'cuIcon-news',
-						src:'../../static/img/sign/piaoju@3x.png',
-						tips: 0,
-						url: `/pages/bill/index`,
+						url: `/pages/erp/contactCustomerService/contactCustomerService`,
 						show: true
-					},
-					// {
-					// 	num: 5,
-					// 	name: '设置',
-					// 	// icon: 'cuIcon-edit',
-					// 	src:'../../static/img/sign/shezhi@2x.png',
-					// 	tips: 0,
-					// 	url: `/pages/user/setUp`,
-					// 	show: true
-					// }
+					}
 				],
 				showTran: true,
 				companyId: 1,
@@ -236,30 +226,33 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 			// 手机号中间4位加*
-			starUserphone(){
+			starUserphone() {
 				let reg = /^(\d{3})\d{4}(\d{4})$/;
-				if(this.userphone){
+				if (this.userphone) {
 					return this.userphone.replace(reg, "$1****$2");
 				}
 			}
 		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
 		onShow() {
-			
+
 			uni.hideKeyboard()
 			uni.showTabBar()
 			this.loadData()
-			console.log("hasLogin",this.hasLogin )
-			if(this.userInfo){
-				if(!this.userInfo.avatarUrl){
+			console.log("hasLogin", this.hasLogin)
+			if (this.userInfo) {
+				if (!this.userInfo.avatarUrl) {
 					this.headUrl = "../../static/img/myimg/YongHu@3x.png"
-				}else{
+				} else {
 					this.headUrl = this.userInfo.avatarUrl
 				}
 				this.username = this.userInfo.userName
 				this.userphone = this.userInfo.phone
 				var that = this
 				this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
-					console.log("noticeNumber",res)
+					console.log("noticeNumber", res)
 					if (res.data.data) {
 						let name = 'myTip';
 						let value = res.data.data.task;
@@ -267,10 +260,10 @@
 							name,
 							value
 						});
-						if(value != 0&&value){
+						if (value != 0 && value) {
 							uni.setTabBarBadge({
-								index:4,
-								text:value+""
+								index: 4,
+								text: value + ""
 							})
 						}
 						name = 'taskTip';
@@ -287,14 +280,14 @@
 						// });
 					}
 				})
-			}else{
+			} else {
 				this.headUrl = "../../static/img/myimg/YongHu@3x.png"
 				this.username = "立即登录"
 			}
-			console.log("this.userInfo",this.userInfo)
+			console.log("this.userInfo", this.userInfo)
 		},
 		methods: {
-			smBtnClick(){
+			smBtnClick() {
 				console.log(2)
 				if (!this.hasLogin) {
 					uni.showModal({
@@ -312,19 +305,19 @@
 						fail: () => {},
 						complete: () => {}
 					})
-				}else {
+				} else {
 					uni.scanCode({
-					    success: function (res) {
-					        console.log('条码内容：' + res.result);
+						success: function(res) {
+							console.log('条码内容：' + res.result);
 							uni.navigateTo({
-								url:"/pages/erpbusiness/sm/sm?data="+res.result
+								url: "/pages/erpbusiness/sm/sm?data=" + res.result
 							})
-					    }
+						}
 					});
 				}
-				
+
 			},
-			fankui(){
+			fankui() {
 				uni.navigateTo({
 					url: `/pages/user/fankui`
 				})
@@ -351,6 +344,26 @@
 				});
 			},
 			loadData() {
+				// 工厂价格
+				let that = this
+				that.$api.request('news', 'getFactoryPriceInfo', {
+					category: this.category,
+					page: 1,
+					limit: 99999
+				}, failres => {
+					that.$api.msg(failres.errmsg)
+					this.isLoadMore = false
+					this.loadStatus = 'nomore'
+					if (this.pages > 1) {
+						this.pages = 1
+					}
+					uni.hideLoading()
+				}).then(res => {
+					let data = res.data
+					that.plantList = data
+					// that.makeScrollData(that.plantList, 8)
+					uni.hideLoading()
+				})
 				// const that = this
 				// if(uni.getStorageSync("PageCur")){
 				// 	that.PageCur = uni.getStorageSync("PageCur");
@@ -432,7 +445,7 @@
 						fail: () => {},
 						complete: () => {}
 					})
-				}else {
+				} else {
 					if (item.url) {
 						uni.navigateTo({
 							url: item.url + `?companyId=${that.companyId}`
@@ -440,7 +453,7 @@
 					}
 				}
 			},
-			setting(){
+			setting() {
 				if (!this.hasLogin) {
 					uni.showModal({
 						title: '登录提示',
@@ -457,20 +470,19 @@
 						fail: () => {},
 						complete: () => {}
 					})
-				}else {
-						uni.navigateTo({
-							url:'/pages/user/setUp'
-						})
+				} else {
+					uni.navigateTo({
+						url: '/pages/user/setUp'
+					})
 				}
 			},
 			toLogin() {
-				console.log("userInfo",this.userInfo)
+				console.log("userInfo", this.userInfo)
 				if (!this.hasLogin || !this.userInfo || this.username == "立即登录") {
 					uni.navigateTo({
 						url: '/pages/public/login_account_number'
 					})
-				}
-				else{
+				} else {
 					uni.navigateTo({
 						url: '/pages/user/setUp'
 					})
@@ -516,7 +528,7 @@
 					success: (e) => {
 						if (e.confirm) {
 							uni.hideTabBarRedDot({
-								index:3
+								index: 3
 							})
 							uni.clearStorageSync();
 							that.$store.commit('logout')
@@ -568,9 +580,10 @@
 	}
 </script>
 <style lang='scss' scoped>
-	page{
-		background:#F8F9FC;
+	page {
+		background: #F8F9FC;
 	}
+
 	.container {
 		padding-top: 85px;
 		padding-top: 35px;
@@ -613,22 +626,23 @@
 		margin-top: 16rpx;
 		margin-bottom: 80rpx;
 	}
+
 	.cu-list.grid>.cu-item .badge_user {
 		color: #fff;
-		border:1px solid #fff;
+		border: 1px solid #fff;
 		background-color: #FF6600;
 		display: inline-block;
 		padding: .25em .25em;
-		position:absolute;
+		position: absolute;
 		font-size: 9px;
 		font-weight: 700;
 		line-height: 1;
 		text-align: center;
 		white-space: nowrap;
 		vertical-align: top;
-		right:26px;
-		top:-10px;
-		z-index:2;
+		right: 26px;
+		top: -10px;
+		z-index: 2;
 		border-radius: 50%;
 		transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
 	}
@@ -692,6 +706,7 @@
 		justify-content: center;
 		padding: 15px 0;
 	}
+
 	.user-section {
 		height: 520upx;
 		padding: 100upx 30upx 0;
@@ -785,11 +800,11 @@
 	}
 
 	.cover-container {
-		padding: 1px 10px ;
-		padding-bottom: 200upx;
-		
-	   /* background-color: #F5F6FA; */
-	/* 	border-radius: 20px; */
+		padding: 1px 10px;
+		padding-bottom: 20rpx;
+
+		/* background-color: #F5F6FA; */
+		/* 	border-radius: 20px; */
 		margin-top: 12upx;
 
 		.arc {
@@ -943,42 +958,123 @@
 		font-weight: 600;
 		height: 36px;
 	}
-	.indexlow{
+
+	.indexlow {
 		/* margin-top: 30px; */
 		border-radius: 10px;
 	}
-	.cu-list>.cu-item:after{
-		border:none;
+
+	.cu-list>.cu-item:after {
+		border: none;
 	}
-	.sign{
-		width:35px;
-		height:35px;
+
+	.sign {
+		width: 35px;
+		height: 35px;
 		top: 4px;
 	}
-	.sign1{
-		width:26px;
-		height:26px;
+
+	.sign1 {
+		width: 26px;
+		height: 26px;
 		top: 4px;
 	}
-	.indexUp{
-		padding:0 20px;
+
+	.indexUp {
+		padding: 0 20px;
 		align-items: center;
 	}
-	.cu-list.grid>.cu-item .cu-tag.badge{
-		color:#fff;
-		background:#FF6600;
-		font-size:9px;
-		line-height:5px;padding:5px;
+
+	.cu-list.grid>.cu-item .cu-tag.badge {
+		color: #fff;
+		background: #FF6600;
+		font-size: 9px;
+		line-height: 5px;
+		padding: 5px;
 	}
-	.cover-container-item{
-		background:#fff;
-		border-radius:10px;
+
+	.cover-container-item {
+		background: #fff;
+		border-radius: 10px;
 		padding: 10px 0;
 	}
-	.cover-container-item .cu-list{
-		margin:0;
+
+	.cover-container-item .cu-list {
+		margin: 0;
+	}
+
+	.cover-container-item .cu-list.grid>.cu-item [class*=cuIcon] {
+		margin: 0;
+	}
+
+	.guess-section-wrap-item {
+		float: left;
+		width: 38vw;
+		background: #F9F9FA;
+		padding: 7px;
+
+		margin: 20rpx;
+		border-radius: 3px;
+		// width:50%;
+	}
+
+	.guess-section-wrap-item:first-child {
+		// margin-left:2px;
+	}
+
+	.clearfix:after {
+		content: "";
+		display: block;
+		clear: both;
+	}
+
+	.guess-section-wrap {
+		padding: 15px;
+		margin: 10rpx 20rpx;
+		border-radius: 5px;
+		background: #fff;
+		overflow: hidden;
+	}
+
+	.guess-section-wrap .price {
+		color: #B2B3BB;
+		display: flex;
+		align-items: center;
+	}
+
+	.title {
+		font-size: 28upx;
+		color: $font-color-dark;
+		font-weight: bold;
+		height: 50upx;
+		line-height: 50upx;
+		flex: 2.5;
+	}
+
+	.factory {
+		font-size: 26rpx;
+		font-weight: 900;
 	}
-	.cover-container-item .cu-list.grid>.cu-item [class*=cuIcon]{
-		margin:0;
+
+	.currectprice {
+		color: rgba(253, 113, 79, 1);
+		font-size: 18px;
+		font-weight: 550;
+		vertical-align: middle;
+		margin-right: 10px;
+	}
+
+	.yesterday {
+		font-size: 14px;
+		font-weight: 600;
+		vertical-align: middle;
+	}
+
+	.yesterday.up {
+		color: rgba(253, 113, 79, 1);
+	}
+
+	.yesterday.down {
+		color: #22C572;
 	}
 </style>