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

config/index.js

@@ -2,7 +2,6 @@ const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	baseUrlNew: 'http://192.168.1.117:8090/',
-	// baseUrlNew: 'http://192.168.1.122:9100/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pageA/freightTransport/addsendgoods.vue

@@ -32,7 +32,7 @@
 				<u-form-item label="收货地址" prop="receivingAddress" label-width="140" required>
 					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="请输入收货地址" />
 				</u-form-item>
-				<u-form-item label="收货人账号" prop="accountNumber" label-width="160" required>
+				<u-form-item class='last' label="收货人账号" prop="accountNumber" label-width="160" required>
 					<u-input v-model="purchaseOrder.accountNumber" input-align="right" placeholder="请输入收货人账号" />
 				</u-form-item>
 			</u-form>
@@ -252,7 +252,7 @@
 		background-color: #FFFFFF;
 		margin: 10px;
 		padding-bottom: 10px;
-		border-radius: 20px;
+		border-radius: 10px;
 	}
 
 	.line {
@@ -664,4 +664,7 @@
 	.uForm {
 		padding: 0 40rpx;
 	}
+	.last::after{
+		border: 0 solid transparent;
+	}
 </style>

pageD/identity/companyIdentity.vue

@@ -55,12 +55,21 @@
 					</view>
 				</view>
 				<view class="c-row b-b">
+					<text class="tit_red">*</text>
 					<text class="tit">身份证号</text>
 					<view class="con-list">
 						<input placeholder="请填写身份证号" name="input"
 							v-model="identityAuthenticationInfo.customerNumberCard"></input>
 					</view>
 				</view>
+				<view class="c-row">
+					<text class="tit_red">*</text>
+					<text class="tit">联系地址</text>
+					<view class="con-list">
+						<input  placeholder="请填写联系地址" name="input"
+							v-model="identityAuthenticationInfo.compAddress"></input>
+					</view>
+				</view>
 				</view>
 				
 			</view>
@@ -238,6 +247,13 @@
 								.recPersonNo)
 						}
 					}
+					
+					if (res.data.data.recPersonAddr != null) {
+						if (res.data.data.recPersonAddr != "") {
+							that.$set(that.identityAuthenticationInfo, 'compAddress', res.data.data
+								.recPersonAddr)
+						}
+					}
 				}).catch(res => {
 					uni.showToast({
 						title: res.data.message,
@@ -268,6 +284,13 @@
 								.recPersonNo)
 						}
 					}
+					
+					if (res.data.data.recPersonAddr != null) {
+						if (res.data.data.recPersonAddr != "") {
+							that.$set(that.identityAuthenticationInfo, 'compAddress', res.data.data
+								.recPersonAddr)
+						}
+					}
 				}).catch(res => {
 					uni.showToast({
 						title: res.data.message,
@@ -318,10 +341,10 @@
 					})
 				} else if (this.consentStatus1) {
 					this.identityAuthenticationInfo.cardAddressUrl = this.id.toString()
-					// if (this.id[0] == '' || this.id[0] == null) {
-					// 	this.$api.msg('请上传身份证正面')
-					// 	return
-					// }
+					if (this.id[0] == '' || this.id[0] == null) {
+						this.$api.msg('请上传身份证正面')
+						return
+					}
 					// if (this.id[1] == '' || this.id[1] == null) {
 					// 	this.$api.msg('请上传身份证反面')
 					// 	return
@@ -335,14 +358,14 @@
 						this.$api.msg('姓名输入错误')
 						return
 					}
-					// if (!this.identityAuthenticationInfo.customerNumberCard) {
-					// 	this.$api.msg('身份证号不能为空')
-					// 	return
-					// }
-					// if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
-					// 	this.$api.msg('身份证号输入错误')
-					// 	return
-					// }
+					if (!this.identityAuthenticationInfo.customerNumberCard) {
+						this.$api.msg('身份证号不能为空')
+						return
+					}
+					if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
+						this.$api.msg('身份证号输入错误')
+						return
+					}
 					this.identityAuthenticationInfo.customerTypeFlag = "1"
 					this.identityAuthenticationInfo.customerType = "个人"
 					var model = JSON.stringify(this.identityAuthenticationInfo);

