前端小程序 sdy

pageA/product/business_sale.vue

@@ -2,13 +2,13 @@
 	<view class="center">
 		<view class="transaction">
 			
-		<view  class="c-row">
+		<view  class="c-row b-b">
 			<view class="title">买方</view>
 			<view class="con-list">
 			<view class="title">{{purchaseOrder.buyer}}</view>
 			</view>
 		</view>
-		<view  class="c-row b-b">
+		<view  class="c-row">
 			<view class="title">卖方</view>
 			<view class="con-list">
 				<!-- <view v-if='goods.customerTypeFlag==1' class="title" @click="liang">{{purchaseOrder.customer?purchaseOrder.customer:goods.customerName}}></view>
@@ -43,7 +43,7 @@
 			<text>{{purchaseOrder.minimumVolume}}</text>
 			</view>
 		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row">
+		<view  v-if="purchaseOrder.salePlanType=='期货'" class="c-row">
 			<view  class="title">今日基差（元/吨）</view>
 			<view class="con-list">
 				<view class="picker">
@@ -94,25 +94,25 @@
 			<textarea maxlength="-1" v-model='purchaseOrder.baggingNotes' placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包" class="textareas"></textarea>
 			</view>
 		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" 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" @input='someprice' v-model="purchaseOrder.pointPrice"></input>
 			</view>
 		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" 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 disabled placeholder="请填写发票费用" name="input" @input='someprice' v-model="purchaseOrder.invoiceFee"></input>
 			</view>
 		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" 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" @input='someprice' v-model="purchaseOrder.packingFee"></input>
 		</view>
 		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class=" align-start ">
+		<view  v-if="purchaseOrder.salePlanType=='期货'" class=" align-start ">
 			<view class="titles">结算价格</view>
 			<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
 			<view class="con-list">
@@ -219,18 +219,20 @@
 				this.purchaseOrder.planId=options.id
 				this.purchaseOrder.seller = options.seller
 				this.purchaseOrder.goodsName = options.goodsName
-				this.purchaseOrder.receivePrivate = options.receivePrivate
-				this.purchaseOrder.receiveCity = options.receiveCity
-				this.purchaseOrder.receiveArea = options.receiveArea
+				this.purchaseOrder.sendPrivate = options.sendPrivate
+				this.purchaseOrder.sendCity = options.sendCity
+				this.purchaseOrder.sendArea = options.sendArea
 				this.purchaseOrder.minimumVolume = options.minimumVolume
 				this.purchaseOrder.buyer = options.buyer
 				this.purchaseOrder.customer = options.customerName
 				this.purchaseOrder.basis = options.basisPrice
-				this.purchaseOrder.unitPrice = options.unitPrice
+				this.purchaseOrder.salePrice = options.salePrice
 				this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
 				this.purchaseOrder.settlementPrice = options.basisPrice
-				this.purchaseOrder.procurementPlanType = options.procurementPlanType
+				this.purchaseOrder.salePlanType = options.salePlanType
 				this.purchaseOrder.procurementPlan=options.procurementPlan
