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

pageD/identity/companyIdentity.vue

@@ -4,58 +4,65 @@
 			<text @click='consent' v-bind:class="switchs1">公司</text>
 			<text @click='consent' v-bind:class="switchs2">个人</text>
 		</view>
-		<view v-if="consentStatus == true">
-			<!-- 公司营业执照上传 -->
-			<view v-if="license1 != ''">
-				<upload v-if="consentStatus == true" class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-					:size-type="['compressed']" @on-success="getImgUrl"  @on-remove="onRemove"
-					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions"
-					:custom="uploadCustom" ></upload>
-			</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.compName"></input>
+		<view class="content">
+			<view v-if="consentStatus == true">
+				<!-- 公司营业执照上传 -->
+				<view v-if="license1 != ''">
+					<upload v-if="consentStatus == true" class="upload" ref="upload" :action="action"
+						:max-size="maxSize" :max-count="1" :size-type="['compressed']" @on-success="getImgUrl"
+						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
+						:options="uploadOptions" :custom="uploadCustom"></upload>
 				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">纳税人识别号</text>
-				<view class="con-list">
-					<input type='number' placeholder="请填写纳税人识别号" name="input"
-						v-model="identityAuthenticationInfo.payTaxesCard"></input>
+				<view class="person-info">
+					<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.compName"></input>
+						</view>
+					</view>
+					<view class="c-row">
+						<text class="tit">纳税人识别号</text>
+						<view class="con-list">
+							<input type='number' placeholder="请填写纳税人识别号" name="input"
+								v-model="identityAuthenticationInfo.payTaxesCard"></input>
+						</view>
+					</view>
 				</view>
 			</view>
-		</view>
-		<view v-else>
-			<view>
-				<!-- 个人身份证正面 -->
-				<upload class="upload" ref="upload1" :action="action" :max-size="maxSize" :max-count="1"
-					:size-type="['compressed']" @on-success="getImgUrl1" @on-remove="onRemove"
-					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
-					:custom="uploadCustom1" ></upload>
-				<!-- 个人身份证反面 -->
-				<upload class="upload" ref="upload2" :action="action" :max-size="maxSize" :max-count="1"
-					:size-type="['compressed']" @on-success="getImgUrl2"  @on-remove="onRemove"
-					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
-					:custom="uploadCustom2" ></upload>
-			</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.customerName"></input>
+			<view v-else>
+				<view>
+					<!-- 个人身份证正面 -->
+					<upload class="upload" ref="upload1" :action="action" :max-size="maxSize" :max-count="1"
+						:size-type="['compressed']" @on-success="getImgUrl1" @on-remove="onRemove"
+						@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
+						:custom="uploadCustom1"></upload>
+					<!-- 个人身份证反面 -->
+					<upload class="upload" ref="upload2" :action="action" :max-size="maxSize" :max-count="1"
+						:size-type="['compressed']" @on-success="getImgUrl2" @on-remove="onRemove"
+						@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
+						:custom="uploadCustom2"></upload>
 				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">身份证号</text>
-				<view class="con-list">
-					<input placeholder="请填写身份证号" name="input"
-						v-model="identityAuthenticationInfo.customerNumberCard"></input>
+				<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.customerName"></input>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">身份证号</text>
+					<view class="con-list">
+						<input placeholder="请填写身份证号" name="input"
+							v-model="identityAuthenticationInfo.customerNumberCard"></input>
+					</view>
 				</view>
 			</view>
+			<button class="btns btn" @click="jumpUrl">下一步</button>
 		</view>
-		<button class="btns btn" @click="jumpUrl">下一步</button>
+
 
 	</view>
 
@@ -79,7 +86,7 @@
 				isAdd: true,
 				uploadCustom: true,
 				uploadCustom1: true,
