chuan

pages/alldeatil/addbill.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-	<!-- 	<view class="listitem">
+		<!-- 	<view class="listitem">
 			<text class="lys">合同名称</text>
 			<view class="inbox">
 				<input type="text" v-model="form.name" placeholder="请输入合同的名称" placeholder-style="color:#BEBDBB" />
@@ -16,7 +16,7 @@
 				</view>
 			</view>
 		</view> -->
-<!-- 		<view class="listitem">
+		<!-- 		<view class="listitem">
 			<view class="" style="display: flex;align-content: center;">
 				<text class="lys">合同附件</text>
 				<text
@@ -67,22 +67,23 @@
 				<text class="lys">汇票号码</text>
 				<view class="inbox">
 					<input type="text" v-model="item.draftNo" placeholder="请输入汇票的号码"
-						placeholder-style="color:#BEBDBB"/>
+						placeholder-style="color:#BEBDBB" />
 				</view>
 			</view>
 			<view class="listitem">
 				<text class="lys">承兑人</text>
-				<view class="chosbox" @click="checkacptIndex(index)">
+				<view class="chosbox">
 					<uni-data-select v-model="item.acceptor" :localdata="range1" @change="changeacPerson"
-						:showas="false" :plname="'搜索兑换人名称'"  @search="searchAcceptor"></uni-data-select>
+						:showas="false" :plname="'搜索兑换人名称'" @search="searchAcceptor" :checklistIn="index"
+						@checkin="checkacptIndex" @clearall="clearValac"></uni-data-select>
 				</view>
 			</view>
-			
 			<view class="listitem">
 				<text class="lys">出票人</text>
-				<view class="chosbox" @click="checkldrwIndex(index)">
+				<view class="chosbox">
 					<uni-data-select v-model="item.drawers" :localdata="range2" @change="changedrPerson"
-						:plname="'搜索出票人名称'" @search="searchDrawers"></uni-data-select>
+						:plname="'搜索出票人名称'" @search="searchDrawers" :checklistIn="index" @checkin="checkldrwIndex"
+						@clearall="clearValdr"></uni-data-select>
 				</view>
 			</view>
 			<view class="listitem">
@@ -141,8 +142,8 @@
 					<text class="lys">服务费率</text>
 					<view class="inbox">
 						<input type="digit" v-model="item.serviceRate+'%'" placeholder="显示对于费率"
-							placeholder-style="color:#BEBDBB" @blur="getserviceRate"
-							@input="getserviceRateIndex(index)" disabled="true"/>
+							placeholder-style="color:#BEBDBB" @blur="getserviceRate" @input="getserviceRateIndex(index)"
+							disabled="true" />
 					</view>
 				</view>
 				<view class="listitem">
@@ -160,7 +161,7 @@
 					<view class="inbox">
 						<input type="digit" v-model="item.interestRate+'%'" placeholder="显示对于利率"
 							placeholder-style="color:#BEBDBB" @blur="getinterestRate"
-							@input="getinterestRateIndex(index)" disabled="true"/>
+							@input="getinterestRateIndex(index)" disabled="true" />
 					</view>
 				</view>
 				<view class="listitem">
@@ -178,9 +179,9 @@
 						style="font-size: 24rpx; color:#D05C39;padding-top: 45rpx;padding-left: 20rpx;">*支持上传pdf、jpg/jpeg、png格式</text>
 				</view>
 
-				<view class="inbox" style="border: none;padding-bottom: 0;"  @click="checkIndex(index)">
+				<view class="inbox" style="border: none;padding-bottom: 0;" @click="checkIndex(index)">
 					<u-upload :fileList="item.picUrling" @afterRead="afterRead" @delete="deletePic" :name="index+4"
-				:checkedindex=index		multiple :maxCount="10" width="100" height="100"></u-upload>
+						:checkedindex="index" multiple :maxCount="10" width="100" height="100"></u-upload>
 				</view>
 			</view>
 		</view>
@@ -193,7 +194,6 @@
 			<view class="newbillbtn">
 				<text>确认上传</text>
 			</view>
-
 		</view>
 		<u-datetime-picker :show="dateshow" mode="date" @confirm="confirm" @cancel="closeDate" v-model="start">
 		</u-datetime-picker>
@@ -225,14 +225,15 @@
 				fileList3: [],
 				fileList4: [],
 				allindex: 0,
-				seacept:'',
-				seadra:'',
+				seacept: '',
+				seadra: '',
 				form: {
-					id:'',
+
 					contractDrafts: [{
+						contractId: '',
 						name: '',
 						draftNo: '',
-						acceptor:'',
+						acceptor: '',
 						acceptorId: '',
 						drawersId: '',
 						drawers: '',
@@ -243,7 +244,7 @@
 						loanLimit: '',
 						expectDiscountDate: '',
 						picUrls: [],
-						picUrling:[],
+						picUrling: [],
 						serviceRate: '',
 						interestRate: '',
 						interest: '',
@@ -251,68 +252,84 @@
 						limitTime: 0,
 						expectDiscountDateTime: 0,
 						acceptDateTime: 0
-					}, ],
+					}],
 				},
-
+				contractId: '',
 				range1: [],
 				range2: [],
 				myindex: 0,
 				sindex: 0,
 				rindex: 0,