pageD/identity/companyIdentityThree.vue

@@ -262,41 +262,41 @@
 			},
 			commit() {
 				var that = this
-				// if (this.bankid[0] == '' || this.bankid[0] == null) {
-				// 	this.$api.msg('请上传银行卡正面')
-				// 	return
-				// }
+				if (this.bankid[0] == '' || this.bankid[0] == null) {
+					this.$api.msg('请上传银行卡正面')
+					return
+				}
 				// if (this.bankid[1] == '' || this.bankid[1] == null) {
 				// 	this.$api.msg('请上传银行卡反面')
 				// 	return
 				// }
-				// if (!this.identityAuthenticationInfo.bankCard) {
-				// 	this.$api.msg('银行卡号不能为空')
-				// 	return
-				// }
-				// if (this.identityAuthenticationInfo.bankCard.length < 16 || this.identityAuthenticationInfo.bankCard
-				// 	.length > 19) {
-				// 	this.$api.msg('银行卡号输入错误')
-				// 	return
-				// }
-				// if (!this.identityAuthenticationInfo.bankDeposit) {
-				// 	this.$api.msg('开户行不能为空')
-				// 	return
-				// }
-				// if (this.identityAuthenticationInfo.bankDeposit.length < 4 || this.identityAuthenticationInfo.bankDeposit
-				// 	.length > 15) {
-				// 	this.$api.msg('开户行输入错误')
-				// 	return
-				// }
-				// if (!this.identityAuthenticationInfo.bankDepositBranch) {
-				// 	this.$api.msg('开户支行不能为空')
-				// 	return
-				// }
-				// if (this.identityAuthenticationInfo.bankDepositBranch.length < 4 || this.identityAuthenticationInfo
-				// 	.bankDepositBranch.length > 30) {
-				// 	this.$api.msg('开户支行输入错误')
-				// 	return
-				// }
+				if (!this.identityAuthenticationInfo.bankCard) {
+					this.$api.msg('银行卡号不能为空')
+					return
+				}
+				if (this.identityAuthenticationInfo.bankCard.length < 16 || this.identityAuthenticationInfo.bankCard
+					.length > 19) {
+					this.$api.msg('银行卡号输入错误')
+					return
+				}
+				if (!this.identityAuthenticationInfo.bankDeposit) {
+					this.$api.msg('开户行不能为空')
+					return
+				}
+				if (this.identityAuthenticationInfo.bankDeposit.length < 4 || this.identityAuthenticationInfo.bankDeposit
+					.length > 15) {
+					this.$api.msg('开户行输入错误')
+					return
+				}
+				if (!this.identityAuthenticationInfo.bankDepositBranch) {
+					this.$api.msg('开户支行不能为空')
+					return
+				}
+				if (this.identityAuthenticationInfo.bankDepositBranch.length < 4 || this.identityAuthenticationInfo
+					.bankDepositBranch.length > 30) {
+					this.$api.msg('开户支行输入错误')
+					return
+				}
 				if (!this.identityAuthenticationInfo.customerPhone) {
 					this.$api.msg('手机号不能为空')
 					return
@@ -310,31 +310,31 @@
 					return
 				}
 				if (this.identityAuthenticationInfo.customerTypeFlag == 1) {
-					// if (!this.identityAuthenticationInfo.payeeName) {
-					// 	this.$api.msg('收款人姓名不能为空')
-					// 	return
-					// }
-					// if (this.identityAuthenticationInfo.payeeName < 2 || this.identityAuthenticationInfo.payeeName > 10) {
-					// 	this.$api.msg('收款人姓名输入错误')
-					// 	return
-					// }
-					// if (!this.identityAuthenticationInfo.payeeNumberCard) {
-					// 	this.$api.msg('收款人身份证号不能为空')
-					// 	return
-					// }
-					// if (this.identityAuthenticationInfo.payeeNumberCard.length != 18) {
-					// 	this.$api.msg('收款人身份证号输入错误')
-					// 	return
-					// }
-					// if (!this.identityAuthenticationInfo.compAddress) {
-					// 	this.$api.msg('联系地址不能为空')
-					// 	return
-					// }
-					// if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
-					// 	.compAddress.length > 20) {
-					// 	this.$api.msg('联系地址输入错误')
-					// 	return
-					// }
+					if (!this.identityAuthenticationInfo.payeeName) {
+						this.$api.msg('收款人姓名不能为空')
+						return
+					}
+					if (this.identityAuthenticationInfo.payeeName < 2 || this.identityAuthenticationInfo.payeeName > 10) {
+						this.$api.msg('收款人姓名输入错误')
+						return
+					}
+					if (!this.identityAuthenticationInfo.payeeNumberCard) {
+						this.$api.msg('收款人身份证号不能为空')
+						return
+					}
+					if (this.identityAuthenticationInfo.payeeNumberCard.length != 18) {
+						this.$api.msg('收款人身份证号输入错误')
+						return
+					}
+					if (!this.identityAuthenticationInfo.compAddress) {
+						this.$api.msg('联系地址不能为空')
+						return
+					}
+					if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
+						.compAddress.length > 20) {
+						this.$api.msg('联系地址输入错误')
+						return
+					}
 				} else if (this.identityAuthenticationInfo.customerTypeFlag == 2) {
 					if (!this.identityAuthenticationInfo.compAddress) {
 						this.$api.msg('公司地址不能为空')

pageD/identity/companyIdentityTwo.vue

@@ -21,11 +21,20 @@
 			</view>
 		</view>
 		<view class="c-row">
+			<text class="tit_red">*</text>
 			<text class="tit">身份证号</text>
 			<view class="con-list">
 				<input  placeholder="请填写身份证号" name="input"
 					v-model="identityAuthenticationInfo.customerNumberCard"></input>
 			</view>
+		</view>
+		<view class="c-row">
+			<text class="tit_red">*</text>
+			<text class="tit">联系地址</text>
+			<view class="con-list">
+				<input  placeholder="请填写联系地址" name="input"
+					v-model="identityAuthenticationInfo.compAddress"></input>
+			</view>
 		</view>
 			</view>
 		<button class="btns btn" @click="jumpUrl">下一步</button>
@@ -111,6 +120,12 @@
 								.recPersonNo)
 						}
 					}
