zhongtianhaoyuan 3 anni fa
parent
commit
e73fb805e5

+ 282 - 164
pageB/contract/contract.vue

@@ -1,59 +1,63 @@
 <template>
 <template>
-	<view class="container">
+	<view class="center">
 		<!-- <block v-if="TabCur==2"> -->
 		<!-- <block v-if="TabCur==2"> -->
-		<view v-for="(item , index) in lists" :Key="index">
-			
-		
-		<view class="cu-form-group">
-			<view class="title">采购</view>
-	
-			<text style="margin-left: -30%;">编号{{item.contractNo}}{{item.procurementPlanType}}</text>
-			<text>{{item.status}}</text>
-		</view>
-		<view class="cu-form-group">
-			<view class="title">买方</view>
-			<text style="margin-left: -45%;">{{item.customer}}</text>
-			<text></text>
-		</view>
-		<view class="cu-form-group">
-			<view class="title">{{item.goodsName}}:<text>{{item.goodsName}}</text></view>
-			<view class="title">单价:<text>{{item.unitPrice}}</text></view>
-			<view class="title">基差:<text>{{item.basis}}</text></view>
-		</view>
-		<view class="c-row b-b">
-			<text><button class="cu-btn commit margin-tb-sm lg" style=" width: 75px;height: 25px; margin-left: 15px;"
-					@click="commit">附件</button></text>
-					
-
-			<text><button class="cu-btn commit margin-tb-sm lg" style=" margin-left: 15px; width: 75px;height: 25px;"
-					@click="someprice(item)">点价</button></text>
-					
-					
-			<text><button class="cu-btn commit margin-tb-sm lg" style=" margin-left: 15px; width: 75px;height: 25px;"
-					@click="commit1(item)">发货</button></text>
-					
-		</view>
-		
+		<view v-for="(item , index) in lists" :Key="index" class="region">
+			<view>
+				<view class="c-row ">
+					<text class="tit">采购</text>
+					<view class="enterprise">
+						编号{{item.contractNo}}{{item.procurementPlanType}}
+					</view>
+				</view>
+				<text>{{item.status}}</text>
+			</view>
+			<view>
+				<view class="c-row ">
+					<text class="tit1">买方</text>
+					<view class="enterprise">
+						{{item.customer}}
+					</view>
+				</view>
+			</view>
+			<view class="forList flex">
+				<view class="title">{{item.goodsName}}:<text>{{item.goodsName}}</text></view>
+				<view class="title">单价:¥<text>{{item.unitPrice}}</text></view>
+				<view class="title">基差:¥<text>{{item.basis}}</text></view>
+			</view>
+			<view class="c-row flex annius">
+				<text class="anniu" @click="commit"> 附件</text>
+				<text class="anniu" @click="someprice(item)"> 点价</text>
+				<text class="anniu1" @click="commit1(item)"> 发货</text>
+				<!-- <text><button class="cu-btn commit margin-tb-sm lg"
+						style=" width: 75px;height: 25px; margin-left: 15px;" @click="commit">附件</button></text>
+				<text><button class="cu-btn commit margin-tb-sm lg"
+						style=" margin-left: 15px; width: 75px;height: 25px;"
+						@click="someprice(item)">点价</button></text>
+				<text><button class="cu-btn commit margin-tb-sm lg"
+						style=" margin-left: 15px; width: 75px;height: 25px;" @click="commit1(item)">发货</button></text>
+ -->
+			</view>
+
 		</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>
+		<view v-if='pricestatus' class='shade'>
+			<view class='shade-content'>
+				<view class='shade-content-item'>
+					<input v-model='price' placeholder="请输入点价价格" type="number">元/吨
+				</view>
 				<view>
 				<view>
 					<button style='width:50%;display:inline-block;' @click='pricestatus=false'>取消</button>
 					<button style='width:50%;display:inline-block;' @click='pricestatus=false'>取消</button>
-					<button  style='width:50%;display:inline-block;' @click='amendprice'>确定</button>
+					<button style='width:50%;display:inline-block;' @click='amendprice'>确定</button>
 				</view>
 				</view>
 
 
-        	</view>
-        </view>
+			</view>
+		</view>
 		<view v-if='shadestatus' class='shade'>
 		<view v-if='shadestatus' class='shade'>
 			<view class='shade-content'>
 			<view class='shade-content'>
 				<view class='shade-content-item'>
 				<view class='shade-content-item'>
 					<view>请于以下时间段进行点价操作:</view>
 					<view>请于以下时间段进行点价操作:</view>
