更新

pageA/product/business_buy.vue

@@ -116,16 +116,17 @@
 						v-model="purchaseOrder.invoiceFee"></input>
 				</view>
 			</view>
-			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
+			<!-- <view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
 				<view class="title">包装费（元/吨）</view>
 				<view class="con-list">
 					<input placeholder="请填写包装费" name="input" placeholder-style="font-size: 12px;" @input='someprice' v-model="packingFee"></input>
 					
 				</view>
-			</view>
+			</view> -->
 			<view v-if="purchaseOrder.procurementPlanType=='期货'" class=" align-start ">
 				<view class="titles">结算价格</view>
-				<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
+				<!-- <text class="textA">结算价格=点价+基差+发票费用+包装费</text> -->
+				<text class="textA">结算价格=点价+基差+发票费用</text>
 				<text
 					style="font-size: 18px;color: #FD714F;margin-left: 25px;">￥{{purchaseOrder.settlementPrice}}</text>
 				<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
@@ -309,12 +310,12 @@
 					}
 				}
 
-				this.purchaseOrder.packingFee = -this.packingFee
+				// this.purchaseOrder.packingFee = -Math.abs(packingFee)
 
-				if (this.purchaseOrder.packingFee > 0 || this.purchaseOrder.packingFee < -2000) {
-					this.$api.msg('包装费输入错误')
-					return
-				}
+				// if (this.purchaseOrder.packingFee > 0 || this.purchaseOrder.packingFee < -2000) {
+				// 	this.$api.msg('包装费输入错误')
+				// 	return
+				// }
 				if (!this.purchaseOrder.customer) {
 					if (this.goods.customerTypeFlag == 1) {
 						this.purchaseOrder.customer = this.goods.customerName

pageA/product/business_sale.vue

@@ -105,15 +105,16 @@
 			<input disabled placeholder="请填写发票费用" placeholder-style="font-size: 12px;" name="input" @input='someprice' v-model="purchaseOrder.invoiceFee"></input>
 			</view>
 		</view>
-		<view  v-if="purchaseOrder.salePlanType=='期货'" class="c-row b-b align-start">
+		<!-- <view  v-if="purchaseOrder.salePlanType=='期货'" class="c-row b-b align-start">
 			<view class="title">包装费（元/吨）</view>
 			<view class="con-list">
 		<input placeholder="请填写包装费" name="input" type="number" placeholder-style="font-size: 12px;" @input='someprice' v-model="purchaseOrder.packingFee"></input>
 		</view>
-		</view>
+		</view> -->
 		<view  v-if="purchaseOrder.salePlanType=='期货'" class=" align-start ">
 			<view class="titles">结算价格</view>
-			<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
+			<text class="textA">结算价格=点价+基差+发票费用</text>
+			<!-- <text class="textA">结算价格=点价+基差+发票费用+包装费</text> -->
 			<text style="font-size: 18px;color: #FD714F;margin-left: 25px;">￥{{purchaseOrder.settlementPrice}}</text>
 			<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 		</view>
@@ -294,14 +295,14 @@
 							if(this.purchaseOrder.pointPrice.split(".")[1].length>2){
 								this.$api.msg('点价输入错误')
 								return
+							}
 						}
+						// this.purchaseOrder.packingFee=-this.purchaseOrder.packingFee
+						// if(this.purchaseOrder.packingFee>0||this.purchaseOrder.packingFee<-2000){
+						// 	this.$api.msg('包装费输入错误')
+						// 	return
+						// }
 					}
