前端gjy

pageA/product/lookup.vue

@@ -30,22 +30,35 @@
 						<view class="price-box">
 							<view class="title">{{item.title}}</view>
 							<view style='dsiplay:flex;' class='flex justify-between'>
-								<view class='address'>
+								<view v-if='TabCur==0' class='address'>
 									{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}{{item.receiveWarehouse}}
 								</view>
-								<view class='price' v-if='item.procurementPlanType=="期货"'>{{item.basisPrice}}<text style='font-size:13px;color:#333333;'>元/吨</text></view>
-								<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.unitPrice}}<text style='font-size:13px;color:#333;'>元/吨</text></view>
+								<view v-if='TabCur==1' class='address'>
+									{{item.sendPrivate}}{{item.sendCity}}{{item.sendArea}}{{item.sendWarehouse}}
+								</view>
+								<view class='price' v-if='item.procurementPlanType=="期货"'>{{item.basisPrice}}<text
+										style='font-size:13px;color:#333333;'>元/吨</text></view>
+								<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.unitPrice}}<text
+										style='font-size:13px;color:#333;'>元/吨</text></view>
+								<view class='price' v-if='item.salePlanType=="期货"'>{{item.basisPrice}}<text
+									style='font-size:13px;color:#333333;'>元/吨</text></view>
+								<view class='price' v-if='item.salePlanType=="现货"'>{{item.unitPrice}}<text
+									style='font-size:13px;color:#333;'>元/吨</text></view>
 							</view>
 						</view>
 						<view class='flex justify-between'>
 							<view>
 								<view class='tag1 tag-bule radius line-pink' v-if='item.procurementPlanType=="现货"'>现货</view>
 								<view class='tag1 tag-bule radius line-pink' v-if='item.procurementPlanType=="期货"'>期货</view>
+								<view class='tag1 tag-bule radius line-pink' v-if='item.salePlanType=="现货"'>现货</view>
+								<view class='tag1 tag-bule radius line-pink' v-if='item.salePlanType=="期货"'>期货</view>
 								<view class='tag1 tag-yellow radius line-green'>{{item.goodsName}}</view>
 								<view class='tag1 tag-red radius line-yellow'>{{item.weight}}吨</view>
 							</view>
 							<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货"'>今日基差</view>
 							<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货"'>采购价格</view>
+							<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货"'>今日基差</view>
+							<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货"'>采购价格</view>
 						</view>
 					</view>
 					<view v-show="isLoadMore">
@@ -193,7 +206,7 @@
 				if (this.TabCur == 0) {
 					param1 = '/procurementPlanInfo/selectProcurementPlanInfo'
 				} else {
-					param1 = 'buy'
+					param1 = '/salePlanInfo/selectSalePlanInfo'
 				}
 				this.$api.doRequest('get', param1,{pageSize:this.pageSize,
 				currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {

pageD/myRelease/sellGrain.vue

@@ -558,22 +558,15 @@
 						}
 					}
 				}
-<<<<<<< HEAD
 				if(this.amendprice() == false){
 					this.$api.msg('验证码输入有误！')
 					return
 				}
-				this.insertProcurementPlanInfo = this.deptList
-				this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
-				this.insertProcurementPlanInfo.commonId = this.userInfo.id
-				this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-=======
 				this.insertSalePlanInfo = this.deptList
 				this.insertSalePlanInfo.basisPrice = -this.insertSalePlanInfo.basisPrice
 				this.insertSalePlanInfo.commonId = this.userInfo.id
 				this.insertSalePlanInfo.salePlanNo='XSJH'+this.getdate()+this.verifyinit()
 				this.insertSalePlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
->>>>>>> cf82327deab7b10c1c2181e90bf088a14545c10f
 				this.$api.doRequest('post', '/salePlanInfo/api/insertSalePlanInfo', this
 						.insertSalePlanInfo).then(res => {
 						if (res.data.code == 200) {

pages/business/business.vue

@@ -26,8 +26,8 @@
 			</view>
 		</view>
 		<view style='background:#fff;padding:0 15px;'>
-			<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>我要卖</view>
-			<view @click='tabcarchange(1)' class='line' :class='TabCur==1?"active":""'>我要买</view>
+			<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>采购</view>
+			<view @click='tabcarchange(1)' class='line' :class='TabCur==1?"active":""'>销售</view>
 		</view>
 		<view v-if='buyInfo.length>0' class="introduce-section">
 			<view v-for="(item, index) in buyInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">