Browse Source

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

# Conflicts:
#	pageA/product/business_buy.vue
wangchao 3 năm trước cách đây
mục cha
commit
664e095a51

+ 10 - 9
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

+ 1 - 5
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}

+ 1 - 5
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}

+ 1 - 131
pages/sale/plant.vue

@@ -208,137 +208,7 @@
 				})
 
 			},
-			//轮播图切换修改背景色
-			swiperChange(e) {
-				const index = e.detail.current;
-				this.swiperCurrent = index;
-				// this.titleNViewBackground = this.carouselList[index].color;
-			},
-			//详情
-			navToDetailPage(item) {
-				let id = item;
-				uni.navigateTo({
-					url: `/pageB/news/news_detail?id=${id}`
-				})
-			},
-			naviageToPage(page) {
-				uni.navigateTo({
-					url: page,
-					fail() {
-						uni.switchTab({
-							url: page
-						})
-					}
-				})
-			},
-			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
-
-				uni.showLoading({
-					title: '正在加载',
-					mask: true
-				})
-				that.$api.request('news', 'getNewsInfo', {
-					category: this.category,
-					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.length > 0) {
-						for (var k = 0; k < data.length; k++) {
-							data[k].gmtUpdate = formatDate(Date.parse(data[k].gmtUpdate))
-						}
-						that.newsInfo = that.newsInfo.concat(data)
-						that.isLoadMore = false
-					} else {
-						if (that.pages > 1) {
-							that.pages -= 1
-						}
-						that.isLoadMore = true
-						that.loadStatus = 'nomore'
-					}
-					uni.hideLoading()
-				})
-			}
-
-		},
-
-		// #ifndef MP
-		// 标题栏input搜索框点击
-		onNavigationBarSearchInputClicked: async function(e) {
-			uni.navigateTo({
-				url: '/pageA/product/search'
-			})
-		},
-		//点击导航栏 buttons 时触发
-		// onNavigationBarButtonTap(e) {
-		// 	const index = e.index;
-		// 	if (index === 0) {
-		// 		this.$api.msg('点击了扫描');
-		// 	} else if (index === 1) {
-		// 		// #ifdef APP-PLUS
-		// 		const pages = getCurrentPages();
-		// 		const page = pages[pages.length - 1];
-		// 		const currentWebview = page.$getAppWebview();
-		// 		currentWebview.hideTitleNViewButtonRedDot({
-		// 			index
-		// 		});
-		// 		// #endif
-		// 		uni.navigateTo({
-		// 			url: '/pages/notice/notice'
-		// 		})
-		// 	}
-		// }
-		// #endif
+		}
 	}
 </script>
 

+ 2 - 164
pages/sale/portprice.vue

@@ -160,38 +160,6 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		methods: {
-
-			DotStyle(e) {
-				this.dotStyle = e.detail.value
-			},
-			cardSwiper(e) {
-				this.cardCur = e.detail.current
-			},
-			hangqing() {
-				uni.navigateTo({
-					url: `/pageB/news/news`
-				})
-			},
-			tabSelect(e) {
-				this.TabCur = e.currentTarget.dataset.id;
-				this.category = this.TabCur
-				this.pages = 1
-				this.loadData()
-			},
-			//回到顶部
-			goTop(e) { // 一键回到顶部
-				console.log(e)
-				if (wx.pageScrollTo) {
-					wx.pageScrollTo({
-						scrollTop: 0
-					})
-				} else {
-					wx.showModal({
-						title: '提示',
-						content: '当前微信版本过低,无法使用该功能,请升级到最新微信版本后重试。'
-					})
-				}
-			},
 			async loadData() {
 				var that = this
 				// 新闻内容
@@ -212,139 +180,9 @@
 					that.newsInfo = data
 					uni.hideLoading()
 				})
-
-			},
-			//轮播图切换修改背景色
-			swiperChange(e) {
-				const index = e.detail.current;
-				this.swiperCurrent = index;
-				// this.titleNViewBackground = this.carouselList[index].color;
-			},
-			//详情
-			navToDetailPage(item) {
-				let id = item;
-				uni.navigateTo({
-					url: `/pageB/news/news_detail?id=${id}`
-				})
+			
 			},
-			naviageToPage(page) {
-				uni.navigateTo({
-					url: page,
-					fail() {
-						uni.switchTab({
-							url: page
-						})
-					}
-				})
-			},
-			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
-
-				uni.showLoading({
-					title: '正在加载',
-					mask: true
-				})
-				that.$api.request('news', 'getNewsInfo', {
-					category: this.category,
-					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.length > 0) {
-						for (var k = 0; k < data.length; k++) {
-							data[k].gmtUpdate = formatDate(Date.parse(data[k].gmtUpdate))
-						}
-						that.newsInfo = that.newsInfo.concat(data)
-						that.isLoadMore = false
-					} else {
-						if (that.pages > 1) {
-							that.pages -= 1
-						}
-						that.isLoadMore = true
-						that.loadStatus = 'nomore'
-					}
-					uni.hideLoading()
-				})
-			}
-
-		},
-
-		// #ifndef MP
-		// 标题栏input搜索框点击
-		onNavigationBarSearchInputClicked: async function(e) {
-			uni.navigateTo({
-				url: '/pageA/product/search'
-			})
-		},
-		//点击导航栏 buttons 时触发
-		// onNavigationBarButtonTap(e) {
-		// 	const index = e.index;
-		// 	if (index === 0) {
-		// 		this.$api.msg('点击了扫描');
-		// 	} else if (index === 1) {
-		// 		// #ifdef APP-PLUS
-		// 		const pages = getCurrentPages();
-		// 		const page = pages[pages.length - 1];
-		// 		const currentWebview = page.$getAppWebview();
-		// 		currentWebview.hideTitleNViewButtonRedDot({
-		// 			index
-		// 		});
-		// 		// #endif
-		// 		uni.navigateTo({
-		// 			url: '/pages/notice/notice'
-		// 		})
-		// 	}
-		// }
-		// #endif
+		}
 	}
 </script>