-					this.purchaseOrder.packingFee=-this.purchaseOrder.packingFee
-					if(this.purchaseOrder.packingFee>0||this.purchaseOrder.packingFee<-2000){
-						this.$api.msg('包装费输入错误')
-						return
-					}
-				}
 					if(!this.purchaseOrder.customer){
 						if(this.goods.customerTypeFlag==1){
 							this.purchaseOrder.customer=this.goods.customerName

pageA/product/detail.vue

@@ -407,11 +407,7 @@
 					this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:this.userInfo.id}).then(res => {
 						if(res.data.code==200){
 							uni.navigateTo({
-								url: `/pageA/product/business_buy?id=${this.goods.id}&receiveArea=${this.goods.receiveArea}&minimumVolume=${this.goods.minimumVolume}
-										&goodsName=${this.goods.goodsName}&receiveCity=${this.goods.receiveCity}&receivePrivate=${this.goods.receivePrivate}&buyer=${this.goods.buyer}
-										&basisPrice=${this.goods.basisPrice}&procurementPrice=${this.goods.procurementPrice}&receiveWarehouse=${this.goods.receiveWarehouse}
-										&procurementPlanType=${this.goods.procurementPlanType}&procurementPlan=${this.goods.procurementPlanNo}&compId=${this.goods.compId}
-										&invoiceFeeCompany=${this.goods.invoiceFeeCompany}&invoiceFeePerson=${this.goods.invoiceFeePerson}`
+								url: `/pageA/product/business_buy?id=${this.goods.id}&receiveArea=${this.goods.receiveArea}&minimumVolume=${this.goods.minimumVolume}&goodsName=${this.goods.goodsName}&receiveCity=${this.goods.receiveCity}&receivePrivate=${this.goods.receivePrivate}&buyer=${this.goods.buyer}&basisPrice=${this.goods.basisPrice}&procurementPrice=${this.goods.procurementPrice}&receiveWarehouse=${this.goods.receiveWarehouse}&procurementPlanType=${this.goods.procurementPlanType}&procurementPlan=${this.goods.procurementPlanNo}&compId=${this.goods.compId}&invoiceFeeCompany=${this.goods.invoiceFeeCompany}&invoiceFeePerson=${this.goods.invoiceFeePerson}`
 							// 	url: `/pageA/product/business_buy?id=${this.goods.id}&packing=${this.goods.packing}}&province=${this.goods.province}
 							// 	&city=${this.goods.city}&area=${this.goods.area}&storeName=${this.goods.storeName}&seller=${this.goods.seller}
 							// 	&companyId=${this.goods.companyId}&sellerPhone=${this.goods.sellerPhone}&minSale=${this.goods.minSale}

pageA/product/sales_detail.vue

@@ -398,11 +398,7 @@
 					this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:this.userInfo.id}).then(res => {
 						if(res.data.code==200){
 							uni.navigateTo({
-								url: `/pageA/product/business_sale?id=${this.goods.id}&sendArea=${this.goods.sendArea}&minimumVolume=${this.goods.minimumVolume}
-										&goodsName=${this.goods.goodsName}&sendCity=${this.goods.sendCity}&sendPrivate=${this.goods.sendPrivate}&seller=${this.goods.seller}
-										&basisPrice=${this.goods.basisPrice}&salePrice=${this.goods.salePrice}&sendWarehouse=${this.goods.sendWarehouse}
-										&salePlanType=${this.goods.salePlanType}&salePlan=${this.goods.salePlanNo}&baggingNotes=${this.goods.baggingNotes}&compId=${this.goods.compId}
-										&invoiceFeeCompany=${this.goods.invoiceFeeCompany}&invoiceFeePerson=${this.goods.invoiceFeePerson}`
+								url: `/pageA/product/business_sale?id=${this.goods.id}&sendArea=${this.goods.sendArea}&minimumVolume=${this.goods.minimumVolume}&goodsName=${this.goods.goodsName}&sendCity=${this.goods.sendCity}&sendPrivate=${this.goods.sendPrivate}&seller=${this.goods.seller}&basisPrice=${this.goods.basisPrice}&salePrice=${this.goods.salePrice}&sendWarehouse=${this.goods.sendWarehouse}&salePlanType=${this.goods.salePlanType}&salePlan=${this.goods.salePlanNo}&baggingNotes=${this.goods.baggingNotes}&compId=${this.goods.compId}&invoiceFeeCompany=${this.goods.invoiceFeeCompany}&invoiceFeePerson=${this.goods.invoiceFeePerson}`
 							// 	url: `/pageA/product/business_buy?id=${this.goods.id}&packing=${this.goods.packing}}&province=${this.goods.province}
 							// 	&city=${this.goods.city}&area=${this.goods.area}&storeName=${this.goods.storeName}&seller=${this.goods.seller}
 							// 	&companyId=${this.goods.companyId}&sellerPhone=${this.goods.sellerPhone}&minSale=${this.goods.minSale}

pages/sale/plant.vue

@@ -121,13 +121,13 @@
 			onPageScroll(e) {
 				this.scrollTop = e.scrollTop;
 			},
-			onReachBottom() { //上拉触底函数
-				if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
-					this.isLoadMore = true
-					this.pages += 1
-					this.getIndexSaleData()
-				}
-			},
+			// onReachBottom() { //上拉触底函数
+			// 	if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+			// 		this.isLoadMore = true
+			// 		this.pages += 1
+			// 		this.getIndexSaleData()
+			// 	}
+			// },
 			onPullDownRefresh() {
 				this.pages = 1
 				this.isLoadMore = false
@@ -229,45 +229,7 @@
 					})
 				},
 				getIndexSaleData() {
-					// const that = this
-					// var pages = that.pages
-					// var limit = that.limit
-					// uni.showLoading({
-					// 	title: '正在加载'
-					// })
-					// that.$api.request('integral', 'getIndexSaleData', {
-					// 	page: pages,
-					// 	limit: limit
-					// }, failres => {
-					// 	that.$api.msg(failres.errmsg)
-					// 	that.isLoadMore = false
-					// 	that.loadStatus = 'nomore'
-					// 	if (that.pages > 1) {
-					// 		that.pages -= 1
-					// 	}
-					// 	uni.hideLoading()
-					// }).then(res => {
-					// 	let data = res.data
-					// 	//销售信息
-					// 	if (data.saleInfo.length > 0 ) {
-					// 		that.saleInfo = that.saleInfo.concat(data.saleInfo)
-					// 		that.isLoadMore = false
-					// 	} else {
-					// 		if (that.pages > 1) {
-					// 			that.pages -= 1
-					// 		}
-					// 		that.isLoadMore = true
-					// 		that.loadStatus = 'nomore'
-					// 	}
-					// 	if(data.saleInfo.length < that.limit){
-					// 		if (that.pages > 1) {
-					// 			that.pages -= 1
-					// 		}
-					// 		that.isLoadMore = true
-					// 		that.loadStatus = 'nomore'
-					// 	}
-					// 	uni.hideLoading()
-					// })
+					
 					const that = this
 					var pages=that.pages
 					var limit=that.limit
@@ -276,7 +238,7 @@
 						title: '正在加载',
 						mask:true
 					})
-					that.$api.request('news', 'getNewsInfo', {
+					that.$api.request('news', 'getFactoryPriceInfo', {
 						category:this.category,
 						page: pages,
 						limit:limit

pages/sale/portprice.vue

@@ -125,13 +125,13 @@
 			onPageScroll(e) {
 				this.scrollTop = e.scrollTop;
 			},
-			onReachBottom() { //上拉触底函数
-				if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
-					this.isLoadMore = true
-					this.pages += 1
-					this.getIndexSaleData()
-				}
-			},
+			// onReachBottom() { //上拉触底函数
+			// 	if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+			// 		this.isLoadMore = true
+			// 		this.pages += 1
+			// 		this.getIndexSaleData()
+			// 	}
+			// },
 			onPullDownRefresh() {
 				this.pages = 1
 				this.isLoadMore = false