前端小程序 sdy

components/uview-ui/libs/util/province.js

@@ -1 +1 @@
-var provinceData=[{"label":"全国","value":"10"},{"label":"北京市","value":"11"},{"label":"天津市","value":"12"},{"label":"河北省","value":"13"},{"label":"山西省","value":"14"},{"label":"内蒙古自治区","value":"15"},{"label":"辽宁省","value":"21"},{"label":"吉林省","value":"22"},{"label":"黑龙江省","value":"23"},{"label":"上海市","value":"31"},{"label":"江苏省","value":"32"},{"label":"浙江省","value":"33"},{"label":"安徽省","value":"34"},{"label":"福建省","value":"35"},{"label":"江西省","value":"36"},{"label":"山东省","value":"37"},{"label":"河南省","value":"41"},{"label":"湖北省","value":"42"},{"label":"湖南省","value":"43"},{"label":"广东省","value":"44"},{"label":"广西壮族自治区","value":"45"},{"label":"海南省","value":"46"},{"label":"重庆市","value":"50"},{"label":"四川省","value":"51"},{"label":"贵州省","value":"52"},{"label":"云南省","value":"53"},{"label":"西藏自治区","value":"54"},{"label":"陕西省","value":"61"},{"label":"甘肃省","value":"62"},{"label":"青海省","value":"63"},{"label":"宁夏回族自治区","value":"64"},{"label":"新疆维吾尔自治区","value":"65"},{"label":"台湾","value":"66"},{"label":"香港","value":"67"},{"label":"澳门","value":"68"}];export default provinceData;
+var provinceData=[{"label":"全部","value":"10"},{"label":"北京市","value":"11"},{"label":"天津市","value":"12"},{"label":"河北省","value":"13"},{"label":"山西省","value":"14"},{"label":"内蒙古自治区","value":"15"},{"label":"辽宁省","value":"21"},{"label":"吉林省","value":"22"},{"label":"黑龙江省","value":"23"},{"label":"上海市","value":"31"},{"label":"江苏省","value":"32"},{"label":"浙江省","value":"33"},{"label":"安徽省","value":"34"},{"label":"福建省","value":"35"},{"label":"江西省","value":"36"},{"label":"山东省","value":"37"},{"label":"河南省","value":"41"},{"label":"湖北省","value":"42"},{"label":"湖南省","value":"43"},{"label":"广东省","value":"44"},{"label":"广西壮族自治区","value":"45"},{"label":"海南省","value":"46"},{"label":"重庆市","value":"50"},{"label":"四川省","value":"51"},{"label":"贵州省","value":"52"},{"label":"云南省","value":"53"},{"label":"西藏自治区","value":"54"},{"label":"陕西省","value":"61"},{"label":"甘肃省","value":"62"},{"label":"青海省","value":"63"},{"label":"宁夏回族自治区","value":"64"},{"label":"新疆维吾尔自治区","value":"65"},{"label":"台湾","value":"66"},{"label":"香港","value":"67"},{"label":"澳门","value":"68"}];export default provinceData;

pageA/product/Identity_switching.vue

@@ -99,7 +99,8 @@
 				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
 						pageSize: 10,
 						currentPage: 1,