+					if (res.data.data.recPersonAddr != null) {
+						if (res.data.data.recPersonAddr != "") {
+							that.$set(that.identityAuthenticationInfo, 'compAddress', res.data.data
+								.recPersonAddr)
+						}
+					}
 				}).catch(res => {
 					uni.showToast({
 						title: res.data.message,
@@ -141,6 +156,12 @@
 						}
 
 					}
+					if (res.data.data.recPersonAddr != null) {
+						if (res.data.data.recPersonAddr != "") {
+							that.$set(that.identityAuthenticationInfo, 'compAddress', res.data.data
+								.recPersonAddr)
+						}
+					}
 				}).catch(res => {
 					uni.showToast({
 						title: res.data.message,
@@ -163,10 +184,10 @@
 			jumpUrl() {
 				
 				this.identityAuthenticationInfo.cardAddressUrl = this.id.toString()
-				// if (this.id[0] == '' || this.id[0] == null) {
-				// 	this.$api.msg('请上传身份证正面')
-				// 	return
-				// }
+				if (this.id[0] == '' || this.id[0] == null) {
+					this.$api.msg('请上传身份证正面')
+					return
+				}
 				// if (this.id[1] == '' || this.id[1] == null) {
 				// 	this.$api.msg('请上传身份证反面')
 				// 	return
@@ -180,10 +201,14 @@
 					this.$api.msg('姓名输入错误')
 					return
 				}
-				// if (!this.identityAuthenticationInfo.customerNumberCard) {
-				// 	this.$api.msg('身份证号不能为空')
-				// 	return
-				// }
+				if (!this.identityAuthenticationInfo.customerNumberCard) {
+					this.$api.msg('身份证号不能为空')
+					return
+				}
+				if (!this.identityAuthenticationInfo.compAddress) {
+					this.$api.msg('联系地址不能为空')
+					return
+				}
 				// if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
 				// 	this.$api.msg('身份证号输入错误')
 				// 	return

pageD/identity/driverIdentityTwo.vue

@@ -39,14 +39,16 @@
 				<picker v-if="carchength" @change="carLongChange($event,index)" :value="carLongIndex"
 					:range="carLongType" class="con-list">
 					<view class="picker" v-model="item.carLength">
-						{{item.carLength?item.carLength:'请选择车长'}}
+						{{item.carLength?item.carLength:'请选择车长 >'}}
 					</view>
 				</picker>
 				<view v-else class="con-list">
 					<input placeholder="请填写车长(米)" name="input" v-model="item.carLength"></input>
 				</view>
-				<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 v-if="carchength" @click="changeCarChength">手动填写<u-icon  name="edit-pen-fill"></u-icon></view>
+				<view v-else @click="changeCarChength">自动获取<u-icon  name="edit-pen-fill"></u-icon></view>
+				<!-- <image  src='' >填写</image> -->
+				<!-- <button v-else class='cu-btn bg-green shadow' @click="changeCarChength">选择</button> -->
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">载重（吨）</text>
@@ -129,8 +131,8 @@
 				<view v-else class="con-list">
 					<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>
+				<view v-if="subBranch" @click="subBranchChength">手动填写<u-icon  name="edit-pen-fill"></u-icon></view>
+				<view v-else @click="subBranchChength">自动识别<u-icon  name="edit-pen-fill"></u-icon></view>
 			</view>
 			<view class="c-row b-b" v-if="items.accountType == '个人账户'"> 
 				<text class="tit">收款人姓名</text>
@@ -508,7 +510,7 @@
 		height: 20rpx;
 		position: absolute;
 		right: 20px;
-		margin-top: -10px;
+		margin-top: -5px;
 	}
 
 	.information {
@@ -516,13 +518,13 @@
 		width: 100%;
 		height: 56px;
 		background-color: #FFFFFF;
-		border-radius: 16px;
+		border-radius: 10px;
 	}
 
 	.informations {
 		margin-top: 10px;
 		background-color: #FFFFFF;
-		border-radius: 20px;
+		border-radius: 10px;
 	}
 
 	.btn {
@@ -537,6 +539,11 @@
 		background-color: #FFFFFF;
 		color:#00C265;
 		border: none;
+		border-radius:30px;
+	}
+	.btnAdd:after{
+		border: none;
+		
 	}
 	.btns {
 		background-color: #22C572;

pages/erp/contactCustomerService/contactCustomerService.vue

@@ -1,30 +1,33 @@
 <template>
-	<view class="wrap">
-		<view class="content">
-			<view class="row row-bottom">
-				<view class="left">姓名</view>
-				<input v-model="personInfo.name" class="right-bottom" placeholder="请输入姓名"></input>
-			</view>
-			<view class="row row-bottom">
-				<view class="left">电话</view>
-				<input class="right-bottom" v-model="personInfo.mobilePhone" placeholder="请输入电话"></input>
-			</view>
-			<view class="row no-boder">
-				<view class="left">留言</view>
-			</view>
-			<view class="row no-boder">
-				<u-input v-model="personInfo.message" :type="type" :border="border" :height="height"
-					:auto-height="autoHeight" />
-			</view>
-			<view class="bottom">
-				<u-button type="primary" class="submit" hover-class="none" @click="submit">提交</u-button>
+	<view>
+		<view class="wrap">
+			<view class="content">
+				<view class="row row-bottom">
+					<view class="left">姓名</view>
+					<input v-model="personInfo.name" class="right-bottom" placeholder="请输入姓名"></input>
+				</view>
+				<view class="row row-bottom">
+					<view class="left">电话</view>
+					<input class="right-bottom" v-model="personInfo.mobilePhone" placeholder="请输入电话"></input>
+				</view>
+				<view class="row no-boder">
+					<view class="left">留言</view>
+				</view>
+				<view style='position:relative;' class="row no-boder">
+					<u-input class='textarea' v-model="personInfo.message" :type="type" :border="border" :height="height"
+						:auto-height="autoHeight" />
+					<view style='position:absolute;right:10px;bottom:20px;color:#AFB3BF;'>{{personInfo.message.length}}/150个字</view>
+				</view>
+				
 			</view>
+			
 		</view>
-		<u-toast ref="uToast" />
-		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+		<view class="bottom">
+					<u-button type="primary" class="submit" hover-class="none" @click="submit">提交</u-button>
+				</view>
+			<u-toast ref="uToast" />
 	</view>
+	
 </template>
 <script>
 	import {
@@ -37,7 +40,6 @@
 		},
 		data() {
 			return {
-
 				isShowAlert: false,
 				content: '当前登入信息验证失败，是否重新登录？',
 				personInfo: {
@@ -140,7 +142,6 @@
 					})
 				}
 				this.$api.doRequest('post', '/openServiceInfo/api/addInfo', this.personInfo).then(res => {
-
 					if (res.data.code == 200) {
 						this.$refs.uToast.show({
 							title: '提交成功，客服人员会及时与您取得联系。！',
@@ -171,24 +172,26 @@
 		border-radius: 20rpx;
 		background: white;
 		padding: 20rpx;
-
+		
 		.row {
-			display: flex;
-			justify-content: space-between;
-			border-bottom: 1px solid #EEEEEE;
+			width:100%;
 			padding: 21rpx 0;
-
-			.right,
+		
 			input {
+				background:#F9F9FA;
 				font-size: 28rpx;
 				color: #333333;
+				border:1px solid #EEEEEE;
+				width:100%;
+				padding:21px;
+				border-radius:3px;
 			}
 		}
 
 		.row-bottom {
 			.right-bottom {
-				width: 300rpx;
-				text-align: right;
+				width: 100%;
+				margin-top:10px;
 			}
 		}
 
@@ -198,8 +201,13 @@
 	}
 
 	.submit {
-		margin-top: 200rpx;
+		margin:20px;
+		margin-top: 160rpx;
 		background: #22C572;
-		border-radius: 10rpx;
+		border-radius: 60rpx;
+	}
+	.textarea{
+		background:#F9F9FA;
+		border:1px solid #EEEEEE;
 	}
 </style>

pages/erp/deliveryfeedback/list.vue

@@ -56,6 +56,7 @@
 				binNumber: "",
 				status: '执行中',
 				positionName: '',
+				flag:'',
 				statusList: [
 					{name:'执行中',value:1},
 					{name:'已完货',value:2},
@@ -82,6 +83,7 @@
 		},
 		onReachBottom() {
 			 this.currentPage+=1
+			 this.flag='1'
 		    this.getList(false)
 			// this.getMoreNews()
 		},
@@ -93,8 +95,13 @@
 					pageSize: this.pageSize
 				}).then(res => {
 					if (res.data.code == 200) {
-						var data=res.data.data.records
-						this.dataList = this.dataList.concat(data)
+						if(this.flag=='1'){
+							var data=res.data.data.records
+							this.dataList = this.dataList.concat(data)
+						}
+						else{
+							this.dataList =res.data.data.records
+						}
 						if(res.data.data.records.length==0){
 							this.isContent=true
 						}
@@ -103,6 +110,9 @@
 			},
 			statuschange(e) {
 				this.status = this.statusList[e[0]].name
+				this.feedbackFlag=this.statusList[e[0]].value
+				this.currentPage = 1,
+				this.flag='0'
 				this.getList()
 			},
 			goDetail(val) {

pages/erp/openService/openService.vue

@@ -1,27 +1,33 @@
 <template>
-	<view class="wrap">
-		<view class="content">
-			<view class="row row-bottom">
-				<view class="left">姓名</view>
-				<input v-model="personInfo.name" class="right-bottom" placeholder="请输入姓名"></input>
-			</view>
-			<view class="row row-bottom">
-				<view class="left">电话</view>
-				<input class="right-bottom" v-model="personInfo.mobilePhone" placeholder="请输入电话"></input>
-			</view>
-			<view class="row no-boder">
-				<view class="left">留言</view>
-			</view>
-			<view class="row no-boder">
-				<u-input v-model="personInfo.message" :type="type" :border="border" :height="height"
-					:auto-height="autoHeight" />
-			</view>
-			<view class="bottom">
-				<u-button type="primary" class="submit" hover-class="none" @click="submit">提交</u-button>
+	<view>
+		<view class="wrap">
+			<view class="content">
+				<view class="row row-bottom">
+					<view class="left">姓名</view>
+					<input v-model="personInfo.name" class="right-bottom" placeholder="请输入姓名"></input>
+				</view>
+				<view class="row row-bottom">
+					<view class="left">电话</view>
+					<input class="right-bottom" v-model="personInfo.mobilePhone" placeholder="请输入电话"></input>
+				</view>
+				<view class="row no-boder">
+					<view class="left">留言</view>
+				</view>
+				<view style='position:relative;' class="row no-boder">
+					<u-input class='textarea' v-model="personInfo.message" :type="type" :border="border" :height="height"
+						:auto-height="autoHeight" />
+					<view style='position:absolute;right:10px;bottom:20px;color:#AFB3BF;'>{{personInfo.message.length}}/150个字</view>
+				</view>
+				
 			</view>
+			
 		</view>
-		<u-toast ref="uToast" />
+		<view class="bottom">
+					<u-button type="primary" class="submit" hover-class="none" @click="submit">提交</u-button>
+				</view>
+			<u-toast ref="uToast" />
 	</view>
+	
 </template>
 <script>
 	import {
@@ -166,24 +172,26 @@
 		border-radius: 20rpx;
 		background: white;
 		padding: 20rpx;
-
+		
 		.row {
-			display: flex;
-			justify-content: space-between;
-			border-bottom: 1px solid #EEEEEE;
+			width:100%;
 			padding: 21rpx 0;
-
-			.right,
+		
 			input {
+				background:#F9F9FA;
 				font-size: 28rpx;
 				color: #333333;
+				border:1px solid #EEEEEE;
+				width:100%;
+				padding:21px;
+				border-radius:3px;
 			}
 		}
 
 		.row-bottom {
 			.right-bottom {
-				width: 300rpx;
-				text-align: right;
+				width: 100%;
+				margin-top:10px;
 			}
 		}
 
@@ -193,8 +201,13 @@
 	}
 
 	.submit {
-		margin-top: 200rpx;
+		margin:20px;
+		margin-top: 160rpx;
 		background: #22C572;
-		border-radius: 10rpx;
+		border-radius: 60rpx;
+	}
+	.textarea{
+		background:#F9F9FA;
+		border:1px solid #EEEEEE;
 	}
 </style>

pages/erp/receivingfeedback/details.vue

@@ -465,7 +465,7 @@
 						return
 					}
 					var tranProcessInfo = {}
-					tranProcessInfo.flag=0
+					tranProcessInfo.flag='1'
 					tranProcessInfo.id=that.freightspace[index].id
 					tranProcessInfo.infoId = that.detailData.infoId
 					tranProcessInfo.processId = that.detailData.id
@@ -527,7 +527,7 @@
 						return
 					}
 					var tranProcessInfo = {}
-					tranProcessInfo.flag=0
+					tranProcessInfo.flag='1'
 					tranProcessInfo.id=that.freightspace[index].id
 					tranProcessInfo.infoId = that.detailData.infoId
 					tranProcessInfo.processId = that.detailData.id
@@ -567,7 +567,7 @@
 						return
 					}
 					var tranProcessInfo = {}
-					tranProcessInfo.flag=0
+					tranProcessInfo.flag='1'
 					tranProcessInfo.id=that.freightspace[index].id
 					tranProcessInfo.infoId = that.detailData.infoId
 					tranProcessInfo.processId = that.detailData.id

pages/erp/receivingfeedback/list.vue

@@ -55,11 +55,12 @@
 				positionId: "",
 				binNumber: "",
 				status: '执行中',
+				flag:'',
 				positionName: '',
 				statusList: [
-					{name:'执行中',value:1},
-					{name:'已完货',value:2},
-					{name:'全部任务',value:3},
+					{name:'执行中',value:4},
+					{name:'已完货',value:5},
+					{name:'全部任务',value:6},
 				],
 				feedbackFlag:4,
 				dataList: [],
@@ -81,7 +82,8 @@
 			this.getList()
 		},
 		onReachBottom() {
-			 this.currentPage+=1
+			this.currentPage+=1
+			this.flag='1'
 		    this.getList(false)
 			// this.getMoreNews()
 		},
@@ -93,8 +95,14 @@
 					pageSize: this.pageSize
 				}).then(res => {
 					if (res.data.code == 200) {
-						var data=res.data.data.records
-						this.dataList = this.dataList.concat(data)
+						console.log(this.flag)
+						if(this.flag=='1'){
+							var data=res.data.data.records
+							this.dataList = this.dataList.concat(data)
+						}
+						else{
+							this.dataList =res.data.data.records
+						}
 						if(res.data.data.records.length==0){
 							this.isContent=true
 						}
@@ -103,6 +111,9 @@
 			},
 			statuschange(e) {
 				this.status = this.statusList[e[0]].name
+				this.feedbackFlag=this.statusList[e[0]].value
+				this.currentPage = 1,
+				this.flag='0'
 				this.getList()
 			},
 			goDetail(val) {

pages/task/my_task.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="content1-top">
 			<view class="search-form round">
-				<u-search placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
+				<u-search placeholder-color='#AFB3BF' search-icon-color='#AFB3BF' bg-color='#F5F6F9' placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
 					@custom="searchKeyWord()"></u-search>
 			</view>
 			<view class="top2">
@@ -667,7 +667,7 @@
 
 	.content1-top {
 		background: white;
-		padding: 20rpx;
+		padding: 20rpx 20rpx 0 20rpx;
 		border-radius: 0 0 30rpx 30rpx;
 	}
 
@@ -677,6 +677,7 @@
 
 	.title-row1 {
 		font-size: 34rpx;
+		font-weight:600;
 	}
 
 	.row2 {

pages/user/set_nickname.vue

@@ -4,9 +4,9 @@
 			昵称长度限制在2-24个字符内
 		</view>
 		<view class="editText">
-			<input placeholder="请输入昵称" name="input" v-model="nickname" class="texts"></input>
+			<input placeholder="请输入昵称" placeholder-color="#C6C6C6" name="input" v-model="nickname" class="texts"></input>
 		</view>
-		<view class="btn" @click="commit">
+		<view class="btn" :class="nickname.length==0?'':'btn-active'" @click="commit">
 			保存
 		</view>
 	</view>
@@ -113,6 +113,8 @@
 		padding-left: 20px;
 		margin-top: 10px;
 		padding-top: 12px;
+		border-top: 1px solid #C9C9CB;
+		border-bottom:1px solid #C9C9CB;
 	}
 
 	.texts {
@@ -121,17 +123,22 @@
 		font-size: 16px;
 		/* placeholder-style="font-size:18px" */
 	}
-
-	.btn {
-		width: 100%;
-		height: 50px;
-		background-color: #FFFFFF;
-		text-align: center;
-		color: #22C572;
-		font-size: 20px;
+	.btn{
+		width: 90%;
+		height: 46px;
+		font-size: 17px;
+		margin:0 auto;
 		margin-top: 16px;
 		border-radius: 20px;
-		line-height: 50px;
+		line-height: 46px;
 		font-weight: 500;
+		text-align: center;
+		background-color: #D8DAE0;
+		color: #fff;
+	}
+	.btn-active {
+		background-color: #FFFFFF;
+		color: #22C572;
+		
 	}
 </style>

pages/user/set_picture.vue

@@ -5,33 +5,36 @@
 				<image src="../../static/img/myimg/YongHu@3x.png" v-bind:class="pictures" @click="oKSelected(1)">
 				</image>
 				<view style="margin: 0 auto;text-align: center;margin-top: -15px;" v-if="pictures == 'picture1'">
-					<image src="../../static/img/login/select@3x.png" class="duihao"></image>
+					<image src="../../static/img/login/duihao2@3x.png" class="duihao"></image>
 				</view>
-
+				<view v-else style='margin: 0 auto;text-align: center;margin-top: -15px;width:18px;height:21px;'></view>
 				<view class="title">默认</view>
 			</view>
 			<view class="pictures">
 				<image src="../../static/img/myimg/SiJi@3x.png" v-bind:class="picturesTwo" @click="oKSelected(2)">
 				</image>
 				<view style="margin: 0 auto;text-align: center;margin-top: -15px;" v-if="picturesTwo == 'picture1'">
-					<image src="../../static/img/login/select@3x.png" class="duihao"></image>
+					<image src="../../static/img/login/duihao2@3x.png" class="duihao"></image>
 				</view>
+				<view v-else style='margin: 0 auto;text-align: center;margin-top: -15px;width:18px;height:21px;'></view>
 				<view class="title">司机</view>
 			</view>
 			<view class="pictures">
 				<image src="../../static/img/myimg/LiangShang@3x.png" v-bind:class="picturesThree"
 					@click="oKSelected(3)"></image>
 				<view style="margin: 0 auto;text-align: center;margin-top: -15px;" v-if="picturesThree == 'picture1'">
-					<image src="../../static/img/login/select@3x.png" class="duihao"></image>
+					<image src="../../static/img/login/duihao2@3x.png" class="duihao"></image>
 				</view>
+				<view v-else style='margin: 0 auto;text-align: center;margin-top: -15px;width:18px;height:21px;'></view>
 				<view class="title">粮商</view>
 			</view>
 			<view class="pictures">
 				<image src="../../static/img/myimg/LiangNong@3x.png" v-bind:class="picturesFour" @click="oKSelected(4)">
 				</image>
 				<view style="margin: 0 auto;text-align: center;margin-top: -15px;" v-if="picturesFour == 'picture1'">
-					<image src="../../static/img/login/select@3x.png" class="duihao"></image>
+					<image src="../../static/img/login/duihao2@3x.png" class="duihao"></image>
 				</view>
+				<view v-else style='margin: 0 auto;text-align: center;margin-top: -15px;width:18px;height:21px;'></view>
 				<view class="title">粮农</view>
 			</view>
 		</view>
@@ -182,6 +185,7 @@
 		height: 70px;
 		margin: 0 auto;
 		margin-top: 10px;
+		border: 2px solid transparent;
 	}
 
 	.picture1 {
@@ -195,7 +199,7 @@
 
 	.title {
 		text-align: center;
-		margin: 16px 0;
+		margin: 9px 0;
 		font-size: 14px;
 		font-weight: 500;
 	}
@@ -213,13 +217,13 @@
 
 	.btn {
 		width: 100%;
-		height: 50px;
+		height: 46px;
 		background-color: #FFFFFF;
 		text-align: center;
 		color: #22C572;
-		font-size: 20px;
+		font-size: 17px;
 		margin-top: 16px;
-		border-radius: 20px;
+		border-radius: 30px;
 		line-height: 50px;
 		font-weight: 500;
 	}