前端gjy

config/index.js

@@ -1,6 +1,7 @@
 const dev = {
-	// baseUrl: 'http://127.0.0.1:8080',
+	// baseUrl: 'http://192.168.1.120:8090/',
 	baseUrl: 'https://www.zthymaoyi.com',
+	baseUrlNew: 'http://192.168.1.120:8090/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

main.js

@@ -99,6 +99,7 @@ const request = (_gp, _mt, data = {}, failCallback) => {
 			userInfo = uni.getStorageSync('userInfo')
 		}
 		let accessToken = userInfo ? userInfo.accessToken : ''
+		// let baseUrl = 'http://192.168.1.120:8090/'
 		let baseUrl = config.def().baseUrl
 		uni.request({
 			url: baseUrl + '/m.api',
@@ -176,7 +177,7 @@ const request = (_gp, _mt, data = {}, failCallback) => {
 const doRequest = (method, url, data)=> {
 	console.log(method,url,data)
 	// let baseUrl = config.def().baseUrl
-	let baseUrl = 'http://192.168.1.120:8090/'
+	let baseUrl = config.def().baseUrlNew
         // 如果data为空
         if (!data) var data = []
         var arr = []
@@ -190,7 +191,7 @@ const doRequest = (method, url, data)=> {
                 data: arr[0],
                 // data:data
                 header: {
-                    'content-type': 'application/x-www-form-urlencoded'
+                    'content-type': 'application/json'
                 },
                 success: function(result) {
                     // resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑

pageA/product/detail.vue

@@ -1,34 +1,32 @@
 <template>
 	<view class="container">
+		<view class="back-btn cuIcon-back" @click="navBack"></view>
+		<view class='title1'>采购详情</view>
+		<image style='width:100%;' src='../../static/img/jiaoyi/bg@3x.png'></image>
 		<view class="introduce-section">
-			<view class="price-box">
-				<view class="title">{{goods.title}}</view>
-				<view  v-if='goods.isFutures==0' class="title-tip">
-					<text class="price-tip">¥</text>
-					<text class="price">{{goods.price}}</text>
-					<text class="price-tip">元/吨</text>
-				</view>
-				<view  v-else class="title-tip">
-					<text class="price-tip">今日基差</text>
-					<text class="price-tip">¥</text>
-					<text class="price-tip">{{goods.basis}}</text>
-					<text class="price-tip">元/吨</text>
+			<view style='height:70px;'>
+				<view class="title">{{goods.title}}(元/吨)</view>
+				<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.unitPrice}}</text>
+					</view>
+					<view style='text-align:right;'  v-else class="title-tip">
+						{{goods.basisPrice}}
+					</view>
 				</view>
+				<view style='text-align:right;' v-if='goods.procurementPlanType=="现货"'>采购价格</view>
+				<view style='text-align:right;' v-if='goods.procurementPlanType=="期货"'>今日基差</view>
 			</view>
-			<view class="bot-row">
+			<!-- <view class="bot-row">
 				<view v-if='goods.companyId==2' class='cu-tag radius line-orange'>佳屹农</view>
 				<view v-else class='cu-tag radius line-orange'>易粮易运</view>
 				<view v-if='goods.sellerPhone && goods.companyId!=2' class='cu-tag radius line-orange' >{{goods.sellerPhone}}</view>
-				<!-- <view class='cu-tag radius line-orange'>{{goods.basis}}元/吨</view> -->
 			</view>
-			<!-- <view v-if='goods.companyId==2' class="bot-row">
-				<view class='cu-tag radius line-orange'>大袋{{goods.basisBig}}</view>
-				<view class='cu-tag radius line-orange'>小袋装{{goods.basisSmall}}</view>
-			</view> -->
 			<view v-if='goods.companyId!=2' class="bot-row">
 				<view class='cu-tag radius line-orange'>剩余量: {{goods.total - goods.soldCount}}吨</view>
 				<view class='cu-tag radius line-orange'>总量: {{goods.total}}吨</view>
-			</view>
+			</view> -->
 		</view>
 		<view v-if="goods.storeImg" class="carousel-section">
 			<swiper autoplay="true" interval="3000" duration="500" class="carousel" circular @change="swiperChange">
@@ -53,140 +51,154 @@
 			<view class="d-header">
 				<text>基本信息</text>
 			</view>
-			 <view class="c-list">
-				<view class="c-row b-b">
-					<text class="tit">品种</text>
+			<view class="c-list">
+				<view class="c-row">
+					<text class="tit">货名</text>
 					<view class="con-list">
 						<text>{{goods.goodsName}}</text>
 					</view>
 				</view>
-				<view  v-if='goods.companyId!=2' class="c-row b-b">
-					<text class="tit">产地</text>
+				<view class="c-row">
+					<text class="tit">采购量（吨）</text>
 					<view class="con-list">
-						<text>{{goods.origin}}</text>
+						<text>{{goods.plannedPurchaseVolume}}</text>
 					</view>
 				</view>
-				<view  v-if='goods.companyId!=2' class="c-row b-b">
-					<text class="tit">国标等级</text>
+				<view class="c-row">
+					<text class="tit">最小成交量（吨）</text>
 					<view class="con-list">
-						<text>{{goods.level}}</text>
+						<text>{{goods.minimumVolume}}</text>
 					</view>
 				</view>
-				<view  v-if='goods.companyId!=2' class="c-row b-b">
-					<text class="tit">年份</text>
+				<view class="c-row">
+					<text class="tit">类型</text>
 					<view class="con-list">
-						<text>{{goods.year}}</text>
+						<text>{{goods.procurementPlanType}}</text>
 					</view>
 				</view>
-				<view v-if='goods.companyId!=2' class="c-row b-b">
-					<text class="tit">包装方式</text>
+				<view class="c-row">
+					<text class="tit">价格类型</text>
 					<view class="con-list">
-						<text>{{goods.packing}}</text>
+						<text>{{goods.priceType}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">最小成交量</text>
+				<view class="c-row">
+					<text class="tit">收货地区</text>
 					<view class="con-list">
-						<text>{{goods.minSale}}(吨)</text>
+						<text>{{goods.receivePrivate}}{{goods.receiveCity}}{{goods.receiveArea}}</text>
 					</view>
 				</view>
-				<view v-if='goods.isFutures==0' class="c-row b-b">
-					<text class="tit">剩余量</text>
+				<view class="c-row">
+					<text class="tit">运费承担方</text>
 					<view class="con-list">
-						<text>{{numFilter(goods.total-goods.soldCount)}}</text>
+						<text>{{goods.freightPayer}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">价格类型</text>
+				<view class="c-row">
+					<text class="tit">包装方式</text>
 					<view class="con-list">
-						<text>{{goods.priceType}}</text>
+						<text>{{goods.packingType}}</text>
+					</view>
+				</view>
+				<view class="c-row">
+					<text class="tit">袋装备注</text>
+					<view class="con-list">
+						<text>{{goods.baggingNotes}}</text>
+					</view>
+				</view>
+				<view class="c-row">
+					<text class="tit">买方</text>
+					<view class="con-list">
+						<text>{{goods.buyer}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">库存地</text>
+				<view class="c-row">
+					<text class="tit">买方电话</text>
 					<view class="con-list">
-						<text>{{goods.stock}}</text>
+						<view>{{goods.buyerPhone}} <a :href="'tel:'+goods.buyerPhone"><image style='width:11px;height:11px;' src='../../static/img/jiaoyi/gengduo1@3x.png'></image></a></view>
 					</view>
 				</view>
 			</view>
+		</view>
+		<view class="detail-desc">
 			<view class="d-header">
-				<text>粮食指标</text>
+				<text>货物要求</text>
 			</view>
 			<view class="c-list">
-				<view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">杂质（%）{{'<='}}</text>
+				<view class="c-row">
+					<text class="tit">水分（%）{{'<='}} </text>
 					<view class="con-list">
-						<text>{{goods.impurity}}</text>
+						<text>{{goods.waterContent}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">生霉粒（%）{{'<='}}</text>
+				<view class="c-row">
+					<text class="tit">容重（g/L）{{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.moldy}}</text>
+						<text>{{goods.bulkDensity}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">容重（g/L）{{'<='}}</text>
+				<view class="c-row">
+					<text class="tit">热损伤（%）{{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.bulkDensity}}</text>
+						<text>{{goods.jiaorenli}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">气味、色泽</text>
+				<view class="c-row">
+					<text class="tit">杂质（%）{{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.smell}}</text>
+						<text>{{goods.impurity}}</text>
 					</view>
 				</view>
-				<!-- <view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">热损（%）{{'<='}}</text>
+				<view class="c-row">
+					<text class="tit">霉变粒（%）{{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.heatLoss}}</text>
+						<text>{{goods.mildewGrain}}</text>
 					</view>
-				</view> -->
-				<view class="c-row b-b">
-					<text class="tit">水分（%）{{'<='}} </text>
+				</view>
+				<view class="c-row">
+					<text class="tit">不完善粒（%）{{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.waterContent}}</text>
+						<text>{{goods.imperfectGrain}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="大豆"' class="c-row b-b">
+				<view class="c-row">
 					<text class="tit">蛋白（%）{{'>='}} </text>
 					<view class="con-list">
 						<text>{{goods.protein}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="大豆"' class="c-row b-b">
+				<view class="c-row">
 					<text class="tit">粒型</text>
 					<view class="con-list">
-						<text>{{goods.grainType}}</text>
+						<text>{{goods.grain}}</text>
+					</view>
+				</view>
+				<view class="c-row">
+					<text class="tit">品级</text>
+					<view class="con-list">
+						<text>{{goods.grade}}</text>
 					</view>
 				</view>
-				<view v-if="goods.userName1" class="c-row b-b">
-					<text class="tit">价格</text>
+				<view class="c-row">
+					<text class="tit">产地</text>
 					<view class="con-list">
-						<input placeholder="请填写" name="input" v-model="price" @input="priceInput"></input>
+						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
 					</view>
-					<button class='cu-btn bg-green shadow' @click="changePrice">修改价格</button>
 				</view>
-				<view v-if="goods.userName1" class="c-row b-b">
-					<text class="tit">备注</text>
+				<view class="c-row">
+					<text class="tit">产出年份</text>
 					<view class="con-list">
-						<input placeholder="请填写" name="input" v-model="reason" @input="reasonInput"></input>
+						<text>{{goods.outputYear}}</text>
 					</view>
-					<button class='cu-btn bg-red shadow' @click="endSale">终止销售</button>
+				</view>
 				</view>
 			</view>
-			 <view v-if="goods.userName" class="padding-xl" @click="navToDetailPage()">
-			 		<button class="cu-btn block line-orange lg">
-			 	     <text  class="cuIcon-upload"></text> 上传图片</button>
-			 </view>
-		</view>
 		<!-- 底部操作菜单 -->
-		<view class="page-bottom">
-			<view class="action-btn-group">
-				<button type="primary" class=" action-btn no-border buy-now-btn" @click="contactUs">联系我们</button>
-				<button v-if="goods.status == 1" type="primary" class=" action-btn no-border add-cart-btn" >交易结束</button>
-				<button v-else type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">我要买粮</button>
+		<view class="page-bottom1">
+			<view>
+				<button type="primary" @click="contactUs">联系我们</button>
+				<button v-if="goods.pcFlag == 1" type="primary" class=" action-btn no-border add-cart-btn" >立即卖粮</button>
+				<button v-else type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">立即发车</button>
 			</view>
 		</view>
 	</view>
@@ -247,21 +259,21 @@
 				title: '正在加载',
 				mask:true
 			})
-			that.$api.request('goods', 'getSaleDetailInfo', {
-				id: options.id
-			}, failres => {
-				that.$api.msg(failres.errmsg)
-				uni.hideLoading()
-			}).then(res => {
-				console.log(res.data)
-				that.goods = res.data
-				that.swiperLength = 3
-				if(that.goods.soldCount >= that.goods.total){
-					that.goods.status = 1
-				}
-				that.share.title = that.goods.title
+			this.$api.doRequest('get', '/procurementPlanInfo/getProcurementPlan',{id:options.id}).then(res => {
 				uni.hideLoading()
+				this.goods=res.data.data
 			})
+			
+			// .then(res => {
+			// 	console.log(res.data)
+			// 	that.goods = res.data
+			// 	that.swiperLength = 3
+			// 	if(that.goods.soldCount >= that.goods.total){
+			// 		that.goods.status = 1
+			// 	}
+			// 	that.share.title = that.goods.title
+			// 	uni.hideLoading()
+			// })
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo'])
@@ -411,8 +423,16 @@
 
 
 <style lang='scss'>
+	.title1{
+		position:absolute;
+		left:50%;
+		transform: translateX(-50%);
+		top: 40upx;
+		z-index:9999;
+		color:#fff;
+	}
 	page {
-		background: $page-color-base;
+		background: #F5F6FA;
 		/* padding-bottom: 160upx; */
 	}
 	.container{
@@ -647,34 +667,22 @@
 	.detail-desc {
 		background: #fff;
 		margin-top: 16upx;
-		width: 750upx;
-
+		margin:10px;
+		position:relative;
+		z-index:4;
+		border-radius:5px;
 		.d-header {
 			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 80upx;
+			padding:10px;
 			font-size: $font-base + 2upx;
 			color: $font-color-dark;
 			position: relative;
-
+			border-bottom:1px solid #EEEEEE;
 			text {
 				padding: 0 20upx;
-				background: #fff;
 				position: relative;
 				z-index: 1;
 			}
-
-			&:after {
-				position: absolute;
-				left: 50%;
-				top: 50%;
-				transform: translateX(-50%);
-				width: 300upx;
-				height: 0;
-				content: '';
-				border-bottom: 1px solid #ccc;
-			}
 		}
 	}
 
@@ -886,20 +894,30 @@
 	}
 
 	/* 底部操作菜单 */
-	.page-bottom {
+	.page-bottom1 {
 		position: fixed;
-		left: 30upx;
-		bottom: 30upx;
+		left: 0;
+		bottom: 0;
 		z-index: 95;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		width: 690upx;
-		height: 100upx;
+		width:100%;
+		height: 70px;
 		background: rgba(255, 255, 255, .9);
-		box-shadow: 0 0 20upx 0 rgba(0, 0, 0, .5);
-		border-radius: 16upx;
-
+		padding:15px;
+		border-radius: 0;
+		text-align:right;
+		button{
+			display:inline-block;
+			border-radius:18px;
+			margin:0 10px;
+			font-size:14px;background:#fff;
+			color:#333;
+			border:1px solid #333;
+		}
+		.action-btn{
+			background:#22C572;
+			color:#fff;
+			border:1px solid #22C572;
+		}
 		.p-b-btn {
 			display: flex;
 			flex-direction: column;
@@ -950,14 +968,19 @@
 	/* 销售信息 */
 	.introduce-section {
 		background: #fff;
-		padding: 20upx 30upx;
-		padding-bottom: 100upx;
+		padding: 30upx 30upx;
+		position:relative;
+		margin:10px;
+		padding-bottom:25px;
+		margin-top:-148px;
+		border-radius:5px;
+		z-index:4;
 		.guess-item {
 			padding-bottom: 20upx;
 			border-bottom: 1px solid #ccc;
 		}
 		.title {
-			font-size: 28upx;
+			font-size: 16px;
 			color: $font-color-dark;
 			font-weight:bold;
 			height: 50upx;
@@ -966,6 +989,7 @@
 		}
 		.title-tip {
 			flex:1.5;
+			color:#FD714F;font-size:30px;
 		}
 		.price-box {
 			display: flex;
@@ -1009,4 +1033,13 @@
 			}
 		}
 	}
+	.back-btn {
+		position: absolute;
+		left: 40upx;
+		z-index: 9999;
+		padding-top: var(--status-bar-height);
+		top: 40upx;
+		font-size: 40upx;
+		color: #fff;
+	}
 </style>

pages.json

@@ -399,7 +399,7 @@
 				{
 					"path": "product/detail",
 					"style": {
-						"navigationBarTitleText": "销售详情"
+						"navigationStyle":"custom"
 					}
 				}, 
 				{