+				this.purchaseOrder.baggingNotes=options.baggingNotes
+				this.purchaseOrder.sendWarehouse = options.sendWarehouse
 			},
 			computed: {
 				...mapState(['hasLogin','userInfo']),
@@ -257,17 +259,17 @@
 						&receivePrivate=${this.purchaseOrder.receivePrivate}&receiveCity=${this.purchaseOrder.receiveCity}
 						&receiveArea=${this.purchaseOrder.receiveArea}&minimumVolume=${this.purchaseOrder.minimumVolume}
 						&buyer=${this.purchaseOrder.buyer}&basisPrice=${this.purchaseOrder.basis}&unitPrice=${this.purchaseOrder.unitPrice}
-						&receiveWarehouse=${this.purchaseOrder.receiveWarehouse}&procurementPlanType=${this.purchaseOrder.procurementPlanType}
+						&receiveWarehouse=${this.purchaseOrder.receiveWarehouse}&salePlanType=${this.purchaseOrder.salePlanType}
 						&procurementPlanNo=${this.purchaseOrder.procurementPlan}`
 					})
 				},
 				commit(){
 					if(!this.purchaseOrder.transactionsNumber){
-						this.$api.msg('出售价格不能为空')
+						this.$api.msg('采购数量不能为空')
 						return
 					}
 					if(this.purchaseOrder.transactionsNumber>10000||this.purchaseOrder.transactionsNumber<1){
-						this.$api.msg('出售数量输入错误')
+						this.$api.msg('采购数量输入错误')
 						return
 					}
 					if(!this.purchaseOrder.pointPrice){
@@ -284,7 +286,7 @@
 							return
 						}
 					}
-					if(this.purchaseOrder.packingFee>0||this.purchaseOrder.packingFee<-2000){
+					if(this.purchaseOrder.packingFee>0||this.purchaseOrder.packingFee<= 2000){
 						this.$api.msg('包装费输入错误')
 						return
 					}
@@ -306,35 +308,35 @@
 					}
 					var that=this
 					this.purchaseOrder.pcFlag=0
-					uni.showModal({
-						content: '订单提交后将发送给买方，是否确定提交？',
-						success: function (res) {
-							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
-										})
-										// uni.navigateBack();
-									}else{
-										uni.showToast({
-											title: '提交失败：'+res.data.message,
-											icon: 'none',
-											duration: 2000
-										})
-									}
-								}).catch(res => {
-									uni.showToast({
-										title: res.data.message,
-										icon: 'none',
-										duration: 2000
-									})
-								})
-							}
-						}
-					})
+					// uni.showModal({
+					// 	content: '订单提交后将发送给买方，是否确定提交？',
+					// 	success: function (res) {
+					// 		if (res.confirm) {
+					// 			that.$api.doRequest('post','  ', that.purchaseOrder).then(res => {
+					// 				if(res.data.code==200){
+					// 					uni.showToast({
+					// 						title: '提交成功，等待买方回复',
+					// 						icon: 'none',
+					// 						duration: 2000
+					// 					})
+					// 					// uni.navigateBack();
+					// 				}else{
+					// 					uni.showToast({
+					// 						title: '提交失败：'+res.data.message,
+					// 						icon: 'none',
+					// 						duration: 2000
+					// 					})
+					// 				}
+					// 			}).catch(res => {
+					// 				uni.showToast({
+					// 					title: res.data.message,
+					// 					icon: 'none',
+					// 					duration: 2000
+					// 				})
+					// 			})
+					// 		}
+					// 	}
+					// })
 				},
 				someprice(e){
 					if(this.purchaseOrder.pointPrice&&this.purchaseOrder.invoiceFee&&this.purchaseOrder.packingFee){

pageA/product/sales_detail.vue

@@ -400,7 +400,7 @@
 								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}`
+										&salePlanType=${this.goods.salePlanType}&salePlanNo=${this.goods.salePlanNo}&baggingNotes=${this.goods.baggingNotes}`
 							// 	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}

pageB/contract/contract.vue

@@ -3,12 +3,13 @@
 		<view v-for="(item , index) in lists" :Key="index" class="region">
 			<view>
 				<view class="c-row ">
-					<text class="tit">采购</text>
+					<text class="tit">{{item.orderType}}</text>
 					<view class="enterprise">
 						编号{{item.contractNo}}{{item.procurementPlanType}}
 					</view>
+					<text class="status">{{item.status}}</text>
 				</view>
-				<text>{{item.status}}</text>
+				
 			</view>
 			<view>
 				<view class="c-row ">
@@ -29,28 +30,29 @@
 				<text class="anniu1" @click="commit1(item)"> 发货</text>
 				<text class="anniu1" @click="commit2(item)"> 收货</text>
 			</view>
-
 		</view>
 		<view v-if='pricestatus' class='shade'>
 			<view class='shade-content'>
-				<view class='shade-content-item'>
-					<input v-model='price' placeholder="请输入点价价格" type="number">元/吨
+				<view class="titles1">点价</view>
+				<view class='shade-content-item flex'>
+					<input v-model='price' placeholder="请输入点价价格" type="number" class="pointprice">
+					<text style="font-size: 16px; color: #AFB3BF;margin-top: -3px;">元/吨</text>
 				</view>
-				<view>
-					<button style='width:50%;display:inline-block;' @click='pricestatus=false'>取消</button>
-					<button style='width:50%;display:inline-block;' @click='amendprice'>确定</button>
+				<view class="flex">
+					<view class="btns btn1" @click='pricestatus=false'>取消</view>
+					<view class="btns btn2" @click='amendprice'>确定</view>
 				</view>
 			</view>
 		</view>
 		<view v-if='shadestatus' class='shade'>
 			<view class='shade-content'>
 				<view class='shade-content-item'>
-					<view>请于以下时间段进行点价操作：</view>
-					<view>11：30 ~ 12：30</view>
-					<view>14：19 ~ 20：00</view>
-					<view>23：00 ~ 08：00</view>
+					<view class="titles">请于以下时间段进行点价操作：</view>
+					<view class="timeslot">11：30 ~ 12：30</view>
+					<view class="timeslot">15：20 ~ 20：00</view>
+					<view class="timeslot">23：00 ~ 08：00</view>
 				</view>
-				<button style='width:50%;display:inline-block;' @click='shadestatus=false'>取消</button>
+				<view  class="cancel" @click='shadestatus=false'>知道了</view>
 			</view>
 		</view>
 		<view class="padding flex flex-direction">
@@ -103,7 +105,6 @@
 					driverNoImg1: '',
 					carNoImg: '',
 					carNoImg1: ''
-
 				},
 				id: 0,
 				PageCur: "trust",
@@ -111,7 +112,6 @@
 				priceTypeIndex: -1,
 				priceType: ['库内价', '到库价', '到港价'],
 				unitPrice: 0,
-				price: 0,
 				seller: '',
 				sellerPhone: '',
 				minSale: '',
@@ -399,7 +399,6 @@
 							this.$api.msg('请填写验证码');
 							return;
 						}
-
 						if (!that.price) {
 							that.$api.msg('请选择价格类型')
 							return
@@ -537,7 +536,6 @@
 								uni.requestSubscribeMessage({
 									tmplIds: ['8cVkckXi_8zfHeScXRHhjN6cgZFYYCWIMPDTiPWagXY'], // 
 									success(res) {
-										console.log(res)
 										if (res['8cVkckXi_8zfHeScXRHhjN6cgZFYYCWIMPDTiPWagXY'] ==
 											"accept") { // 字段就是tmplIds模板id
 											uni.showLoading({
@@ -549,7 +547,6 @@
 													failres => {
 														uni.hideLoading()
 														that.$api.msg(failres.errmsg);
-
 													}).then(res => {
 													uni.hideLoading()
 													uni.showModal({
@@ -569,7 +566,6 @@
 													failres => {
 														uni.hideLoading()
 														that.$api.msg(failres.errmsg);
-
 													}).then(res => {
 													uni.hideLoading()
 													uni.showModal({
@@ -603,7 +599,6 @@
 													})
 													// that.$api.prePage().refreshList(data, that.manageType);
 												})
-
 											} else if (that.TabCur == 3) {
 												that.$api.request('tran', 'addCarDriver', that.tran,
 													failres => {
@@ -623,9 +618,7 @@
 													})
 													// that.$api.prePage().refreshList(data, that.manageType);
 												})
-
 											}
-
 										}
 									}
 								})
@@ -718,6 +711,7 @@
 		width: 100%;
 		background: rgba(0, 0, 0, 0.5);
 		height: 100%;
+		
 		z-index: 999999;
 	}
 
@@ -726,6 +720,7 @@
 		position: absolute;
 		top: 50%;
 		left: 50%;
+		border-radius: 20px;
 		transform: translateX(-50%) translateY(-50%);
 		z-index: 999999;
 		text-align: center;
@@ -812,8 +807,7 @@
 		width: 50px;
 		font-size: 16px;
 		border: 1px solid #CDCDCD;
-		border-radius: 15px;
-		/* margin-left: 20px; */
+		border-radius: 12px;
 		position: relative;
 		margin-right: 10px;
 		text-align: center;
@@ -825,10 +819,63 @@
 		border: 1px solid #22C572;
 		border-radius: 15px;
 		color: #22C572;
-		/* margin-left: 20px; */
 		position: relative;
 		margin-right: 10px;
 		text-align: center;
 		line-height: 30px;
 	}
+	.titles{
+		color: #333333;
+		font-size: 16px;
+		font-weight: 600;
+		margin-top: -16px;
+		margin-bottom: 10px;
+		
+	}
+	.timeslot{
+		font-size: 14px;
+		color: #333333;
+		height: 20px;
+	}
+	.cancel{
+		text-align: center;
+		width: 100%;
+		color:#22C572;
+		border-top: 1px solid #EEEEEE;
+		margin-bottom: 6px;
+		font-size: 18px;
+		line-height: 40px;
+		display:inline-block;
+		}
+		.pointprice{
+			border-bottom: 1px solid #EEEEEE;
+			text-align: left;
+			padding-left: 10px;
+			width: 70%;
+			margin: 0 auto;
+		}
+		.titles1{
+			color: #333333;
+			font-size: 16px;
+			font-weight: 600;
+			margin-top: 10px;
+		}
+		.btns{
+			width: 50%;
+			line-height: 50px;
+			font-size: 18px;
+			border-top: 1px solid #EEEEEE;
+			margin-top: -20px;
+		}
+		.btn1{
+			color: #AFB3BF;
+			border-right: 1px solid #EEEEEE;
+		}
+		.btn2{
+			color: #22C572;
+		}
+		.status{
+			right: 20px;
+			position: absolute;
+		}
 </style>

pageD/identity/companyIdentity.vue

@@ -117,7 +117,6 @@
 					}
 					this.identityAuthenticationInfo.customerTypeFlag = "2"
 					this.identityAuthenticationInfo.customerType = "企业"
-					this.identityAuthenticationInfo.businessLicenseAddressUrl = this.businessLicenseAddressUrl
 					var model = JSON.stringify(this.identityAuthenticationInfo);
 					uni.navigateTo({
 						url: `/pageD/identity/companyIdentityTwo?identityAuthenticationInfo=` + model,
@@ -174,8 +173,7 @@
 							success(res) {
 								var data = res.data
 								var strToObj = JSON.parse(data)
-								that.identityAuthenticationInfo.businessLicenseAddressUrl = strToObj
-									.url
+								that.identityAuthenticationInfo.businessLicenseAddressUrl = strToObj.url
 								that.license1 = strToObj.url
 								that.certificates = false
 							}
@@ -183,53 +181,53 @@
 					}
 				})
 			},
-			// idUp(){
-			// 	var that = this
-			// 	wx.chooseImage({
-			// 		success: function(res) {
-			// 			wx.uploadFile({
-			// 				url: 'https://www.zthymaoyi.com/upload/admin',
-			// 				filePath: res.tempFilePaths[0],
-			// 				name: 'file',
-			// 				success(res) {
-			// 					var data = res.data
-			// 					var strToObj = JSON.parse(data)			
-			// 					that.id[0] = strToObj.url
-			// 					that.id1 = strToObj.url
-			// 					that.identityImgs1.personImg = strToObj.url
-			// 					that.$api.doRequest('get', '/driverViewInfo/personShibie', that.identityImgs1).then(res => {
-			// 						that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
-			// 						that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
-			// 					}).catch(res => {
-			// 						uni.showToast({
-			// 							title: res.data.message,
-			// 							icon: 'none',
-			// 							duration: 2000
-			// 						})
-			// 					})
-			// 				}
-			// 			})
-			// 		}
-			// 	})
-			// },
-			// idLow(){
-			// 	var that = this
-			// 	wx.chooseImage({
-			// 		success: function(res) {
-			// 			wx.uploadFile({
-			// 				url: 'https://www.zthymaoyi.com/upload/admin',
-			// 				filePath: res.tempFilePaths[0],
-			// 				name: 'file',
-			// 				success(res) {
-			// 					var data = res.data
-			// 					var strToObj = JSON.parse(data)			
-			// 					that.id[1] = strToObj.url
-			// 					that.id2 = strToObj.url
-			// 				}
-			// 			})
-			// 		}
-			// 	})
-			// },
+			idUp(){
+				var that = this
+				wx.chooseImage({
+					success: function(res) {
+						wx.uploadFile({
+							url: 'https://www.zthymaoyi.com/upload/admin',
+							filePath: res.tempFilePaths[0],
+							name: 'file',
+							success(res) {
+								var data = res.data
+								var strToObj = JSON.parse(data)			
+								that.id[0] = strToObj.url
+								that.id1 = strToObj.url
+								that.identityImgs1.personImg = strToObj.url
+								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.identityImgs1).then(res => {
+									that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
+									that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
+							}
+						})
+					}
+				})
+			},
+			idLow(){
+				var that = this
+				wx.chooseImage({
+					success: function(res) {
+						wx.uploadFile({
+							url: 'https://www.zthymaoyi.com/upload/admin',
+							filePath: res.tempFilePaths[0],
+							name: 'file',
+							success(res) {
+								var data = res.data
+								var strToObj = JSON.parse(data)			
+								that.id[1] = strToObj.url
+								that.id2 = strToObj.url
+							}
+						})
+					}
+				})
+			},
 			phoneinput(e) {
 				if (e.detail.value.length == 11) {
 					this.codestatus = true

pageD/identity/companyIdentityEdit.vue

@@ -18,7 +18,7 @@
 					<input placeholder="请填写公司名称" name="input" v-model="deptList.compName"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">纳税人识别号</text>
 				<view class="con-list">
 				<input placeholder="请填写纳税人识别号" name="input" v-model="deptList.payTaxesCard"></input>
@@ -43,7 +43,7 @@
 					<input placeholder="请填写姓名" name="input" v-model="deptList.customerName"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
 					<input placeholder="请填写身份证号" name="input"

pageD/identity/companyIdentityLook.vue

@@ -100,13 +100,13 @@
 					{{deptList.customerPhone}}
 				</view>
 			</view>
-			<view class="c-row b-b" v-if="deptList.customerTypeFlag == 2">
+			<view class="c-row " v-if="deptList.customerTypeFlag == 2">
 				<text class="tit">公司地址</text>
 				<view class="con-list">
 					{{deptList.compAddress}}
 				</view>
 			</view>
-			<view class="c-row b-b" v-if="deptList.customerTypeFlag == 1">
+			<view class="c-row" v-if="deptList.customerTypeFlag == 1">
 				<text class="tit">联系地址</text>
 				<view class="con-list">
 					<input placeholder="请填写联系地址" name="input" v-model="deptList.compAddress"></input>
@@ -162,14 +162,12 @@
 								this.id = this.deptList.cardAddressUrl.split(",")
 								this.idup = this.id[0]
 								this.idlow = this.id[1]
-								console.log(this.id,"fdsfdfsfgdsds")
 							}
 							if(this.deptList.payeeAddressUrl != ""){
 								this.payeeAddress = this.deptList.payeeAddressUrl.split(","),
 							this.bank1 = this.payeeAddress[0]
 							this.bank2 = this.payeeAddress[1]
 							}
-							console.log(this.businessmanbusinessman,"langshang")
 						})
 						.catch(res => {
 							uni.showToast({

pageD/identity/companyIdentityThree.vue

@@ -118,7 +118,6 @@
 		},
 		onLoad(options) {
 			this.identityAuthenticationInfo = JSON.parse(options.identityAuthenticationInfo)
-			console.log(this.identityAuthenticationInfo)
 		},
 		methods: {
 			bankUp() {
@@ -227,7 +226,6 @@
 			
 				this.identityAuthenticationInfo.commonId = this.userInfo.id
 				this.identityAuthenticationInfo.payeeAddressUrl = this.bankid.toString()
-
 				this.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this
 						.identityAuthenticationInfo)
 					.then(res => {

pageD/identity/driverIdentityEdit.vue

@@ -110,12 +110,10 @@
 				 <image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image> 
 				 <texe>添加车辆</texe>
 				 </button>
-
-		
 		<!-- 账户信息 -->
 		<view class="information">
 			<view class="c-row">
-				<text class="tit">账户信息</text>
+				<text class="tit" style="line-height: 36px;">账户信息</text>
 				<view class="con-list">
 					<image v-bind:src="openuser" class="open" openuserboolean @click="openuserclick"></image>
 				</view>
@@ -766,7 +764,11 @@
 	.open {
 		width: 30px;
 		height: 20px;
+		position: absolute;
+		right: 20px;
+		margin-top: -10px;
 	}
+	
 	.add{
 		width: 26px;
 		height: 26px;

pageD/identity/driverIdentityLook.vue

@@ -332,7 +332,11 @@
 	.open {
 		width: 30px;
 		height: 20px;
+		position: absolute;
+		right: 20px;
+		margin-top: -10px;
 	}
+	
 	.information {
 		margin-top: 10px;
 		width: 100%;

pageD/identity/driverIdentityTwo.vue

@@ -5,7 +5,7 @@
 			<view class="c-row">
 				<text class="tit">货车信息</text>
 				<view class="con-list">
-					<image v-bind:src="opencar" class="open" opencarboolean @click="opencarclick"></image>
+					<image v-bind:src="opencar" class="open" opencarboolean @click="opencarclick" ></image>
 				</view>
 			</view>
 		</view>
@@ -388,6 +388,9 @@
 	.open {
 		width: 30px;
 		height: 20px;
+		position: absolute;
+		right: 20px;
+		margin-top: -10px;
 	}
 
 	.information {

pages/attestation/index.vue

@@ -387,7 +387,7 @@
 		width: 90%;
 		height: 200px;
 		margin: 0 auto;
-		position: fixed;
+		position: absolute;
 	}
 
 	.arrows1 {

pages/attestation/indexThree.vue

@@ -6,11 +6,7 @@
 					粮商
 				</view>
 				<view class="company">{{item.driverName}}</view>
-				<view class="geren">{{item.driverPhone}}</view>
-				<!-- <view class = "company" v-if="item.customerTypeFlag == 1">{{item.customerName}}</view>
-				<view class = "geren" v-if="item.customerTypeFlag == 1">  {{item.customerPhone}}</view>
-				<view class = "geren" v-if="item.customerTypeFlag == 2">{{item.customerName}}    {{item.customerPhone}}</view> -->
-
+				
 				<view class="status" v-if="item.authenticationStatus == '已认证'">
 					<image src="../../static/img/authentication/cert-personal@3x.png"
 						style="width: 16px;height: 16px;top:3px;"></image>
@@ -26,11 +22,12 @@
 					{{item.authenticationStatus}}
 				</view>
 			</view>
+			<view class="geren">{{item.driverPhone}}</view>
 			<hr style="margin: 10px 0;">
 			<view class="flex">
 				<view class="yuan">
 					<image src="../../static/img/authentication/selected(2).png"
-						style="width: 16px;height: 16px;top: 3px;">设置默认</image>
+						style="width: 16px;height: 16px;top: 3px;">设为默认</image>
 				</view>
 				<view class='but' @click="open(item)">更换手机号</view>
 				<view class='but' @click="companyEdit(item)">修改</view>
@@ -46,7 +43,7 @@
 						<input v-model='price' placeholder="请输入手机号" type="number" class="tainput">
 					</view>
 					<view>
-						<!-- 	<view style='width:50%;display:inline-block;' @click='pricestatus=false'>取消</view>
+						<!--<view style='width:50%;display:inline-block;' @click='pricestatus=false'>取消</view>
 						<view style='width:50%;display:inline-block;' @click='amendprice'>确定</view> -->
 						<view class="determine" @click="getcode">
 							获取验证码
@@ -54,7 +51,7 @@
 					</view>
 				</view>
 			</view>
-			<!-- 	//填写验证码 -->
+			<!-- 填写验证码 -->
 			<view v-if='pricestatusTwo' class='shade'>
 				<view class='shade-content'>
 					<view class="titel">
@@ -101,6 +98,7 @@
 				price: "",
 				verifyCode: "",
 				sendText: "60s后重发",
+				id:"",
 			}
 		},
 		computed: {
@@ -110,7 +108,8 @@
 			this.getList()
 		},
 		methods: {
-			open() {
+			open(item) {
+				this.id = item.id
 				this.pricestatus = !this.pricestatus
 			},
 
@@ -128,10 +127,7 @@
 						flag: 0
 					}, 'application/json;charset=UTF-8').then(res => {
 						console.log("成功连接")
-
 						this.drivers = res.data.data.records
-
-						console.log(this.drivers, "skalkdkk")
 					})
 					.catch(res => {
 						uni.showToast({
@@ -142,26 +138,22 @@
 					});
 			},
 			amendprice(item) {
-				console.log(item.id, "判断id是否正确")
 				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
 						phone: this.price,
 						verifyCode: this.verifyCode
 					}).then(res => {
 						if (res.data.code == 200) {
-							console.log(item.id, "判断id")
 							this.$api.doRequest('post', '/driverViewInfo/api/editInfo', {
 									driverPhone: this.price,
-									id: item.id,
+									id: this.id,
 									commonId: this.userInfo.id
 								}, 'application/json;charset=UTF-8').then(res => {
-									console.log("手机号修改成功")
 									if (res.data.code == 200) {
-										uni.switchTab({
+										uni.navigateTo({
 											url: '/pages/attestation/indexThree'
 										});
 										this.$api.msg('修改成功！')
 									}
-									console.log("执行完毕")
 								})
 								.catch(res => {
 									uni.showToast({
@@ -179,9 +171,7 @@
 						}
 					})
 					.catch(res => {
-						console.log(res.data.message),
 							uni.showToast({
-
 								title: res.data.message,
 								icon: 'none',
 								duration: 2000
@@ -189,6 +179,14 @@
 					});
 			},
 			getcode() {
+				if (!this.price) {
+					this.$api.msg('请填写手机号')
+					return
+				}
+				if (this.price.length != 11 ) {
+					this.$api.msg('请正确填写手机号')
+					return
+				}
 				this.pricestatusTwo = !this.pricestatusTwo
 				var that = this
 				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.price)) {
@@ -301,8 +299,8 @@
 	.geren {
 		color: #AFB3BF;
 		font-size: 14px;
-		margin-top: 34px;
-		margin-left: -10px;
+		 margin-top: -10px;
+		 margin-left: 45px; 
 	}
 
 	.infos {
@@ -428,7 +426,7 @@
 		top: 0;
 		left: 0;
 		width: 100%;
-		background: rgba(0, 0, 0, 0.5);
+		background: rgba(0, 0, 0, 0.1);
 		height: 100%;
 		z-index: 999999;
 	}
@@ -494,7 +492,6 @@
 		padding-left: 10px;
 		margin: 0 auto;
 		text-align: left;
-		/* 	border-bottom: 1px solid #AFB3BF; */
 		border-radius: 3px;
 	}
 </style>

pages/attestation/indexTwo.vue

@@ -7,35 +7,34 @@
 				</view>
 				<view class="company">{{item.compName}}</view>
 				<view class="company" v-if="item.customerTypeFlag == 1">{{item.customerName}}</view>
-				<view class="geren" v-if="item.customerTypeFlag == 1"> {{item.customerPhone}}</view>
-				<view class="geren" v-if="item.customerTypeFlag == 2">{{item.customerName}} {{item.customerPhone}}
-				</view>
 				<view class="status" v-if="item.authenticationStatus == '已认证'">
 					<image src="../../static/img/authentication/cert-personal@3x.png"
 						style="width: 16px;height: 16px;top:3px;"></image>
 					{{item.authenticationStatus}}
 				</view>
-				<view class="status1" v-if="item.authenticationStatus == '审核中'">
-					{{item.authenticationStatus}}
-				</view>
-				<view class="status2" v-if="item.authenticationStatus == '未通过'">
-					{{item.authenticationStatus}}
-				</view>
-				<view class="status3" v-if="item.authenticationStatus == '已覆盖'">
-					{{item.authenticationStatus}}
+				  <view class="status1" v-if="item.authenticationStatus == '审核中'">
+				  	{{item.authenticationStatus}}
+				  </view>
+				  <view class="status2" v-if="item.authenticationStatus == '未通过'">
+				  	{{item.authenticationStatus}}
+				  </view>
+				  <view class="status3" v-if="item.authenticationStatus == '已覆盖'">
+				  	{{item.authenticationStatus}}
+				  </view>			
 				</view>
+				<view class="geren" v-if="item.customerTypeFlag == 1"> {{item.customerPhone}}</view>
+				<view class="geren" v-if="item.customerTypeFlag == 2">{{item.customerName}}{{item.customerPhone}}	
 			</view>
 			<hr style="margin: 10px 0;">
 			<view class="flex">
-				<view class=" yuan">
+				<view class="yuan">
 					<image src="../../static/img/authentication/selected(2).png"
-						style="width: 16px;height: 16px;top: 3px;">设置默认</image>
+						style="width: 16px;height: 16px;top: 3px;">设为默认</image>
 				</view>
-				<view class=' but' @click="open(item)">更换手机号</view>
-				<view class=' but' @click="companyEdit(item)">修改</view>
-				<view class=' but' @click="deleteLS(item)">删除</view>
+				<view class='but' @click="open(item)">更换手机号</view>
+				<view class='but' @click="companyEdit(item)">修改</view>
+				<view class='but' @click="deleteLS(item)">删除</view>
 			</view>
-
 			<view v-if='pricestatus' class='shade'>
 				<view class='shade-content'>
 					<view class="titel">
@@ -77,8 +76,6 @@
 					</view>
 				</view>
 			</view>
-
-
 		</view>
 		<button class="btn btns" @click="Add">新增</button>
 	</view>
@@ -100,6 +97,8 @@
 				price: "",
 				sendText: "60s后重发",
 				verifyCode: "",
+				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
+				id:"",
 			}
 		},
 		computed: {
@@ -110,17 +109,18 @@
 		},
 		methods: {
 			nextstep() {
-				// if (!this.price) {
-				// 	this.$api.msg('请填写手机号')
-				// 	return
-				// }
-				// if (this.price.length != 11 ) {
-				// 	this.$api.msg('请正确填写手机号')
-				// 	return
-				// }
-				this.pricestatusTwo = !this.pricestatusTwo
+				if (!this.price) {
+					this.$api.msg('请填写手机号')
+					return
+				}
+				if (this.price.length != 11 ) {
+					this.$api.msg('请正确填写手机号')
+					return
+				}
+				// this.pricestatusTwo = !this.pricestatusTwo
 			},
-			open() {
+			open(item) {
+				this.id = item.id
 				this.pricestatus = !this.pricestatus
 			},
 
@@ -155,16 +155,15 @@
 						if (res.data.code == 200) {
 							this.$api.doRequest('post', '/identityAuthenticationInfo/api/modifyIdentityPhone', {
 									customerPhone: this.price,
-									id: item.id,
+									id: this.id,
 									commonId: this.userInfo.id
 								}, 'application/json;charset=UTF-8').then(res => {
 									if (res.data.code == 200) {
-										uni.switchTab({
+										uni.navigateTo({
 											url: '/pages/attestation/indexTwo'
 										});
 										this.$api.msg('修改成功！')
-									}
-									
+									}				
 								})
 								.catch(res => {
 									uni.showToast({
@@ -185,7 +184,6 @@
 						}
 					})
 					.catch(res => {
-						console.log(res.data.message),
 							uni.showToast({
 
 								title: res.data.message,
@@ -195,6 +193,14 @@
 					});
 			},
 			getcode() {
+				if (!this.price) {
+					this.$api.msg('请填写手机号')
+					return
+				}
+				if (this.price.length != 11 ) {
+					this.$api.msg('请正确填写手机号')
+					return
+				}
 				this.pricestatusTwo = !this.pricestatusTwo
 				var that = this
 				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.price)) {
@@ -308,8 +314,8 @@
 	.geren {
 		color: #AFB3BF;
 		font-size: 14px;
-		margin-top: 34px;
-		margin-left: -54px;
+		margin-top: -10px;
+		margin-left: 46px;
 	}
 
 	.infos {
@@ -363,7 +369,6 @@
 		margin-top: 10px;
 		padding: 10px 10px;
 		border-radius: 16px;
-
 	}
 
 	.status {
@@ -421,7 +426,6 @@
 		text-align: center;
 		height: 121px;
 		padding: 35px 10px;
-
 	}
 
 	.shade {
@@ -429,7 +433,7 @@
 		top: 0;
 		left: 0;
 		width: 100%;
-		background: rgba(0, 0, 0, 0.5);
+		background: rgba(0, 0, 0, 0.1);
 		height: 100%;
 		z-index: 999999;
 	}
@@ -459,7 +463,6 @@
 		text-align: left;
 		border-bottom: 1px solid #AFB3BF;
 		border-radius: 3px;
-
 	}
 
 	.tainput1 {

pages/business/business.vue

@@ -148,7 +148,7 @@
 			},
 			tabcarchange(status) {
 				this.TabCur = status
-				this.pageSize = 1
+				this.pageSize = 10
 				this.loadData()
 			},
 			naviageToPage(page) {

pages/release/release.vue

@@ -72,12 +72,10 @@
 			}
 		},
 		onLoad(){
-			console.log("release.vue onload")
 			this.getList()
 		},
 		methods: {
 			switch1(item){
-				console.log(125489)
 				// if (!this.hasLogin) {
 					uni.showModal({
 						// title: '登录提示',
@@ -155,7 +153,6 @@
 						url: `/pageD/myRelease/buyGrain`
 					})
 				}
-			
 			},
 			details(item){
 				uni.navigateTo({
@@ -166,8 +163,6 @@
 				// this.procurementPlanInfo.pcFlag = "1"
 				this.$api.doRequest('get','/procurementPlanInfo/selectProcurementPlanInfo',this.procurementPlanInfo).then(res => {		
 					this.procurementPlanInfos = res.data.data.records
-					console.log(this.procurementPlanInfos,"对象")
-					
 				})
 				.catch(res => {
 					uni.showToast({