-				uploadCustom2:true,
+				uploadCustom2: true,
 				uploadOptions: {
 					"text": "上传营业执照",
 					"bgc": ""
@@ -207,8 +214,7 @@
 			onProgress(e) {
 				console.log(e)
 			},
-			onRemove(index) {
-			},
+			onRemove(index) {},
 			jumpUrl() {
 				if (this.consentStatus) {
 					if (!this.identityAuthenticationInfo.compName) {
@@ -308,6 +314,17 @@
 
 <style>
 	.center {
+		/* padding: 10px 20px; */
+
+	}
+
+	.top {
+		background: white;
+		padding: 10px 20px;
+		border-radius: 0 0 20rpx 20rpx;
+	}
+
+	.content {
 		padding: 10px 20px;
 	}
 
@@ -366,6 +383,20 @@
 		font-size: 20px;
 		font-weight: 700;
 		margin-right: 16px;
+		position: relative;
+	}
+
+	.switchs1::after,
+	.switchs2::after {
+		background: #22C572;
+		width: 20px;
+		height: 4px;
+		content: ' ';
+		position: absolute;
+		bottom: -20rpx;
+		left: 0;
+		right: 0;
+		margin: auto;
 	}
 
 	.switchs2 {
@@ -395,7 +426,14 @@
 	.upload {
 		margin: 20rpx 0;
 	}
-	.tit_red{
+
+	.tit_red {
 		color: #E54D42;
 	}
+	.person-info{
+		background: white;
+		padding: 20rpx;
+		border-radius: 20rpx;
+		margin-bottom: 50rpx;
+	}
 </style>

pages/attestation/indexThree.vue

@@ -10,20 +10,20 @@
 					已覆盖
 				</view>
 				<view v-else>
-				<view class="status" v-if="item.authenticationStatus == '已认证'">
-					<image src="../../static/img/authentication/cert-personal@3x.png"
-						style="width: 16px;height: 16px;top:3px;"></image>
-					{{item.authenticationStatus}}
-				</view>
-				<view class="status1" v-if="item.authenticationStatus == '审核中'">
-					{{item.authenticationStatus}}
-				</view>
-				<view class="status2" v-if="item.authenticationStatus == '未通过'">
-					{{item.authenticationStatus}}
-				</view>
-				<view class="status3" v-if="item.authenticationStatus == '已覆盖'">
-					{{item.authenticationStatus}}
-				</view>
+					<view class="status" v-if="item.authenticationStatus == '已认证'">
+						<image src="../../static/img/authentication/cert-personal@3x.png"
+							style="width: 16px;height: 16px;top:3px;"></image>
+						{{item.authenticationStatus}}
+					</view>
+					<view class="status1" v-if="item.authenticationStatus == '审核中'">
+						{{item.authenticationStatus}}
+					</view>
+					<view class="status2" v-if="item.authenticationStatus == '未通过'">
+						{{item.authenticationStatus}}
+					</view>
+					<view class="status3" v-if="item.authenticationStatus == '已覆盖'">
+						{{item.authenticationStatus}}
+					</view>
 				</view>
 			</view>
 			<view class="geren">{{item.driverPhone}}</view>
@@ -32,7 +32,8 @@
 					<image src="../../static/img/authentication/selected(2).png"
 						style="width: 16px;height: 16px;top: 3px;">设为默认</image>
 				</view> -->
-				<view class='but' v-if="item.authenticationStatus == '已覆盖'||item.authenticationStatus == '已认证'" @click="open(item)">更换手机号</view>
+				<view class='but' v-if="item.authenticationStatus == '已覆盖'||item.authenticationStatus == '已认证'"
+					@click="open(item)">更换手机号</view>
 				<view class='but' v-if="item.authenticationStatus != '审核中'" @click="companyEdit(item)">修改</view>
 				<view class='but' @click="deleteSJ(item)">删除</view>
 			</view>
@@ -43,9 +44,9 @@
 					</view>
 					<view class="cancel" @click='pricestatus=false'>×</view>
 					<view class='shade-content-item'>
-						<input v-model='price' placeholder="请输入手机号" maxlength="11" type="number" class="tainput" >
+						<input v-model='price' placeholder="请输入手机号" maxlength="11" type="number" class="tainput">
 					</view>
-					<view>
+					<view class="bottom-btn">
 						<!--<view style='width:50%;display:inline-block;' @click='pricestatus=false'>取消</view>
 						<view style='width:50%;display:inline-block;' @click='amendprice'>确定</view> -->
 						<view class="determine" @click="getcode">
@@ -82,7 +83,7 @@
 
 		</view>
 		<view v-if="drivers.length==0">
-			<button class="btn btns"  @click="Add">新增</button>
+			<button class="btn btns" @click="Add">新增</button>
 		</view>
 	</view>
 </template>
@@ -103,7 +104,7 @@
 				price: "",
 				verifyCode: "",
 				sendText: "60s后重发",
-				id:"",
+				id: "",
 			}
 		},
 		computed: {
@@ -114,15 +115,15 @@
 		},
 		onPullDownRefresh() {
 			this.getList()
-			setTimeout(function () {
+			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
 		methods: {
 			resend() {
-				
+
 				price
-				
+
 				if (this.sendText == "获取验证码") {
 					this.getcode()
 				}
@@ -146,21 +147,20 @@
 						pcFlag: 0
 					}, 'application/json;charset=UTF-8').then(res => {
 						console.log(res.data.data.records)
-						for(var i = 0 ; i < res.data.data.records.length ; i++){
-							res.data.data.records[i].logo = res.data.data.records[i].driverName.substr(0,1)
+						for (var i = 0; i < res.data.data.records.length; i++) {
+							res.data.data.records[i].logo = res.data.data.records[i].driverName.substr(0, 1)
 						}
-						
+
 						this.drivers = res.data.data.records
 					})
 					.catch(res => {
-						if(res.errmsg){
+						if (res.errmsg) {
 							uni.showToast({
 								title: res.errmsg,
 								icon: 'none',
 								duration: 2000
 							})
-						}
-						else{
+						} else {
 							uni.showToast({
 								title: "系统异常，请联系管理员",
 								icon: 'none',
@@ -173,85 +173,88 @@
 				var that = this
 				that.identityAuthenticationInfo.driverPhone = that.price
 				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
-						phone: this.price,
-						verifyCode: this.verifyCode
-					}).then(res => {
-						if (res.data.code == 200) {
-							that.$api.doRequest('get','/driverViewInfo/selectPhone',that.identityAuthenticationInfo)
+					phone: this.price,
+					verifyCode: this.verifyCode
+				}).then(res => {
+					if (res.data.code == 200) {
+						that.$api.doRequest('get', '/driverViewInfo/selectPhone', that.identityAuthenticationInfo)
 							.then(res => {
-									if (res.data.code == '11018') {
-										uni.showModal({
-											title: '提示',
-											content: '该手机号已认证过司机，再次认证将覆盖之前的认证信息，是否确定认证？',
-											success: function(res) {										
-												if (res.confirm) {
-													that.identityAuthenticationInfo.id = item.id
-													that.$api.doRequest('post','/driverViewInfo/api/modifyPhone',that.identityAuthenticationInfo).then(
-														res => {
-															uni.showToast({
-																title: '提交成功',
-																icon: 'none',
-																duration: 2000
-															})
-															uni.navigateTo({
-																url: `/pages/attestation/indexThree`,
-															})
-														}).catch(res => {
+								if (res.data.code == '11018') {
+									uni.showModal({
+										title: '提示',
+										content: '该手机号已认证过司机，再次认证将覆盖之前的认证信息，是否确定认证？',
+										success: function(res) {
+											if (res.confirm) {
+												that.identityAuthenticationInfo.id = item.id
+												that.$api.doRequest('post',
+													'/driverViewInfo/api/modifyPhone', that
+													.identityAuthenticationInfo).then(
+													res => {
 														uni.showToast({
-															title: res.data.message,
+															title: '提交成功',
 															icon: 'none',
 															duration: 2000
 														})
-													})
-												} else if (res.cancel) {
+														uni.navigateTo({
+															url: `/pages/attestation/indexThree`,
+														})
+													}).catch(res => {
 													uni.showToast({
-														title: '提交失败',
+														title: res.data.message,
 														icon: 'none',
 														duration: 2000
 													})
-												}
-											}
-										});
-									}else if(res.data.code == 200){
-										that.identityAuthenticationInfo.id = item.id
-										that.$api.doRequest('post','/driverViewInfo/api/modifyPhone',that.identityAuthenticationInfo).then(
-											res => {
+												})
+											} else if (res.cancel) {
 												uni.showToast({
-													title: '提交成功',
+													title: '提交失败',
 													icon: 'none',
 													duration: 2000
 												})
-												uni.navigateTo({
-													url: `/pages/attestation/indexThree`,
-												})
-											}).catch(res => {
+											}
+										}
+									});
+								} else if (res.data.code == 200) {
+									that.identityAuthenticationInfo.id = item.id
+									that.$api.doRequest('post', '/driverViewInfo/api/modifyPhone', that
+										.identityAuthenticationInfo).then(
+										res => {
 											uni.showToast({
-												title: res.data.message,
+												title: '提交成功',
 												icon: 'none',
 												duration: 2000
 											})
+											uni.navigateTo({
+												url: `/pages/attestation/indexThree`,
+											})
+										}).catch(res => {
+										uni.showToast({
+											title: res.data.message,
+											icon: 'none',
+											duration: 2000
 										})
-									}
-								}).catch(res => {
-									uni.showToast({
-										title: res.data.message,
-										icon: 'none',
-										duration: 2000
 									})
+								}
+							}).catch(res => {
+								uni.showToast({
+									title: res.data.message,
+									icon: 'none',
+									duration: 2000
 								})
-							}
-						})
+							})
+					}
+				})
 			},
 			getcode() {
-					if (!this.price) {
-						uni.showToast({
-							title: '请填写手机号！',
-							icon: 'none',
-							duration: 2000
-						})
-						return
-					}
-				if (this.price.length != 11 ) {
+				if (!this.price) {
+					uni.showToast({
+						title: '请填写手机号！',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
+				if (this.price.length != 11) {
 					uni.showToast({
 						title: '请正确填写手机号！',
 						icon: 'none',
@@ -313,7 +316,7 @@
 					showCancel: true,
 					confirmText: '确定',
 					success: (e) => {
-						if(e.confirm){
+						if (e.confirm) {
 							this.$api.doRequest('post', '/driverViewInfo/api/deleteDriver', this.deletes,
 									'application/json;charset=UTF-8').then(res => {
 									if (res.data.code == 200) {
@@ -323,14 +326,13 @@
 									}
 								})
 								.catch(res => {
-									if(res.errmsg){
+									if (res.errmsg) {
 										uni.showToast({
 											title: res.errmsg,
 											icon: 'none',
 											duration: 2000
 										})
-									}
-									else{
+									} else {
 										uni.showToast({
 											title: "系统异常，请联系管理员",
 											icon: 'none',
@@ -339,7 +341,7 @@
 									}
 								});
 						}
-						
+
 					},
 					fail: () => {},
 					complete: () => {}
@@ -382,7 +384,7 @@
 		color: #AFB3BF;
 		font-size: 14px;
 		margin-top: -10px;
-		margin-left: 45px; 
+		margin-left: 45px;
 		margin-bottom: 20px;
 	}
 
@@ -471,11 +473,9 @@
 	}
 
 	.but {
-		height: 33px;
 		border: 1px solid #CDCDCD;
 		border-radius: 20px;
-		line-height: 30px;
-		padding: 0 8px;
+		padding: 15rpx 30rpx;
 		text-align: center;
 		margin-left: 20px;
 		font-size: 14px;
@@ -502,7 +502,7 @@
 	.shade-content-item {
 		width: 277px;
 		text-align: center;
-		height: 121px;
+		height: 160rpx;
 		padding: 35px 10px;
 
 	}
@@ -523,21 +523,23 @@
 		margin-top: 20px;
 	}
 
+	.bottom-btn {
+		display: flex;
+		justify-content: center;
+		margin-bottom: 50rpx;
+	}
+
 	.determine {
-		width: 95px;
-		height: 36px;
+		width: 50%;
 		background-color: #22C572;
 		color: #FFFFFF;
 		border-radius: 10px;
-		margin: 0 auto;
-		line-height: 36px;
-		margin-top: -30px;
-		margin-bottom: 20px;
+		padding: 15rpx 18rpx;
 	}
 
 	.tainput {
-		width: 70%;
-		padding-left: 10px;
+		width: 90%;
+		padding-bottom: 15rpx;
 		margin: 0 auto;
 		text-align: left;
 		border-bottom: 1px solid #AFB3BF;
@@ -580,7 +582,8 @@
 		text-align: left;
 		border-radius: 3px;
 	}
-	.options{
+
+	.options {
 		justify-content: flex-end;
 	}
 </style>

pages/attestation/indexTwo.vue

@@ -1,36 +1,48 @@
 <template>
 	<view class="center">
 		<view v-for="(item , index) in businessman" :Key="index" class="forList">
-			<view class='flex' @click="navToDetailPage(item)">
-				<view class="logo">
+			<view class='forList-item' @click="navToDetailPage(item)">
+				<view class="logo left">
 					粮商
 				</view>
-				<view class="company">{{item.compName}}</view>
-				<view class="company" v-if="item.customerTypeFlag == 1">{{item.customerName}}</view>
-				<view class="status" v-if="item.cover == '1'">
-					已覆盖
-				</view>
-				<view v-else>
-					<view class="status" v-if="item.authenticationStatus == '已认证'">
-						<image src="../../static/img/authentication/cert-personal@3x.png"
-							style="width: 16px;height: 16px;top:3px;"></image>
-						{{item.authenticationStatus}}
-					</view>
-					<view class="status1" v-if="item.authenticationStatus == '审核中'">
-						{{item.authenticationStatus}}
-					</view>
-					<view class="status2" v-if="item.authenticationStatus == '未通过'">
-						{{item.authenticationStatus}}
+				<view class="right">
+					<view class="top">
+						<view class="company" v-if="item.customerTypeFlag != 1">{{item.compName}}</view>
+						<view class="company" v-if="item.customerTypeFlag == 1">{{item.customerName}}</view>
+						<view class="status" v-if="item.cover == '1'">
+							已覆盖
+						</view>
+						<view v-else>
+							<view class="status" v-if="item.authenticationStatus == '已认证'">
+								<image src="../../static/img/authentication/cert-personal@3x.png"
+									style="width: 16px;height: 16px;top:3px;"></image>
+								{{item.authenticationStatus}}
+							</view>
+							<view class="status1" v-if="item.authenticationStatus == '审核中'">
+								{{item.authenticationStatus}}
+							</view>
+							<view class="status2" v-if="item.authenticationStatus == '未通过'">
+								{{item.authenticationStatus}}
+							</view>
+							<view class="status3" v-if="item.authenticationStatus == '已覆盖'">
+								{{item.authenticationStatus}}
+							</view>
+						</view>
 					</view>
-					<view class="status3" v-if="item.authenticationStatus == '已覆盖'">
-						{{item.authenticationStatus}}
+					<view class="bottom">
+
+						<view class="">
+							<view class="geren" v-if="item.basis == 'true'">默认</view>
+							<view class="geren" v-if="item.customerTypeFlag == 1"> {{item.customerPhone}}</view>
+							<view class="geren" v-if="item.customerTypeFlag == 2">{{item.customerName}}</view>
+							<view class="geren" v-if="item.customerTypeFlag == 2">{{item.customerPhone}}</view>
+						</view>
 					</view>
 				</view>
+
 			</view>
-			<view class="geren" v-if="item.customerTypeFlag == 1"> {{item.customerPhone}}</view>
-			<view class="geren" v-if="item.customerTypeFlag == 2">{{item.customerName}}{{item.customerPhone}}
-			</view>
-			<view class="flex">
+
+			<view class="flex number">
 				<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>
@@ -52,7 +64,7 @@
 					<view class='shade-content-item'>
 						<input v-model='price' placeholder="请输入手机号" type="number" class="tainput" maxlength="11">
 					</view>
-					<view>
+					<view class="bottom-btn">
 						<view class="determine" @click="getcode">
 							获取验证码
 						</view>
@@ -104,7 +116,7 @@
 				id: "",
 				defaults1: "default1",
 				defaults2: "default2",
-				identityAuthenticationInfos:{},
+				identityAuthenticationInfos: {},
 			}
 		},
 		computed: {
@@ -115,7 +127,7 @@
 		},
 		onPullDownRefresh() {
 			this.getList()
-			setTimeout(function () {
+			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
@@ -144,7 +156,8 @@
 					this.identityAuthenticationInfo.commonId = this.userInfo.id
 					this.identityAuthenticationInfo.defaultFlag = 1
 					this.identityAuthenticationInfo.id = item.id
-					this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', this.identityAuthenticationInfo,
+					this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', this
+							.identityAuthenticationInfo,
 							'application/json;charset=UTF-8').then(res => {
 							for (var i = 0; i < this.businessman.length; i++) {
 								if (this.businessman.defaultFlag == 1) {
@@ -156,14 +169,13 @@
 							this.getList()
 						})
 						.catch(res => {
-							if(res.errmsg){
+							if (res.errmsg) {
 								uni.showToast({
 									title: res.errmsg,
 									icon: 'none',
 									duration: 2000
 								})
-							}
-							else{
+							} else {
 								uni.showToast({
 									title: "系统异常，请联系管理员",
 									icon: 'none',
@@ -201,10 +213,10 @@
 							}
 						}
 						var data = res.data.data.records
-						for(var i=0;i<data.length;i++){
-							if(data[i].customerTypeFlag==2){
-								if(data[i].compName&&data[i].compName.length > 10){
-									data[i].compName = data[i].compName.substring(0,10) + "..."
+						for (var i = 0; i < data.length; i++) {
+							if (data[i].customerTypeFlag == 2) {
+								if (data[i].compName && data[i].compName.length > 10) {
+									data[i].compName = data[i].compName.substring(0, 10) + "..."
 								}
 							}
 						}
@@ -212,14 +224,13 @@
 
 					})
 					.catch(res => {
-						if(res.message){
+						if (res.message) {
 							uni.showToast({
 								title: res.message,
 								icon: 'none',
 								duration: 2000
 							})
-						}
-						else{
+						} else {
 							uni.showToast({
 								title: "系统异常，请联系管理员",
 								icon: 'none',
@@ -238,13 +249,14 @@
 					}).then(res => {
 						if (res.data.code == 200) {
 							that.identityAuthenticationInfos.customerPhone = that.price
-							that.$api.doRequest('get','/identityAuthenticationInfo/selectPhone', that.identityAuthenticationInfos)
+							that.$api.doRequest('get', '/identityAuthenticationInfo/selectPhone', that
+									.identityAuthenticationInfos)
 								.then(res => {
 									if (res.data.code == '11018') {
 										uni.showModal({
 											title: '提示',
 											content: '该手机号已认证过个人粮商，再次认证将覆盖之前的认证信息，是否确定认证？',
-											success: function(res) {										
+											success: function(res) {
 												if (res.confirm) {
 													that.$api.doRequest('post',
 														'/identityAuthenticationInfo/api/modifyIdentityPhone',
@@ -301,7 +313,7 @@
 											duration: 2000
 										})
 									}
-					
+
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,
@@ -309,7 +321,7 @@
 										duration: 2000
 									})
 								})
-					
+
 						} else {
 							that.verification = false
 							uni.showToast({
@@ -403,32 +415,31 @@
 					success: (e) => {
 						if (e.confirm) {
 							this.$api.doRequest('post',
-								'/identityAuthenticationInfo/api/deleteIdentityAuthenticationInfo', {
-									id: item.id
-								}, 'application/json;charset=UTF-8').then(res => {
-								// this.procurementPlanInfos = res.data.data.records
-								if (res.data.code == 200) {
-									this.$api.msg('删除成功！')
-									this.getList()
-									return
-								}
-							})
-							.catch(res => {
-								if(res.errmsg){
-									uni.showToast({
-										title: res.errmsg,
-										icon: 'none',
-										duration: 2000
-									})
-								}
-								else{
-									uni.showToast({
-										title: "系统异常，请联系管理员",
-										icon: 'none',
-										duration: 2000
-									})
-								}
-							});
+									'/identityAuthenticationInfo/api/deleteIdentityAuthenticationInfo', {
+										id: item.id
+									}, 'application/json;charset=UTF-8').then(res => {
+									// this.procurementPlanInfos = res.data.data.records
+									if (res.data.code == 200) {
+										this.$api.msg('删除成功！')
+										this.getList()
+										return
+									}
+								})
+								.catch(res => {
+									if (res.errmsg) {
+										uni.showToast({
+											title: res.errmsg,
+											icon: 'none',
+											duration: 2000
+										})
+									} else {
+										uni.showToast({
+											title: "系统异常，请联系管理员",
+											icon: 'none',
+											duration: 2000
+										})
+									}
+								});
 						}
 					},
 					fail: () => {},
@@ -444,11 +455,10 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
 	.center {
-		padding: 10px 20px;
-		background-color: #eeeeee;
-		height: 2000rpx;
+		padding: 10px 20rpx;
+		height:calc(100vh - 88rpx);
 	}
 
 	.title {
@@ -466,15 +476,16 @@
 		font-weight: 600;
 		margin-top: 10px;
 		display: inline-block;
-		margin-left: 10px;
 	}
 
 	.geren {
 		color: #AFB3BF;
 		font-size: 14px;
-		margin-top: -15px;
+		margin-right: 10px;
+		display: inline-block;
+		/* 		margin-top: -15px;
 		margin-bottom: 20px;
-		margin-left: 46px;
+		margin-left: 46px; */
 	}
 
 	.infos {
@@ -487,11 +498,9 @@
 	}
 
 	.but {
-		height: 33px;
 		border: 1px solid #CDCDCD;
 		border-radius: 20px;
-		line-height: 30px;
-		padding: 0 8px;
+		padding: 15rpx 30rpx;
 		text-align: center;
 		margin-left: 20px;
 		font-size: 14px;
@@ -531,16 +540,16 @@
 	}
 
 	.status {
-		position: absolute;
-		margin-top: 10px;
-		right: 36px;
+		/* position: absolute; */
+		/* margin-top: 10px; */
+		/* right: 36px; */
 		color: #22C572;
 	}
 
 	.status1 {
-		position: absolute;
-		margin-top: 10px;
-		right: 36px;
+		// position: absolute;
+		// margin-top: 10px;
+		// right: 36px;
 		color: #FE6430;
 	}
 
@@ -568,6 +577,7 @@
 	.btns {
 		background-color: #22C572;
 		color: white;
+		margin: 52rpx 0;
 	}
 
 	.shade-content {
@@ -584,7 +594,7 @@
 	.shade-content-item {
 		width: 277px;
 		text-align: center;
-		height: 121px;
+		height: 160rpx;
 		padding: 35px 10px;
 	}
 
@@ -603,22 +613,22 @@
 		font-weight: 600;
 		margin-top: 20px;
 	}
-
+.bottom-btn{
+	display: flex;
+	justify-content: center;
+	margin-bottom: 50rpx;
+}
 	.determine {
-		width: 95px;
-		height: 36px;
+		width: 50%;
 		background-color: #22C572;
 		color: #FFFFFF;
 		border-radius: 10px;
-		margin: 0 auto;
-		line-height: 36px;
-		margin-top: -30px;
-		margin-bottom: 20px;
+		padding: 15rpx 18rpx;
 	}
 
 	.tainput {
-		width: 70%;
-		padding-left: 10px;
+		width: 90%;
+		padding-bottom: 15rpx;
 		margin: 0 auto;
 		text-align: left;
 		border-bottom: 1px solid #AFB3BF;
@@ -690,4 +700,37 @@
 	.options {
 		justify-content: flex-end;
 	}
+
+	.forList-item {
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1px solid #EEEEEE;
+		padding-bottom: 20px;
+
+		.left {
+			margin-left: 5px;
+		}
+
+		.right {
+			flex: 1;
+			margin-left:10rpx
+		}
+
+		.top {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+
+		.company {
+			display: inline-block;
+		}
+
+		.bottom {
+			width: 100%;
+		}
+	}
+	.number{
+		margin-top: 40rpx;
+	}
 </style>

pages/bill/index.vue

@@ -1,21 +1,64 @@
 <template>
-	<view>
-		<view v-for='item in dataInfo'>
-			<view>
-			买方{{item.compName}}
+	<view  :class="show ? 'tl-show': ''">
+		<view>
+			<view style='background:#fff;display:flex;' class="cu-bar search">
+				<view style='flex:6;' class="search-form round Medium">
+					<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
+					<input type="text" maxlength="20" :focus="true" v-model="searchKeyWord" @confirm="doSearch()"
+						 placeholder="请输入买方名称或编号" confirm-type="search"></input>
+				</view>
+				<view @click='doSearch()' class="Regular" style="width:4%;flex:1;">搜索</view>
+				<u-icon @click='emptysearch' class="cuIcon" v-if='searchKeyWord.length>0' size="34" name="close-circle-fill" color="#D6D9E0"></u-icon>
+				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 			</view>
-			<view>
-			卖方{{item.customerName}}
+			<view style='background:#fff;padding:0 15px;border-radius:0rpx 0rpx 30rpx 30rpx;' class="Semibold">
+				<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>全部</view>
+				<view @click='tabcarchange(5)' class='line' :class='TabCur==5?"active":""'>待付款</view>
+				<view @click='tabcarchange(6)' class='line' :class='TabCur==6?"active":""'>已付款</view>
 			</view>
-			<view>{{item.paymentNo}}</view>
-			<view>
-				<view>{{item.goodsName}}{{item.netWeight}}</view>
-				<view>单价{{item.tidalGrainPrice}}</view>
+		</view>
+		<view class='wrap' v-for='item in dataInfo'>
+			<view style='margin:5px;padding:10px 0;border-bottom:1px solid #eee;' class="flex justify-between align-item-center">
+				<view style='color:#878C9C;'>{{item.paymentNo}}</view>
+				<view class='not' v-if='item.status=="待结算"'>待付款</view>
+				<view class='already' v-else>已付款</view>
+			</view>
+			<view style='line-height:30px;'>
+				<view class='purchaser'>买方</view><view style='font-size:14px;display:inline-block;'>{{item.compName}}</view>
+			</view>
+			<view style='line-height:30px;'>
+				<view class='seller'>卖方</view><view style='font-size:14px;display:inline-block;'>{{item.customerName}}</view>
+				
+			</view>
+			<view class='flex justify-between align-item-center'>
+				<view style="color:#878C9C;padding:5px;">{{item.goodsName}}</view>
+				<view>{{item.netWeight}}</view>
+			</view>
+			<view class='flex justify-between align-item-center'>
+				<view style="color:#878C9C;padding:5px;">单价</view><view>{{item.tidalGrainPrice}}</view>
 			</view>
-			<view>
-				<view>应付{{item.amountIngPayable}}</view>
-				<view>单价{{item.amountEdPayable}}</view>
+			<view class='flex justify-between align-item-center'>
+				<view style="color:#878C9C;padding:5px;">应付</view>
+				<view>{{item.amountIngPayable}}</view>
 			</view>
+			<view class='flex justify-between align-item-center'>
+				<view style='color:#878C9C;padding:5px;'>单价</view>
+				<view>{{item.amountEdPayable}}</view>
+			</view>
+			<view style='flex-direction:row-reverse;' class='flex'>
+				<view @click='showImage(3,item)' class='button'>结算单</view>
+				<view @click='showImage(2,item)' class='button'>检斤单</view>
+				<view @click='showImage(1,item)' class='button'>质检单</view>
+			</view>
+		</view>
+		<view v-show="isContent">
+			<uni-load-more :status="loadStatus"></uni-load-more>
+		</view>
+		<view @click='closepop' class='popup' v-if='show'>
+			<view class='imagewrap' style='text-align:center;'>
+				<image :src="img" mode=""></image>
+			</view>
+			<view @click='xiazai' class='xiazai'><image style='width:24px;height:24px;' src="../../static/img/erp/xiazai@3x.png" mode=""></image></view>
 		</view>
 	</view>
 </template>
@@ -28,10 +71,15 @@
 		name: "business",
 		data() {
 			return {
+				TabCur:0,
 				pageSize:10,
 				currentPage:1,
 				isLoadMore:false,
+				isContent:false,
+				loadStatus:'noMore',
 				searchKeyWord:'',
+				show:false,
+				img:'',
 				searchType:'',
 				dataInfo:[]
 			}
@@ -61,10 +109,58 @@
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
 				this.isLoadMore = true
 				this.currentPage += 1
-				this.getIndexBuyData()
+				this.loadData()
 			}
 		},
 		methods: {
+			closepop(){
+				this.show=false
+			},
+			xiazai(){
+				const that = this;
+							uni.downloadFile({
+								url:that.img,
+								success: res => {
+									if (res.statusCode === 200) {
+										uni.saveImageToPhotosAlbum({
+											filePath: res.tempFilePath,
+											success: function() {
+												this.tools.toast('保存成功');
+												that.show=false
+											},
+											fail: function() {
+												this.tools.toast('保存失败，请稍后重试');
+											}
+										});
+									} else {
+										this.tools.toast('下载失败');
+									}
+								}
+							});
+				
+			},
+			showImage(status,item){
+				console.log(1111)
+				if(status==1){
+					this.img=item.qualityInspectionPictureAddress
+				}else if(status==2){
+					this.img=item.weighingPictureAddress
+				}else if(status==3){
+					this.img=item.pictureAddress
+				}
+				this.show=true
+			},
+			tabcarchange(status){
+				this.TabCur=status
+				if(status==0){
+					this.searchType=''
+				}else{
+					this.searchType=status
+				}
+				this.currentPage = 1
+				this.loadData()
+				
+			},
 			top() { //回到顶部  
 			　　　　uni.pageScrollTo({ 
 			　　　　　　scrollTop: 0, duration: 300 
@@ -94,6 +190,15 @@
 				this.currentPage = 1
 				this.loadData()
 			},
+			emptysearch(){
+				this.searchKeyWord=''
+				this.dataInfo=[]
+				this.loadData()
+			},
+			doSearch(){
+				this.dataInfo=[]
+				this.loadData()
+			},
 			//加载商品 ，带下拉刷新和上滑加载
 			async loadData(type = 'add', loading) {
 				if(!this.hasLogin){
@@ -124,12 +229,16 @@
 						searchKeyWord: this.searchKeyWord,
 						searchType: this.searchType,
 						managementType:1,
-						customerPhone:this.userInfo.phone,
-						pcFlag:1
+						// customerPhone:this.userInfo.phone,
+						// pcFlag:1
 						// warehouseName:'',
 					}).then(res => {
 						uni.hideLoading()
-						this.dataInfo = res.data.data.records
+						var data= res.data.data.records
+						this.dataInfo = this.dataInfo.concat(data)
+						if(data.length==0){
+							this.isContent=true
+						}
 					})
 					.catch(res => {
 						uni.hideLoading()
@@ -154,5 +263,137 @@
 	}
 </script>
 
-<style>
+<style scoped>
+	.wrap{
+		background:#fff;
+		margin:10px;
+		border-radius:10px;
+		padding:0  10px 10px;
+		font-size:12px;
+	}
+	.already{
+		color:#22C572;
+	}
+	.not{
+		color:#FE6430;
+	}
+	.purchaser{
+		padding:5px;background:#E9F8F0;color:#22C572;
+		display:inline;
+		border-radius:3px;
+		margin-right:10px;
+	}
+	.seller{
+		padding:5px;background:#FEECE6;color:#FE6430;
+		display:inline;
+		border-radius:3px;
+		margin-right:10px;
+	}
+	.button{
+		display:inline-block;
+		border:1px solid #CDCDCD;
+		padding:6px 15px;
+		border-radius:15px;
+		margin:5px 3px;
+	}
+	.search-form {
+			background: #F5F6F9;
+		}
+	
+		.search-box {
+			width: 100%;
+			background-color: rgb(242, 242, 242);
+			padding: 15upx 2.5%;
+			display: flex;
+			justify-content: space-between;
+		}
+	
+		.search-box .mSearch-input-box {
+			width: 100%;
+		}
+	
+		.search-box .input-box {
+			width: 85%;
+			flex-shrink: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	
+		.search-box .search-btn {
+			width: 15%;
+			margin: 0 0 0 2%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-shrink: 0;
+			font-size: 28upx;
+			color: #fff;
+			background: linear-gradient(to right, #ff9801, #ff570a);
+			border-radius: 60upx;
+		}
+	
+		.search-box .input-box>input {
+			width: 100%;
+			height: 60upx;
+			font-size: 32upx;
+			border: 0;
+			border-radius: 60upx;
+			-webkit-appearance: none;
+			-moz-appearance: none;
+			appearance: none;
+			padding: 0 3%;
+			margin: 0;
+			background-color: #ffffff;
+		}
+	.cuIcon {
+			position: absolute;
+			right: 80px;
+		}
+		.line {
+			display: inline-block;
+			padding: 5px;
+			position: relative;
+			font-size: 17px;
+		}
+		
+		.line.active {
+			font-size: 19px;
+			font-weight: 900;
+		}
+		
+		.line.active:after {
+			content: '';
+			display: block;
+			position: absolute;
+			width: 36rpx;
+			height: 6rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			bottom: 0;
+			background: #22C572;
+			/* border-bottom: 1px solid #22C572; */
+		}
+		.popup{
+			background:rgba(0, 0, 0, 0.8);
+			position:fixed;top:0;left:0;width:100%;height:100%;
+		}
+		.imagewrap{
+			position:absolute;
+			top:50%;
+			transform: translateY(-50%) translateX(-50%);
+			left:50%;
+		}
+		.xiazai{
+			position: absolute;
+			bottom:10px;
+			left:50%;
+			transform: translateX(-50%);
+		}
+		.tl-show{
+		  overflow: hidden;
+		  position:fixed;
+		  height: 100%;
+		  width: 100%;
+		}
 </style>

pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -149,8 +149,8 @@
 					warehouseName: this.warehouseName,
 					managementType: 1,
 				}).then(res => {
-					this.dataList = res.data.data.records
-					console.log(res.data.data.records)
+					var data=res.data.data.records
+					this.dataList = this.dataList.concat(data)
 					if(res.data.data.records.length==0){
 						this.isContent=true
 					}

pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue

@@ -161,7 +161,8 @@
 					warehouseName: this.warehouseName,
 					managementType: 3,
 				}).then(res => {
-					this.dataList = res.data.data.records
+					var data=res.data.data.records
+					this.dataList = this.dataList.concat(data)
 					console.log(res.data.data.records)
 					if(res.data.data.records.length==0){
 						this.isContent=true

pages/grain_pulse/dynamic.vue

@@ -1,7 +1,10 @@
 <template>
 	<view class="center">
-		<u-search placeholder="请输入关键字" v-model="keyword" @clear="searchClear" style="width: 96%; margin: 0 auto;"
+		<view class='search' >
+			<u-search placeholder="请输入关键字" bg-color='#F5F6F9' v-model="keyword" @clear="searchClear" style="width: 96%; margin: 0 auto;"
 			@search="getData" @custom="getData"></u-search>
+		</view>
+		
 		<view class="bottom flex">
 			<view class="bottonCss" @click="release">
 				<image src="../../static/img/liangmai/fabu-2-check@3x.png" mode="" style="width: 40rpx; height: 40rpx;">
@@ -53,9 +56,6 @@
 			<!-- <uni-load-more :status="loadStatus" icon icon-type></uni-load-more> -->
 			<u-loadmore :status="loadStatus" icon icon-type="circle" margin-bottom="200"/>
 		</view>
-		<view style='height:12vh;background:#F5F6FA;line-height:12vh;text-align:center;' v-if='releaseList.length == 0'>
-			当前暂无结果
-		</view>
 		<u-back-top :scroll-top="scrollTop" mode="circle" icon="arrow-upward"></u-back-top>
 	</view>
 </template>
@@ -257,7 +257,7 @@
 		background:#F5F6FA;
 	}
 	.center {
-		padding: 10rpx 4rpx;
+		padding: 0 4rpx;
 	}
 
 	.bottom {
@@ -321,4 +321,8 @@
 	/deep/.u-content {
 		text-indent:0 !important;	
 	}
+	.search{
+		background:#fff;
+		padding:10px;
+	}
 </style>

pages/grain_pulse/enter.vue

@@ -196,6 +196,11 @@
 		},
 		onShow() {
 			var that = this
+			try {
+			    this.position = uni.getStorageSync('position');
+			} catch (e) {
+			    // error
+			}
 			uni.getStorage({
 				key: 'setPosition',
 				success: (res) => {