7.26BUG修改

pages.json

@@ -20,7 +20,8 @@
 				"navigationBarTitleText": "",
 				"app-plus": {
 					"animationType": "pop-out",
-					"animationDuration": "slide-in-right"
+					"animationDuration": "slide-in-right",
+					 "enablePullDownRefresh": true
 				}
 
 			}

pages/alldeatil/acptdetail.vue

@@ -256,7 +256,8 @@
 	.logininbtn {
 		margin-top: 80rpx;
 		width:690rpx;
-		border-radius: 43rpx;
+		border-radius: 20rpx;
+		box-shadow: 0 10rpx 20rpx 1rpx rgba(179, 116, 5, 0.2);
 		background: linear-gradient(to right, #FFE1AD,#D8AB5A);
 		height: 100rpx;
 		text-align: center;

pages/alldeatil/addbill.vue

@@ -350,6 +350,8 @@
 			initAcceptor() {
 				// 承兑人列表
 				uni.$u.http.post('/api/Acceptor/search', {
+					pageIndex:1,
+					pageSize: 200,
 					name: this.seacept
 				}, {
 
@@ -379,6 +381,8 @@
 			initDrawers() {
 				// 出票人列表
 				uni.$u.http.post('/api/Drawer/search', {
+					pageIndex:1,
+					pageSize: 200,
 					name: this.seadra
 				}, {
 					custom: {

pages/alldeatil/addnewacpt.vue

@@ -237,8 +237,9 @@
 	.logininbtn {
 		margin-top: 80rpx;
 		width:690rpx;
-		border-radius: 43rpx;
+		border-radius: 20rpx;
 		background: linear-gradient(to right, #FFE1AD,#D8AB5A);
+		box-shadow: 0 10rpx 20rpx 1rpx rgba(179, 116, 5, 0.2);
 		height: 100rpx;
 		text-align: center;
 		color: #fff;

pages/alldeatil/addnewdrawer.vue

@@ -234,11 +234,11 @@
 		margin-top: 80rpx;
 		width: 690rpx;
 		border-radius: 20rpx;
-		// background: linear-gradient(to right, #FFE1AD,#D8AB5A);
-		border: 1rpx solid #BEBDBB;
+		background: linear-gradient(to right, #FFE1AD,#D8AB5A);
+		box-shadow: 0 10rpx 20rpx 1rpx rgba(179, 116, 5, 0.2);
 		height: 100rpx;
 		text-align: center;
-		color: #BEBDBB;
+		color: #fff;
 		line-height: 100rpx;
 	}
 </style>

pages/alldeatil/billdetail.vue

@@ -100,7 +100,7 @@
 			</view>
 		</view>
 		<view style="width: 100%;height: 140rpx;"></view>
-		<view class="newbill flex1"  v-if="state==0">
+		<view class="newbill flex1"  v-if="state==0&&!statusText=='待审核'">
 		<view class="choosebtn">
 			<view class="delbtn flex1" @click="examineFail()">审核失败</view>
 			<view class="succbtn flex1" @click="examineSuccess()">审核成功</view>
@@ -139,7 +139,8 @@
 				disabled:false,
 				delablepic:true,
 				placehodertitle:'请输入审核反馈',
-				contractId:''
+				contractId:'',
+				statusText:''
 			}
 		},
 		onLoad(o) {
@@ -149,11 +150,14 @@
 				this.disabled=true
 				this.delablepic=false
 			}
+			
 			if(o.obj){
 				let obj=JSON.parse(o.obj)
 				this.id=obj.id
+				console.log(obj,6464654)
 				this.index=obj.index
 				this.contractId=obj.contractId
+				this.statusText=obj.statusText
 			}
 			this.init()
 		},

pages/alldeatil/contractdetail.vue

@@ -246,8 +246,9 @@
 							url: item,
 						}
 					})
+					this.fileList3 = newData3
 					if(res.feedbackPics){
-						this.fileList3 = newData3
+						
 						const newData4 = res.feedbackPics.map((item) => {
 							return {
 								url: item,
@@ -316,14 +317,20 @@
 				})
 			},
 			billDetail(id, index) {
-				let obj = {
-					id: id,
-					index: index,
-					contractId:this.id
-				}
-				uni.navigateTo({
-					url: "/pages/alldeatil/billdetail?obj=" + JSON.stringify(obj)
-				})
+				// if(this.msg.statusText=="待审核"&&this.state==1){
+				// 	return
+				// }else{
+					let obj = {
+						id: id,
+						index: index,
+						contractId:this.id,
+						statusText:this.msg.statusText
+					}
+					uni.navigateTo({
+						url: "/pages/alldeatil/billdetail?obj=" + JSON.stringify(obj)
+					})
+				// }
+				
 			},
 			makeSureAll() {
 				this.quan = !this.quan
@@ -404,7 +411,7 @@
 			examineFail() {
 				uni.showModal({
 					title: '提示',
-					content: "是否审核成功？",
+					content: "是否审核失败？",
 					success: function(res) {
 						if (res.confirm) {
 							

pages/alldeatil/drawerdetail.vue

@@ -247,13 +247,13 @@
 
 	.logininbtn {
 		margin-top: 80rpx;
-		width: 690rpx;
-		border-radius: 20rpx;
-		// background: linear-gradient(to right, #FFE1AD,#D8AB5A);
-		border: 1rpx solid #BEBDBB;
+		width:690rpx;
+		border-radius:20rpx;
+		background: linear-gradient(to right, #FFE1AD,#D8AB5A);
+		box-shadow: 0 10rpx 20rpx 1rpx rgba(179, 116, 5, 0.2);
 		height: 100rpx;
 		text-align: center;
-		color: #BEBDBB;
+		color: #fff;
 		line-height: 100rpx;
 	}
 </style>

pages/alldeatil/upcontract.vue

@@ -217,6 +217,7 @@
 			calllips,
 			wUpload 
 		},
+		
 		data() {
 			return {
 
@@ -369,6 +370,8 @@
 			initAcceptor() {
 				// 承兑人列表
 				uni.$u.http.post('/api/Acceptor/search', {
+					pageIndex:1,
+					pageSize: 200,
 					name: this.seacept
 				}, {
 
@@ -391,6 +394,8 @@
 			initDrawers() {
 				// 出票人列表
 				uni.$u.http.post('/api/Drawer/search', {
+					pageIndex:1,
+					pageSize: 200,
 					name: this.seadra
 				}, {
 					custom: {

pages/bsinessadmin/privacypolicy.vue

@@ -1,8 +1,37 @@
 <template>
+	<view style="padding: 20rpx;">
+		<text style="display: block;text-align: center;">用户隐私协议</text>
+		<text>
+			
+			
+			用户隐私协议
+			尊敬的用户，欢迎阅读本协议：
+			
+			您的隐私对我们（“我们”或“我们的”）很重要。并且我们致力于保护您的隐私。因此，我们制定了隐私政策。本隐私政策（“隐私政策”）解释了当您使用软件和服务时，我们如何处理您的信息并保护您的隐私，以及与您的信息有关的可用权利和选项。我们认为，您有权了解我们在使用软件和服务（“软件和服务”）时可能收集和使用的信息的做法。如果您不同意此处设定的条款和条件，请不要使用该软件和服务。
+			
+			1.我们处理的信息以及处理您的信息的目的
+			我们将处理两大类信息。我们的使命是不断改进我们的软件和服务，并为您提供新的或更好的体验。作为此任务的一部分，我们将您的信息用于以下目的。如果出现用于处理您的个人数据的任何新目的，我们将通过对本隐私政策进行相应的更改，在开始处理有关该新目的的信息之前通知您。
+			
+			1.1您提交的信息
+			
+			（1）相机和照片（不包括面部照片）。通常，为了向您提供许多照片编辑器功能（例如模板，滤镜），您可以自愿授予我们访问相机或相册的权限，以便在您的移动设备中获取照片。我们将使用第三方提供的SDK处理照片。对于此类照片，我们既不会存储也不会与任何第三方共享。此信息对于您与我们之间的合同的适当履行是必要的。
+			
+			（2）面部特征数据。首次使用面部识别功能时，您可以自愿授予我们访问相机和相册的权限，以便在移动设备中获取面部照片。只有您确认许可，我们才能访问您的相机和相册。然后，我们将使用第三方提供的sdk分析面部特征数据，识别照片中五个感官的位置和形状，并处理照片，并将效果图反馈给您。这样的效果图将不包含任何个人身份信息。对于此类数据，照片和效果图，我们既不会存储也不会与任何第三方共享。 处理此类信息的目的仅在于操作应用程序的面部识别功能（包括但不限于衰老效果，性别变换，人脸融合等）。
+			
+			（3）处理此类信息的目的仅在于操作应用程序的人脸识别功能（包括但不限于衰老效果、性别转化效果、人脸融合效果、换脸效果、滤镜效果），相机和照片。为了使用该应用程序的某些功能，您可以自愿授予我们访问相机或相册的权限，以便在您的移动设备中获取照片。我们可能会通过使用Photo Kit API来收集您在使用该应用程序时上传或提交的照片，图片和其他数据。此信息对于您与我们之间的合同的适当履行是必要的。
+			
+			（4）支持相关信息。如果您通过我们的支持部分或通过电子邮件与我们联系，我们可能会收集您的联系信息，您的投诉或反馈以及您自愿提供的与此支持有关的任何信息。此类信息仅用于为您提供支持服务，不会与通过软件和服务从您那里收集的任何其他信息相关联。 您提交的信息的目的是：
+			（1）操作和更新软件和服务；
+			（2）改进和定制软件和服务及相关服务；
+			（3）维护，测试和监视软件的质量和操作；
+			（4）为您提供支持并处理您的投诉和/或反馈；
+			（5）在涉及您与软件和服务有关的纠纷时采取任何措施；
+			（6）遵守并满足任何适用的法律法规，法律程序或可执行的政府要求。</text>
+	</view>
 </template>
 
 <script>
 </script>
 
 <style>
-</style>
+</style>

pages/bsinessadmin/register.vue

@@ -58,7 +58,7 @@
 				@click="loginIn">马上登录</text></view>
 		<view class="flex1 checkag">
 			<u-checkbox-group @change="checkboxChange">
-				<u-checkbox name="gou" activeColor="#D8AB5A">
+				<u-checkbox name="gou" activeColor="#D8AB5A" :size="20">
 				</u-checkbox>
 			</u-checkbox-group>
 			<text>我已阅读并同意</text><text style="color: #D05C39;" @click="moveAgreement">用户协议</text><text>和</text><text style="color: #D05C39;" @click="privacyPolicy">隐私政策</text>

pages/bsinessadmin/setpassword.vue

@@ -213,10 +213,11 @@
 		box-sizing: border-box;
 		flex: 1;
 		border-radius: 20rpx;
-		border: 1rpx solid #BEBDBB;
+		background: linear-gradient(to right, #FFE1AD,#D8AB5A);
+		box-shadow: 0 10rpx 20rpx 1rpx rgba(179, 116, 5, 0.2);
 		height: 100rpx;
 		text-align: center;
-		color: #BEBDBB;
+		color: #fff;
 		line-height: 100rpx;
 		margin-bottom: 100rpx;
 	}

pages/bsinessadmin/supplierges.vue

@@ -130,9 +130,33 @@
 				}
 				form.checked=1
 				console.log(form)
-				uni.navigateTo({
-					url: "/pages/bsinessadmin/register?form="+JSON.stringify(form)
-				})
+					uni.$u.http.get(`/api/Supplier/name?name=${this.form.name}`, {
+						
+						name:that.form.name,
+						
+					}, {
+						custom: {
+							auth: true
+						}
+					}).then((res) => {
+						console.log(res.data)
+						if(res){
+							this.$toast("供货商名称已被使用，请重新填写")
+							// uni.navigateTo({
+							// 	url: "/pages/bsinessadmin/register?form="+JSON.stringify(form)
+							// })
+						}
+						// console.log(that.suplist,999999999)
+					}).catch((err) => {
+						uni.hideLoading()
+						console.log(err)
+						if(!err.data){
+							uni.navigateTo({
+								url: "/pages/bsinessadmin/register?form="+JSON.stringify(form)
+							})
+						}
+					})
+				
 			},
 
 			upImages(e) {

pages/bsinessadmin/useragreement.vue

@@ -1,8 +1,56 @@
 <template>
+	<view style="padding: 20rpx;">
+		<text style="display: block;text-align: center;">平台用户协议</text>
+		<text>
+			
+			
+			
+			平台用户协议（以下简称“本协议”）由以下双方根据《中华人民共和国合同法》等相关法律法规签署并遵照执行。
+
+			用户：在手机、平板电脑、电脑等注册成为平台（以下简称“平台”或“平台方”）的使用者，通过平台发布、查看、接收图文/音频/视频信息或其他文件，或与其他用户进行延时/实时交流的用户（以下简称“用户”）。
+
+			平台方：北京世纪超星信息技术发展有限责任公司（以下简称“平台方”）。
+
+			本协议所指“用户”包括但不限于教师身份用户、家长身份用户和学生身份用户。
+
+			第一条 用户注册
+			1.1用户下载平台并根据平台的注册规则完成注册流程（包括但不限于设置用户名称及密码）后，即有权通过平台发布、查看、接收图文/音频/视频信息或其他文件，或与其他用户进行延时/实时交流。用户在平台上有效注册（或有效变更注册）的用户名及密码共同构成用户在平台的唯一有效身份证明。
+
+			1.2用户一旦完成注册，则视为用户允许平台方通过短信、电子邮件、APP/服务器推送或其他方式向其发送与平台相关的信息。
+
+			1.3用户应当保证其完成上述注册（或变更注册）时所提供的身份信息及电话、电子邮箱等必要信息真实、准确、有效；如此类信息有任何变动，用户应当在三日内通过平台完成信息更新。因用户提供虚假或无效信息导致平台方或其他用户遭受损失的，用户应当承担全部责任。
+
+			1.4用户应自行妥善保管用户名及密码，除经平台方事先书面同意或本协议另有约定外，不得将其赠予、转让、出售或出借于他人使用；如用户发现其用户名及密码遭他人使用，应立即通知平台方以避免损失或损失扩大。因网络攻击、用户保管用户名及密码不当、转让或出借用户名及密码、怠于履行本协议及其他相关协议下的通知义务等情形或其他非平台方原因，导致用户未能正常使用平台或遭受任何损失的，由用户自行担责，平台方不承担任何责任。
+
+			1.5用户需自行确认，在开始注册使用平台前，其应当具备中华人民共和国法律规定的与其行为相适应的民事行为能力。若用户不具备前述与用户行为相适应的民事行为能力，则其监护人应依照法律规定承担此用户行为产生的一切法律后果（未成年人应在其监护人监督指导下使用平台）。
+
+			1.6用户注册的账户为用户自行设置并由用户自行保管，平台方任何时候均不会主动要求用户提供其账户密码。用户账户因用户的主动泄露或遭受他人攻击、诈骗等行为导致的损失及后果，平台方不承担责任，用户应自行通过司法、行政等救济途径向侵权行为人追偿。
+
+			1.7如发生以下情形，平台方有权收回用户注册的账户，用户将不能再登录平台，相应服务同时终止：
+
+			（一）经发现非由注册用户本人实际使用的；
+
+			（二）连续三个月未用于登录平台；
+
+			（三）其他平台方认为有必要的情形。
+
+			1.8用户一旦完成注册，即视为完全了解、接受并同意遵守本协议项下的全部内容并受限于本协议相关条款。平台方有权根据法律法规、政策以及运营中的实际情况对协议进行修改，并对用户进行公布。修改后的协议条款一经平台方公布即替换本协议的原条款，构成用户与平台方之间就本协议的全部、最新协议。用户可以随时在平台应用程序中查阅最新协议条款。如果用户不接受平台方修改后的最新协议条款，可选择停止使用平台并注销其账户。如用户选择继续使用平台，则视为用户完全了解、接受并同意遵守平台方修改后的最新协议条款。用户承认并认可，已经完全了解并理解本协议相关内容，对本协议及相关内容不存在任何重大误解；同时认可本协议内容并不存在显失公平的情形，用户与平台方在协议中处于平等地位，用户对协议的接受与否具有自由选择的权利。
+
+			第二条 服务内容
+			2.1平台方为用户提供发布、查看、接收图文/音频/视频信息或其他文件，或与其他用户进行延时/实时交流的服务。
+
+			2.2平台方作为平台软件的设计/开发/所有/经营者，有权对于平台软件不时作出更新和调整，只要用户仍为平台的注册用户，即视为其同意平台方作出的任何更新和调整。
+
+			2.3平台方仅为用户提供发布、查看、接收图文/音频/视频信息或其他文件，或与其他用户进行延时/实时交流的技术支持，因用户自身原因造成的延迟确认、延迟回复、未按时保存、操作失误等情形，平台方不承担任何责任。
+
+			2.4用户应当知晓在使用平台软件的过程中可能存在由其他用户进行通知、提醒、审批、定时、评论、发起问卷、投票等行为设置，平台方仅为前述行为提供技术支持，前述行为均为用户自身行为，与平台方无关。
+
+			2.5用户应当知晓在使用平台软件的过程中可能涉及第三方服务软件的参与（包括但不限于微信、QQ、支付宝等），因前述第三方服务软件所造成的信息提供错误、信息提供延误、信息泄露、连接错误、服务器故障等情形与平台方无关。</text>
+	</view>
 </template>
 
 <script>
 </script>
 
 <style>
-</style>
+</style>

pages/index/index.vue

@@ -5,7 +5,7 @@
 			<view class="searchbox">
 				<u-icon name="search" bold="true" size="25" color="rgb(246,185,78)"></u-icon>
 				<input type="text" v-model="keywords" placeholder="合同名称/编号、承兑人名称或出票人名称"
-					placeholder-style="color:#BBBCBE" @blur="changeSeach"/>
+					placeholder-style="color:#BBBCBE" @blur="changeSeach" />
 			</view>
 			<view class="screen" @click="show = true">
 				<text>筛选</text>
@@ -22,26 +22,29 @@
 					</view>
 
 					<view class="card" @click.stop="moveDetail(item.id)">
-						<view class="passreview" v-if="item.statusText=='成功'">
+						<view class="passreview" v-if="item.statusText=='成功'&&item.contractStatus!==1">
 							<image src="../../static/img/resuccess.png" mode="aspectFill"></image>
 						</view>
-						<view class="passreview" v-if="item.statusText=='待审核'">
+						<view class="passreview" v-if="item.statusText=='待审核'&&item.contractStatus!==1">
 							<image src="../../static/img/toreviewe.png" mode="aspectFill"></image>
 						</view>
-						<view class="passreview" v-if="item.statusText=='失败'">
+						<view class="passreview" v-if="item.statusText=='失败'&&item.contractStatus!==1">
 							<image src="../../static/img/falis.png" mode="aspectFill"></image>
 						</view>
-						<view class="passreview" v-if="item.statusText=='已删除'">
+						<view class="passreview" v-if="item.contractStatus==1">
 							<image src="../../static/img/redel.png" mode="aspectFill"></image>
 						</view>
-						<view class="timebox" v-if="item.statusText=='成功'"><text>{{item.createdAt}}</text></view>
-						<view class="timebox" v-if="item.statusText=='待审核'" :style="{'background-color':'#FFEBE5'}">
+						<view class="timebox" v-if="item.statusText=='成功'&&item.contractStatus!==1">
+							<text>{{item.createdAt}}</text></view>
+						<view class="timebox" v-if="item.statusText=='待审核'&&item.contractStatus!==1"
+							:style="{'background-color':'#FFEBE5'}">
 							<text>{{item.createdAt}}</text>
 						</view>
-						<view class="timebox" v-if="item.statusText=='失败'" :style="{'background-color':'#E7E7E7'}">
+						<view class="timebox" v-if="item.statusText=='失败'&&item.contractStatus!==1"
+							:style="{'background-color':'#E7E7E7'}">
 							<text>{{item.createdAt}}</text>
 						</view>
-						<view class="timebox" v-if="item.statusText=='已删除'" :style="{'background-color':'#F6F6F6'}">
+						<view class="timebox" v-if="item.contractStatus==1" :style="{'background-color':'#F6F6F6'}">
 							<text>{{item.createdAt}}</text>
 						</view>
 						<view class="innerbox">
@@ -92,6 +95,17 @@
 						</view>
 					</view>
 				</view>
+				<view class="checklist" v-for="(item,index) in ctrexamstatus" :key="index">
+					<view class="alllistbtn">
+						<text class="btntitle" style="">{{item.title}}</text>
+						<view class="yunbtn">
+							<view class="btnchoose" v-for="(i,k) in item.list" :key="k" @click="choose(item.title,k)"
+								:class="[ contract_examstatus== k?'active':'btnchoose']">
+								<text>{{i.name}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
 				<view class="checklist" v-for="(item,index) in billstatus" :key="index">
 					<view class="alllistbtn">
 						<text class="btntitle" style="">{{item.title}}</text>
@@ -117,26 +131,36 @@
 				<view class="flex4 custom" v-if="time_status==3">
 					<text style="font-size: 26rpx;font-weight: 600;">自定义</text>
 					<view class="custombox flex3">
-						<view class="creatdata flex6">
+						<view class="creatdata flex6" @click="openDatePicker(1)">
 							<text>开始日期</text>
-							<view class="flex4 chodatain" @click="openDatePicker(1)">
+							<view class="flex4 chodatain" >
 								<text>{{creatTime}}</text>
 								<u-icon name="arrow-right" color="#BEBDBB" bold="true" size="12"></u-icon>
 							</view>
 						</view>
-						<view class="creatdata flex6">
+						<view class="creatdata flex6" @click="openDatePicker(2)">
 							<text>结束日期</text>
-							<view class="flex4 chodatain" @click="openDatePicker(2)">
+							<view class="flex4 chodatain" >
 								<text>{{endTime}}</text>
 								<u-icon name="arrow-right" color="#BEBDBB" bold="true" size="12"></u-icon>
 							</view>
 						</view>
 					</view>
 				</view>
-				<view class="searchbox" style="margin: 0 20px;margin-bottom: 30px;" v-if="state==0">
+				<view class="checklist">
+					<view class="alllistbtn">
+						<text class="btntitle" style="">搜索供应商</text>
+						<view class="yunbtn">
+							<view class="chosbox">
+								<uni-data-select v-model="asd" :localdata="suplist" @change="changeacPerson" :showas="false" :plname="'搜索供应商名称'" @search="searchSupplier"  @checkin="checkacptIndex":nomore="nomore"></uni-data-select>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 	<view class="searchbox" style="margin: 0 20px;margin-bottom: 30px;" v-if="state==0">
 					<u-icon name="search" bold="true" size="25" color="rgb(246,185,78)"></u-icon>
 					<input type="text" v-model="supkeywords" placeholder="请输入供应商名称" placeholder-style="color:#BBBCBE" />
-				</view>
+				</view> -->
 				<view class="aszs flex6">
 					<view class="againbtn" @click="restoreALL"><text>重置</text></view>
 					<view class="againbtn" style="color: #D8AB5A;border: 1rpx solid #D8AB5A;" @click="makeSureSelect">
@@ -198,7 +222,7 @@
 		data() {
 			return {
 				keywords: '',
-				supkeywords:'',
+				supkeywords: '',
 				state: 0,
 				show: false,
 				editall: false,
@@ -206,19 +230,40 @@
 				quan: false,
 				creatTime: '',
 				endTime: '',
+				asd:'',
 				value1: Number(new Date()),
 				intime: 1,
-				contract_status: '',
-				draft_status: '',
-				time_status: '',
+				contract_examstatus: 0,
+				contract_status: 0,
+				draft_status: 0,
+				time_status: 0,
 				listall: [],
+				suplist:[],
 				pageIndex: 1,
+				supageIndex:1,
 				total: '',
 				nomore: false,
 				shai: false,
-				startTime:'',
+				startTime: '',
+				supplierId:0,
 				ctrstatus: [{
 					title: "合同状态",
+					list: [{
+							name: "全部",
+
+						},
+						{
+							name: "正常",
+
+						},
+						{
+							name: "已删除",
+
+						},
+					]
+				}],
+				ctrexamstatus: [{
+					title: "合同审核状态",
 					list: [{
 							name: "全部",
 
@@ -235,10 +280,7 @@
 							name: "失败",
 
 						},
-						{
-							name: "已删除",
 
-						},
 					]
 				}],
 				billstatus: [{
@@ -298,6 +340,7 @@
 			that.nomore = false
 			that.listall = []
 			this.init()
+			this.initSupplier()
 		},
 		// 下拉到底部后加载新数据
 		onReachBottom() {
@@ -308,21 +351,30 @@
 			} else {
 				this.nomore = true
 			}
-
 		},
 		methods: {
 
 			init() {
 				uni.showLoading()
+				let conkey = ''
+				if (this.contract_status == 0) {
+					conkey = 0
+				} else if (this.contract_status == 1) {
+					conkey = 2
+				} else if (this.contract_status == 2) {
+					conkey = 1
+				}
+				console.log(this.supplierId,778)
 				uni.$u.http.post('/api/Contract/search', {
 					pageIndex: this.pageIndex,
 					pageSize: 10,
 					startTime: this.creatTime,
 					endTime: this.endTime,
 					name: this.keywords,
-					contractStatus: this.contract_status,
+					contractStatus: conkey,
+					approveStatus: this.contract_examstatus,
 					draftStatus: this.draft_status,
-					supplierName:this.supkeywords
+					supplierId: this.supplierId
 				}, {
 					custom: {
 						auth: true
@@ -347,13 +399,71 @@
 				})
 
 			},
-			changeSeach(e){
-				this.keywords=e.detail.value
+			initSupplier(){
+				uni.$u.http.post('/api/Supplier/search', {
+					pageIndex:1,
+					pageSize: 200,
+					// startTime:'',
+					// endTime:'',
+					name:this.seacesu,
+					// contractStatus:'',
+					// contractNo:''
+				}, {
+					custom: {
+						auth: true
+					}
+				}).then((res) => {
+					let list=res.result
+					if(list.length>0){
+						list.forEach((item,index)=>{
+							that.suplist.push({
+								id:item.id,
+								text:item.account,
+								value:index
+							})
+						})
+						if(list.length<10){
+							that.nomore=true
+						}
+					}
+					// console.log(that.suplist,999999999)
+				}).catch((err) => {
+					uni.hideLoading()
+					console.log(err)
+				})
+			},
+			changeSeach(e) {
+				this.keywords = e.detail.value
 				that.pageIndex = 1
 				that.nomore = false
 				that.listall = []
 				this.init()
 			},
+			searchSupplier(e){
+				this.seacesu = e
+				this.supageIndex=1,
+				this.suplist = []
+				this.initSupplier()
+			},
+			checkacptIndex(index) {
+				this.acptIndex = index
+			},
+			changeacPerson(e) {
+				this.asd = e
+				if (e == "clearall") {
+					this.supplierId = ''
+				} else {
+					for (let i in this.suplist) {
+						console.log(this.supplierId)
+						if (i == e) {
+							console.log(this.supplierId)
+							this.supplierId=this.suplist[i].id
+							console.log(this.suplist)
+						}
+					}
+				}
+				console.log(this.supplierId)
+			},
 			examineFail() {
 				let ids = []
 				that.listall.forEach(item => {
@@ -605,9 +715,10 @@
 				this.dateshow = false
 				const timeFormat = uni.$u.timeFormat
 				if (this.intime == 1) {
-					this.creatTime = timeFormat(e.value, 'yyyy-mm-dd')
+					
+					this.creatTime = timeFormat(e.value, 'yyyy-mm-dd 23:59:59')
 				} else {
-					this.endTime = timeFormat(e.value, 'yyyy-mm-dd')
+					this.endTime = timeFormat(e.value, 'yyyy-mm-dd 00:00:00')
 				}
 
 			},
@@ -643,14 +754,16 @@
 				this.endTime = ''
 				this.time_status = 0
 				this.contract_status = 0
-					this.draft_status = 0
-					that.pageIndex = 1
-					that.nomore = false
-					that.listall = []
-					this.init()
+				this.draft_status = 0
+				that.pageIndex = 1
+				that.nomore = false
+				that.listall = []
+				this.init()
 			},
 			choose(title, k) {
-				if (title == "合同状态") {
+				if (title == "合同审核状态") {
+					this.contract_examstatus = k
+				} else if (title == "合同状态") {
 					this.contract_status = k
 				} else if (title == "汇票状态") {
 					this.draft_status = k
@@ -658,7 +771,9 @@
 					this.time_status = k
 					if (k == 0) {
 						this.creatTime = ''
+						this.endTime=''
 					} else if (k == 1) {
+						this.endTime=''
 						let myDate = new Date()
 						let yy = String(myDate.getFullYear())
 						let mm = String(myDate.getMonth() + 1 < 10 ? '0' + (myDate.getMonth() + 1) : myDate.getMonth() + 1)
@@ -666,12 +781,17 @@
 						let nowDate = yy + '-' + mm + '-' + dd
 						this.creatTime = nowDate
 					} else if (k == 2) {
+						this.endTime=''
+						this.creatTime =''
 						let myDate = new Date()
 						let yy = String(myDate.getFullYear())
 						let mm = String(myDate.getMonth() + 1 < 10 ? '0' + (myDate.getMonth() + 1) : myDate.getMonth() + 1)
 						let dd = String(myDate.getDate() - 1 < 10 ? '0' + myDate.getDate() - 1 : myDate.getDate() - 1)
-						let nowDate = yy + '-' + mm + '-' + dd
-						this.creatTime = nowDate
+						let aa = String(myDate.getDate()  < 10 ? '0' + myDate.getDate()  : myDate.getDate())
+						let nowDate = yy + '-' + mm + '-' + aa+' '+"00:00:00"
+						let startDate=yy + '-' + mm + '-' + dd+' '+"23:59:59"
+						this.endTime=nowDate
+						this.creatTime = startDate
 					}
 
 				}
@@ -698,7 +818,7 @@
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			padding-left: 30rpx;
+			// padding-left: 30rpx;
 		}
 	}
 
@@ -708,7 +828,7 @@
 		background-color: #ECECEC;
 		border-radius: 38rpx;
 		// width: 688rpx;
-		flex: 1;
+		// flex: 1;
 		height: 75rpx;
 		margin: 0 auto;
 		display: flex;

pages/login/login.vue

@@ -29,11 +29,11 @@
 			<text @click="show = true">忘记密码？</text>
 		</view>
 		<view class="logininbtn" @click="loginIn">
-			<text>登陆</text>
+			<text>登录</text>
 		</view>
 		<view class="flex1 checkag">
 			<u-checkbox-group @change="checkboxChange">
-				<u-checkbox name="gou" activeColor="#D8AB5A">
+				<u-checkbox name="gou" activeColor="#D8AB5A" :size="20">
 				</u-checkbox>
 			</u-checkbox-group>
 
@@ -109,7 +109,7 @@
 					uni.setStorageSync('token', res.token)
 					uni.setStorageSync('supplierId', res.userInfo.id)
 					uni.hideLoading()
-					this.$toast("登陆成功")
+					this.$toast("登录成功")
 					this.$store.commit("getAdmin", this.checked)
 					setTimeout(() => {
 						uni.reLaunch({

static/css/flex.scss

@@ -208,9 +208,16 @@
 					display: flex;
 					flex-direction: row;
 					flex-wrap: wrap;
+					margin: 0 auto;
 					margin-left: 30rpx;
+					margin-bottom: 40rpx;
+				}
+				.chosbox{
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin-left: 15rpx;
 				}
-	
 				.btnchoose {
 					margin-bottom: 30rpx;
 					margin-right: 41rpx;

store/index.js

@@ -8,7 +8,7 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
   state:{
 	  userinfo:'',
-		admin:1
+		admin:0
    },
    mutations:{
 	   // 获取用户信息

uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -57,7 +57,8 @@
 				mixinDatacomResData: [],
 				apps: [],
 				channels: [],
-				seachcontent:''
+				seachcontent:'',
+				pageIndex:1
 			};
 		},
 		props: {
@@ -79,6 +80,10 @@
 				type: Boolean,
 				default: true
 			},
+			nomore:{
+				type: Boolean,
+				default: true
+			},
 			value: {
 				type: [String, Number],
 				default: ''
@@ -112,6 +117,18 @@
 				default: 0
 			}
 		},
+		// 下拉到底部后加载新数据
+		onReachBottom() {
+			console.log(2222222222222)
+			//判断下一页是否存在数据，不存在将显示暂无数据等提示语
+			// if (this.localdata.length >= this.pageIndex * 10) {
+			// 	this.pageIndex++; //页数加一
+			// 	this.init(); //回调接口
+			// } else {
+			// 	this.nomore = true
+			// }
+		
+		},
 		created() {
 			this.last = `${this.collection}_last_selected_option_value`
 			if (this.collection && !this.localdata.length) {
@@ -160,6 +177,7 @@
 				}
 			}
 		},
+		
 		methods: {
 			moveAdd(){
 				uni.navigateTo({
@@ -390,6 +408,8 @@
 		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 		z-index: 99;
 		padding: 4px 0;
+		margin-bottom: 40rpx;
+		// bottom: 40rpx;
 	}
 
 	.uni-select__selector-scroll {

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -223,7 +223,15 @@ page {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
+  margin: 0 auto;
   margin-left: 30rpx;
+  margin-bottom: 40rpx;
+}
+.popscreen .checklist .alllistbtn .chosbox {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-left: 15rpx;
 }
 .popscreen .checklist .alllistbtn .btnchoose {
   margin-bottom: 30rpx;

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js

@@ -80,19 +80,19 @@ var components
 try {
   components = {
     uOverlay: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-overlay/u-overlay */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-overlay/u-overlay")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-overlay/u-overlay.vue */ 424))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-overlay/u-overlay */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-overlay/u-overlay")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-overlay/u-overlay.vue */ 432))
     },
     uTransition: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-transition/u-transition */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-transition/u-transition")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-transition/u-transition.vue */ 432))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-transition/u-transition */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-transition/u-transition")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-transition/u-transition.vue */ 440))
     },
     uStatusBar: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-status-bar/u-status-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-status-bar/u-status-bar")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-status-bar/u-status-bar.vue */ 442))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-status-bar/u-status-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-status-bar/u-status-bar")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-status-bar/u-status-bar.vue */ 450))
     },
     uIcon: function() {
       return Promise.all(/*! import() | node-modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-icon/u-icon.vue */ 354))
     },
     uSafeBottom: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-safe-bottom/u-safe-bottom.vue */ 450))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-safe-bottom/u-safe-bottom.vue */ 458))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/acceptor/acceptor.js

@@ -265,7 +265,7 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 
-var that;var tabar = function tabar() {__webpack_require__.e(/*! require.ensure | componet/tabbar/tabbar */ "componet/tabbar/tabbar").then((function () {return resolve(__webpack_require__(/*! @/componet/tabbar/tabbar.vue */ 372));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+var that;var tabar = function tabar() {__webpack_require__.e(/*! require.ensure | componet/tabbar/tabbar */ "componet/tabbar/tabbar").then((function () {return resolve(__webpack_require__(/*! @/componet/tabbar/tabbar.vue */ 382));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 {
   components: {

unpackage/dist/dev/mp-weixin/pages/alldeatil/acptdetail.wxss

@@ -133,7 +133,8 @@
 .logininbtn.data-v-5ede9767 {
   margin-top: 80rpx;
   width: 690rpx;
-  border-radius: 43rpx;
+  border-radius: 20rpx;
+  box-shadow: 0 10rpx 20rpx 1rpx rgba(179, 116, 5, 0.2);
   background: linear-gradient(to right, #FFE1AD, #D8AB5A);
   height: 100rpx;
   text-align: center;

unpackage/dist/dev/mp-weixin/pages/alldeatil/addbill.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uniDataSelect: function() {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 409))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 363))
     },
     uUpload: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-upload/u-upload.vue */ 399))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-upload/u-upload.vue */ 409))
     },
     uDatetimePicker: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-datetime-picker/u-datetime-picker.vue */ 363))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-datetime-picker/u-datetime-picker.vue */ 373))
     }
   }
 } catch (e) {
@@ -572,8 +572,12 @@ var that;var calllips = function calllips() {__webpack_require__.e(/*! require.e
     // this.initDrawers()
   }, onShow: function onShow() {this.initAcceptor();this.initDrawers();}, methods: (_methods = { loadTime: function loadTime() {var myDate = new Date();var wk = parseInt(Date.now() / 100000).toFixed(0) * 100000;var yy = String(myDate.getFullYear()); // let mm = myDate.getMonth() + 1
       var mm = String(myDate.getMonth() + 1 < 10 ? '0' + (myDate.getMonth() + 1) : myDate.getMonth() + 1);var dd = String(myDate.getDate() < 10 ? '0' + myDate.getDate() : myDate.getDate());var nowDate = yy + '-' + mm + '-' + dd;this.form.contractDrafts.forEach(function (item) {item.acceptDate = nowDate;item.issueDate = nowDate;item.expireDate = nowDate;item.expectDiscountDate = nowDate;item.expectDiscountDateTime = wk;item.acceptDateTime = wk;var nTime = item.acceptDateTime - item.expectDiscountDateTime;item.limitTime = Math.floor(nTime / 86400000);});}, initAcceptor: function initAcceptor() {var _this = this; // 承兑人列表
-      uni.$u.http.post('/api/Acceptor/search', { name: this.seacept }, {}, { custom: { auth: true } }).then(function (res) {uni.hideLoading();_this.range1 = res.result;_this.range1.forEach(function (item, index) {_this.range1[index].value = index;_this.range1[index].text = item.name;});if (_this.again) {that.range1.forEach(function (item, index) {console.log(that.form.contractDrafts[0], item);if (item.id == that.form.contractDrafts[0].acceptorId) {that.form.contractDrafts[0].acceptor = index;}});}}).catch(function (err) {});}, initDrawers: function initDrawers() {var _this2 = this; // 出票人列表
-      uni.$u.http.post('/api/Drawer/search', { name: this.seadra }, { custom: { auth: true } }).then(function (res) {uni.hideLoading();_this2.range2 = res.result;_this2.range2.forEach(function (item, index) {_this2.range2[index].value = index;_this2.range2[index].text = item.name;});if (_this2.again) {that.range2.forEach(function (item, index) {if (item.id == that.form.contractDrafts[0].drawersId) {that.form.contractDrafts[0].drawers = index;}});}}).catch(function (err) {});}, searchAcceptor: function searchAcceptor(e) {this.seacept = e;this.initAcceptor();}, searchDrawers: function searchDrawers(e) {this.seadra = e;this.initDrawers();}, checkacptIndex: function checkacptIndex(index) {this.acptIndex = index;
+      uni.$u.http.post('/api/Acceptor/search', { pageIndex: 1, pageSize: 200, name: this.seacept }, {}, { custom: { auth: true } }).then(function (res) {uni.hideLoading();_this.range1 = res.result;_this.range1.forEach(function (item, index) {_this.range1[index].value = index;_this.range1[index].text = item.name;});if (_this.again) {that.range1.forEach(function (item, index) {console.log(that.form.contractDrafts[0], item);if (item.id == that.form.contractDrafts[0].acceptorId) {that.form.contractDrafts[0].acceptor = index;}});}}).catch(function (err) {});}, initDrawers: function initDrawers() {var _this2 = this; // 出票人列表
+      uni.$u.http.post('/api/Drawer/search', { pageIndex: 1, pageSize: 200, name: this.seadra }, { custom: { auth: true } }).then(function (res) {uni.hideLoading();_this2.range2 = res.result;_this2.range2.forEach(function (item, index) {_this2.range2[index].value = index;_this2.range2[index].text = item.name;});if (_this2.again) {that.range2.forEach(function (item, index) {if (item.id == that.form.contractDrafts[0].drawersId) {that.form.contractDrafts[0].drawers = index;}});}}).catch(function (err) {});}, searchAcceptor: function searchAcceptor(e) {this.seacept = e;this.initAcceptor();}, searchDrawers: function searchDrawers(e) {this.seadra = e;
+      this.initDrawers();
+    },
+    checkacptIndex: function checkacptIndex(index) {
+      this.acptIndex = index;
     },
     checkldrwIndex: function checkldrwIndex(index) {
       this.drwIndex = index;

unpackage/dist/dev/mp-weixin/pages/alldeatil/addnewacpt.wxss

@@ -133,8 +133,9 @@
 .logininbtn.data-v-d5789316 {
   margin-top: 80rpx;
   width: 690rpx;
-  border-radius: 43rpx;
+  border-radius: 20rpx;
   background: linear-gradient(to right, #FFE1AD, #D8AB5A);
+  box-shadow: 0 10rpx 20rpx 1rpx rgba(179, 116, 5, 0.2);
   height: 100rpx;
   text-align: center;
   color: #fff;

unpackage/dist/dev/mp-weixin/pages/alldeatil/addnewdrawer.wxss

@@ -141,10 +141,11 @@
   margin-top: 80rpx;
   width: 690rpx;
   border-radius: 20rpx;
-  border: 1rpx solid #BEBDBB;
+  background: linear-gradient(to right, #FFE1AD, #D8AB5A);
+  box-shadow: 0 10rpx 20rpx 1rpx rgba(179, 116, 5, 0.2);
   height: 100rpx;
   text-align: center;
-  color: #BEBDBB;
+  color: #fff;
   line-height: 100rpx;
 }
 

unpackage/dist/dev/mp-weixin/pages/alldeatil/billdetail.js

@@ -98,7 +98,7 @@ var components
 try {
   components = {
     uUpload: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-upload/u-upload.vue */ 399))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-upload/u-upload.vue */ 409))
     }
   }
 } catch (e) {
@@ -405,13 +405,17 @@ var _baseUrl = __webpack_require__(/*! @/http/baseUrl.js */ 16);function _intero
 //
 //
 //
-var that;var _default = { data: function data() {return { id: '', msg: '', index: '', state: 0, fileList4: [], feedback: '', disabled: false, delablepic: true, placehodertitle: '请输入审核反馈', contractId: '' };}, onLoad: function onLoad(o) {that = this;this.state = this.$store.state.admin;if (this.state == 1) {this.disabled = true;this.delablepic = false;}if (o.obj) {var obj = JSON.parse(o.obj);this.id = obj.id;this.index = obj.index;this.contractId = obj.contractId;}this.init();}, methods: { init: function init() {var _this = this;var id = this.id;uni.showLoading();uni.$u.http.get("/api/Contract/contractDraft/".concat(id), { custom: { auth: true } }).then(function (res) {uni.hideLoading();_this.msg = res;if (res.feedbackPicList) {var newData4 = res.feedbackPicList.map(function (item) {return { url: item };});_this.fileList4 = newData4;}if (_this.state == 1) {if (res.feedback.length > 0) {_this.feedback = res.feedback;} else {_this.feedback = "无";}} else {if (res.feedback.length > 0) {_this.feedback = res.feedback;} else {_this.placehodertitle = "请输入审核反馈";}}}).catch(function (err) {uni.hideLoading();_this.$toast(err.msg);});}, prviewPic: function prviewPic(item) {var pics = [];pics.push(item);uni.previewImage({ urls: pics });}, tryAgain: function tryAgain() {var obj = { contractId: this.contractId, id: this.id, contractDrafts: [this.msg] };uni.navigateTo({ url: "/pages/alldeatil/addbill?obj=" + JSON.stringify(obj) });}, addBill: function addBill() {uni.navigateTo({ url: "/pages/alldeatil/addbill" });}, examineSuccess: function examineSuccess() {// let ids = []
+var that;var _default = { data: function data() {return { id: '', msg: '', index: '', state: 0, fileList4: [], feedback: '', disabled: false, delablepic: true, placehodertitle: '请输入审核反馈', contractId: '', statusText: '' };}, onLoad: function onLoad(o) {that = this;this.state = this.$store.state.admin;if (this.state == 1) {this.disabled = true;this.delablepic = false;}if (o.obj) {var obj = JSON.parse(o.obj);this.id = obj.id;console.log(obj, 6464654);this.index = obj.index;this.contractId = obj.contractId;this.statusText = obj.statusText;}this.init();}, methods: { init: function init() {var _this = this;var id = this.id;uni.showLoading();uni.$u.http.get("/api/Contract/contractDraft/".concat(id), { custom: { auth: true } }).then(function (res) {uni.hideLoading();_this.msg = res;if (res.feedbackPicList) {var newData4 = res.feedbackPicList.map(function (item) {return { url: item };});_this.fileList4 = newData4;}if (_this.state == 1) {if (res.feedback.length > 0) {_this.feedback = res.feedback;} else {_this.feedback = "无";}} else {if (res.feedback.length > 0) {_this.feedback = res.feedback;} else {_this.placehodertitle = "请输入审核反馈";}}}).catch(function (err) {uni.hideLoading();_this.$toast(err.msg);});}, prviewPic: function prviewPic(item) {var pics = [];pics.push(item);uni.previewImage({ urls: pics });}, tryAgain: function tryAgain() {var obj = { contractId: this.contractId, id: this.id, contractDrafts: [this.msg] };uni.navigateTo({ url: "/pages/alldeatil/addbill?obj=" + JSON.stringify(obj) });}, addBill: function addBill() {uni.navigateTo({ url: "/pages/alldeatil/addbill" });}, examineSuccess: function examineSuccess() {// let ids = []
       // ids.push(this.id)
-      uni.showModal({ title: '提示', content: "是否审核成功？", success: function success(res) {if (res.confirm) {var form = { id: Number(that.id), approveStatus: 1 };if (that.fileList4.length > 0) {var feedbackPicList = [];that.fileList4.forEach(function (item) {feedbackPicList.push(item.url);});form.feedbackPicList = feedbackPicList;}var feedback = that.feedback;if (feedback.length > 0) {form.feedback = feedback;} // ={
+      uni.showModal({ title: '提示', content: "是否审核成功？", success: function success(res) {if (res.confirm) {var form = { id: Number(that.id), approveStatus: 1 };if (that.fileList4.length > 0) {var feedbackPicList = [];that.fileList4.forEach(function (item) {feedbackPicList.push(item.url);});form.feedbackPicList = feedbackPicList;}var feedback = that.feedback;if (feedback.length > 0) {
+              form.feedback = feedback;
+            }
+            // ={
             // 	feedback:feedback,
             // 	feedbackPicList:feedbackPicList
             // }
-            uni.showLoading();uni.$u.http.post('api/Contract/approveContractDraft', form, {
+            uni.showLoading();
+            uni.$u.http.post('api/Contract/approveContractDraft', form, {
               custom: {
                 auth: true } }).
 

unpackage/dist/dev/mp-weixin/pages/alldeatil/drawerdetail.wxss

@@ -141,10 +141,11 @@
   margin-top: 80rpx;
   width: 690rpx;
   border-radius: 20rpx;
-  border: 1rpx solid #BEBDBB;
+  background: linear-gradient(to right, #FFE1AD, #D8AB5A);
+  box-shadow: 0 10rpx 20rpx 1rpx rgba(179, 116, 5, 0.2);
   height: 100rpx;
   text-align: center;
-  color: #BEBDBB;
+  color: #fff;
   line-height: 100rpx;
 }
 

unpackage/dist/dev/mp-weixin/pages/alldeatil/supplierdetail.js

@@ -104,13 +104,13 @@ try {
       return Promise.all(/*! import() | node-modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-popup/u-popup.vue */ 346))
     },
     "u-Form": function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u--form/u--form */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u--form/u--form")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u--form/u--form.vue */ 379))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u--form/u--form */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u--form/u--form")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u--form/u--form.vue */ 389))
     },
     uFormItem: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-form-item/u-form-item.vue */ 385))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-form-item/u-form-item.vue */ 395))
     },
     "u-Input": function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u--input/u--input.vue */ 393))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u--input/u--input.vue */ 403))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/alldeatil/upcontract.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uUpload: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-upload/u-upload.vue */ 399))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-upload/u-upload.vue */ 409))
     },
     uniDataSelect: function() {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 409))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 363))
     },
     uDatetimePicker: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-datetime-picker/u-datetime-picker.vue */ 363))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-datetime-picker/u-datetime-picker.vue */ 373))
     }
   }
 } catch (e) {
@@ -577,7 +577,7 @@ var _baseUrl = __webpack_require__(/*! @/http/baseUrl.js */ 16);var _methods;fun
 //
 //
 //
-var that;var wUpload = function wUpload() {Promise.all(/*! require.ensure | components/file-img-upload/w-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/file-img-upload/w-upload")]).then((function () {return resolve(__webpack_require__(/*! @/components/file-img-upload/w-upload.vue */ 555));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var calllips = function calllips() {__webpack_require__.e(/*! require.ensure | componet/calllips/calllips */ "componet/calllips/calllips").then((function () {return resolve(__webpack_require__(/*! @/componet/calllips/calllips.vue */ 419));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default = { components: { calllips: calllips, wUpload: wUpload }, data: function data() {return { editall: false, quan: false, dateshow: false, opdanum: '', state: '', index: 0, start: Number(new Date()), fileList1: [], fileList2: [], fileList3: [], fileList4: [], allindex: 0, seacept: '', seadra: '', form: { name: '', supplierId: '', invoicePics: [], pics: [], tradePics: [], contractDrafts: [{ name: '', draftNo: '', acceptor: '', acceptorId: '', drawersId: '', drawers: '', money: '', acceptDate: '', issueDate: '', expireDate: '', loanLimit: '', expectDiscountDate: '', picUrls: [], picUrling: [], serviceRate: '', interestRate: '', interest: '', serviceMoney: '', limitTime: 0, expectDiscountDateTime: 0, acceptDateTime: 0 }] }, range1: [], range2: [], myindex: 0, sindex: 0, rindex: 0, acptIndex: 0, drwIndex: 0, openhe: false, imgShow: true, // 是否展示图片列表
+var that;var wUpload = function wUpload() {Promise.all(/*! require.ensure | components/file-img-upload/w-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/file-img-upload/w-upload")]).then((function () {return resolve(__webpack_require__(/*! @/components/file-img-upload/w-upload.vue */ 424));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var calllips = function calllips() {__webpack_require__.e(/*! require.ensure | componet/calllips/calllips */ "componet/calllips/calllips").then((function () {return resolve(__webpack_require__(/*! @/componet/calllips/calllips.vue */ 419));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default = { components: { calllips: calllips, wUpload: wUpload }, data: function data() {return { editall: false, quan: false, dateshow: false, opdanum: '', state: '', index: 0, start: Number(new Date()), fileList1: [], fileList2: [], fileList3: [], fileList4: [], allindex: 0, seacept: '', seadra: '', form: { name: '', supplierId: '', invoicePics: [], pics: [], tradePics: [], contractDrafts: [{ name: '', draftNo: '', acceptor: '', acceptorId: '', drawersId: '', drawers: '', money: '', acceptDate: '', issueDate: '', expireDate: '', loanLimit: '', expectDiscountDate: '', picUrls: [], picUrling: [], serviceRate: '', interestRate: '', interest: '', serviceMoney: '', limitTime: 0, expectDiscountDateTime: 0, acceptDateTime: 0 }] }, range1: [], range2: [], myindex: 0, sindex: 0, rindex: 0, acptIndex: 0, drwIndex: 0, openhe: false, imgShow: true, // 是否展示图片列表
       fileShow: true, // 是否展示文件列表
       token: '', // 非必填
       requestUrl: '', // 上传文件/图片的请求地址，必填
@@ -594,10 +594,15 @@ var that;var wUpload = function wUpload() {Promise.all(/*! require.ensure | comp
     updateImgList: function updateImgList(val) {console.log(val);}, // 返回图片上传成功后的图片信息
     imgSuccess: function imgSuccess(val) {console.log(val);}, // 返回文件/图片上传成功后的文件信息
     fileSuccess: function fileSuccess(val) {console.log(val);}, initAcceptor: function initAcceptor() {var _this = this; // 承兑人列表
-      uni.$u.http.post('/api/Acceptor/search', { name: this.seacept }, {}, { custom: { auth: true } }).then(function (res) {uni.hideLoading();_this.range1 = res.result; // for(let i in this.range1){
+      uni.$u.http.post('/api/Acceptor/search', { pageIndex: 1, pageSize: 200, name: this.seacept }, {}, { custom: { auth: true } }).then(function (res) {uni.hideLoading();_this.range1 = res.result; // for(let i in this.range1){
         // }
         _this.range1.forEach(function (item, index) {_this.range1[index].value = index;_this.range1[index].text = item.name;});}).catch(function (err) {});}, initDrawers: function initDrawers() {var _this2 = this; // 出票人列表
-      uni.$u.http.post('/api/Drawer/search', { name: this.seadra }, { custom: { auth: true } }).then(function (res) {uni.hideLoading();_this2.range2 = res.result;_this2.range2.forEach(function (item, index) {_this2.range2[index].value = index;_this2.range2[index].text = item.name;});}).catch(function (err) {});}, searchAcceptor: function searchAcceptor(e) {this.seacept = e;this.initAcceptor();}, searchDrawers: function searchDrawers(e) {this.seadra = e;this.initDrawers();}, checkacptIndex: function checkacptIndex(index) {this.acptIndex = index;}, checkldrwIndex: function checkldrwIndex(index) {this.drwIndex = index;}, deleBill: function deleBill(index) {uni.showModal({ title: "提示", content: "是否确认删除?", success: function success(res) {if (res.confirm) {that.form.contractDrafts.splice(index, 1);}} });}, getinterestRateIndex: function getinterestRateIndex(index) {this.rindex = index;},
+      uni.$u.http.post('/api/Drawer/search', { pageIndex: 1, pageSize: 200, name: this.seadra }, { custom: { auth: true } }).then(function (res) {uni.hideLoading();_this2.range2 = res.result;_this2.range2.forEach(function (item, index) {_this2.range2[index].value = index;_this2.range2[index].text = item.name;});}).catch(function (err) {});}, searchAcceptor: function searchAcceptor(e) {this.seacept = e;this.initAcceptor();}, searchDrawers: function searchDrawers(e) {this.seadra = e;this.initDrawers();}, checkacptIndex: function checkacptIndex(index) {this.acptIndex = index;}, checkldrwIndex: function checkldrwIndex(index) {this.drwIndex = index;}, deleBill: function deleBill(index) {uni.showModal({ title: "提示", content: "是否确认删除?", success: function success(res) {if (res.confirm) {that.form.contractDrafts.splice(index, 1);}} });
+
+    },
+    getinterestRateIndex: function getinterestRateIndex(index) {
+      this.rindex = index;
+    },
     getinterestRate: function getinterestRate(event) {
       this.form.contractDrafts[this.rindex].interestRate = Number(event.detail.value);
       this.getloanLimt(this.rindex);

unpackage/dist/dev/mp-weixin/pages/bsinessadmin/privacypolicy.js

@@ -129,6 +129,35 @@ __webpack_require__.r(__webpack_exports__);
 /*! no static exports found */
 /***/ (function(module, exports) {
 
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //

unpackage/dist/dev/mp-weixin/pages/bsinessadmin/privacypolicy.wxml

@@ -1 +1,23 @@
-<view class="_div"></view>
+<view style="padding:20rpx;"><text style="display:block;text-align:center;">用户隐私协议</text><text>用户隐私协议
+		尊敬的用户，欢迎阅读本协议：
+		
+		您的隐私对我们（“我们”或“我们的”）很重要。并且我们致力于保护您的隐私。因此，我们制定了隐私政策。本隐私政策（“隐私政策”）解释了当您使用软件和服务时，我们如何处理您的信息并保护您的隐私，以及与您的信息有关的可用权利和选项。我们认为，您有权了解我们在使用软件和服务（“软件和服务”）时可能收集和使用的信息的做法。如果您不同意此处设定的条款和条件，请不要使用该软件和服务。
+		
+		1.我们处理的信息以及处理您的信息的目的
+		我们将处理两大类信息。我们的使命是不断改进我们的软件和服务，并为您提供新的或更好的体验。作为此任务的一部分，我们将您的信息用于以下目的。如果出现用于处理您的个人数据的任何新目的，我们将通过对本隐私政策进行相应的更改，在开始处理有关该新目的的信息之前通知您。
+		
+		1.1您提交的信息
+		
+		（1）相机和照片（不包括面部照片）。通常，为了向您提供许多照片编辑器功能（例如模板，滤镜），您可以自愿授予我们访问相机或相册的权限，以便在您的移动设备中获取照片。我们将使用第三方提供的SDK处理照片。对于此类照片，我们既不会存储也不会与任何第三方共享。此信息对于您与我们之间的合同的适当履行是必要的。
+		
+		（2）面部特征数据。首次使用面部识别功能时，您可以自愿授予我们访问相机和相册的权限，以便在移动设备中获取面部照片。只有您确认许可，我们才能访问您的相机和相册。然后，我们将使用第三方提供的sdk分析面部特征数据，识别照片中五个感官的位置和形状，并处理照片，并将效果图反馈给您。这样的效果图将不包含任何个人身份信息。对于此类数据，照片和效果图，我们既不会存储也不会与任何第三方共享。 处理此类信息的目的仅在于操作应用程序的面部识别功能（包括但不限于衰老效果，性别变换，人脸融合等）。
+		
+		（3）处理此类信息的目的仅在于操作应用程序的人脸识别功能（包括但不限于衰老效果、性别转化效果、人脸融合效果、换脸效果、滤镜效果），相机和照片。为了使用该应用程序的某些功能，您可以自愿授予我们访问相机或相册的权限，以便在您的移动设备中获取照片。我们可能会通过使用Photo Kit API来收集您在使用该应用程序时上传或提交的照片，图片和其他数据。此信息对于您与我们之间的合同的适当履行是必要的。
+		
+		（4）支持相关信息。如果您通过我们的支持部分或通过电子邮件与我们联系，我们可能会收集您的联系信息，您的投诉或反馈以及您自愿提供的与此支持有关的任何信息。此类信息仅用于为您提供支持服务，不会与通过软件和服务从您那里收集的任何其他信息相关联。 您提交的信息的目的是：
+		（1）操作和更新软件和服务；
+		（2）改进和定制软件和服务及相关服务；
+		（3）维护，测试和监视软件的质量和操作；
+		（4）为您提供支持并处理您的投诉和/或反馈；
+		（5）在涉及您与软件和服务有关的纠纷时采取任何措施；
+		（6）遵守并满足任何适用的法律法规，法律程序或可执行的政府要求。</text></view>

unpackage/dist/dev/mp-weixin/pages/bsinessadmin/setpassword.wxss

@@ -93,10 +93,11 @@
   box-sizing: border-box;
   flex: 1;
   border-radius: 20rpx;
-  border: 1rpx solid #BEBDBB;
+  background: linear-gradient(to right, #FFE1AD, #D8AB5A);
+  box-shadow: 0 10rpx 20rpx 1rpx rgba(179, 116, 5, 0.2);
   height: 100rpx;
   text-align: center;
-  color: #BEBDBB;
+  color: #fff;
   line-height: 100rpx;
   margin-bottom: 100rpx;
 }