-						commonId: this.userInfo.id
+						commonId: this.userInfo.id,
+						flag:1
 					}, 'application/json;charset=UTF-8').then(res => {
 						if(res.data.code==200){
 							for(var i=0;i<res.data.data.records.length;i++){

pageA/product/business_buy.vue

@@ -309,11 +309,27 @@
 							if (res.confirm) {
 								that.$api.doRequest('post','/purchaseOrder/api/insertPurchaseOrder', that.purchaseOrder).then(res => {
 									if(res.data.code==200){
-										uni.showToast({
-											title: '提交成功，等待买方回复',
-											icon: 'none',
-											duration: 2000
-										})
+										// that.$api.doRequest('post','/purchaseOrder/api/submitPurchaseOrder', {id:res.data.data}).then(res1 => {
+										// 	if(res1.data.code==200){
+												uni.showToast({
+													title: '提交成功，等待买方回复',
+													icon: 'none',
+													duration: 2000
+												})
+										// 	}else{
+										// 		uni.showToast({
+										// 			title: res.data.message,
+										// 			icon: 'none',
+										// 			duration: 2000
+										// 		})
+										// 	}
+										// }).catch(res => {
+										// 	uni.showToast({
+										// 		title: res.data.message,
+										// 		icon: 'none',
+										// 		duration: 2000
+										// 	})
+										// })
 										// uni.navigateBack();
 									}else{
 										uni.showToast({
@@ -400,9 +416,6 @@
 				buyerPhoneInput(e){
 					this.buyerPhone = e.detail.value
 				},
-				unitPriceInput(e){
-					this.unitPrice = e.detail.value
-				},
 				addressInput(e){
 					this.address = e.detail.value
 				},

pageA/product/business_sale.vue

@@ -55,7 +55,7 @@
 			<view   class="title">销售单价（元/吨）</view>
 			<view class="con-list">
 				<view class="picker">
-					<text>{{purchaseOrder.salePrice}}</text>
+					<text>{{purchaseOrder.unitPrice}}</text>
 				</view>
 				</view>
 		</view>
@@ -224,13 +224,14 @@
 				this.purchaseOrder.buyer = options.buyer
 				this.purchaseOrder.customer = options.customerName
 				this.purchaseOrder.basis = options.basisPrice
-				this.purchaseOrder.salePrice = options.salePrice
+				this.purchaseOrder.unitPrice = options.unitPrice
 				this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
 				this.purchaseOrder.settlementPrice = options.basisPrice
 				this.purchaseOrder.salePlanType = options.salePlanType
-				this.purchaseOrder.procurementPlan=options.procurementPlan
+				this.purchaseOrder.salePlan=options.salePlan
 				this.purchaseOrder.baggingNotes=options.baggingNotes
 				this.purchaseOrder.sendWarehouse = options.sendWarehouse
+				this.purchaseOrder.compId=options.compId
 			},
 			computed: {
 				...mapState(['hasLogin','userInfo']),
@@ -258,7 +259,7 @@
 						&receiveArea=${this.purchaseOrder.receiveArea}&minimumVolume=${this.purchaseOrder.minimumVolume}
 						&buyer=${this.purchaseOrder.buyer}&basisPrice=${this.purchaseOrder.basis}&unitPrice=${this.purchaseOrder.unitPrice}
 						&receiveWarehouse=${this.purchaseOrder.receiveWarehouse}&salePlanType=${this.purchaseOrder.salePlanType}
-						&procurementPlanNo=${this.purchaseOrder.procurementPlan}`
+						&salePlanNo=${this.purchaseOrder.salePlan}`
 					})
 				},
 				commit(){
@@ -270,25 +271,27 @@
 						this.$api.msg('采购数量输入错误')
 						return
 					}
-					if(!this.purchaseOrder.pointPrice){
-						this.$api.msg('点价不能为空')
-						return
-					}
-					if(this.purchaseOrder.pointPrice>10000){
-						this.$api.msg('点价输入错误')
-						return
-					}
-					if(this.purchaseOrder.pointPrice.indexOf('.')!=-1){
-						if(this.purchaseOrder.pointPrice.split(".")[1].length>2){
+					if(this.purchaseOrder.salePlanType=='期货'){
+						if(!this.purchaseOrder.pointPrice){
+							this.$api.msg('点价不能为空')
+							return
+						}
+						if(this.purchaseOrder.pointPrice>10000){
 							this.$api.msg('点价输入错误')
 							return
 						}
+						if(this.purchaseOrder.pointPrice.indexOf('.')!=-1){
+							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
 					}
+				}
 					if(!this.purchaseOrder.customer){
 						if(this.goods.customerTypeFlag==1){
 							this.purchaseOrder.customer=this.goods.customerName
@@ -296,17 +299,21 @@
 							this.purchaseOrder.customer=this.goods.compName
 						}
 					}
-					if(!this.purchaseOrder.seller){
+					if(!this.purchaseOrder.buyer){
 						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.seller=this.goods.customerName
-							this.purchaseOrder.sellerPhone=this.goods.customerPhone
+							this.purchaseOrder.buyer=this.goods.customerName
+							this.purchaseOrder.buyerPhone=this.goods.customerPhone
 						}else{
-							this.purchaseOrder.seller=this.goods.compName
-							this.purchaseOrder.sellerPhone=this.goods.customerPhone
+							this.purchaseOrder.buyer=this.goods.compName
+							this.purchaseOrder.buyerPhone=this.goods.customerPhone
 						}
 					}
 					var that=this
+					this.purchaseOrder.commonId=that.userInfo.id
 					this.purchaseOrder.pcFlag=0
+					if(this.purchaseOrder.salePlanType == "期货"){
+					this.purchaseOrder.unitPrice = this.purchaseOrder.settlementPrice
+					}
 					uni.showModal({
 						content: '订单提交后将发送给卖方，是否确定提交？',
 						success: function (res) {
@@ -381,38 +388,6 @@
 						}
 					}
 				},
-				changeZhihang(){
-					uni.navigateTo({
-						url: '/pageA/pages/newcompany'
-					})
-				},
-				PriceTypeChange(e) {
-					this.priceTypeIndex = e.detail.value
-					this.price = this.priceType[this.priceTypeIndex]
-				},
-				RegionChange(e) {
-					this.region = e.detail.value
-					this.province = this.region[0];
-					this.area = this.region[0]+this.region[1]+this.region[2];
-				},
-				textareaInput(e) {
-					this.memo = e.detail.value
-				},
-				buyerInput(e){
-					this.buyer = e.detail.value
-				},
-				buyerPhoneInput(e){
-					this.buyerPhone = e.detail.value
-				},
-				unitPriceInput(e){
-					this.unitPrice = e.detail.value
-				},
-				addressInput(e){
-					this.address = e.detail.value
-				},
-				countInput(e){
-					this.count = e.detail.value
-				},
 			}
 		}
 </script>

pageA/product/detail.vue

@@ -10,7 +10,7 @@
 				<view class='flex justify-between'>
 					<view style='flex:1.5;color:#878C9C;'>{{goods.receivePrivate}}{{goods.receiveCity}}{{goods.receiveArea}}{{goods.receiveWarehouse}}</view>
 					<view  v-if='goods.procurementPlanType=="现货"' class="title-tip">
-						<text class="price">{{goods.procurementPrice}}</text>
+						{{goods.procurementPrice}}
 					</view>
 					<view style='text-align:right;'  v-else class="title-tip">
 						{{goods.basisPrice}}
@@ -74,6 +74,18 @@
 						<text>{{goods.priceType}}</text>
 					</view>
 				</view>
+				<view v-if='goods.procurementPlanType=="现货"' class="c-row">
+					<text class="tit">采购价格(元/吨)</text>
+					<view class="con-list">
+						<text>{{goods.unitPrice}}</text>
+					</view>
+				</view>
+				<view v-else class="c-row">
+					<text class="tit">基差(元/吨)</text>
+					<view class="con-list">
+						<text>{{goods.basisPrice}}</text>
+					</view>
+				</view>
 				<view class="c-row">
 					<text class="tit">收货地区</text>
 					<view class="con-list">
@@ -92,7 +104,7 @@
 						<text>{{goods.packingType}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view v-if='goods.baggingNotes' class="c-row">
 					<text class="tit">袋装备注</text>
 					<view class="con-list">
 						<text>{{goods.baggingNotes}}</text>

pageA/product/lookup.vue

@@ -5,8 +5,10 @@
 			<view style='flex:6;' class="search-form round" >
 				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
 				<input type="text" v-model="searchKeyWord" @input="doSearch" placeholder="请输入货名或标题" confirm-type="search"></input>
+				
 			</view>
-			<view style="width:4%;flex:1;">{{content}}</view>
+			<view @click='emptysearch1' style="width:4%;flex:1;">{{content}}</view>
+			<text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text>
 			</view>
 			<!-- mSearch组件 如果使用原样式，删除组件元素-->
 			<!-- <mSearch class="mSearch-input-box" :mode="2" button="inside" :placeholder="defaultKeyword" @search="doSearch(false)" @input="inputChange" @confirm="doSearch(false)" v-model="keyword"></mSearch> -->
@@ -131,7 +133,9 @@
 			}
 		},
 		onLoad(options) {
-			this.searchKeyWord=options.searchKeyWord
+			if(options.searchKeyWord){
+				this.searchKeyWord=options.searchKeyWord
+			}
 			this.TabCur = options.TabCur
 			if(this.searchKeyWord){
 				this.isShowKeywordList=true
@@ -176,6 +180,16 @@
 			blur(){
 				uni.hideKeyboard()
 			},
+			emptysearch1(){
+				if(this.content=='取消'){
+					this.searchKeyWord=''
+					this.content='搜索'
+				}
+			},
+			emptysearch(){
+				this.searchKeyWord=''
+				this.content='搜索'
+			},
 			loadHotKeyword(){
 				this.$api.doRequest('get', '/searchRecordsInfo/selectRecommendedSearchRecordsInfo',{pageSize:this.pageSize,
 				currentPage:this.currentPage,commonId:this.userInfo.id}).then(res => {
@@ -283,13 +297,13 @@
 					success: (res) => {
 						if (res.confirm) {
 							this.$api.doRequest('post', '/searchRecordsInfo/api/deleteSearchRecordsInfo',{commonId:this.userInfo.id}).then(res => {
-								that.oldKeywordList=[]
 								if(res.data.code==200){
 									uni.showToast({
 										title: '清除历史搜索成功',
 										icon:'none',
 										duration: 2000
 									})
+									that.oldKeywordList.records=[]
 								}
 							})
 							.catch(res => {
@@ -489,7 +503,10 @@
 	.keyword-box .keyword-block .keyword {width:94%;padding:3px 3%;display:flex;flex-flow:wrap;justify-content:flex-start;}
 	.keyword-box .keyword-block .hide-hot-tis {display:flex;justify-content:center;font-size:28upx;color:#6b6b6b;}
 	.keyword-box .keyword-block .keyword>view {display:flex;justify-content:center;align-items:center;border-radius:60upx;padding:0 20upx;margin:10upx 20upx 10upx 0;height:60upx;font-size:28upx;background-color:rgb(242,242,242);color:#6b6b6b;}
-
+	.cuIcon-roundclosefill{
+		position:absolute;
+		right:80px;
+	}
 	.tag1 {
 		background:#F5F6F9;
 		padding: 5px;

pageA/product/sales_detail.vue

@@ -10,7 +10,7 @@
 				<view class='flex justify-between'>
 					<view style='flex:1.5;color:#878C9C;'>{{goods.sendPrivate}}{{goods.sendCity}}{{goods.sendArea}}{{goods.sendWarehouse}}</view>
 					<view  v-if='goods.salePlanType=="现货"' class="title-tip">
-						<text class="price">{{goods.unitPrice}}</text>
+						{{goods.salePrice}}
 					</view>
 					<view style='text-align:right;'  v-else class="title-tip">
 						{{goods.basisPrice}}
@@ -83,7 +83,7 @@
 				<view class="c-row" v-if="goods.salePlanType == '现货'">
 					<text class="tit">销售价格（元/吨）</text>
 					<view class="con-list">
-						<text>{{goods.unitPrice}}</text>
+						<text>{{goods.salePrice}}</text>
 					</view>
 				</view>
 				<view class="c-row">
@@ -250,8 +250,8 @@
 					moldy: 0,
 					impurity: 0,
 					overFlow: 0,
-					seller:'',
-					sellerPhone:'',
+					buyer:'',
+					buyerPhone:'',
 					minSale: 0,
 					status:0
 				},
@@ -267,6 +267,7 @@
 		onShow() {
 		},
 		onLoad(options) {
+			this.goods.compId=options.compId
 			const that = this
 			uni.showLoading({
 				title: '正在加载',
@@ -383,8 +384,8 @@
 							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}&salePlanNo=${this.goods.salePlanNo}&baggingNotes=${this.goods.baggingNotes}`
+										&basisPrice=${this.goods.basisPrice}&salPrice=${this.goods.salePrice}&sendWarehouse=${this.goods.sendWarehouse}
+										&salePlanType=${this.goods.salePlanType}&salePlan=${this.goods.salePlanNo}&baggingNotes=${this.goods.baggingNotes}&compId=${this.goods.compId}`
 							// 	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}

pageD/myRelease/Identity_switching.vue

@@ -1,38 +1,40 @@
 <template>
 	<view class="center">
-		<view v-for="(item , index) in lists" :Key="index">
-			<view class="forList">
-				<view class="flex">
-					<view class="company" v-if="item.customerType == '企业'">{{item.customerType}}</view>
-					<view class="company1" v-if="item.customerType == '个人'">{{item.customerType}}</view>
-					<view class="guess-item" @click="navToDetailPage(item)">
-				</view>
-				
-					<view class="infos">
-
-						<view class="info1">{{item.customerName}}
-							<view class='but but1' v-if="item.authenticationStatus == '已认证'">{{item.authenticationStatus}}</view>
-							<view class='but but2' v-if="item.authenticationStatus == '审核中'">{{item.authenticationStatus}}</view>
-							<view class='but but3' v-if="item.authenticationStatus == '未通过'">{{item.authenticationStatus}}</view>
-							<view class='but but4' v-if="item.authenticationStatus == '已覆盖'">{{item.authenticationStatus}}</view>
-						</view>
-						<view class="info2">{{item.customerPhone}}</view>
-					
+		<view v-if='lists.length>0'>
+			<view v-for="(item , index) in lists" :Key="index">
+				<view @click="navToDetailPage(item)" class="forList">
+					<view class="flex">
+						<view class="company" v-if="item.customerType == '企业'">{{item.customerType}}</view>
+						<view class="company1" v-if="item.customerType == '个人'">{{item.customerType}}</view>
+						<view class="infos">
+							<view class="info1">
+							<text v-if='item.customerTypeFlag==1'>{{item.customerName}}</text>
+							<text v-if='item.customerTypeFlag==2'>{{item.compName}}</text>
+								<view class='but but1' v-if="item.authenticationStatus == '已认证'">{{item.authenticationStatus}}</view>
+								<view class='but but2' v-if="item.authenticationStatus == '审核中'">{{item.authenticationStatus}}</view>
+								<view class='but but3' v-if="item.authenticationStatus == '未通过'">{{item.authenticationStatus}}</view>
+								<view class='but but4' v-if="item.authenticationStatus == '已覆盖'">{{item.authenticationStatus}}</view>
+							</view>
+							<view class="info2">{{item.customerPhone}}</view>
 						
-					</view>
+							
+						</view>
 
+					</view>
+						<hr style="margin: 10px 0px;">
+					<label>
+						<checkbox style='transform: scale(0.8);' :value='item.id' :checked="item.checked" @click.stop="checkBox($event,item)" ></checkbox>
+						<text>设置默认</text>
+					</label>
 				</view>
-					<hr style="margin: 10px 0px;">
-				<label>
-					<checkbox style='transform: scale(0.8);' :value='item.id' :checked="item.checked" @click.stop="checkBox($event,item)" ></checkbox>
-					<text>设置默认</text>
-				</label>
 			</view>
 		</view>
+		
+		<view style='text-align:center;' v-else>
+			当前暂无已认证的粮商身份
+		</view>
 	</view>
 
-	</view>
-	</view>
 </template>
 
 <script>
@@ -76,22 +78,24 @@
 				},
 			};
 		},
-		onShow(){
-			this.getList()
-		},
 		onLoad(options) {
 			this.id=options.id
 		},
+		onShow(){
+			this.getList()
+		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		methods: {
 			getList() {
+				console.log(this.userInfo)
 				this.identityAuthenticationInfo.commonId = this.userInfo.id
 				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
 						pageSize: 10,
 						currentPage: 1,
-						commonId: this.userInfo.id
+						commonId: this.userInfo.id,
+						flag:1
 					}, 'application/json;charset=UTF-8').then(res => {
 						if(res.data.code==200){
 							for(var i=0;i<res.data.data.records.length;i++){
@@ -145,6 +149,7 @@
 			// 	}
 			// },
 			navToDetailPage(item) {
+				console.log(11111)
 				// if (index == 1) {
 					if(item.customerTypeFlag==1){
 						uni.navigateTo({

pageD/myRelease/buyEdit.vue

@@ -5,7 +5,7 @@
 		<view class="c-row b-b">
 			<text class="tit">名头</text>
 			<view class="con-list">
-				<text @click="navToDetailPage">{{deptList.procurementPlanNo}}</text>
+				<text @click="navToDetailPage">{{deptList.buyer}}</text>
 			</view>
 		</view>
 		<view class="c-row b-b">
@@ -34,12 +34,9 @@
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">类型</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list"
-				>
-				<view class="picker" v-model="deptList.procurementPlanType">
-					{{typesIndex>-1?typesType[typesIndex]:'请选择类型'}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{deptList.procurementPlanType}}
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">价格类型</text>
@@ -51,7 +48,7 @@
 		<view class="c-row b-b" v-if="this.typesIndex != 1">
 			<text class="tit">单价（元/吨）</text>
 			<view class="con-list">
-				<input placeholder="请填写单价" name="input" v-model="deptList.unitPrice"></input>
+				<input placeholder="请填写单价" name="input" v-model="deptList.procurementPrice"></input>
 			</view>
 		</view>
 		<view class="c-row b-b" v-if="this.typesIndex == 1">
@@ -558,7 +555,9 @@
 				}
 				}
 				this.insertProcurementPlanInfo = this.deptList
-				this.insertProcurementPlanInfo.basisPrice=-this.insertProcurementPlanInfo.basisPrice
+				if(this.deptList.procurementPlanType == '期货'){
+								this.insertProcurementPlanInfo.basisPrice=-this.insertProcurementPlanInfo.basisPrice
+					}
 		         this.insertProcurementPlanInfo.commonId = this.userInfo.id
 				 this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				 uni.showModal({

pageD/myRelease/buyGrain.vue

@@ -4,7 +4,7 @@
 			<view class="c-row b-b">
 				<text class="tit">名头</text>
 				<view class="con-list">
-					<text @click="navToDetailPage">{{deptList.buyer}}</text>
+					<text @click="navToDetailPage">{{deptList.buyer}}<text class='tip_text cuIcon-right'></text></text>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -94,49 +94,49 @@
 					style="font-size: 14px; ">完善更多信息<text
 						style="font-size: 10px; color: #AFB3BF;">（选填，可由客服人员代为完善）</text></text>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">水分（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写水分占比" name="input" v-model="deptList.waterContent"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">容重（g/L）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写容重" name="input" v-model="deptList.bulkDensity"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">热损伤（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写热损伤占比" name="input" v-model="deptList.jiaorenli"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">杂质（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写杂质占比" name="input" v-model="deptList.impurity"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">霉变粒（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写霉变粒占比" name="input" v-model="deptList.mildewGrain"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">不完整粒（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写不完整粒占比" name="input" v-model="deptList.imperfectGrain"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">蛋白（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写蛋白占比" name="input" v-model="deptList.protein"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">粒型 </text>
 				<picker @change="liChange" :value="liIndex" :range="liType" class="con-list" v-model="deptList.grain">
 					<view class="con-list">
@@ -144,7 +144,7 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">品级 </text>
 				<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
 					<view class="con-list">
@@ -152,14 +152,14 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">产地</text>
 				<view class="con-list">
 					<view @click='regionchange1'>{{region1}}</view>
 					<u-picker :params='params1' @confirm='regionpicker1' mode="region" v-model="show1"></u-picker>
 				</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">产出年份</text>
 				<picker @change="nianChange" :value="nianIndex" :range="nianType" class="con-list">
 					<view class="con-list">
@@ -167,7 +167,7 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">包装方式</text>
 				<picker @change="baoChange" :value="baoIndex" :range="baoType" class="con-list">
 					<view class="con-list">
@@ -175,13 +175,13 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked&&baoIndex==2||!checked&&baoIndex==3' class="c-row b-b">
+			<view v-if='checked&&baoIndex==2||checked&&baoIndex==3' class="c-row b-b">
 				<text class="tit">袋装备注</text>
 				<view class="con-list">
 					<input placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
 				</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">运费承担方</text>
 				<picker @change="chengChange" :value="chengIndex" :range="chengType" class="con-list">
 					<view class="con-list">
@@ -264,15 +264,15 @@
 		onShow() {
 			var that = this
 			this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo', {
-				commonId: this.userInfo.id
+				commonId: that.userInfo.id
 			}).then(res => {
 				if (res.data.code == 200) {
 					if (res.data.data.customerTypeFlag == 1) {
-						that.$set(this.deptList, 'buyer', res.data.data.customerName)
+						that.$set(that.deptList, 'buyer', res.data.data.customerName)
 					} else {
-						that.$set(this.deptList, 'buyer', res.data.data.compName)
+						that.$set(that.deptList, 'buyer', res.data.data.compName)
 					}
-					this.goods = res.data.data
+					that.goods = res.data.data
 				}
 				uni.hideLoading()
 			})
@@ -476,6 +476,14 @@
 					this.$api.msg('买方手机号不能为空')
 					return
 				}
+				if (this.deptList.buyerPhone.length!=11) {
+					this.$api.msg('买方手机号输入错误')
+					return
+				}
+				if(!this.verifyCode){
+					this.$api.msg('验证码不能为空')
+					return
+				}
 				if (this.checked == false) {
 					if (this.deptList.waterContent && this.deptList.waterContent < 1 ||
 						this.deptList.waterContent && this.deptList.waterContent > 40) {
@@ -558,20 +566,42 @@
 				this.insertProcurementPlanInfo.commonId = this.userInfo.id
 				this.insertProcurementPlanInfo.procurementPlanNo='CGJH'+this.getdate()+this.verifyinit()
 				this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-				this.$api.doRequest('post', '/procurementPlanInfo/api/insertProcurementPlanInfo', this
-						.insertProcurementPlanInfo).then(res => {
+				var that = this
+				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
+						phone: this.deptList.buyerPhone,
+						verifyCode: this.verifyCode
+					}).then(res => {
 						if (res.data.code == 200) {
-							uni.showToast({
-								title: "发布成功",
-								icon: 'none',
-							})
-							// setTimeout(() => {
-							// 	uni.navigateBack({})
-							// }, 1000)
-							this.deptList = {}
-							uni.navigateTo({
-								url: `/pages/release/release`
-							})
+							that.$api.doRequest('post', '/procurementPlanInfo/api/insertProcurementPlanInfo', that
+									.insertProcurementPlanInfo).then(res => {
+									if (res.data.code == 200) {
+										uni.showToast({
+											title: "发布成功",
+											icon: 'none',
+										})
+										// setTimeout(() => {
+										// 	uni.navigateBack({})
+										// }, 1000)
+										that.deptList = {}
+										uni.navigateTo({
+											url: `/pages/release/release`
+										})
+									} else {
+										uni.showToast({
+											title: res.data.message,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+							
+								})
+								.catch(res => {
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none',
+										duration: 2000
+									})
+								});
 						} else {
 							uni.showToast({
 								title: res.data.message,
@@ -579,11 +609,10 @@
 								duration: 2000
 							})
 						}
-
 					})
 					.catch(res => {
 						uni.showToast({
-							title: res.errmsg,
+							title: res.data.message,
 							icon: 'none',
 							duration: 2000
 						})

pageD/myRelease/sellDetails.vue

@@ -37,7 +37,6 @@
 			<view class="c-row b-b">
 				<text class="tit">类型</text>
 				<view class="con-list">
-
 					{{deptList.salePlanType}}
 				</view>
 			</view>

pageD/myRelease/sellEdit.vue

@@ -4,7 +4,6 @@
 			<view class="c-row b-b">
 				<text class="tit">名头</text>
 				<view class="con-list">
-				<!-- 	<text @click="navToDetailPage">{{deptList.procurementPlanNo}}</text> -->
 					<text @click="navToDetailPage">{{deptList.seller}}</text>
 				</view>
 			</view>
@@ -35,11 +34,9 @@
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">类型</text>
-				<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-					<view class="picker" v-model="deptList.salePlanType">
-						{{typesIndex>-1?typesType[typesIndex]:'请选择类型'}}
-					</view>
-				</picker>
+				<view class="con-list">
+					{{deptList.salePlanType}}
+				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">价格类型</text>
@@ -402,16 +399,16 @@
 					return
 				}
 				if (this.deptList.salePlanType == '现货') {
-					if (!this.deptList.unitPrice) {
+					if (!this.deptList.salePrice) {
 						this.$api.msg('单价不能为空')
 						return
 					}
-					if (this.deptList.unitPrice > 100000 || this.deptList.unitPrice < 1) {
+					if (this.deptList.salePrice > 100000 || this.deptList.salePrice < 1) {
 						this.$api.msg('单价输入错误')
 						return
 					}
-					if (this.deptList.unitPrice.indexOf('.') != -1) {
-						if (this.deptList.unitPrice.split('.')[1].length > 2) {
+					if (this.deptList.salePrice.indexOf('.') != -1) {
+						if (this.deptList.salePrice.split('.')[1].length > 2) {
 							this.$api.msg('单价输入错误')
 							return
 						}
@@ -512,7 +509,9 @@
 					}
 				}
 				this.insertProcurementPlanInfo = this.deptList
-				this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
+				if (this.deptList.salePlanType == '期货') {
+					this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
+				}
 				this.insertProcurementPlanInfo.commonId = this.userInfo.id
 				this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				this.$api.doRequest('post', '/salePlanInfo/api/editSalePlanInfo', this

pageD/myRelease/sellGrain.vue

@@ -4,7 +4,7 @@
 			<view class="c-row b-b">
 				<text class="tit">名头</text>
 				<view class="con-list">
-					<text @click="navToDetailPage">{{deptList.seller}}</text>
+					<text @click="navToDetailPage">{{deptList.seller}}<text class='tip_text cuIcon-right'></text></text>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -21,9 +21,9 @@
 				</view>
 			</view>
 			<view class="c-row b-b">
-				<text class="tit">出货量（吨）</text>
+				<text class="tit">出售量（吨）</text>
 				<view class="con-list">
-					<input placeholder="请输入采购重量，如1000" name="input" v-model="deptList.plannedSaleVolume"></input>
+					<input placeholder="请输入出售重量，如1000" name="input" v-model="deptList.plannedSaleVolume"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -76,7 +76,7 @@
 			<view class="c-row b-b">
 				<text class="tit">卖方手机号</text>
 				<view class="con-list">
-					<input placeholder="请输入买方手机号" name="input" v-model="deptList.sellerPhone"></input>
+					<input placeholder="请输入卖方手机号" name="input" v-model="deptList.sellerPhone"></input>
 				</view>
 			</view>
 			<!-- <view class="c-row ">
@@ -104,49 +104,49 @@
 					style="font-size: 14px; ">完善更多信息<text
 						style="font-size: 10px; color: #AFB3BF;">（选填，可由客服人员代为完善）</text></text>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">水分（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写水分占比" name="input" v-model="deptList.waterContent"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">容重（g/L）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写容重" name="input" v-model="deptList.bulkDensity"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">热损伤（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写热损伤占比" name="input" v-model="deptList.jiaorenli"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">杂质（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写杂质占比" name="input" v-model="deptList.impurity"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">霉变粒（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写霉变粒占比" name="input" v-model="deptList.mildewGrain"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">不完整粒（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写不完整粒占比" name="input" v-model="deptList.imperfectGrain"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">蛋白（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写蛋白占比" name="input" v-model="deptList.protein"></input>
 						</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">粒型 </text>
 				<picker @change="liChange" :value="liIndex" :range="liType" class="con-list" v-model="deptList.grain">
 					<view class="con-list">
@@ -154,7 +154,7 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">品级 </text>
 				<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
 					<view class="con-list">
@@ -163,7 +163,7 @@
 				</picker>
 			</view>
 
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">产出年份</text>
 				<picker @change="nianChange" :value="nianIndex" :range="nianType" class="con-list">
 					<view class="con-list">
@@ -171,7 +171,7 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">包装方式</text>
 				<picker @change="baoChange" :value="baoIndex" :range="baoType" class="con-list">
 					<view class="con-list">
@@ -179,13 +179,13 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked&&baoIndex==2||!checked&&baoIndex==3' class="c-row b-b">
+			<view v-if='checked&&baoIndex==2||checked&&baoIndex==3' class="c-row b-b">
 				<text class="tit">袋装备注</text>
 				<view class="con-list">
 					<input placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
 				</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">运费承担方</text>
 				<picker @change="chengChange" :value="chengIndex" :range="chengType" class="con-list">
 					<view class="con-list">
@@ -211,13 +211,13 @@
 				typesType: ["现货", "期货"],
 				typesIndex: 0,
 				deptList: {
+					salePlanType:'现货',
 					salePlanTypeKey:0,
 					grainKey:0,
 					gradeKey:0,
 					packingTypeKey:0,
 					freightPayerKey:-1,
-					priceType: "定价采购",
-					procurementPlanType: "现货",
+					priceType: "定价销售",
 					grain: "塔粮",
 					grade: "不限（默认）",
 					outputYear: "2020",
@@ -245,7 +245,7 @@
 				],
 				show: false,
 				show1: false,
-				region: '请选择收货地区',
+				region: '请选择发货地区',
 				region1: '请选择产地',
 				baoIndex: 0,
 				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
@@ -283,36 +283,6 @@
 			})
 		},
 		methods: {
-			async amendprice() {
-				var that = this
-				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
-						phone: this.deptList.sellerPhone,
-						verifyCode: this.verifyCode
-					}).then(res => {
-						if (res.data.code == 200) {
-							
-						} else {
-							that.verification = false
-							console.log(that.verification,"1")
-							uni.showToast({
-								title: res.data.message,
-								icon: 'none',
-								duration: 2000
-							})
-							return false
-						}
-					})
-					.catch(res => {
-						that.verification = false
-						console.log(that.verification,"2")
-						uni.showToast({
-							title: res.data.message,
-							icon: 'none',
-							duration: 2000
-						})
-						return false
-					});
-			},
 			getcode() {
 				var that = this
 				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(that.deptList.sellerPhone)) {
@@ -382,7 +352,7 @@
 				this.deptList.salePlanTypeKey = e.detail.value+1
 				this.deptList.salePlanType = this.typesType[this.typesIndex];
 				if (this.typesIndex == 0) {
-					this.deptList.priceType = '定价采购'
+					this.deptList.priceType = '定价销售'
 				} else {
 					this.deptList.priceType = '期货盘面价+基差'
 				}
@@ -413,16 +383,16 @@
 					return
 				}
 				if (!this.deptList.plannedSaleVolume) {
-					this.$api.msg('出货量不能为空')
+					this.$api.msg('出售量不能为空')
 					return
 				}
 				if (this.deptList.plannedSaleVolume > 100000 || this.deptList.plannedSaleVolume < 1) {
-					this.$api.msg('出货量输入错误')
+					this.$api.msg('出售量输入错误')
 					return
 				}
 				if (this.deptList.plannedSaleVolume.indexOf('.') != -1) {
 					if (this.deptList.plannedSaleVolume.split('.')[1].length > 2) {
-						this.$api.msg('出货量输入错误')
+						this.$api.msg('出售量输入错误')
 						return
 					}
 				}
@@ -449,16 +419,16 @@
 					return
 				}
 				if (this.deptList.salePlanType == '现货') {
-					if (!this.deptList.unitPrice) {
+					if (!this.deptList.salePrice) {
 						this.$api.msg('单价不能为空')
 						return
 					}
-					if (this.deptList.unitPrice > 100000 || this.deptList.unitPrice < 1) {
+					if (this.deptList.salePrice > 100000 || this.deptList.salePrice < 1) {
 						this.$api.msg('单价输入错误')
 						return
 					}
-					if (this.deptList.unitPrice.indexOf('.') != -1) {
-						if (this.deptList.unitPrice.split('.')[1].length > 2) {
+					if (this.deptList.salePrice.indexOf('.') != -1) {
+						if (this.deptList.salePrice.split('.')[1].length > 2) {
 							this.$api.msg('单价输入错误')
 							return
 						}
@@ -484,7 +454,14 @@
 					this.$api.msg('卖方手机号不能为空')
 					return
 				}
-
+				if (this.deptList.sellerPhone.length!=11) {
+					this.$api.msg('卖方手机号输入错误')
+					return
+				}
+				if(!this.verifyCode){
+					this.$api.msg('验证码不能为空')
+					return
+				}
 				if (this.checked == false) {
 					if (this.deptList.waterContent && this.deptList.waterContent < 1 ||
 						this.deptList.waterContent && this.deptList.waterContent > 40) {
@@ -558,50 +535,67 @@
 						}
 					}
 				}
-				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"
+				var that=this
 				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"
-				this.$api.doRequest('post', '/salePlanInfo/api/insertSalePlanInfo', this
-						.insertSalePlanInfo).then(res => {
+				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
+						phone: this.deptList.sellerPhone,
+						verifyCode: this.verifyCode
+					}).then(res => {
 						if (res.data.code == 200) {
-							uni.showToast({
-								title: "发布成功",
-								icon: 'none',
-							})
-							// setTimeout(() => {
-							// 	uni.navigateBack({})
-							// }, 1000)
-							this.deptList = {}
-							uni.navigateTo({
-								url: `/pages/release/release`
-							})
+							that.$api.doRequest('post', '/salePlanInfo/api/insertSalePlanInfo', that.insertSalePlanInfo).then(res => {
+									if (res.data.code == 200) {
+										uni.showToast({
+											title: "发布成功",
+											icon: 'none',
+										})
+										// setTimeout(() => {
+										// 	uni.navigateBack({})
+										// }, 1000)
+										that.deptList = {}
+										uni.navigateTo({
+											url: `/pages/release/release`
+										})
+									} else {
+										uni.showToast({
+											title: res.data.message,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+							
+								})
+								.catch(res => {
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none',
+										duration: 2000
+									})
+								});
 						} else {
 							uni.showToast({
 								title: res.data.message,
 								icon: 'none',
 								duration: 2000
 							})
+							return
 						}
-
 					})
 					.catch(res => {
 						uni.showToast({
-							title: res.errmsg,
+							title: res.data.message,
 							icon: 'none',
 							duration: 2000
 						})
+						return
 					});
+				// this.insertProcurementPlanInfo = this.deptList
+				// this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
+				// this.insertProcurementPlanInfo.commonId = this.userInfo.id
+				// this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 			},
 			liChange(e) {
 				this.liIndex = e.detail.value
@@ -692,19 +686,16 @@
 		-webkit-box-direction: normal;
 		-webkit-flex-direction: column;
 		flex-direction: column;
-		color: #AFB3BF;
 		line-height: 40rpx;
 		text-align: right;
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
-
 	.buyup {
 		background-color: #FFFFFF;
 		border-radius: 20px;
 		margin-top: 10px;
 	}
-
 	.buylow {
 		background-color: #FFFFFF;
 		border-radius: 20px;
@@ -717,7 +708,6 @@
 		background-color: #22C572;
 		color: #FFFFFF;
 	}
-
 	.validate {
 		width: 100px;
 		height: 32px;
@@ -738,11 +728,9 @@
 		height: 30px;
 		line-height: 30px;
 	}
-	
 	.getcode.active {
 		border: none;
 	}
-	
 	.getcode.active {
 		background: #22C572;
 		color: #fff;

pages/business/business.vue

@@ -43,11 +43,11 @@
 					</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
+					<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.procurementPrice}}<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
+					<view class='price' v-if='item.salePlanType=="现货"'>{{item.salePrice}}<text
 						style='font-size:13px;color:#333;'>元/吨</text></view>
 				</view>
 				<view class='flex justify-between'>

pages/release/release.vue

@@ -11,7 +11,7 @@
 						<view class="status">
 							<view v-if='item.status=="已驳回"' class='put2'>未通过</view>
 							<view v-if='item.status=="待审核"' class='put1'>审核中</view>
-							<view v-if='item.status=="已认证"' class='put'>已通过</view>
+							<view v-if='item.status=="已通过"' class='put'>已通过</view>
 						</view>
 					</view>
 					<view class="address">{{item.privates}}{{item.city}}{{item.Area}}</view>
@@ -28,8 +28,8 @@
 				<hr style="margin: 16px 0; color: #EEEEEE;">
 				<view class="flex" style="right: 10px;">
 					<view @click='edit(item)' v-if='item.status!="待审核"' class='anniu'>编辑</view>
-					<view class='anniu' @click="switch1(item)" v-if="item.showFlag == 0">隐藏</view>
-					<view class='anniu' @click="switch1(item)" v-if="item.showFlag == 1">显示</view>
+					<view class='anniu' @click="switch1(item)" v-if="item.showFlag == 0">显示</view>
+					<view class='anniu' @click="switch1(item)" v-if="item.showFlag == 1">隐藏</view>
 					<view class='anniu' @click="deleteRelease(item)">删除</view>
 				</view>
 			</view>
@@ -76,9 +76,9 @@
 				if (item.type == "买粮") {
 					var that = this
 					var tips
-					if (item.showFlag == 0) {
+					if (item.showFlag == 1) {
 						tips = "隐藏后该信息不再展示给其他用户，是否确定隐藏？"
-					} else if (item.showFlag == 1) {
+					} else if (item.showFlag == 0) {
 						tips = "确定显示该信息？"
 					}
 					uni.showModal({
@@ -94,9 +94,9 @@
 									}).then(res => {
 										// this.procurementPlanInfos = res.data.data.records
 										if (res.data.message == "Success") {
-											if (item.showFlag == 0) {
+											if (item.showFlag == 1) {
 												that.$api.msg('隐藏成功！')
-											} else if (item.showFlag == 1) {
+											} else if (item.showFlag == 0) {
 												that.$api.msg('显示成功！')
 											}
 											that.getList()
@@ -118,9 +118,9 @@
 				} else if (item.type == "卖粮") {
 					var that = this
 					var tips
-					if (item.showFlag == 0) {
+					if (item.showFlag == 1) {
 						tips = "隐藏后该信息不再展示给其他用户，是否确定隐藏？"
-					} else if (item.showFlag == 1) {
+					} else if (item.showFlag == 0) {
 						tips = "确定显示该信息？"
 					}
 					uni.showModal({
@@ -135,9 +135,9 @@
 									}).then(res => {
 										// this.procurementPlanInfos = res.data.data.records
 										if (res.data.message == "Success") {
-											if (item.showFlag == 0) {
+											if (item.showFlag == 1) {
 												that.$api.msg('隐藏成功！')
-											} else if (item.showFlag == 1) {
+											} else if (item.showFlag == 0) {
 												that.$api.msg('显示成功！')
 											}
 											that.getList()
@@ -171,6 +171,7 @@
 			deleteRelease(item) {
 				var that = this
 				if (item.type == "买粮") {
+					var that = this
 					uni.showModal({
 						// title: '登录提示',
 						content: '确定删除该信息？',