Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

config/index.js

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

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.2",
-    "versionCode" : 112,
+    "versionName" : "1.1.3",
+    "versionCode" : 113,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pageA/product/lookup.vue

@@ -65,13 +65,13 @@
 						<view class='tag1 tag-red radius line-yellow' v-if="TabCur== 1">{{item.plannedSaleVolume}}吨
 						</view>
 					</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货" && TabCur== 0'>
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货" && TabCur== 0'>
 						今日基差</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货" && TabCur== 0'>
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货" && TabCur== 0'>
 						采购价格</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货" && TabCur== 1'>今日基差
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货" && TabCur== 1'>今日基差
 					</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货" && TabCur== 1'>销售价格
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货" && TabCur== 1'>销售价格
 					</view>
 				</view>
 					</view>
@@ -184,10 +184,11 @@
 				}
 			},
 			init() {
-				this.loadDefaultKeyword();
-				this.loadOldKeyword();
-				this.loadHotKeyword();
-
+				if (this.hasLogin) {
+					this.loadDefaultKeyword();
+					this.loadOldKeyword();
+					this.loadHotKeyword();
+				}
 			},
 			search(e) {
 				if (e.detail.value.length == 0) {
@@ -238,6 +239,7 @@
 						searchKeyWord: this.searchKeyWord
 					}).then(res => {
 						uni.hideLoading()
+						console.log("res.data",res.data)
 						this.keywordList = res.data.data.records
 					})
 					.catch(res => {
@@ -759,7 +761,7 @@
 
 	.tag1 {
 		background: #F5F6F9;
-		padding: 5px;
+		padding: 2px;
 		color: #333333;
 		display: inline-flex;
 		font-size: 22rpx;
@@ -802,57 +804,50 @@
 		height: 40px;
 		line-height: 40px;
 		flex: 2.5;
-		border-bottom: 1px solid #EEEEEE;
+		/* border-bottom: 1px solid #EEEEEE; */
 	}
 
 	.introduce-section .address {
 		color: #878C9C;
 		font-size: 12px;
-		padding: 15px 0 10px;
+		/* padding: 15px 0 10px; */
 	}
 
 	.introduce-section .price {
-		padding: 10px 0 10px;
+		/* padding: 10px 0 10px; */
 		color: #FD714F;
 		font-size: 19px;
 		font-weight: 700;
 	}
-
-	/* 销售信息 */
-	.introduce-section {
+	.introduce-section .guess-item {
+		border-radius: 10px;
 		background: #fff;
 		padding: 0upx 30upx 20upx;
-		margin: 10px;
-		border-radius: 4px;
-
-		.guess-item {
-			padding-bottom: 20upx;
-			border-bottom: 1px solid #ccc;
-		}
-
+		margin: 8px;
+		/* border-bottom: 1px solid #ccc; */
+	}
+	/* 销售信息 */
+	.introduce-section {
 		.title-tip {
 			flex: 1;
 		}
-
+	
 		.price-box {
 			display: flex;
 			align-items: baseline;
-			height: 70upx;
-			padding: 10upx 0;
 			font-size: 26upx;
-			color: $uni-color-primary;
 		}
-
+	
 		.price {
 			font-size: $font-lg + 2upx;
 		}
-
+	
 		.m-price {
 			margin: 0 12upx;
 			color: $font-color-light;
 			text-decoration: line-through;
 		}
-
+	
 		.coupon-tip {
 			align-items: center;
 			padding: 4upx 10upx;
@@ -863,14 +858,14 @@
 			line-height: 1;
 			transform: translateY(-4upx);
 		}
-
+	
 		.bot-row {
 			display: flex;
 			align-items: center;
 			height: 50upx;
 			font-size: $font-sm;
 			color: $font-color-light;
-
+	
 			view {
 				flex: 1;
 			}

pageB/contract/collectLook.vue

@@ -46,7 +46,7 @@
 				</view>
 				<view v-if="item.confirmFlag == 1" >
 					<view class="titles">磅单照片</view>
-					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+					<upload class="upload" ref="upload" :action="action"  :max-count="1"
 						:size-type="['compressed']" @on-success="getImgUrl" @on-remove="onRemove"
 						@on-uploaded="isAdd = true" :before-upload="filterFileType"
 						v-if="item.loadPoundImg == null || item.loadPoundImg == '' "></upload>

pageD/identity/companyIdentity.vue

@@ -72,7 +72,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 5M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pageD/identity/companyIdentityEdit.vue

@@ -193,7 +193,7 @@
 
 				radios: 2,
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 2M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pageD/identity/companyIdentityThree.vue

@@ -94,7 +94,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 2M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],
@@ -221,7 +221,7 @@
 
 			},
 			onError(error) {
-				alert(error)
+				// alert(error)
 				console.log('------------error-----------')
 				console.log(error)
 			},

pageD/identity/companyIdentityTwo.vue

@@ -41,7 +41,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 2M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pageD/identity/driverIdentity.vue

@@ -62,7 +62,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 2M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pageD/identity/driverIdentityEdit.vue

@@ -21,25 +21,25 @@
 			</swiper>
 			</view>
 			<view class="personalcss">
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">姓名</text>
 					<view class="con-list">
 						<input placeholder="请填写姓名" name="input" v-model="DriverViewInfo.driverName"></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="DriverViewInfo.numberCard"></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="DriverViewInfo.driverPhone"></input>
 					</view>
 				</view>
-				<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
+				<view style='width:100%;position:relative;padding:10px;' class="flex">
 					<button :class='!sendDisabled?"getcode active":"getcode"' @click='getcode'
 						>{{sendText}}</button>
 					<view style='width:70%;position:relative;margin-left: 200rpx;'>
@@ -54,19 +54,17 @@
 					<text class="tit">常驻城市</text>
 					<view class="con-list">
 						<view @click='regionchange'>{{region}}</view>
-						<u-picker :params='params1' @confirm='regionpicker' mode="region" v-model="show1"></u-picker>
+						<u-picker :params='params1' @confirm='regionpicker' mode="region" v-model="showFlag"></u-picker>
 					</view>
 				</view>
 			</view>
-
-
 		</view>
 		<!-- 车辆信息 -->
-		<view @click="opencarclick" class="information">
+		<view  class="information">
 			<view class="c-row">
 				<text class="tit">货车信息</text>
 				<view class="con-list">
-					<image v-bind:src="opencar" class="icon-up" ></image>
+					<image v-bind:src="opencar" class="icon-up" @click="opencarclick"></image>
 				</view>
 			</view>
 		</view>
@@ -79,27 +77,27 @@
 					</image>
 				</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="item.carNumber"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">车型</text>
 				<picker @change="ModelChange" :value="ModelIndex" :range="ModelType" class="con-list">
 					<view class="picker " v-model="item.carModel">
-						{{ModelIndex>-1?ModelType[ModelIndex]:'请选择车型'}}
+						{{item.carModel?item.carModel:'请选择车型'}}
 					</view>
 				</picker>
 				<!-- </view> -->
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">不含车头车长（米）</text>
 				<picker @change="carLongChange" :value="carLongIndex" :range="carLongType" class="con-list"
 					v-if="carchength">
 					<view class="picker" v-model="item.carLength">
-						{{carLongIndex>-1?carLongType[carLongIndex]:'请选择车长'}}
+						{{item.carLength?item.carLength:'请选择车长'}}
 					</view>
 				</picker>
 
@@ -109,7 +107,7 @@
 				<button v-if="carchength" class='cu-btn bg-green shadow' @click="changeCarChength">填写</button>
 				<button v-else class='cu-btn bg-green shadow' @click="changeCarChength">选择</button>
 			</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="item.carLoad"></input>
@@ -117,9 +115,9 @@
 			</view>
 			<view class="c-row ">
 				<text class="tit">出厂年份</text>
-				<view class="con-list">
-					<view @click='yearchange'>{{item.yearManufacture == null?"请选择出厂年份":item.yearManufacture}}</view>
-					<u-picker :params='params' @confirm='yearpicker($event,index)' v-model="show" mode="time"
+				<view class="con-list" >
+					<view @click="yearchange">{{item.yearManufacture?item.yearManufacture:"请选择出厂年份"}}</view>
+					<u-picker :params='params' @confirm='yearpicker($event,index)' v-model="showYearFlag" mode="time"
 						:start-year="startData" :end-year="endData">
 					</u-picker>
 				</view>
@@ -149,13 +147,13 @@
 					</image>
 				</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="items.accountType"></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="items.payeeAddressUrl" @clisk="bankimg(items)"></input> -->
@@ -166,13 +164,13 @@
 
 				</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="items.bankCard"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">开户行</text>
 
 				<view class="con-list">
@@ -180,13 +178,13 @@
 				</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="items.bankDepositBranch"></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="items.payeeName"></input>
@@ -214,25 +212,25 @@
 		</view>
 		<view v-if='openfujianboolean'>
 			<view class="fujians" v-if="travels != ''" @click="travel">
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="picturebiaoti">行驶证</text>
 				</view>
 				<image v-bind:src="travels" class="picture"></image>
 			</view>
 			<view class="fujians" v-if="drives != ''" @click="drive">
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="picturebiaoti">驾驶证</text>
 				</view>
 				<image v-bind:src="drives" class="picture"></image>
 			</view>
 			<view class="fujians" v-if="operates != ''" @click="operate">
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="picturebiaoti">道路运营证</text>
 				</view>
 				<image v-bind:src="operates" class="picture"></image>
 			</view>
 			<view class="fujians" v-if="practices != ''" @click="practice">
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="picturebiaoti">从业资格证</text>
 				</view>
 				<image v-bind:src="practices" class="picture"></image>
@@ -301,8 +299,8 @@
 				openuserboolean: false,
 				openfujianboolean:false,
 				carchength: true,
-				show: false,
-				show1: false,
+				showYearFlag: false,
+				showFlag: false,
 				opencar: "../../static/img/authentication/down2@3x.png",
 				openuser: "../../static/img/authentication/down2@3x.png",
 				openfujian: "../../static/img/authentication/down2@3x.png",
@@ -319,9 +317,7 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		computed:{
-			yearchange() {
-				this.show = true
-			},
+			
 			startData(){
 				var data = new Date()
 				return data.getFullYear() - 30
@@ -335,8 +331,11 @@
 			this.getList(option.id)
 		},
 		methods: {
+			yearchange() {
+				this.showYearFlag = true
+			},
 			regionchange() {
-				this.show1 = true
+				this.showFlag = true
 			},
 			regionpicker(e) {
 				// this.deptList.outputPrivate = e.province.label
@@ -385,6 +384,7 @@
 				}
 			},
 			opencarclick() {
+				this.showYearFlag = false
 				if (this.opencarboolean == false) {
 					this.opencarboolean = true;
 					this.opencar = "../../static/img/authentication/up2%20(3).png"
@@ -697,7 +697,6 @@
 	}
 	.cardaddress .title{
 		padding:0px 0 10px;
-		border-bottom:1px solid #EEEEEE;
 		margin-bottom:10px;
 	}
 	.swiper-item image{

pageD/identity/driverIdentityLook.vue

@@ -2,31 +2,31 @@
 	<view class="center">
 		<view>
 			<view  class="fujians" v-if="idup != ''">
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="picturebiaoti">身份证正面</text>			
 				</view>
 				<image v-bind:src="idup" class="picture"></image>
 			</view>
 			<view  class="fujians" v-if="idlow != ''">
-				<view class="c-row b-b">
+				<view class="c-row">
 					<text class="picturebiaoti">身份证反面</text>			
 				</view>
 				<image v-bind:src="idlow" class="picture"></image>
 			</view>
 			<view class="personalcss">	
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">姓名</text>
 				<view class="con-list">
 					{{drivers.driverName}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
 					{{drivers.numberCard}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">手机号</text>
 				<view class="con-list">
 					{{drivers.driverPhone}}
@@ -56,31 +56,31 @@
 					<text class="tit">车辆 -{{index+1}}</text>
 					
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">车牌号</text>
 					<view class="con-list">
 						{{item.carNumber}}
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">车型</text>
 					<view class="con-list">
 						{{item.carModel}}
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">不含车头车长（米）</text>
 					<view class="con-list">
 						{{item.carLength}}
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">载重（吨）</text>
 					<view class="con-list">
 						{{item.carLoad}}
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">出厂年份</text>
 					<view class="con-list">
 						{{item.yearManufacture}}
@@ -102,47 +102,47 @@
 		<view class="informations" v-if="openuserboolean == true">
 			<!-- <view class="labels">账户信息</view> -->
 			<view v-for="(items , index) in  drivers.driverPayeeInfoList" :Key="index">
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">账户 - {{index+1}}</text>	
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">账户类型</text>
 					<view class="con-list">
 						{{items.accountType}}
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">银行卡照片</text>
 					<view   class="con-list" @click="bankimgs(index)">
 						<view v-if="items.bankimg.length==0">未上传</view>
 						<image v-for='item in items.bankimg' v-bind:src="item" style="width: 40px; height: 40px;" v-if="items.bankimg.length>0"></image>
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">银行卡号</text>
 					<view class="con-list">
 						{{items.bankCard}}
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">开户行</text>
 					<view class="con-list">
 						{{items.bankDeposit}}
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">开户支行</text>
 					<view class="con-list">
 						{{items.bankDepositBranch}}
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">收款人姓名</text>
 					<view class="con-list">
 						{{items.payeeName}}
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="tit">收款人身份证号</text>
 					<view class="con-list">
 						{{items.payeeNumberCard}}
@@ -163,26 +163,26 @@
 		<view  v-if="openfujianboolean == true">
 
 			<view  class="fujians" v-if="travels != ''">
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="picturebiaoti">行驶证</text>			
 				</view>
 				<image v-bind:src="travels" class="picture"></image>
 			</view>
 
 			<view class="fujians" v-if="drives != ''">
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="picturebiaoti">驾驶证</text>			
 				</view>
 				<image v-bind:src="drives" class="picture"></image>
 			</view>
 			<view class="fujians" v-if="practices != ''">
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="picturebiaoti">道路运营证</text>			
 				</view>
 				<image v-bind:src="practices" class="picture"></image>
 			</view>
 			<view class="fujians" v-if="operates != ''">
-				<view class="c-row b-b">
+				<view class="c-row ">
 					<text class="picturebiaoti">从业资格证</text>			
 				</view>
 				<image v-bind:src="operates" class="picture"></image>
@@ -341,7 +341,7 @@
 		width: 100%;
 		height: 220px;
 		text-align: center;
-		margin-top: 10px;
+		margin-top: 10rpx;
 	}
 	.tit{
 		font-size: 14px;
@@ -353,11 +353,11 @@
 		margin-top: 10px;
 	}
 	.open {
-		width: 30px;
-		height: 20px;
+		width: 30rpx;
+		height: 20rpx;
 		position: absolute;
 		right: 20px;
-		margin-top: -10px;
+		margin-top: -10rpx;
 	}
 	
 	.information {
@@ -375,7 +375,7 @@
 	.fujians{
 		margin: 0 auto;
 		background-color: #FFFFFF;
-		margin-top: 30px;
+		margin-top: 10rpx;
 		border-radius: 20px;
 		padding: 10px 10px;
 	}

pageD/identity/driverIdentityThree.vue

@@ -77,7 +77,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 2M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pageD/identity/driverIdentityTwo.vue

@@ -14,21 +14,23 @@
 			<view class="c-row ">
 				<text class="tit">车辆 -{{index+1}}</text>
 				<view class="con-list">
+					<view>
 					<image src="../../static/img/jiaoyi/shanchu@2x.png" class="eliminate" @click="carDel(index)">
 					</image>
+					</view>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">车牌号</text>
 				<view class="con-list">
-					<input placeholder="请填写车牌号" maxlength = "7" name="input" v-model="item.carNumber"></input>
+					<input placeholder="请填写车牌号" placeholder-style="font-size: 14px;color:#AFB3BF;" maxlength = "7" name="input" v-model="item.carNumber"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">车型</text>
 				<picker @change="ModelChange($event,index)" :value="ModelIndex" :range="ModelType" class="con-list">
 					<view class="picker " v-model="item.carModel">
-						{{carModelType[index] != null?carModelType[index]:'请选择车型'}}
+						{{item.carModel ?item.carModel:'请选择车型'}}
 					</view>
 				</picker>
 			</view>
@@ -37,7 +39,7 @@
 				<picker v-if="carchength" @change="carLongChange($event,index)" :value="carLongIndex"
 					:range="carLongType" class="con-list">
 					<view class="picker" v-model="item.carLength">
-						{{carLengtharr[index] != null?carLengtharr[index]:'请选择车长'}}
+						{{item.carLength?item.carLength:'请选择车长'}}
 					</view>
 				</picker>
 				<view v-else class="con-list">
@@ -49,7 +51,7 @@
 			<view class="c-row b-b">
 				<text class="tit">载重（吨）</text>
 				<view class="con-list">
-					<input placeholder="请填写载重（吨）" name="input" v-model="item.carLoad"></input>
+					<input placeholder="请填写载重（吨）"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="item.carLoad"></input>
 				</view>
 			</view>
 			<view class="c-row ">
@@ -61,16 +63,16 @@
 				</view>
 			</view>
 		</view>
-		<button class="btn" v-if="opencarboolean == true" @click="carAdd">
-			<image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image>
-			<text>添加车辆</text>
+		<button class="btnAdd" v-if="opencarboolean == true" @click="carAdd">
+			<image style='width:16px;height:16px;margin-right:3px;position:relative;top:2px;' src="../../static/img/add@3x.png" mode=""></image>
+			<texe>添加车辆</texe>
 		</button>
 		<!-- 账户信息 -->
 		<view class="information">
 			<view class="c-row">
 				<text class="tit">账户信息</text>
 				<view class="con-list">
-					<image v-bind:src="openuser" class="open" openuserboolean @click="openuserclick"></image>
+						<image v-bind:src="openuser" class="open" openuserboolean @click="openuserclick"></image>
 				</view>
 			</view>
 		</view>
@@ -80,8 +82,10 @@
 			<view class="c-row ">
 				<text class="tit">账户 -{{index+1}}</text>
 				<view class="con-list">
-					<image src="../../static/img/jiaoyi/shanchu@2x.png" class="eliminate" @click="userDel(index)">
-					</image>
+					<view>
+						<image src="../../static/img/jiaoyi/shanchu@2x.png" class="eliminate" @click="userDel(index)">
+						</image>
+					</view>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -105,13 +109,13 @@
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
 				<view class="con-list">
-					<input placeholder="请输入银行卡号" name="input" v-model="items.bankCard"></input>
+					<input placeholder="请输入银行卡号"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="items.bankCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户行</text>
 				<view class="con-list">
-					<input placeholder="请输入开户行" name="input" v-model="items.bankDeposit"></input>
+					<input placeholder="请输入开户行"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="items.bankDeposit"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -123,7 +127,7 @@
 					</view>
 				</picker>
 				<view v-else class="con-list">
-					<input placeholder="请填写开户支行" name="input" v-model="items.bankDepositBranch"></input>
+					<input placeholder="请填写开户支行"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="items.bankDepositBranch"></input>
 				</view>
 				<button v-if="subBranch" class='cu-btn bg-green shadow' @click="subBranchChength">填写</button>
 				<button v-else class='cu-btn bg-green shadow' @click="subBranchChength">识别</button>
@@ -131,25 +135,25 @@
 			<view class="c-row b-b" v-if="items.accountType == '个人账户'"> 
 				<text class="tit">收款人姓名</text>
 				<view class="con-list">
-					<input placeholder="请输入收款人姓名" name="input" v-model="items.payeeName"></input>
+					<input placeholder="请输入收款人姓名"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="items.payeeName"></input>
 				</view>
 			</view>
 			<view class="c-row " v-if="items.accountType == '个人账户'">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
-					<input placeholder="请输入收款人身份证号" name="input" v-model="items.payeeNumberCard"></input>
+					<input placeholder="请输入收款人身份证号"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="items.payeeNumberCard"></input>
 				</view>
 			</view>	
 			<view class="c-row " v-if="items.accountType == '企业账户'">
 				<text class="tit">企业名称</text>
 				<view class="con-list">
-					<input placeholder="请输入企业名称" name="input" v-model="items.compName"></input>
+					<input placeholder="请输入企业名称"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="items.compName"></input>
 				</view>
 			</view>
 		</view>
-		<button class="btn" v-if="openuserboolean == true && this.driverPayeeInfoList.length < 10" @click="userAdd()" >
-			<image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image>
-			<text style="margin-top: -2px;">添加账户</text>
+		<button class="btnAdd" v-if="openuserboolean == true && this.driverPayeeInfoList.length < 10" @click="userAdd()" >
+			<image style='width:16px;height:16px;margin-right:3px;position:relative;top:2px;' src="../../static/img/add@3x.png" mode=""></image>
+			<texe>添加账户</texe>
 		</button>
 		<button class="btns btn" @click="jumpUrl">下一步</button>
 	</view>
@@ -169,8 +173,8 @@
 				openuserboolean: false,
 				driverCarInfoList: [{
 					carNumber: '',
-					carModel: "高栏",
-					carLength: "13",
+					carModel: "",
+					carLength: "",
 					carLoad: "",
 					yearManufacture: "",
 				}],
@@ -225,7 +229,7 @@
 		onLoad(options) {
 			this.DriverViewInfo = JSON.parse(options.DriverViewInfo)
 			this.driverPayeeInfoList[0].payeeName = this.DriverViewInfo.driverName
-				this.driverPayeeInfoList[0].payeeNumberCard = this.DriverViewInfo.numberCard
+			this.driverPayeeInfoList[0].payeeNumberCard = this.DriverViewInfo.numberCard
 		},
 		methods: {
 			subBranchChength(){
@@ -525,9 +529,15 @@
 		margin-top: 10px;
 		background-color: #FFFFFF;
 		border-radius: 25px;
+		font-weight: 550;
+	}
+	
+	.btnAdd {
+		margin-top: 10px;
+		background-color: #FFFFFF;
+		color:#00C265;
 		border: none;
 	}
-
 	.btns {
 		background-color: #22C572;
 		color: white;
@@ -540,8 +550,8 @@
 
 	/* 清除 */
 	.eliminate {
-		width: 20px;
-		height: 20px;
+		width: 15px;
+		height: 15px;
 		float: right;
 	}
 

pageD/warehousings/ex_warehouse.vue

@@ -232,7 +232,7 @@
 				rutypes: '',
 				ruType: ['销售出库', '移库出库', '暂存出库', '贸易服务出库', '采购出库'],
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 5M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				imgUrls: [],
 				binNumber: [],

pageD/warehousings/warehousings.vue

@@ -229,7 +229,7 @@ import upload from '@/components/upload.vue';
 				warehouseIndex1:-1,
 				ruType: ['采购入库', '移库入库', '暂存入库', '贸易服务入库', '退库'],
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024,//限制文件大小 5M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				imgUrls: [],
 				isAdd: true,

pages.json

@@ -22,12 +22,12 @@
 				"selectedIconPath": "static/img/jiaoyi_check.png",
 				"text": "交易"
 			},
-			{
-				"pagePath": "pages/grain_pulse/home",
-				"iconPath": "static/img/liangmai.png",
-				"selectedIconPath": "static/img/liangmai_check.png",
-				"text": "粮脉"
-			},
+			// {
+			// 	"pagePath": "pages/grain_pulse/home",
+			// 	"iconPath": "static/img/liangmai.png",
+			// 	"selectedIconPath": "static/img/liangmai_check.png",
+			// 	"text": "粮脉"
+			// },
 			{
 				"pagePath": "pages/tran/tran",
 				"iconPath": "static/img/wuliu.png",

pages/attestation/index.vue

@@ -1,9 +1,11 @@
 <template>
 	<view class="center">
 		<view class="homePage">
-			<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
-			<view class="title" @click="liangShang">
-				粮商身份
+			<view @click="liangShang">
+				<image src="../../static/img/authentication/bg@2x.png"   class="background"></image>
+				<view class="title" >
+					粮商身份
+				</view>
 			</view>
 			<view class="arrows1" @click="addliangShang">
 				<text style="margin-right: 30px;">新增身份</text>
@@ -13,10 +15,13 @@
 		</view>
 
 		<view class="homePage1">
-			<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
-			<view class="title" @click="siJi">
-				司机身份
+			<view @click="siJi">
+				<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
+				<view class="title" @click="siJi">
+					司机身份
+				</view>
 			</view>
+			
 			<view class="arrows1" @click="addsiJi">
 				<text style="margin-right: 30px;">新增身份</text>
 				<image src="../../static/img/authentication/jiantou@3x.png" class="arrow"></image>

pages/attestation/indexThree.vue

@@ -27,7 +27,6 @@
 				</view>
 			</view>
 			<view class="geren">{{item.driverPhone}}</view>
-			<hr style="margin: 10px 0;">
 			<view class="flex options">
 				<!-- <view class="yuan">
 					<image src="../../static/img/authentication/selected(2).png"
@@ -110,7 +109,7 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
-		onLoad() {
+		onShow() {
 			this.getList()
 		},
 		onPullDownRefresh() {
@@ -382,8 +381,9 @@
 	.geren {
 		color: #AFB3BF;
 		font-size: 14px;
-		 margin-top: -10px;
-		 margin-left: 45px; 
+		margin-top: -10px;
+		margin-left: 45px; 
+		margin-bottom: 20px;
 	}
 
 	.infos {

pages/attestation/indexTwo.vue

@@ -30,11 +30,10 @@
 			<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 flex">
 					<view v-bind:class="defaults1" @click.stop="select(item)" v-if="item.basis == 'false'"></view>
-					<view v-bind:class="defaults2" @click.stop="select(item)" v-if="item.basis == 'true'">√</view>
+					<view v-bind:class="defaults2" @click.stop="select(item)" v-if="item.basis == 'true'">✓</view>
 					<text style="font-size: 12px;" @click.stop="select(item)">设为默认</text>
 				</view>
 				<view class="options flex">
@@ -448,7 +447,8 @@
 <style>
 	.center {
 		padding: 10px 20px;
-		background-color: #F5F6FA;
+		background-color: #eeeeee;
+		height: 2000rpx;
 	}
 
 	.title {
@@ -472,7 +472,8 @@
 	.geren {
 		color: #AFB3BF;
 		font-size: 14px;
-		margin-top: -10px;
+		margin-top: -15px;
+		margin-bottom: 20px;
 		margin-left: 46px;
 	}
 
@@ -493,7 +494,7 @@
 		padding: 0 8px;
 		text-align: center;
 		margin-left: 20px;
-		font-size: 10px;
+		font-size: 14px;
 		font-weight: 500;
 	}
 
@@ -510,16 +511,16 @@
 	}
 
 	.logo {
-		width: 35px;
-		height: 35px;
+		width: 75rpx;
+		height: 75rpx;
 		background-color: #E9F8F0;
 		color: #22C572;
 		text-align: center;
-		line-height: 35px;
-		padding: 0 3px;
-		border-radius: 6px;
+		line-height: 70rpx;
+		padding: 0 4rpx;
+		border-radius: 6rpx;
 		display: inline-block;
-		margin-top: 10px;
+		margin-top: 20rpx;
 	}
 
 	.forList {
@@ -676,7 +677,7 @@
 	.default2 {
 		width: 16px;
 		height: 16px;
-		border: 1px solid #AFB3BF;
+		/* border: 1px solid #AFB3BF; */
 		border-radius: 8px;
 		text-align: center;
 		line-height: 16px;

pages/business/business.vue

@@ -76,13 +76,13 @@
 						<view class='tag1 tag-red radius line-yellow' v-if="TabCur== 1">{{item.plannedSaleVolume}}吨
 						</view>
 					</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货" && TabCur== 0'>
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货" && TabCur== 0'>
 						今日基差</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货" && TabCur== 0'>
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货" && TabCur== 0'>
 						采购价格</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货" && TabCur== 1'>今日基差
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货" && TabCur== 1'>今日基差
 					</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货" && TabCur== 1'>销售价格
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货" && TabCur== 1'>销售价格
 					</view>
 				</view>
 			</view>
@@ -138,6 +138,7 @@
 		},
 		onShow() {
 			uni.showTabBar()
+			uni.hideKeyboard()
 			var userInfo = uni.getStorageSync("userInfo")
 			var that = this
 			console.log("userInfo", userInfo)
@@ -456,7 +457,7 @@
 
 	.tag1 {
 		background: #F5F6F9;
-		padding: 5px;
+		padding: 2px;
 		color: #333333;
 		display: inline-flex;
 		font-size: 22rpx;
@@ -749,17 +750,17 @@
 		height: 40px;
 		line-height: 40px;
 		flex: 2.5;
-		border-bottom: 1px solid #EEEEEE;
+		/* border-bottom: 1px solid #EEEEEE; */
 	}
 
 	.introduce-section .address {
 		color: #878C9C;
 		font-size: 12px;
-		padding: 10px 0 10px;
+		/* padding-left:10px; */
 	}
 
 	.introduce-section .price {
-		padding: 10px 0 10px;
+		/* padding-left:10px; */
 		color: #FD714F;
 		font-size: 19px;
 		font-weight: 700;

pages/grain_pulse/enter.vue

@@ -120,7 +120,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false,
 				isAdd: true,
 				uploadOptions: {

pages/grain_pulse/errorcorrection.vue

@@ -32,7 +32,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 5M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pages/grain_pulse/jubao.vue

@@ -32,7 +32,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 5M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pages/sale/information.vue

@@ -32,13 +32,13 @@
 				<view class='Regular' style='color:#B2B3BB;' @click='more("/pages/sale/plant")'>更多</view>
 			</view>
 			<swiper class="screen-swiper header-swiper" :autoplay="true" interval="6000" duration="500" :circular="true"
-				:acceleration="true" style="min-height: 380px;">
+				:acceleration="true" style="min-height: 650rpx;">
 				<swiper-item class="" v-for="(item1,index) in factoryPriceData.list" :key="index">
-					<view class='Semibold guess-section-wrap-item clearfix' v-for='(item,index1) in item1' :key="index1">
+					<view class=' guess-section-wrap-item clearfix' v-for='(item,index1) in item1' :key="index1">
 						<view class='factory'>{{item.factory}}</view>
 						<view class='wrap'>{{item.city}} {{item.factoryType}}</view>
 						<view class='price'>
-							<text class='currectprice NumberBold'>{{item.price}}</text>
+							<text class='currectprice '>{{item.price}}</text>
 							较昨日
 							<image v-if='item.comparePrice>0' style="width:7.5px;height:9px;"
 								src='../../static/img/homepage/shangsheng.png'></image>
@@ -66,7 +66,7 @@
 						<view class='factory'>{{item.port}}</view>
 						<view class='wrap'>{{item.goodsName}}</view>
 						<view class='price'>
-							<text class='currectprice NumberBold'>{{item.price}}</text>
+							<text class='currectprice '>{{item.price}}</text>
 							较昨日
 							<image v-if='item.comparePrice>0' style="width:7.5px;height:9px;"
 								src='../../static/img/homepage/shangsheng.png'></image>
@@ -77,7 +77,7 @@
 							<text v-if='item.comparePrice==0' class='yesterday'>-</text>
 						</view>
 						<view style='color:#B2B3BB;' class='flex'>
-							<view class="port-number-style NumberBold">
+							<view class="port-number-style ">
 								<image style='width:11px;height:11px;' src='../../static/img/homepage/water@3x.png'>
 								</image>
 								<={{item.waterContent}} </view>
@@ -170,6 +170,8 @@
 		},
 		onReady() {},
 		onShow() {
+			
+			uni.hideKeyboard()
 			uni.showTabBar()
 			this.pages = 1
 			this.isLoadMore = false
@@ -715,7 +717,7 @@
 	.currectprice {
 		color: rgba(253, 113, 79, 1);
 		font-size: 18px;
-		font-weight: 600;
+		font-weight: 550;
 		vertical-align: middle;
 		margin-right: 10px;
 	}
@@ -875,7 +877,7 @@
 		float: left;
 		width: 38vw;
 		background: #F9F9FA;
-		padding: 10px;
+		padding: 7px;
 
 		margin: 20rpx;
 		border-radius: 3px;

pages/sale/portprice.vue

@@ -204,9 +204,9 @@
 		width: 7.5px;
 		height: 9px;
 		position: relative;
-		top: -2px;
 		vertical-align: middle;
 		margin-right: 2px;
+		margin-top: 5px;
 	}
 
 	.gird-left,

pages/tran/tran.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view :style="statusBarHeight" class="status_bar">
 		</view>
-		<scroll-view scroll-x class="nav">
+		<scroll-view scroll-x class="nav" style="margin-top: 20rpx;">
 			<view class="flex text-center">
 				<view class="cu-item flex-sub" :class="0==TabCur?'text-white':''" @tap="tabSelect" data-id="0">
 					<text>货源找车</text>
@@ -124,6 +124,7 @@
 			},
 			onShow() {
 				uni.showTabBar()
+				uni.hideKeyboard()
 				this.loadData()
 				var userInfo = uni.getStorageSync("userInfo")
 				var that = this

pages/user/user.vue

@@ -15,6 +15,10 @@
 				</view>
 			</view>
 		</view> -->
+		
+		<view style="position: absolute;width: 90%;padding-left: 85%;">
+			<image @click='setting' style='width:21px;height:21px;' src="../../static/img/sign/shezhi@3x.png" ></image>
+		</view>
 		<view class="indexUp flex justify-between">
 			<view class='flex'>
 				<image v-bind:src="headUrl" class="headPortrait"></image>
@@ -23,7 +27,6 @@
 					<view class="information">{{starUserphone}}</view>
 				</view>
 			</view>
-			<view><image @click='setting' style='width:21px;height:21px;' src="../../static/img/sign/shezhi@3x.png" ></image></view>
 
 		</view>
 		<view class="cover-container">
@@ -55,7 +58,8 @@
 			<view style='text-align:center;'>
 				<navigator
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
-					class="path" hover-class="navigator-hover">《服务协议》</navigator>|<navigator
+					class="path" hover-class="navigator-hover">《服务协议》</navigator>
+				<navigator
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/screctAgreement.html"
 					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
 			</view>
@@ -124,7 +128,7 @@
 						num: 3,
 						name: '我的粮脉',
 						// icon: 'cuIcon-apps',
-						src:'../../static/img/sign/authentication@2x.png',
+						src:'../../static/img/sign/liangmai.png',
 						tips: 0,
 						url: '/pages/grain_pulse/my_grain_pulse',
 						show: true
@@ -197,6 +201,8 @@
 			}
 		},
 		onShow() {
+			
+			uni.hideKeyboard()
 			uni.showTabBar()
 			this.loadData()
 			console.log("hasLogin",this.hasLogin )