-				acptIndex:0,
-				drwIndex:0,
-				again:false
+				acptIndex: 0,
+				drwIndex: 0,
+				again: false
 			}
 		},
 		onLoad(o) {
 			that = this
-			
-			this.form.supplierId = uni.getStorageSync('supplierId')
+
+			// this.form.supplierId = uni.getStorageSync('supplierId')
 			this.loadTime()
-			if(o.obj){
-				this.again=true
-				let obj=JSON.parse((o.obj))
-				let form=obj.contractDrafts
-				console.log(obj,9996)
-				this.form.id=obj.id
-				console.log(form,778)
-				let inform=this.form.contractDrafts[0]
-				inform.name=form[0].name
-				inform.id=form[0].id
-				inform.acceptorId=form[0].acceptorId
-				inform.drawersId=form[0].drawersId
-				inform.money=form[0].money
-				inform.draftNo=form[0].draftNo
-				inform.loanLimit=form[0].loanLimit
-				inform.serviceRate=form[0].serviceRate
-				inform.interestRate=form[0].interestRate
-				inform.interest=form[0].interest
-				inform.serviceMoney=form[0].serviceMoney
-				inform.expectDiscountDate=form[0].expectDiscountDate
-				inform.acceptDate=form[0].acceptDate
-				inform.issueDate=form[0].issueDate
-				inform.expireDate=form[0].expireDate
-				form.forEach(item=>{
-					item.picList.forEach(i=>{
-						item.picUrling=[]
-						item.picUrling.push({"url":i})
+			if (o.obj) {
+				this.again = true
+				let obj = JSON.parse(o.obj)
+				console.log(obj, 7897489)
+				this.contractId = obj.contractId
+				let form = obj.contractDrafts
+				let inform = this.form.contractDrafts[0]
+				inform.contractId = obj.contractId
+				if (obj.contractDrafts) {
+					let form = obj.contractDrafts
+					let inform = this.form.contractDrafts[0]
+					inform.name = form[0].name
+					inform.id = form[0].id
+					inform.contractId = obj.contractId
+					inform.acceptorId = form[0].acceptorId
+					inform.drawersId = form[0].drawersId
+					inform.money = form[0].money
+					inform.draftNo = form[0].draftNo
+					inform.loanLimit = form[0].loanLimit
+					inform.serviceRate = form[0].serviceRate
+					inform.interestRate = form[0].interestRate
+					inform.interest = form[0].interest
+					inform.serviceMoney = form[0].serviceMoney
+					inform.expectDiscountDate = form[0].expectDiscountDate
+					inform.acceptDate = form[0].acceptDate
+					inform.issueDate = form[0].issueDate
+					inform.expireDate = form[0].expireDate
+					form.forEach(item => {
+						item.picList.forEach(i => {
+							item.picUrling = []
+							item.picUrling.push({
+								"url": i
+							})
+						})
 					})
-				})
-				inform.picUrling=form[0].picUrling
+					inform.picUrling = form[0].picUrling
+					console.log((new Date('form[0].expectDiscountDate').getTime() / 100000).toFixed(0) * 100000, 556)
+					console.log((new Date(form[0].expectDiscountDate).getTime() / 100000).toFixed(0) * 100000, 556)
+					inform.expectDiscountDateTime = (new Date(form[0].expectDiscountDate).getTime() / 100000).toFixed(0) *
+						100000
+					inform.acceptDateTime = (new Date(form[0].acceptDate).getTime() / 100000).toFixed(0) * 100000
+					let nTime = inform.acceptDateTime - inform.expectDiscountDateTime
+					inform.limitTime = Math.floor(nTime / 86400000)
+				}
+				console.log(this.form.contractDrafts[0], 778)
+
 			}
 			// this.initAcceptor()
 			// this.initDrawers()
 		},
-		onShow(){
+		onShow() {
 			this.initAcceptor()
 			this.initDrawers()
-			
-			
+
+
 		},
 		methods: {
 			loadTime() {
 				let myDate = new Date()
-				let wk =parseInt(Date.now()/100000).toFixed(0)*100000
+				let wk = parseInt(Date.now() / 100000).toFixed(0) * 100000
 				let yy = String(myDate.getFullYear())
 				// let mm = myDate.getMonth() + 1
 				let mm = String(myDate.getMonth() + 1 < 10 ? '0' + (myDate.getMonth() + 1) : myDate.getMonth() + 1)
@@ -325,17 +342,17 @@
 					item.expectDiscountDate = nowDate
 					item.expectDiscountDateTime = wk
 					item.acceptDateTime = wk
-					let nTime = item.acceptDateTime-item.expectDiscountDateTime
+					let nTime = item.acceptDateTime - item.expectDiscountDateTime
 					item.limitTime = Math.floor(nTime / 86400000);
 				})
 			},
-					
-		  initAcceptor(){
+
+			initAcceptor() {
 				// 承兑人列表
-			 uni.$u.http.post('/api/Acceptor/search',{
-					name:this.seacept
-				},{
-				
+				uni.$u.http.post('/api/Acceptor/search', {
+					name: this.seacept
+				}, {
+
 				}, {
 					custom: {
 						auth: true
@@ -347,24 +364,22 @@
 						this.range1[index].value = index
 						this.range1[index].text = item.name
 					})
-					if(this.again){
-						
-						that.range1.forEach((item,index)=>{
-							console.log(that.form.contractDrafts[0],item)
-							if(item.id==that.form.contractDrafts[0].acceptorId){
-								console.log(555555555555555555555555)
-								that.form.contractDrafts[0].acceptor=index
-								console.log(that.form.contractDrafts[0].acceptor)
+					if (this.again) {
+
+						that.range1.forEach((item, index) => {
+							console.log(that.form.contractDrafts[0], item)
+							if (item.id == that.form.contractDrafts[0].acceptorId) {
+								that.form.contractDrafts[0].acceptor = index
 							}
 						})
 					}
-					
+
 				}).catch((err) => {})
 			},
-			initDrawers(){
+			initDrawers() {
 				// 出票人列表
 				uni.$u.http.post('/api/Drawer/search', {
-						name:this.seadra
+					name: this.seadra
 				}, {
 					custom: {
 						auth: true
@@ -376,42 +391,42 @@
 						this.range2[index].value = index
 						this.range2[index].text = item.name
 					})
-					if(this.again){
-						
-						that.range2.forEach((item,index)=>{
-							if(item.id==that.form.contractDrafts[0].drawersId){
-								that.form.contractDrafts[0].drawers=index
+					if (this.again) {
+
+						that.range2.forEach((item, index) => {
+							if (item.id == that.form.contractDrafts[0].drawersId) {
+								that.form.contractDrafts[0].drawers = index
 							}
 						})
 					}
 				}).catch((err) => {})
 			},
-			searchAcceptor(e){
-				this.seacept=e
+			searchAcceptor(e) {
+				this.seacept = e
 				this.initAcceptor()
 			},
-			searchDrawers(e){
-				this.seadra=e
+			searchDrawers(e) {
+				this.seadra = e
 				this.initDrawers()
 			},
-			checkacptIndex(index){
-				this.acptIndex=index
+			checkacptIndex(index) {
+				this.acptIndex = index
 			},
-			checkldrwIndex(index){
-				this.drwIndex=index
+			checkldrwIndex(index) {
+				this.drwIndex = index
 			},
-			deleBill(index){
+			deleBill(index) {
 				uni.showModal({
-					title:"提示",
-					content:"是否确认删除?",
-					success:(res)=>{
-						if(res.confirm){
-							that.form.contractDrafts.splice(index,1)
+					title: "提示",
+					content: "是否确认删除?",
+					success: (res) => {
+						if (res.confirm) {
+							that.form.contractDrafts.splice(index)
 						}
-						
+
 					}
 				})
-				
+
 			},
 			getinterestRateIndex(index) {
 				this.rindex = index
@@ -443,18 +458,21 @@
 			getloanLimt(i) {
 				if (this.form.contractDrafts[i].money && this.form.contractDrafts[i].serviceRate && this.form
 					.contractDrafts[i].interestRate) {
-					this.form.contractDrafts[i].loanLimit = (this.form.contractDrafts[i].money / (this.form.contractDrafts[
-							i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.contractDrafts[i]
-						.limitTime / 360 + 1).toFixed(2)
+					this.form.contractDrafts[i].loanLimit = ((this.form.contractDrafts[i].money / (this.form
+							.contractDrafts[
+								i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form
+						.contractDrafts[i]
+						.limitTime / 360) + 1).toFixed(2)
 				}
 
 			},
 			getSerMoney(i) {
 				if (this.form.contractDrafts[i].money && this.form.contractDrafts[i].serviceRate && this.form
 					.contractDrafts[i].interestRate) {
-					this.form.contractDrafts[i].serviceMoney = ((this.form.contractDrafts[i].money / (this.form
-								.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form
-							.contractDrafts[i].limitTime / 360 + 1) * this.form.contractDrafts[i].serviceRate * this
+					this.form.contractDrafts[i].serviceMoney = (((this.form.contractDrafts[i].money / (this.form
+								.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this
+							.form
+							.contractDrafts[i].limitTime / 360) + 1) * this.form.contractDrafts[i].serviceRate * this
 						.form.contractDrafts[i].limitTime / 360).toFixed(2)
 				}
 
@@ -462,9 +480,11 @@
 			getInterMoney(i) {
 				if (this.form.contractDrafts[i].money && this.form.contractDrafts[i].serviceRate && this.form
 					.contractDrafts[i].interestRate) {
-					this.form.contractDrafts[i].interest = ((this.form.contractDrafts[i].money / (this.form.contractDrafts[
-							i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.contractDrafts[
-							i].limitTime / 360 + 1) * this.form.contractDrafts[i].interestRate * this.form
+					this.form.contractDrafts[i].interest = (((this.form.contractDrafts[i].money / (this.form
+								.contractDrafts[
+									i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form
+							.contractDrafts[
+								i].limitTime / 360) + 1) * this.form.contractDrafts[i].interestRate * this.form
 						.contractDrafts[i].limitTime / 360).toFixed(2)
 				}
 
@@ -518,7 +538,7 @@
 									that.$toast('请输入服务费率')
 									return
 								}
-								
+
 								if (i.interestRate.length == 0) {
 									that.$toast('请输入利率')
 									return
@@ -552,38 +572,44 @@
 							// that.fileList3.forEach(item => {
 							// 	form.tradePics.push(item.url)
 							// })
-							form.contractDrafts.forEach(item=>{
-								item.picUrling.forEach(i=>{
+							form.contractDrafts.forEach(item => {
+								// that.$delete(item,'expectDiscountDateTime')
+								// that.$delete(item,'acceptDateTime')
+								item.picUrling.forEach(i => {
 									item.picUrls.push(i.url)
 								})
 							})
+							let copyform = Object.assign([], form.contractDrafts);
+							that.$delete(copyform, 'expectDiscountDateTime')
+							that.$delete(copyform, 'acceptDateTime')
+							console.log(copyform, 999)
 							uni.showLoading()
-							uni.$u.http.post('/api/Contract/addContractDraft', form, {
+							uni.$u.http.post('/api/Contract/addContractDraft', copyform, {
 								custom: {
 									auth: true
 								}
 							}).then((res) => {
 								uni.hideLoading()
 								that.$toast("汇票上传成功")
-								that.form.invoicePics = []
-								that.form.pics = []
-								that.form.tradePics = []
+								// that.form.invoicePics = []
+								// that.form.pics = []
+								// that.form.tradePics = []
 								that.form.contractDrafts.forEach(item => {
 									item.picUrls = []
 								})
-								setTimeout(()=>{
+								setTimeout(() => {
 									uni.navigateBack({
-										delta:1
+										delta: 1
 									})
-								},500)
+								}, 500)
 							}).catch((err) => {
 								uni.hideLoading()
 								that.$toast(err.msg)
-								that.form.invoicePics=[]
-								that.form.pics=[]
-								that.form.tradePics=[]
-								that.form.contractDrafts.forEach(item=>{
-										item.picUrls=[]
+								// that.form.invoicePics=[]
+								// that.form.pics=[]
+								// that.form.tradePics=[]
+								that.form.contractDrafts.forEach(item => {
+									item.picUrls = []
 								})
 								console.log(err)
 							})
@@ -594,6 +620,7 @@
 			},
 			addNewBill() {
 				let form = [{
+					contractId: that.contractId,
 					name: '',
 					draftNo: '',
 					acceptor: '',
@@ -607,7 +634,7 @@
 					loanLimit: '',
 					expectDiscountDate: '',
 					picUrls: [],
-					picUrling:[],
+					picUrling: [],
 					serviceRate: '',
 					interestRate: '',
 					interest: '',
@@ -631,50 +658,60 @@
 					item.expectDiscountDate = nowDate
 					item.expectDiscountDateTime = wk
 					item.acceptDateTime = wk
-					let nTime =item.acceptDateTime- item.expectDiscountDateTime
-					item.limitTime = Math.floor(nTime / 86400000) ;
+					let nTime = item.acceptDateTime - item.expectDiscountDateTime
+					item.limitTime = Math.floor(nTime / 86400000);
 				})
 				this.form.contractDrafts.push(form[0])
 			},
+			clearValac(e) {
+				this.form.contractDrafts[this.acptIndex].acceptorId = ''
+				this.form.contractDrafts[this.acptIndex].serviceRate = ''
+				this.form.contractDrafts[this.acptIndex].interestRate = ''
+				this.form.contractDrafts[this.acptIndex].acceptor = ''
+			},
+			clearValdr(e) {
+				this.form.contractDrafts[this.acptIndex].drawersId = ''
+				this.form.contractDrafts[this.acptIndex].drawers = ''
+			},
 			changeacPerson(e) {
 				this.acceptor = e
-				for(let i in this.range1){
-					if(i==e){
-						this.form.contractDrafts[this.acptIndex].acceptorId=this.range1[i].id
-						this.form.contractDrafts[this.acptIndex].serviceRate=this.range1[i].serviceRate
-						this.form.contractDrafts[this.acptIndex].interestRate=this.range1[i].interest
-						this.form.contractDrafts[this.acptIndex].acceptor=this.range1[i].name
+				if (e == "clearall") {
+					this.form.contractDrafts[this.acptIndex].acceptorId = ''
+					this.form.contractDrafts[this.acptIndex].serviceRate = ''
+					this.form.contractDrafts[this.acptIndex].interestRate = ''
+					this.form.contractDrafts[this.acptIndex].acceptor = ''
+				} else {
+					for (let i in this.range1) {
+						if (i == e) {
+							this.form.contractDrafts[this.acptIndex].acceptorId = this.range1[i].id
+							this.form.contractDrafts[this.acptIndex].serviceRate = this.range1[i].serviceRate
+							this.form.contractDrafts[this.acptIndex].interestRate = this.range1[i].interest
+							this.form.contractDrafts[this.acptIndex].acceptor = this.range1[i].name
+						}
 					}
 				}
-				this.range1.forEach(item=>{
-					if(item.id==e.id){
-						
-					}
-				})
-				
-				// console.log(e)
-				
+
 			},
 			changedrPerson(e) {
 				this.drawers = e
-				for(let i in this.range2){
-					if(i==e){
-						this.form.contractDrafts[this.acptIndex].drawersId=this.range2[i].id
-						this.form.contractDrafts[this.acptIndex].drawers=this.range2[i].name
+				if (e == "clearall") {
+					this.form.contractDrafts[this.acptIndex].drawersId = ''
+					this.form.contractDrafts[this.acptIndex].drawers = ''
+				} else {
+					for (let i in this.range2) {
+						if (i == e) {
+							this.form.contractDrafts[this.acptIndex].drawersId = this.range2[i].id
+							this.form.contractDrafts[this.acptIndex].drawers = this.range2[i].name
+						}
 					}
 				}
-				// this.range2.forEach(item=>{
-				// 	if(item.id==e.id){
-				// 		this.form.contractDrafts[this.drwIndex].drawersId=e.id
-				// 		this.form.contractDrafts[this.drwIndex].drawers=e.name
-				// 	}
-				// })
+
 			},
 			openTime(index, value) {
 				this.dateshow = true
 				this.index = index
 				this.opdanum = value
-				
+
 			},
 			closeDate() {
 				this.dateshow = false
@@ -683,18 +720,18 @@
 				const timeFormat = uni.$u.timeFormat
 				let form = this.form.contractDrafts
 				if (this.opdanum == 1) {
-					let ino =parseInt(e.value/10000).toFixed(0)*10000
+					let ino = parseInt(e.value / 10000).toFixed(0) * 10000
 					form[this.index].acceptDateTime = ino
-					let nTime =form[this.index].acceptDateTime- form[this.index].expectDiscountDateTime
-					let limitTime=Math.floor(nTime / 86400000)
-					console.log(form[this.index].acceptDateTime,88)
-					console.log(form[this.index].expectDiscountDateTime,88)
-					console.log(limitTime,88)
-					if(limitTime<=-1){
+					let nTime = form[this.index].acceptDateTime - form[this.index].expectDiscountDateTime
+					let limitTime = Math.floor(nTime / 86400000)
+					console.log(form[this.index].acceptDateTime, 88)
+					console.log(form[this.index].expectDiscountDateTime, 88)
+					console.log(limitTime, 88)
+					if (limitTime <= -1) {
 						this.$toast('承兑日期应该大于预计贴现日')
 						return
 					}
-					form[this.index].limitTime =limitTime
+					form[this.index].limitTime = limitTime
 					form[this.index].acceptDate = timeFormat(e.value, 'yyyy-mm-dd')
 					this.getloanLimt(this.index)
 					this.getSerMoney(this.index)
@@ -706,13 +743,13 @@
 					form[this.index].expireDate = timeFormat(e.value, 'yyyy-mm-dd')
 				} else if (this.opdanum == 4) {
 					form[this.index].expectDiscountDateTime = e.value
-					let nTime =form[this.index].acceptDateTime- form[this.index].expectDiscountDateTime
-					let limitTime=Math.floor(nTime / 86400000)
-					if(limitTime<=-1){
+					let nTime = form[this.index].acceptDateTime - form[this.index].expectDiscountDateTime
+					let limitTime = Math.floor(nTime / 86400000)
+					if (limitTime <= -1) {
 						this.$toast('预计贴现日应该小于承兑日期')
 						return
 					}
-					form[this.index].limitTime =limitTime
+					form[this.index].limitTime = limitTime
 					form[this.index].expectDiscountDate = timeFormat(e.value, 'yyyy-mm-dd')
 					this.getloanLimt(this.index)
 					this.getSerMoney(this.index)
@@ -735,14 +772,13 @@
 			},
 			checkIndex(index) {
 				this.allindex = index
-				console.log(index)
 			},
 			// 删除图片
 			async deletePic(event) {
 				// this.checkIndex(index) 
-				console.log(this.allindex,789)
+				console.log(this.allindex, 789)
 				if (event.name >= 4) {
-					 this.form.contractDrafts[this.allindex].picUrling.splice(event.index, 1)
+					this.form.contractDrafts[this.allindex].picUrling.splice(event.index, 1)
 				} else {
 					this[`fileList${event.name}`].splice(event.index, 1)
 				}
@@ -754,7 +790,7 @@
 
 				if (event.name >= 4) {
 					let lists = [].concat(event.file)
-					let icurls= this.form.contractDrafts[this.allindex].picUrling
+					let icurls = this.form.contractDrafts[this.allindex].picUrling
 					let fileListLen = icurls.length
 					lists.map((item) => {
 						icurls.push({
@@ -772,59 +808,59 @@
 							message: '',
 							url: result
 						}))
-						
-						fileListLen++
-					} 
-		
-				
-					}else {
-						console.log(2222222222)
-						let lists = [].concat(event.file)
-						let fileListLen = this[`fileList${event.name}`].length
-						lists.map((item) => {
-							this[`fileList${event.name}`].push({
-								...item,
-								status: 'uploading',
-								message: '上传中'
-							})
-						})
-						for (let i = 0; i < lists.length; i++) {
-							const result = await this.uploadFilePromise(lists[i].url)
-							let item = this[`fileList${event.name}`][fileListLen]
-							this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
-								status: 'success',
-								message: '',
-								url: result
-							}))
-							fileListLen++
-						}
-						
 
+						fileListLen++
 					}
-				},
-				uploadFilePromise(url) {
-					return new Promise((resolve, reject) => {
-						let a = uni.uploadFile({
-							url: mainUrl + '/api/File', // 仅为示例，非真实的接口地址
-							filePath: url,
-							name: 'File',
-							header: {
-								"User-Agent": "apifox/1.0.0 (https://www.apifox.cn)"
-							},
-							formData: {
-								File: JSON.stringify(url),
-							},
-							success: (res) => {
-								let request = JSON.parse(res.data)
-								setTimeout(() => {
-									resolve(request.data.file)
-								}, 1000)
-							}
-						});
+
+
+				} else {
+
+					let lists = [].concat(event.file)
+					let fileListLen = this[`fileList${event.name}`].length
+					lists.map((item) => {
+						this[`fileList${event.name}`].push({
+							...item,
+							status: 'uploading',
+							message: '上传中'
+						})
 					})
-				},
-			}
+					for (let i = 0; i < lists.length; i++) {
+						const result = await this.uploadFilePromise(lists[i].url)
+						let item = this[`fileList${event.name}`][fileListLen]
+						this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+							status: 'success',
+							message: '',
+							url: result
+						}))
+						fileListLen++
+					}
+
+
+				}
+			},
+			uploadFilePromise(url) {
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: mainUrl + '/api/File', // 仅为示例，非真实的接口地址
+						filePath: url,
+						name: 'File',
+						header: {
+							"User-Agent": "apifox/1.0.0 (https://www.apifox.cn)"
+						},
+						formData: {
+							File: JSON.stringify(url),
+						},
+						success: (res) => {
+							let request = JSON.parse(res.data)
+							setTimeout(() => {
+								resolve(request.data.file)
+							}, 1000)
+						}
+					});
+				})
+			},
 		}
+	}
 </script>
 
 <style lang="scss">

pages/alldeatil/billdetail.vue

@@ -39,18 +39,21 @@
 					<text class="pl">预计贴现日</text>
 					<text class="pr">{{msg.expectDiscountDate}}</text>
 				</view>
-
 				<view class="titleall bod">
+					<text class="pl">最高贷款额度</text>
+					<text class="pr">{{msg.loanLimit}}</text>
+				</view>
+				<view class="titleall " style="padding-top: 30rpx !important; ">
 					<text class="pl">服务费率</text>
-					<text class="pr">{{msg.serviceRate?msg.serviceRate:''}}</text>
+					<text class="pr">{{msg.serviceRate?msg.serviceRate:''}}%</text>
 				</view>
-				<view class="titleall" style="padding-top: 30rpx !important; ">
+				<view class="titleall" >
 					<text class="pl">服务费</text>
 					<text class="pr">{{msg.serviceMoney}}</text>
 				</view>
 				<view class="titleall ">
 					<text class="pl">利率</text>
-					<text class="pr">{{msg.interestRate?msg.interestRate:0}}</text>
+					<text class="pr">{{msg.interestRate?msg.interestRate:''}}%</text>
 				</view>
 				<view class="titleall ">
 					<text class="pl">利息</text>
@@ -136,7 +139,7 @@
 				disabled:false,
 				delablepic:true,
 				placehodertitle:'请输入审核反馈',
-				contractid:''
+				contractId:''
 			}
 		},
 		onLoad(o) {
@@ -150,7 +153,7 @@
 				let obj=JSON.parse(o.obj)
 				this.id=obj.id
 				this.index=obj.index
-				this.contractid=obj.contractid
+				this.contractId=obj.contractId
 			}
 			this.init()
 		},
@@ -205,7 +208,8 @@
 			},
 			tryAgain(){
 				let obj={
-					id:this.contractid,
+					contractId:this.contractId,
+					id:this.id,
 					contractDrafts:[this.msg]
 					
 				}

pages/alldeatil/contractdetail.vue

@@ -91,7 +91,7 @@
 
 		</view>
 		<view class="totalmanage ">
-			<text style="color:#68625B;font-size: 28rpx;">合计：4份</text>
+			<text style="color:#68625B;font-size: 28rpx;">合计：{{msg.contractDraft.total}}份</text>
 			<view class=" maboxtitls" @click="editall=true">
 				<view class="managebox">
 					<image src="/static/img/manage.png" mode="aspectFit"></image>
@@ -308,15 +308,18 @@
 				})
 			},
 			addBill() {
+				let obj = {
+					contractId:this.id
+				}
 				uni.navigateTo({
-					url: "/pages/alldeatil/addbill"
+					url: "/pages/alldeatil/addbill?obj="+ JSON.stringify(obj)
 				})
 			},
 			billDetail(id, index) {
 				let obj = {
 					id: id,
 					index: index,
-					contractid:this.id
+					contractId:this.id
 				}
 				uni.navigateTo({
 					url: "/pages/alldeatil/billdetail?obj=" + JSON.stringify(obj)

pages/alldeatil/upcontract.vue

@@ -38,6 +38,10 @@
 			<view class="inbox" style="border: none;padding-bottom: 0">
 				<u-upload :fileList="fileList2" @afterRead="afterRead" @delete="deletePic" name="2" multiple
 					:maxCount="10" width="100" height="100"></u-upload>
+				<!-- <w-upload ref="wUpload" :token="token" :fileShow="fileShow" :imgShow="imgShow" :uploadName="uploadName"
+					:requestUrl="requestUrl" :fileType="fileType" :imgType="imgType" @updateImgList="updateImgList"
+					@updateFileList="updateFileList" :fileList="fileList" :imgList="imgList" @imgSuccess="imgSuccess"
+					@fileSuccess="fileSuccess"></w-upload> -->
 			</view>
 		</view>
 		<view class="listitem">
@@ -55,7 +59,7 @@
 		<view v-for="(item,index) in form.contractDrafts" :key="index" v-if="!openhe">
 			<view class="addtitle flex6">
 				<text class="ty">汇票{{index+1}}</text>
-				<text class="tde" @click="deleBill" v-if="index>0">删除</text>
+				<text class="tde" @click="deleBill(index)" v-if="index>0">删除</text>
 			</view>
 			<view class="listitem">
 				<text class="lys">汇票名称</text>
@@ -72,16 +76,18 @@
 			</view>
 			<view class="listitem">
 				<text class="lys">承兑人</text>
-				<view class="chosbox" @click="checkacptIndex(index)">
+				<view class="chosbox">
 					<uni-data-select v-model="item.acceptor" :localdata="range1" @change="changeacPerson"
-						:showas="false" :plname="'搜索兑换人名称'" @search="searchAcceptor"></uni-data-select>
+						:showas="false" :plname="'搜索兑换人名称'" @search="searchAcceptor" :checklistIn="index"
+						@checkin="checkacptIndex"></uni-data-select>
 				</view>
 			</view>
 			<view class="listitem">
 				<text class="lys">出票人</text>
-				<view class="chosbox" @click="checkldrwIndex(index)">
+				<view class="chosbox">
 					<uni-data-select v-model="item.drawers" :localdata="range2" @change="changedrPerson"
-						:plname="'搜索出票人名称'" @search="searchDrawers"></uni-data-select>
+						:plname="'搜索出票人名称'" @search="searchDrawers" :checklistIn="index" @checkin="checkldrwIndex">
+					</uni-data-select>
 				</view>
 			</view>
 			<view class="listitem">
@@ -204,10 +210,12 @@
 	import {
 		mainUrl
 	} from '@/http/baseUrl.js';
+	import wUpload from '@/components/file-img-upload/w-upload.vue';
 	import calllips from "@/componet/calllips/calllips.vue"
 	export default {
 		components: {
-			calllips
+			calllips,
+			wUpload 
 		},
 		data() {
 			return {
@@ -264,7 +272,17 @@
 				rindex: 0,
 				acptIndex: 0,
 				drwIndex: 0,
-				openhe:false
+				openhe: false,
+				imgShow: true, // 是否展示图片列表
+				fileShow: true, // 是否展示文件列表
+				token: '', // 非必填
+				requestUrl: '', // 上传文件/图片的请求地址，必填
+				uploadName: 'upload_resource', // 看上传文件/图片接口的名字关键字，必填
+				fileType: 'file', // 看上传接口要求的文件格式关键字，必填
+				imgType: 'pictures', // 看上传接口要求上传的图片格式关键字，必填
+				fileList: [],
+				imgList: [],
+				src: "" // 下载文件的网络地址
 			}
 		},
 		onLoad(o) {
@@ -275,28 +293,28 @@
 			this.loadTime()
 			if (o.obj) {
 				let form = JSON.parse(o.obj)
-				this.openhe=true
+				this.openhe = true
 				const newData1 = form.invoicePicList.map((item) => {
 					return {
 						url: item,
 					}
 				})
-				this.fileList1=newData1
+				this.fileList1 = newData1
 				const newData2 = form.picList.map((item) => {
 					return {
 						url: item,
 					}
 				})
-				this.fileList2=newData2
+				this.fileList2 = newData2
 				const newData3 = form.tradePicList.map((item) => {
 					return {
 						url: item,
 					}
 				})
-				this.fileList3=newData3
+				this.fileList3 = newData3
 				this.form.name = form.name
 				this.form.id = form.id
-				this.$delete(this.form,'contractDrafts')
+				this.$delete(this.form, 'contractDrafts')
 			}
 		},
 		onShow() {
@@ -324,7 +342,30 @@
 				})
 			},
 
-
+			 // 打开上传文件弹窗
+			        uploadOpen() {
+			            this.$refs.wUpload.uploadOpen();
+			        },
+			        // 下载预览文件/图片
+			        wpriven(url) {
+			            this.$refs.wUpload.wpriven(url);
+			        },
+			        // 返回被删除的文件和索引号
+			        updateFileList(val) {
+			            console.log(val);
+			        },
+			        // 返回被删除的图片和索引号
+			        updateImgList(val) {
+			            console.log(val);
+			        },
+			        // 返回图片上传成功后的图片信息
+			        imgSuccess(val) {
+			            console.log(val);
+			        },
+			        // 返回文件/图片上传成功后的文件信息
+			        fileSuccess(val) {
+			            console.log(val);
+			        },
 			initAcceptor() {
 				// 承兑人列表
 				uni.$u.http.post('/api/Acceptor/search', {
@@ -421,29 +462,24 @@
 			getloanLimt(i) {
 				if (this.form.contractDrafts[i].money && this.form.contractDrafts[i].serviceRate && this.form
 					.contractDrafts[i].interestRate) {
-					this.form.contractDrafts[i].loanLimit = (this.form.contractDrafts[i].money / (this.form.contractDrafts[
-							i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.contractDrafts[i]
-						.limitTime / 360 + 1).toFixed(2)
+					this.form.contractDrafts[i].loanLimit = (this.form.contractDrafts[i].money/((this.form.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.contractDrafts[i].limitTime / 360 /100+1)).toFixed(2)
 				}
-
+			
 			},
 			getSerMoney(i) {
 				if (this.form.contractDrafts[i].money && this.form.contractDrafts[i].serviceRate && this.form
 					.contractDrafts[i].interestRate) {
-					this.form.contractDrafts[i].serviceMoney = ((this.form.contractDrafts[i].money / (this.form
-								.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form
-							.contractDrafts[i].limitTime / 360 + 1) * this.form.contractDrafts[i].serviceRate * this
-						.form.contractDrafts[i].limitTime / 360).toFixed(2)
+						this.form.contractDrafts[i].serviceMoney=((this.form.contractDrafts[i].money/((this.form.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.contractDrafts[i].limitTime / 360 /100+1))* (this.form.contractDrafts[i].serviceRate/100*this.form.contractDrafts[i].limitTime/360)).toFixed(2)
+					// this.form.contractDrafts[i].serviceMoney = ((this.form.contractDrafts[i].money/((this.form.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.contractDrafts[i].limitTime / 360 /100+1)) * this.form.contractDrafts[i].serviceRate * this.form.contractDrafts[i].limitTime / 360).toFixed(2)
 				}
-
+				
 			},
 			getInterMoney(i) {
 				if (this.form.contractDrafts[i].money && this.form.contractDrafts[i].serviceRate && this.form
 					.contractDrafts[i].interestRate) {
-					this.form.contractDrafts[i].interest = ((this.form.contractDrafts[i].money / (this.form.contractDrafts[
-							i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.contractDrafts[
-							i].limitTime / 360 + 1) * this.form.contractDrafts[i].interestRate * this.form
-						.contractDrafts[i].limitTime / 360).toFixed(2)
+						this.form.contractDrafts[i].interest=((this.form.contractDrafts[i].money/((this.form.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.contractDrafts[i].limitTime / 360 /100+1))*(this.form.contractDrafts[i].interestRate/100*this.form.contractDrafts[i].limitTime/360)).toFixed(2)
+					// this.form.contractDrafts[i].interest = ((this.form.contractDrafts[i].money/((this.form.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.contractDrafts[i].limitTime / 360 /100+1)) * this.form.contractDrafts[i].interestRate * this.form
+					// 	.contractDrafts[i].limitTime / 360).toFixed(2)
 				}
 
 			},
@@ -454,128 +490,128 @@
 					success: function(res) {
 						if (res.confirm) {
 							let form = that.form
-								if (form.name.length == 0) {
-									that.$toast('请输入合同名称')
-									return
-								}
-								if (that.fileList1.length == 0) {
-									that.$toast('请上传合同附件')
-									return
-								}
-								if (that.fileList2.length == 0) {
-									that.$toast('请上传发票附件')
-									return
-								}
-								if (that.fileList3.length == 0) {
-									that.$toast('请上传贸易合同')
-									return
-								}
-								that.fileList1.forEach(item => {
-									form.invoicePics.push(item.url)
-								})
-								that.fileList2.forEach(item => {
-									form.pics.push(item.url)
+							if (form.name.length == 0) {
+								that.$toast('请输入合同名称')
+								return
+							}
+							if (that.fileList1.length == 0) {
+								that.$toast('请上传合同附件')
+								return
+							}
+							if (that.fileList2.length == 0) {
+								that.$toast('请上传发票附件')
+								return
+							}
+							if (that.fileList3.length == 0) {
+								that.$toast('请上传贸易合同')
+								return
+							}
+							that.fileList1.forEach(item => {
+								form.invoicePics.push(item.url)
+							})
+							that.fileList2.forEach(item => {
+								form.pics.push(item.url)
+							})
+							that.fileList3.forEach(item => {
+								form.tradePics.push(item.url)
+							})
+							if (!that.openhe) {
+								form.contractDrafts.forEach(i => {
+									if (i.name.length == 0) {
+										that.$toast('请输入汇票名称')
+										return
+									}
+									if (i.draftNo.length == 0) {
+										that.$toast('请输入汇票号码')
+										return
+									}
+									if (i.acceptor.length == 0) {
+										that.$toast('请选择承兑人')
+										return
+									}
+									if (i.drawers.length == 0) {
+										that.$toast('请选择出票人')
+										return
+									}
+									if (i.money.length == 0) {
+										that.$toast('请输入金额')
+										return
+									}
+
+									if (i.serviceRate.length == 0) {
+										that.$toast('请输入服务费率')
+										return
+									}
+									if (i.interestRate.length == 0) {
+										that.$toast('请输入利率')
+										return
+									}
+									if (i.picUrls.length == 0) {
+										that.$toast('请上传附件')
+										return
+									}
+
 								})
-								that.fileList3.forEach(item => {
-									form.tradePics.push(item.url)
+
+								form.contractDrafts.forEach(item => {
+									item.picUrling.forEach(i => {
+										item.picUrls.push(i.url)
+									})
 								})
-								if(!that.openhe){
-									form.contractDrafts.forEach(i => {
-										if (i.name.length == 0) {
-											that.$toast('请输入汇票名称')
-											return
-										}
-										if (i.draftNo.length == 0) {
-											that.$toast('请输入汇票号码')
-											return
-										}
-										if (i.acceptor.length == 0) {
-											that.$toast('请选择承兑人')
-											return
-										}
-										if (i.drawers.length == 0) {
-											that.$toast('请选择出票人')
-											return
-										}
-										if (i.money.length == 0) {
-											that.$toast('请输入金额')
-											return
-										}
-									
-										if (i.serviceRate.length == 0) {
-											that.$toast('请输入服务费率')
-											return
-										}
-										if (i.interestRate.length == 0) {
-											that.$toast('请输入利率')
-											return
-										}
-										if (i.picUrls.length == 0) {
-											that.$toast('请上传附件')
-											return
-										}
-										
+							}
+
+							// that.range2.forEach(item => {
+							// 	form.contractDrafts.forEach(i => {
+							// 		if (that.range2[i.drawers].name == item.name) {
+							// 			i.drawersId = item.id
+							// 		}
+							// 	})
+							// })
+							// that.range1.forEach(item => {
+							// 	form.contractDrafts.forEach(i => {
+							// 		if (that.range1[i.acceptor].name == item.name) {
+							// 			i.acceptorId = item.id
+							// 		}
+							// 	})
+							// })
+
+
+							uni.showLoading()
+							uni.$u.http.post('/api/Contract', form, {
+								custom: {
+									auth: true
+								}
+							}).then((res) => {
+								uni.hideLoading()
+								that.$toast("合同上传成功")
+								that.form.invoicePics = []
+								that.form.pics = []
+								that.form.tradePics = []
+								if (!that.openhe) {
+									that.form.contractDrafts.forEach(item => {
+										item.picUrls = []
 									})
-									
-									form.contractDrafts.forEach(item => {
-										item.picUrling.forEach(i => {
-											item.picUrls.push(i.url)
-										})
+								}
+								setTimeout(() => {
+									uni.navigateBack({
+										delta: 1
+									})
+								}, 500)
+							}).catch((err) => {
+								uni.hideLoading()
+								that.$toast(err.msg)
+								that.form.invoicePics = []
+								that.form.pics = []
+								that.form.tradePics = []
+								if (!that.openhe) {
+									that.form.contractDrafts.forEach(item => {
+										item.picUrls = []
 									})
 								}
-								
-								// that.range2.forEach(item => {
-								// 	form.contractDrafts.forEach(i => {
-								// 		if (that.range2[i.drawers].name == item.name) {
-								// 			i.drawersId = item.id
-								// 		}
-								// 	})
-								// })
-								// that.range1.forEach(item => {
-								// 	form.contractDrafts.forEach(i => {
-								// 		if (that.range1[i.acceptor].name == item.name) {
-								// 			i.acceptorId = item.id
-								// 		}
-								// 	})
-								// })
-								
-								
-								uni.showLoading()
-								uni.$u.http.post('/api/Contract', form, {
-									custom: {
-										auth: true
-									}
-								}).then((res) => {
-									uni.hideLoading()
-									that.$toast("合同上传成功")
-									that.form.invoicePics = []
-									that.form.pics = []
-									that.form.tradePics = []
-									if(!that.openhe){
-										that.form.contractDrafts.forEach(item => {
-											item.picUrls = []
-										})
-									}
-									setTimeout(()=>{
-										uni.navigateBack({
-											delta:1
-										})
-									},500)
-								}).catch((err) => {
-									uni.hideLoading()
-									that.$toast(err.msg)
-									that.form.invoicePics = []
-									that.form.pics = []
-									that.form.tradePics = []
-									if(!that.openhe){
-										that.form.contractDrafts.forEach(item => {
-											item.picUrls = []
-										})
-									}
-									console.log(err)
-								})
-							
-							
+								console.log(err)
+							})
+
+
 						} else if (res.cancel) {}
 					}
 				});
@@ -627,39 +663,44 @@
 				this.form.contractDrafts.push(form[0])
 			},
 			changeacPerson(e) {
-				console.log(e, 88)
 				this.acceptor = e
-				for (let i in this.range1) {
-					if (i == e) {
-						this.form.contractDrafts[this.acptIndex].acceptorId = this.range1[i].id
-						this.form.contractDrafts[this.acptIndex].serviceRate = this.range1[i].serviceRate
-						this.form.contractDrafts[this.acptIndex].interestRate = this.range1[i].interest
-						this.form.contractDrafts[this.acptIndex].acceptor = this.range1[i].name
+				if (e == "clearall") {
+					this.form.contractDrafts[this.acptIndex].acceptorId = ''
+					this.form.contractDrafts[this.acptIndex].serviceRate = ''
+					this.form.contractDrafts[this.acptIndex].interestRate = ''
+					this.form.contractDrafts[this.acptIndex].acceptor = ''
+					this.getloanLimt(this.acptIndex)
+					this.getInterMoney(this.acptIndex)
+					this.getSerMoney(this.acptIndex)
+				} else {
+					for (let i in this.range1) {
+						if (i == e) {
+							this.form.contractDrafts[this.acptIndex].acceptorId = this.range1[i].id
+							this.form.contractDrafts[this.acptIndex].serviceRate = this.range1[i].serviceRate
+							this.form.contractDrafts[this.acptIndex].interestRate = this.range1[i].interest
+							this.form.contractDrafts[this.acptIndex].acceptor = this.range1[i].name
+							this.getloanLimt(this.acptIndex)
+							this.getInterMoney(this.acptIndex)
+							this.getSerMoney(this.acptIndex)
+						}
 					}
 				}
-				this.range1.forEach(item => {
-					if (item.id == e.id) {
-
-					}
-				})
-
-				// console.log(e)
-
+			
 			},
 			changedrPerson(e) {
 				this.drawers = e
-				for (let i in this.range2) {
-					if (i == e) {
-						this.form.contractDrafts[this.acptIndex].drawersId = this.range2[i].id
-						this.form.contractDrafts[this.acptIndex].drawers = this.range2[i].name
+				if (e == "clearall") {
+					this.form.contractDrafts[this.acptIndex].drawersId = ''
+					this.form.contractDrafts[this.acptIndex].drawers = ''
+				} else {
+					for (let i in this.range2) {
+						if (i == e) {
+							this.form.contractDrafts[this.acptIndex].drawersId = this.range2[i].id
+							this.form.contractDrafts[this.acptIndex].drawers = this.range2[i].name
+						}
 					}
 				}
-				// this.range2.forEach(item=>{
-				// 	if(item.id==e.id){
-				// 		this.form.contractDrafts[this.drwIndex].drawersId=e.id
-				// 		this.form.contractDrafts[this.drwIndex].drawers=e.name
-				// 	}
-				// })
+			
 			},
 			openTime(index, value) {
 				this.dateshow = true
@@ -731,7 +772,6 @@
 			// 删除图片
 			async deletePic(event) {
 				// this.checkIndex(index) 
-				console.log(this.allindex, 789)
 				if (event.name >= 4) {
 					this.form.contractDrafts[this.allindex].picUrling.splice(event.index, 1)
 				} else {
@@ -744,7 +784,6 @@
 				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
 
 				if (event.name >= 4) {
-					console.log(2222222222999)
 					let lists = [].concat(event.file)
 					let icurls = this.form.contractDrafts[this.allindex].picUrling
 					let fileListLen = icurls.length
@@ -770,7 +809,6 @@
 
 
 				} else {
-					console.log(2222222222)
 					let lists = [].concat(event.file)
 					let fileListLen = this[`fileList${event.name}`].length
 					lists.map((item) => {

pages/bsinessadmin/register.vue

@@ -255,15 +255,16 @@
 		}
 	}
 
+	
 	.logininbtn {
+		box-sizing: border-box;
 		margin-top: 80rpx;
 		// width: 606rpx;
-		flex: 1;
 		border-radius: 20rpx;
-		border: 1rpx solid #BEBDBB;
+		background: linear-gradient(to right, #FFE1AD, #D07539);
 		height: 100rpx;
 		text-align: center;
-		color: #BEBDBB;
+		color: #fff;
 		line-height: 100rpx;
 	}
 

pages/bsinessadmin/setpassword.vue

@@ -54,9 +54,11 @@
 					newPassword:'',
 					password:''
 				},
+				state:0
 			}
 		},
 		onLoad(o) {
+			this.state = this.$store.state.admin
 			if (o.account) {
 				this.account = o.account
 			}
@@ -85,23 +87,44 @@
 				uni.showLoading()
 				let form=this.form
 				delete form.password
-				uni.$u.http.post('/api/Supplier/password',form, {
-					custom: {
-						auth: true
-					}
-				}).then((res) => {
-					uni.hideLoading()
-					this.form={
-						oldPassword:'',
-						newPassword:'',
-						password:''
-					}
-					this.$toast("修改成功")
-				}).catch((err) => {
-					console.log(err)
-					uni.hideLoading()
-					this.$toast(err.msg)
-				})
+				if(this.state==1){
+					uni.$u.http.post('/api/Supplier/password',form, {
+						custom: {
+							auth: true
+						}
+					}).then((res) => {
+						uni.hideLoading()
+						this.form={
+							oldPassword:'',
+							newPassword:'',
+							password:''
+						}
+						this.$toast("修改成功")
+					}).catch((err) => {
+						console.log(err)
+						uni.hideLoading()
+						this.$toast(err.msg)
+					})
+				}else{
+					uni.$u.http.post('/api/Account/password',form, {
+						custom: {
+							auth: true
+						}
+					}).then((res) => {
+						uni.hideLoading()
+						this.form={
+							oldPassword:'',
+							newPassword:'',
+							password:''
+						}
+						this.$toast("修改成功")
+					}).catch((err) => {
+						console.log(err)
+						uni.hideLoading()
+						this.$toast(err.msg)
+					})
+				}
+
 			},
 			forgetPwd(){
 				this.show = true

pages/bsinessadmin/supplierges.vue

@@ -295,18 +295,17 @@
 		}
 	}
 
+	
 	.logininbtn {
 		box-sizing: border-box;
-		margin-top: 140rpx;
+		margin-top: 80rpx;
 		// width: 606rpx;
-		flex: 1;
 		border-radius: 20rpx;
-		border: 1rpx solid #BEBDBB;
+		background: linear-gradient(to right, #FFE1AD, #D07539);
 		height: 100rpx;
 		text-align: center;
-		color: #BEBDBB;
+		color: #fff;
 		line-height: 100rpx;
-		margin-bottom: 100rpx;
 	}
 
 	.acountall {

pages/drawer/drawer.vue

@@ -132,10 +132,13 @@
 			}
 		},
 		onLoad() {
+			
 			that=this
-			// this.in'it()
 		},
 		onShow(){
+			that.pageIndex = 1
+			that.nomore = false
+			that.listall = []
 			this.init()
 		},
 		// 下拉到底部后加载新数据

pages/mine/mine.vue

@@ -289,7 +289,7 @@
 		// left: 0;
 		// right: 0;
 		// bottom: 180rpx;
-		margin-top:250rpx;
+		margin-top:100rpx;
 		// : 220rpx;
 		width: 690rpx;
 		border-radius: 20rpx;

static/css/flex.scss

@@ -33,6 +33,7 @@
 			display: flex;
 			align-items: center;
 			justify-content: center;
+			z-index: 999;
 			.delbtn{
 				width: 335rpx;
 				height: 88rpx;

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

@@ -1,12 +1,12 @@
 <template>
 	<view class="uni-stat__select" >
 		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
-		<view class="uni-select" >
+		<view class="uni-select">
 			<view class="uni-select__input-box" @click.stop="toggleSelector" >
 				<view v-if="current" class="uni-select__input-text">{{current}}</view>
 				<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
 				
-				<uni-icons v-if="current && clear" type="clear" color="#1F242A" size="20" @click.stop="clearVal" />
+				<uni-icons v-if="current && clear" type="clear" color="#1F242A" size="20" @click="clearVal" />
 				<uni-icons v-else :type="showSelector? 'top' : 'bottom'" size="18" color="#1F242A" />
 			</view>
 			<!-- <view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" /> -->
@@ -95,6 +95,10 @@
 				type: String,
 				default: '请选择'
 			},
+			checklistIn: {
+				type: Number,
+				default: 0
+			},
 			emptyTips: {
 				type: String,
 				default: '无选项'
@@ -203,9 +207,13 @@
 
 				return isDisabled;
 			},
-
+			selectChecked(){
+				
+			},
 			clearVal() {
-				this.emit('')
+				// console.log(999999999)
+				this.emit('clearall',111)
+				// this.emit('')
 				if (this.collection) {
 					uni.removeStorageSync(this.last)
 				}
@@ -232,6 +240,7 @@
 
 			toggleSelector() {
 				this.showSelector = !this.showSelector
+				this.$emit('checkin',this.checklistIn)
 			},
 			changeSeach(e){
 				this.$emit('search',e.detail.value)

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

@@ -63,6 +63,7 @@ page {
   display: flex;
   align-items: center;
   justify-content: center;
+  z-index: 999;
 }
 .choosebtn .delbtn {
   width: 335rpx;

unpackage/dist/dev/mp-weixin/components/file-img-upload/w-upload.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/dev/mp-weixin/components/file-img-upload/w-upload.wxml

@@ -0,0 +1 @@
+<view class="w-upload data-v-5f2291c5"><block wx:if="{{fileShow}}"><view class="fileBox data-v-5f2291c5"><block wx:for="{{fileList}}" wx:for-item="j" wx:for-index="index1" wx:key="index1"><view class="filePath data-v-5f2291c5"><view data-event-opts="{{[['tap',[['wpriven',['$0'],[[['fileList','',index1,'src']]]]]]]}}" class="text1 data-v-5f2291c5" bindtap="__e">{{j.name}}</view><view data-event-opts="{{[['tap',[['wdelete',[index1,'$0',1],['fileList']]]]]}}" class="w-edit data-v-5f2291c5" bindtap="__e"><text class="w-btn1 data-v-5f2291c5">x</text></view></view></block></view></block><block wx:if="{{imgShow}}"><view class="imgList data-v-5f2291c5"><block wx:for="{{imgList}}" wx:for-item="k" wx:for-index="index2" wx:key="index2"><view class="imgItem data-v-5f2291c5"><image class="w-img data-v-5f2291c5" src="{{k.src}}" mode data-event-opts="{{[['tap',[['wpriven',['$0'],[[['imgList','',index2,'src']]]]]]]}}" bindtap="__e"></image><text data-event-opts="{{[['tap',[['wdelete',[index2,'$0',2],['imgList']]]]]}}" class="cancel data-v-5f2291c5" bindtap="__e">x</text></view></block><view data-event-opts="{{[['tap',[['upLoadImg',[1]]]]]}}" class="addItem data-v-5f2291c5" bindtap="__e">+</view></view></block><view class="w-drawer data-v-5f2291c5"><view class="{{['w-setbox','data-v-5f2291c5',(isshow)?'wShow':'']}}"><view class="w-header data-v-5f2291c5"><block wx:for="{{selectList}}" wx:for-item="i" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['wselect',[index]]]]]}}" class="w-item w-item1 data-v-5f2291c5" bindtap="__e">{{i}}</view></block><view class="w-line data-v-5f2291c5"></view><view data-event-opts="{{[['tap',[['wclose',['$event']]]]]}}" class="w-item data-v-5f2291c5" bindtap="__e">取消</view></view></view></view></view>

unpackage/dist/dev/mp-weixin/components/file-img-upload/w-upload.wxss

@@ -0,0 +1,140 @@
+
+.w-drawer.data-v-5f2291c5 {
+	box-sizing: border-box;
+	width: 100%;
+	height: 100%;
+	display: flex;
+	display: -webkit-flex;
+	flex-direction: column;
+}
+.w-setbox.data-v-5f2291c5 {
+	box-sizing: border-box;
+	position: fixed;
+	z-index: 1000;
+	left: 0px;
+	right: 0px;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.7);
+	box-shadow: 0px 3px 12px rgba(0, 0, 0, 0.12);
+	transition: all 0.2 ease;
+	bottom: -100%;
+	/* -webkit-transform: scale(1);
+	transform: scale(1); */
+}
+.wShow.data-v-5f2291c5 {
+	box-sizing: border-box;
+	bottom: 0;
+	/* transform: scale(0); */
+}
+.w-header.data-v-5f2291c5 {
+	box-sizing: border-box;
+	width: 100%;
+	background: #ffffff;
+	line-height: 40px;
+	position: absolute;
+
+	bottom: 0;
+	border-top-left-radius: 20px;
+	border-top-right-radius: 20px;
+	transition: all 0.4 ease;
+	/* border-bottom: 10rpx solid #ffffff; */
+}
+.w-line.data-v-5f2291c5 {
+	width: 100%;
+	background-color: #f7f8fa;
+	height: 8px;
+}
+.w-item.data-v-5f2291c5 {
+	box-sizing: border-box;
+	height: 100rpx;
+	line-height: 100rpx;
+	width: 100%;
+	text-align: center;
+}
+.w-item1.data-v-5f2291c5:first-child {
+	border-bottom: 1px solid #ebedf0;
+}
+.fileBox.data-v-5f2291c5 {
+	box-sizing: border-box;
+	margin: 20rpx;
+}
+.filePath.data-v-5f2291c5 {
+	box-sizing: border-box;
+	width: 100%;
+	/* padding: 10rpx 0; */
+	display: flex;
+	/* flex-direction: column; */
+	justify-content: space-between;
+	align-items: center;
+	border-bottom: 1px solid #c0c0c0;
+}
+.text1.data-v-5f2291c5 {
+	flex: 1;
+	/* width: 100%; */
+	/* margin: 10rpx 0 20rpx; */
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+	padding-left: 10rpx;
+	/* text-align: center; */
+	vertical-align: middle;
+}
+.w-btn1.data-v-5f2291c5 {
+	padding: 10rpx;
+	padding-right: 20rpx;
+	/* color: #f56c6c; */
+	font-size: 38rpx;
+}
+.w-edit.data-v-5f2291c5 {
+	color: #cccccc;
+	/* width: 100%; */
+	display: flex;
+	justify-content: flex-end;
+}
+.imgList.data-v-5f2291c5 {
+	display: flex;
+	justify-content: flex-start;
+	flex-wrap: wrap;
+	padding: 0 10rpx;
+}
+.imgItem.data-v-5f2291c5 {
+	margin: 20rpx 10rpx;
+	position: relative;
+	width: 160rpx;
+	height: 160rpx;
+	border-radius: 5px;
+}
+.cancel.data-v-5f2291c5 {
+	position: absolute;
+	height: 35rpx;
+	width: 35rpx;
+	line-height: 28rpx;
+	font-size: 30rpx;
+	text-align: center;
+	vertical-align: middle;
+	right: 0px;
+	top: 0px;
+	background-color: #f56c6c;
+	color: #ffffff;
+	z-index: 999;
+	border-radius: 0 5px 0 0;
+}
+.w-img.data-v-5f2291c5 {
+	border-radius: 5px;
+	width: 160rpx;
+	height: 160rpx;
+}
+.addItem.data-v-5f2291c5 {
+	margin: 20rpx 10rpx;
+	width: 160rpx;
+	height: 160rpx;
+	border: 1px solid #cccccc;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 50rpx;
+	color: #999;
+	border-radius: 5px;
+}
+