-					<view>11:30  ~  12:30</view>
-					<view>15:30  ~  20:00</view>
-					<view>23:00  ~  08:00</view>
+					<view>11:30 ~ 12:30</view>
+					<view>15:30 ~ 20:00</view>
+					<view>23:00 ~ 08:00</view>
 				</view>
 				</view>
 				<button style='width:50%;display:inline-block;' @click='shadestatus=false'>取消</button>
 				<button style='width:50%;display:inline-block;' @click='shadestatus=false'>取消</button>
 			</view>
 			</view>
@@ -66,7 +70,6 @@
 </template>
 </template>
 
 
 <script>
 <script>
-	
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	import {
 	import {
 		mapState
 		mapState
@@ -75,19 +78,19 @@
 		name: "trust",
 		name: "trust",
 		data() {
 		data() {
 			return {
 			return {
-				lists:[],
-				shadestatus:false,
-				pricestatus:false,
+				lists: [],
+				shadestatus: false,
+				pricestatus: false,
 				goods: {
 				goods: {
-					pageSize:10,
-					currentPage:1,
-					id:"41651544",
+					pageSize: 10,
+					currentPage: 1,
+					id: "41651544",
 					// pcFlag : 0,
 					// pcFlag : 0,
 				},
 				},
-				procurementPlanInfo:{
-				     pageSize:10,
-				     currentPage:1
-				    },
+				procurementPlanInfo: {
+					pageSize: 10,
+					currentPage: 1
+				},
 				tran: {
 				tran: {
 					total: 0,
 					total: 0,
 					price: 0,
 					price: 0,
@@ -111,7 +114,7 @@
 					carNoImg1: ''
 					carNoImg1: ''
 
 
 				},
 				},
-				id:0,
+				id: 0,
 				PageCur: "trust",
 				PageCur: "trust",
 				TabCur: 0,
 				TabCur: 0,
 				priceTypeIndex: -1,
 				priceTypeIndex: -1,
@@ -162,89 +165,93 @@
 		// onShow() {
 		// onShow() {
 		// 	this.loadData()
 		// 	this.loadData()
 		// },
 		// },
-		onLoad(){
+		onLoad() {
 			this.getList()
 			this.getList()
 		},
 		},
 		methods: {
 		methods: {
-			amendprice(){
-				this.$api.doRequest('post','/purchaseOrder/api/pointPrice',{id:this.id,unitPrice:Number(this.price)}).then(res => {
-						if(res.data.code==200){
-							this.pricestatus=false
-						}else{
+			amendprice() {
+				this.$api.doRequest('post', '/purchaseOrder/api/pointPrice', {
+						id: this.id,
+						unitPrice: Number(this.price)
+					}).then(res => {
+						if (res.data.code == 200) {
+							this.pricestatus = false
+						} else {
 							uni.showToast({
 							uni.showToast({
-							 title: res.data.message,
-							 icon:'none',
-							 duration: 2000
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
 							})
 							})
 						}
 						}
-				    })
-				    .catch(res => {
-				     uni.showToast({
-				      title: res.errmsg,
-				      icon:'none',
-				      duration: 2000
-				     })
-				    });
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					});
 			},
 			},
-			someprice(item){
-				var time=new Date().getTime()
-				var time1=new Date(new Date(new Date().toLocaleDateString()).getTime()-(1*60*60*1000))
-				var time2=new Date()
+			someprice(item) {
+				var time = new Date().getTime()
+				var time1 = new Date(new Date(new Date().toLocaleDateString()).getTime() - (1 * 60 * 60 * 1000))
+				var time2 = new Date()
 				time2.setHours(8);
 				time2.setHours(8);
 				time2.setMinutes(0);
 				time2.setMinutes(0);
 				time2.setSeconds(0);
 				time2.setSeconds(0);
-				var time3=new Date()
+				var time3 = new Date()
 				time3.setHours(11);
 				time3.setHours(11);
 				time3.setMinutes(30);
 				time3.setMinutes(30);
 				time3.setSeconds(0);
 				time3.setSeconds(0);
-				var time4=new Date()
+				var time4 = new Date()
 				time4.setHours(12);
 				time4.setHours(12);
 				time4.setMinutes(30);
 				time4.setMinutes(30);
 				time4.setSeconds(0);
 				time4.setSeconds(0);
-				var time5=new Date()
+				var time5 = new Date()
 				time5.setHours(15);
 				time5.setHours(15);
 				time5.setMinutes(30);
 				time5.setMinutes(30);
 				time5.setSeconds(0);
 				time5.setSeconds(0);
-				var time6=new Date()
+				var time6 = new Date()
 				time6.setHours(20);
 				time6.setHours(20);
 				time6.setMinutes(0);
 				time6.setMinutes(0);
 				time6.setSeconds(0);
 				time6.setSeconds(0);
-				if(time<time2.getTime()&&time>time1||time<time4.getTime()&&time>time3.getTime()||time<time6.getTime()&&time>time5.getTime()){
-					this.id=item.id
-					this.pricestatus=true
-				}else{
-					this.shadestatus=true
+				if (time < time2.getTime() && time > time1 || time < time4.getTime() && time > time3.getTime() || time <
+					time6.getTime() && time > time5.getTime()) {
+					this.id = item.id
+					this.pricestatus = true
+				} else {
+					this.shadestatus = true
 				}
 				}
 			},
 			},
-			commit1(item){
+			commit1(item) {
 				uni.navigateTo({
 				uni.navigateTo({
 					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}`
 					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}`
 				})
 				})
 			},
 			},
-			getList(){
+			getList() {
 				this.goods.commonId = this.userInfo.id
 				this.goods.commonId = this.userInfo.id
-	
-			this.$api.doRequest('get','/purchaseOrder/selectPurchaseOrder',this.goods).then(res => {
-					if(res.data.code==200){
-						this.lists = res.data.data.records
-					}else{
+
+				this.$api.doRequest('get', '/purchaseOrder/selectPurchaseOrder', this.goods).then(res => {
+						if (res.data.code == 200) {
+							this.lists = res.data.data.records
+						} else {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.catch(res => {
 						uni.showToast({
 						uni.showToast({
-						 title: res.data.message,
-						 icon:'none',
-						 duration: 2000
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
 						})
 						})
-					}
-			    })
-			    .catch(res => {
-			     uni.showToast({
-			      title: res.errmsg,
-			      icon:'none',
-			      duration: 2000
-			     })
-			    });
-			   },
-			
-					
+					});
+			},
+
+
 			ChooseImageCar() {
 			ChooseImageCar() {
 				uni.chooseImage({
 				uni.chooseImage({
 					count: 1, //默认9
 					count: 1, //默认9
@@ -300,7 +307,7 @@
 			// 		}
 			// 		}
 			// 	})
 			// 	})
 			// },
 			// },
-			
+
 			commit11() {
 			commit11() {
 				if (this.hasLogin) {
 				if (this.hasLogin) {
 					uni.showModal({
 					uni.showModal({
@@ -318,8 +325,7 @@
 						fail: () => {},
 						fail: () => {},
 						complete: () => {}
 						complete: () => {}
 					})
 					})
-				} 
-				else {
+				} else {
 					const that = this
 					const that = this
 					if (this.TabCur == 0) {
 					if (this.TabCur == 0) {
 						// if (!that.seller) {
 						// if (!that.seller) {
@@ -634,44 +640,58 @@
 			}
 			}
 		},
 		},
 	}
 	}
-	
-	
-	
 </script>
 </script>
 
 
 <style scoped>
 <style scoped>
+	.center {
+		padding: 10px 20px;
+		background-color: #F5F6FA;
+	}
+
+	.region {
+		background-color: #FFFFFF;
+		border-radius: 20px;
+		margin-top: 10px;
+	}
+
 	.zan-dialog__mask {
 	.zan-dialog__mask {
-	    position: fixed;
-	    top: 0;
-	    left: 0;
-	    right: 0;
-	    bottom: 0;
-	    z-index: 10;
-	    background: rgba(0, 0, 0, 0);   /*设置阴影半透明背景如: background: rgba(0, 0, 0, 0.4);*/
-	    display: none;
-	  }
-	  
-	  .zan-dialog__container {
-	    position: fixed;
-	    bottom: 400rpx;
-	    width: 650rpx;    /*弹窗布局宽*/
-	    height: 350rpx;   /*弹窗布局高,与下面弹出距离transform有关*/
-	    margin-left: 50rpx;
-	    background: #f8f8f8;
-	    transform: translateY(300%);  /*弹框弹出距离,与弹框布局高度有关,如300%表示弹起距离为3倍弹窗高度 */
-	    transition: all 0.4s ease;
-	    z-index: 12;
-	    border-radius: 20rpx;
-	    box-shadow: 0px 3px 3px 2px gainsboro;  /*弹框的悬浮阴影效果,如不需要可注释该行*/
-	  }
-	  
-	  .zan-dialog--show .zan-dialog__container {
-	    transform: translateY(0);
-	  }
-	  
-	  .zan-dialog--show .zan-dialog__mask {
-	    display: block;
-	  }
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 10;
+		background: rgba(0, 0, 0, 0);
+		/*设置阴影半透明背景如: background: rgba(0, 0, 0, 0.4);*/
+		display: none;
+	}
+
+	.zan-dialog__container {
+		position: fixed;
+		bottom: 400rpx;
+		width: 650rpx;
+		/*弹窗布局宽*/
+		height: 350rpx;
+		/*弹窗布局高,与下面弹出距离transform有关*/
+		margin-left: 50rpx;
+		background: #f8f8f8;
+		transform: translateY(300%);
+		/*弹框弹出距离,与弹框布局高度有关,如300%表示弹起距离为3倍弹窗高度 */
+		transition: all 0.4s ease;
+		z-index: 12;
+		border-radius: 20rpx;
+		box-shadow: 0px 3px 3px 2px gainsboro;
+		/*弹框的悬浮阴影效果,如不需要可注释该行*/
+	}
+
+	.zan-dialog--show .zan-dialog__container {
+		transform: translateY(0);
+	}
+
+	.zan-dialog--show .zan-dialog__mask {
+		display: block;
+	}
+
 	.container {
 	.container {
 		padding-bottom: 160rpx;
 		padding-bottom: 160rpx;
 	}
 	}
@@ -694,27 +714,125 @@
 		background: linear-gradient(45deg, #DF331C, #DA611A);
 		background: linear-gradient(45deg, #DF331C, #DA611A);
 		color: #fff;
 		color: #fff;
 	}
 	}
-	.shade{
-		position:fixed;
-		top:0;
-		left:0;
-		width:100%;background:rgba(0,0,0,0.5);
-		height:100%;
-		z-index:999999;
+
+	.shade {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		background: rgba(0, 0, 0, 0.5);
+		height: 100%;
+		z-index: 999999;
 	}
 	}
-	.shade-content{
-		background:#fff;
-		position:absolute;
-		top:50%;
-		left:50%;
+
+	.shade-content {
+		background: #fff;
+		position: absolute;
+		top: 50%;
+		left: 50%;
 		transform: translateX(-50%) translateY(-50%);
 		transform: translateX(-50%) translateY(-50%);
-		z-index:999999;
-		text-align:center;
+		z-index: 999999;
+		text-align: center;
 	}
 	}
-	.shade-content-item{
+
+	.shade-content-item {
 		width: 277px;
 		width: 277px;
-		text-align:center;
-		height:121px;
-		padding:35px 10px;
+		text-align: center;
+		height: 121px;
+		padding: 35px 10px;
+	}
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+		font-size: 14px;
+	}
+
+	.forList {
+		width: 90%;
+		height: 30px;
+		margin: 0 auto;
+		background-color: #F9F9FA;
+		border-radius: 10px;
+	}
+
+	.forList .title {
+		line-height: 30px;
+		margin-left: 20px;
+		color: #9698A2;
+	}
+
+	.tit {
+		width: 34px;
+		height: 24px;
+		background-color: #E9F8F0;
+		color: #22C572;
+		padding: 2px 3px;
+		border-radius: 5px;
+	}
+
+	.tit1 {
+		width: 34px;
+		height: 24px;
+		background-color: #FEECE6;
+		color: #FE6430;
+		padding: 2px 3px;
+		border-radius: 5px;
+	}
+
+	.enterprise {
+		font-size: 16px;
+		font-weight: 600;
+		margin-left: 20px;
+	}
+	.annius{
+		width: 70%;
+	margin-left: 110px;
+	}
+	.anniu{
+		width: 50px;
+		font-size: 16px;
+		border: 1px solid #CDCDCD;
+		border-radius: 15px;
+		/* margin-left: 20px; */
+		position: relative;
+		margin-right: 10px;
+		text-align: center;
+		line-height: 30px;
+	}
+	.anniu1{
+		width: 50px;
+		font-size: 16px;
+		border: 1px solid #22C572;
+		border-radius: 15px;
+		color: #22C572;
+		/* margin-left: 20px; */
+		position: relative;
+		margin-right: 10px;
+		text-align: center;
+		line-height: 30px;
 	}
 	}
 </style>
 </style>

+ 81 - 13
pageB/contract/contract_detail.vue

@@ -1,41 +1,64 @@
 <template>
 <template>
 	<view class="container">
 	<view class="container">
+		<view class="information">
 		<!-- <block v-if="TabCur==2"> -->
 		<!-- <block v-if="TabCur==2"> -->
-			<view class="cu-form-group">
+		<view class="c-row">
+			<view class="title1">发车信息</view>
+			
+		</view>
+			<view class="c-row b-b">
 				<view class="title">派车编号</view>
 				<view class="title">派车编号</view>
-				<input disabled  name="input" v-model="goods.tranCarNo"></input>
+				<view class="con-list">
+					<input disabled  name="input" v-model="goods.tranCarNo"></input>
+				</view>
 			</view>
 			</view>
-			<view class="cu-form-group">
+			<view class="c-row b-b">
 				<view class="title">车牌号</view>
 				<view class="title">车牌号</view>
 				<input maxlength='7' placeholder="请输入车牌号" name="input" v-model="goods.carNo"></input>
 				<input maxlength='7' placeholder="请输入车牌号" name="input" v-model="goods.carNo"></input>
 			</view>
 			</view>
-			<view class="cu-form-group">
+			<view class="c-row b-b">
 				<view class="title">司机手机号</view>
 				<view class="title">司机手机号</view>
+				<view class="con-list">
 				<input  maxlength='11' placeholder="请输入司机身份认证的手机号" name="input" v-model="goods.driverPhone"></input>
 				<input  maxlength='11' placeholder="请输入司机身份认证的手机号" name="input" v-model="goods.driverPhone"></input>
+			  </view>
 			</view>
 			</view>
-			<view class="cu-form-group">
+			<view class="c-row b-b">
 				<view class="title">毛重(吨)</view>
 				<view class="title">毛重(吨)</view>
+				<view class="con-list">
 				<input placeholder="请输入毛重" type="mobile" name="input"  @input="grossWeightchange" v-model="goods.grossWeight"></input>
 				<input placeholder="请输入毛重" type="mobile" name="input"  @input="grossWeightchange" v-model="goods.grossWeight"></input>
 			</view>
 			</view>
-			<view class="cu-form-group">
+			</view>
+			<view class="c-row b-b">
 				<view class="title">皮重(吨)</view>
 				<view class="title">皮重(吨)</view>
+				<view class="con-list">
 				<input placeholder="请输入皮重" type="mobile" name="input"  @input="tarechange" v-model="goods.tare"></input>
 				<input placeholder="请输入皮重" type="mobile" name="input"  @input="tarechange" v-model="goods.tare"></input>
 			</view>
 			</view>
-			<view class="cu-form-group">
+			</view>
+			<view class="c-row b-b">
 				<view class="title">净重(吨)</view>
 				<view class="title">净重(吨)</view>
+				<view class="con-list">
+				<view class="con-list">
 				<input placeholder="自动计算" type="mobile" name="input" v-model="goods.loadNetWeight"></input>
 				<input placeholder="自动计算" type="mobile" name="input" v-model="goods.loadNetWeight"></input>
+				</view>
 			</view>
 			</view>
-			<view class="cu-form-group">
+			</view>
+			<view class="c-row ">
 				<view class="title">发货日期</view>
 				<view class="title">发货日期</view>
+				<view class="con-list">
 				<view @click="show = true">{{goods.sendDateStart!=''?goods.sendDateStart:time}}</view>
 				<view @click="show = true">{{goods.sendDateStart!=''?goods.sendDateStart:time}}</view>
 				<u-picker  :params='params' :default-time='time' @confirm="DateChange" v-model="show" mode="time"></u-picker>
 				<u-picker  :params='params' :default-time='time' @confirm="DateChange" v-model="show" mode="time"></u-picker>
 			</view>
 			</view>
-			<view class="cu-bar bg-white margin-top">
+			</view>
+			
+				
+			</view>
+			<view class="information">
+			<view class="c-row">
 				<view class="action">
 				<view class="action">
 					上传磅单照片
 					上传磅单照片
 				</view>
 				</view>
 			</view>
 			</view>
-			<view class="cu-form-group">
+			<view class="c-row">
 				<view class="grid col-4 grid-square flex-sub">
 				<view class="grid col-4 grid-square flex-sub">
 					<view class="bg-img" v-if="goods.loadPoundImg != ''" @tap="ViewImage" :data-url="goods.loadPoundImg">
 					<view class="bg-img" v-if="goods.loadPoundImg != ''" @tap="ViewImage" :data-url="goods.loadPoundImg">
 					 <image :src="goods.loadPoundImg" mode="aspectFit"></image>
 					 <image :src="goods.loadPoundImg" mode="aspectFit"></image>
@@ -48,9 +71,10 @@
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
-			<view class="padding flex flex-direction">
-				<button class="cu-btn commit margin-tb-sm lg" @click="getList">提交</button>
 			</view>
 			</view>
+			
+				<button class="btn btns" @click="getList">提交</button>
+			
 		<!-- </block> -->
 		<!-- </block> -->
 	</view>
 	</view>
 </template>
 </template>
@@ -392,8 +416,13 @@
 
 
 <style scoped>
 <style scoped>
 	.container{
 	.container{
-		padding-bottom: 160rpx;
+		padding: 10px 10px;
+		background-color: #F5F6FA;
 	}
 	}
+	.title1{
+		font-size: 18px;
+		font-weight: 600;
+		}
 	.cu-form-group input {
 	.cu-form-group input {
 		text-align: right;
 		text-align: right;
 	}
 	}
@@ -409,4 +438,43 @@
 		background: linear-gradient(45deg, #DF331C, #DA611A);
 		background: linear-gradient(45deg, #DF331C, #DA611A);
 		color:#fff;
 		color:#fff;
 	}
 	}
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+		font-size: 14px;
+	}
+	.information{
+		background-color: #FFFFFF;
+		border-radius: 20px;
+		margin-top: 10px;
+	}
+	.btn{
+		margin-top: 10px;
+		border-radius: 25px;
+		background-color: #22C572;
+		border: none;
+		color: #FFFFFF;
+	}
 </style>
 </style>

File diff suppressed because it is too large
+ 149 - 123
pageB/contract/look.vue


+ 0 - 1
pageD/identity/companyIdentity.vue

@@ -290,7 +290,6 @@
 	}
 	}
 	.switchs2{
 	.switchs2{
 		font-size: 20px;
 		font-size: 20px;
-
 		margin-right: 16px;
 		margin-right: 16px;
 	}
 	}
 	.picture{
 	.picture{

+ 103 - 40
pageD/identity/companyIdentityEdit.vue

@@ -1,19 +1,17 @@
 <template>
 <template>
 	<view class="center">
 	<view class="center">
-		<view>
-			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'" alt=""></image>
-			<text>公司</text>
-			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus1==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'" alt=""></image>
-			<text>个人</text>
-
+		<view>	
+			<text @click='consent' v-bind:class="switchs1">公司</text>
+			<text  @click='consent' v-bind:class="switchs2">个人</text>
 		</view>
 		</view>
 		<view v-if="consentStatus == true">
 		<view v-if="consentStatus == true">
 			<view>
 			<view>
-				<button type="default" @click="license">营业执照</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="license1 != ''">
-					<image v-bind:src = "license1" style="width: 100px;height: 100px;"></image>
+				<view style="margin: 0 auto;" v-if="license1 != ''" @click="license">
+					<image v-bind:src = "license1" class="picture"></image>
 				</view>
 				</view>
 			</view>
 			</view>
+			
+			<view class="personalcss">
 			<view class="c-row b-b">
 			<view class="c-row b-b">
 				<text class="tit">公司名称</text>
 				<text class="tit">公司名称</text>
 				<view class="con-list">
 				<view class="con-list">
@@ -26,16 +24,19 @@
 				<input placeholder="请填写纳税人识别号" name="input" v-model="deptList.payTaxesCard"></input>
 				<input placeholder="请填写纳税人识别号" name="input" v-model="deptList.payTaxesCard"></input>
 				</view>
 				</view>
 			</view>
 			</view>
+			</view>
+			
 			<view>
 			<view>
-				<button type="default" @click="idUp">身份证正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="idup != ''">
-					<image v-bind:src = "idup" style="width: 100px;height: 100px;"></image>
+			
+				<view style="margin: 0 auto;" v-if="idup != ''" @click="idUp">
+					<image v-bind:src = "idup" class="picture"></image>
 				</view>
 				</view>
-				<button type="default"  @click="idLow">身份证反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="idlow != ''">
-					<image v-bind:src = "idlow" style="width: 100px;height: 100px;"></image>
+		
+				<view style="margin: 0 auto;" v-if="idlow != ''" @click="idLow">
+					<image v-bind:src = "idlow" class="picture"></image>
 				</view>
 				</view>
 			</view>
 			</view>
+			<view class="personalcss">
 			<view class="c-row b-b">
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
 				<text class="tit">姓名</text>
 				<view class="con-list">
 				<view class="con-list">
@@ -49,16 +50,18 @@
 						v-model="deptList.customerNumberCard"></input>
 						v-model="deptList.customerNumberCard"></input>
 				</view>
 				</view>
 			</view>
 			</view>
+			</view>
 			<view>
 			<view>
-				<button type="default"  @click="bankUp()">银行卡正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank1 != ''">
-					<image v-bind:src = "bank1" style="width: 100px;height: 100px;"></image>
+		
+				<view style="margin: 0 auto;" v-if="bank1 != ''"  @click="bankUp()">
+					<image v-bind:src = "bank1" class="picture"></image>
 				</view>
 				</view>
-				<button type="default" @click="bankLow()">银行卡反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank2 != ''">
-					<image v-bind:src = "bank2" style="width: 100px;height: 100px;"></image>
+
+				<view style="margin: 0 auto;" v-if="bank2 != ''" @click="bankLow()">
+					<image v-bind:src = "bank2" class="picture"></image>
 				</view>
 				</view>
 			</view>
 			</view>
+			<view class="personalcss">
 			<view class="c-row b-b">
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
 				<text class="tit">银行卡号</text>
 				<view class="con-list">
 				<view class="con-list">
@@ -91,17 +94,18 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
+		</view>
 		<view v-else>
 		<view v-else>
 			<view>
 			<view>
-				<button type="default" @click="idUp">上传身份证正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="idup != ''">
-					<image v-bind:src = "idup" style="width: 100px;height: 100px;"></image>
+				<view style="margin: 0 auto;" v-if="idup != ''" @click="idUp">
+					<image v-bind:src = "idup" class="picture"></image>
 				</view>
 				</view>
-				<button type="default" @click="idLow">上传身份证反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="idlow != ''">
-					<image v-bind:src = "idlow" style="width: 100px;height: 100px;"></image>
+						
+				<view style="margin: 0 auto;" v-if="idlow != ''" @click="idLow">
+					<image v-bind:src = "idlow" class="picture"></image>
 				</view>
 				</view>
 			</view>
 			</view>
+			<view class="personalcss">
 			<view class="c-row b-b">
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
 				<text class="tit">姓名</text>
 				<view class="con-list">
 				<view class="con-list">
@@ -115,16 +119,17 @@
 						v-model="deptList.customerNumberCard"></input>
 						v-model="deptList.customerNumberCard"></input>
 				</view>
 				</view>
 			</view>
 			</view>
+			</view>
 			<view>
 			<view>
-				<button type="default" @click="bankUp()">上传银行卡正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank1 != ''">
-					<image v-bind:src = "bank1" style="width: 100px;height: 100px;"></image>
+				<view style="margin: 0 auto;" v-if="bank1 != ''"  @click="bankUp()">
+					<image v-bind:src = "bank1" class="picture"></image>
 				</view>
 				</view>
-				<button type="default" @click="bankLow()">上传银行卡反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank2 != ''">
-					<image v-bind:src = "bank2" style="width: 100px;height: 100px;"></image>
+				
+				<view style="margin: 0 auto;" v-if="bank2 != ''" @click="bankLow()">
+					<image v-bind:src = "bank2" class="picture"></image>
 				</view>
 				</view>
 			</view>
 			</view>
+			<view class="personalcss">
 			<view class="c-row b-b">
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
 				<text class="tit">银行卡号</text>
 				<view class="con-list">
 				<view class="con-list">
@@ -150,7 +155,7 @@
 					<input placeholder="请填写收款人姓名" name="input" v-model="deptList.payeeName"></input>
 					<input placeholder="请填写收款人姓名" name="input" v-model="deptList.payeeName"></input>
 				</view>
 				</view>
 			</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row">
 				<text class="tit">收款人身份证号</text>
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
 				<view class="con-list">
 					<input placeholder="请填写收款身份证号" name="input"
 					<input placeholder="请填写收款身份证号" name="input"
@@ -163,7 +168,7 @@
 				<input placeholder="请填写手机号" @input='phoneinput' v-model="deptList.customerPhone"></input>
 				<input placeholder="请填写手机号" @input='phoneinput' v-model="deptList.customerPhone"></input>
 				</view>
 				</view>
 			</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">联系地址</text>
 				<text class="tit">联系地址</text>
 				<view class="con-list">
 				<view class="con-list">
 					<input placeholder="请填写联系地址" name="input" v-model="deptList.compAddress"></input>
 					<input placeholder="请填写联系地址" name="input" v-model="deptList.compAddress"></input>
@@ -171,9 +176,9 @@
 			</view>
 			</view>
 		
 		
 		</view>
 		</view>
-		<view class="padding flex flex-direction">
-			<button class="cu-btn bg-red margin-tb-sm lg" @click="commitEdit">修改</button>
-		</view>
+</view>
+			<button class="btn btns" @click="commitEdit">修改</button>
+
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -202,7 +207,9 @@
 				bank2:"",
 				bank2:"",
 				bankid:[],
 				bankid:[],
 				payeeAddress:[],
 				payeeAddress:[],
-				commitEdits:{}
+				commitEdits:{},
+				switchs1:"switchs1",
+				switchs2:"switchs2",
 			};
 			};
 		},
 		},
 		onLoad(option) {
 		onLoad(option) {
@@ -341,7 +348,6 @@
 							console.log("成功连接")
 							console.log("成功连接")
 				
 				
 							this.deptList = res.data.data
 							this.deptList = res.data.data
-					console.log(this.deptList)
 							if(this.deptList.businessLicenseAddressUrl != ""){
 							if(this.deptList.businessLicenseAddressUrl != ""){
 								this.license1 = this.deptList.businessLicenseAddressUrl
 								this.license1 = this.deptList.businessLicenseAddressUrl
 							}
 							}
@@ -355,6 +361,18 @@
 							this.bank1 = this.payeeAddress[0]
 							this.bank1 = this.payeeAddress[0]
 							this.bank2 = this.payeeAddress[1]
 							this.bank2 = this.payeeAddress[1]
 							}
 							}
+							console.log(this.deptList.customerTypeFlag,"判断")
+							if(this.deptList.customerTypeFlag == 2){
+								this.consentStatus = true
+								this.consentStatus1 = false
+								this.switchs1 = "switchs1"
+								this.switchs2 = "switchs2"
+							}else{
+								this.consentStatus = false
+								this.consentStatus1 = true
+								this.switchs1 = "switchs2"
+								this.switchs2 = "switchs1"
+							}
 		
 		
 						})
 						})
 						.catch(res => {
 						.catch(res => {
@@ -369,9 +387,13 @@
 				if(this.consentStatus == false && this.consentStatus1 == true){
 				if(this.consentStatus == false && this.consentStatus1 == true){
 					this.consentStatus = true
 					this.consentStatus = true
 					this.consentStatus1 = false
 					this.consentStatus1 = false
+					this.switchs1 = "switchs1"
+					this.switchs2 = "switchs2"
 				}else if(this.consentStatus == true && this.consentStatus1 == false){
 				}else if(this.consentStatus == true && this.consentStatus1 == false){
 					this.consentStatus = false
 					this.consentStatus = false
 					this.consentStatus1 = true
 					this.consentStatus1 = true
+					this.switchs1 = "switchs2"
+					this.switchs2 = "switchs1"
 				}
 				}
 				
 				
 			},
 			},
@@ -413,4 +435,45 @@
 		padding-right: 20rpx;
 		padding-right: 20rpx;
 		font-size: 14px;
 		font-size: 14px;
 	}
 	}
+	.picture{
+		width: 100%;
+		 height: 220px;
+		 text-align: center;
+		 margin-top: 10px;
+	}
+	.fujians{
+		margin: 0 auto;
+		background-color: #FFFFFF;
+		margin-top: 30px;
+		border-radius: 20px;
+		padding: 10px 10px;
+	}
+	.picturebiaoti{
+		font-size: 17px;
+		font-weight: 700;
+	}
+	.personalcss{
+		background-color: #FFFFFF;
+		border-radius: 20px;
+		margin-top: 10px;
+	}
+	.btn {
+		margin-top: 10px;
+		background-color: #FFFFFF;
+		border-radius: 25px;
+		border: none;
+	}
+	
+	.btns {
+		background-color: #22C572;
+	}
+	.switchs1{
+		font-size: 20px;
+		font-weight: 700;
+		margin-right: 16px;
+	}
+	.switchs2{
+		font-size: 20px;
+		margin-right: 16px;
+	}
 </style>
 </style>

+ 2 - 0
pageD/identity/companyIdentityLook.vue

@@ -1,5 +1,6 @@
 <template>
 <template>
 	<view class="center">
 	<view class="center">
+		<view v-if="deptList.customerTypeFlag == 2">
 			<view  class="fujians" v-if="license1 != ''">
 			<view  class="fujians" v-if="license1 != ''">
 				<view class="c-row b-b">
 				<view class="c-row b-b">
 					<text class="picturebiaoti">营业执照</text>			
 					<text class="picturebiaoti">营业执照</text>			
@@ -20,6 +21,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 			</view>
 			</view>
+			</view>
 			<view  class="fujians" v-if="idup != ''">
 			<view  class="fujians" v-if="idup != ''">
 				<view class="c-row b-b">
 				<view class="c-row b-b">
 					<text class="picturebiaoti">身份证正面</text>			
 					<text class="picturebiaoti">身份证正面</text>			

+ 2 - 2
pages.json

@@ -666,13 +666,13 @@
 				{
 				{
 				    "path" : "contract/contract_detail",
 				    "path" : "contract/contract_detail",
 				    "style" : {
 				    "style" : {
-						"navigationBarTitleText": "添加发车信息"
+						"navigationBarTitleText": "添加"
 						}
 						}
 				},
 				},
 				{
 				{
 				    "path" : "contract/contract",
 				    "path" : "contract/contract",
 				    "style" : {
 				    "style" : {
-						"navigationBarTitleText": "合同管理",
+						"navigationBarTitleText": "我的合同",
 						"enablePullDownRefresh": true
 						"enablePullDownRefresh": true
 						}
 						}
 				},{
 				},{

Some files were not shown because too many files changed in this diff