소스 검색

前端gjy

gjy 3 년 전
부모
커밋
acb95c24c8
3개의 변경된 파일41개의 추가작업 그리고 21개의 파일을 삭제
  1. 16 16
      pageA/product/business_buy.vue
  2. 20 3
      pageA/product/lookup.vue
  3. 5 2
      pageD/myRelease/sellGrain.vue

+ 16 - 16
pageA/product/business_buy.vue

@@ -314,27 +314,27 @@
 							if (res.confirm) {
 							if (res.confirm) {
 								that.$api.doRequest('post','/purchaseOrder/api/insertPurchaseOrder', that.purchaseOrder).then(res => {
 								that.$api.doRequest('post','/purchaseOrder/api/insertPurchaseOrder', that.purchaseOrder).then(res => {
 									if(res.data.code==200){
 									if(res.data.code==200){
-										that.$api.doRequest('post','/purchaseOrder/api/submitPurchaseOrder', {id:res.data.data}).then(res1 => {
-											if(res1.data.code==200){
+										// that.$api.doRequest('post','/purchaseOrder/api/submitPurchaseOrder', {id:res.data.data}).then(res1 => {
+										// 	if(res1.data.code==200){
 												uni.showToast({
 												uni.showToast({
 													title: '提交成功,等待买方回复',
 													title: '提交成功,等待买方回复',
 													icon: 'none',
 													icon: 'none',
 													duration: 2000
 													duration: 2000
 												})
 												})
-											}else{
-												uni.showToast({
-													title: res.data.message,
-													icon: 'none',
-													duration: 2000
-												})
-											}
-										}).catch(res => {
-											uni.showToast({
-												title: res.data.message,
-												icon: 'none',
-												duration: 2000
-											})
-										})
+										// 	}else{
+										// 		uni.showToast({
+										// 			title: res.data.message,
+										// 			icon: 'none',
+										// 			duration: 2000
+										// 		})
+										// 	}
+										// }).catch(res => {
+										// 	uni.showToast({
+										// 		title: res.data.message,
+										// 		icon: 'none',
+										// 		duration: 2000
+										// 	})
+										// })
 										// uni.navigateBack();
 										// uni.navigateBack();
 									}else{
 									}else{
 										uni.showToast({
 										uni.showToast({

+ 20 - 3
pageA/product/lookup.vue

@@ -5,8 +5,10 @@
 			<view style='flex:6;' class="search-form round" >
 			<view style='flex:6;' class="search-form round" >
 				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
 				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
 				<input type="text" v-model="searchKeyWord" @input="doSearch" placeholder="请输入货名或标题" confirm-type="search"></input>
 				<input type="text" v-model="searchKeyWord" @input="doSearch" placeholder="请输入货名或标题" confirm-type="search"></input>
+				
 			</view>
 			</view>
-			<view style="width:4%;flex:1;">{{content}}</view>
+			<view @click='emptysearch1' style="width:4%;flex:1;">{{content}}</view>
+			<text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text>
 			</view>
 			</view>
 			<!-- mSearch组件 如果使用原样式,删除组件元素-->
 			<!-- mSearch组件 如果使用原样式,删除组件元素-->
 			<!-- <mSearch class="mSearch-input-box" :mode="2" button="inside" :placeholder="defaultKeyword" @search="doSearch(false)" @input="inputChange" @confirm="doSearch(false)" v-model="keyword"></mSearch> -->
 			<!-- <mSearch class="mSearch-input-box" :mode="2" button="inside" :placeholder="defaultKeyword" @search="doSearch(false)" @input="inputChange" @confirm="doSearch(false)" v-model="keyword"></mSearch> -->
@@ -131,7 +133,9 @@
 			}
 			}
 		},
 		},
 		onLoad(options) {
 		onLoad(options) {
-			this.searchKeyWord=options.searchKeyWord
+			if(options.searchKeyWord){
+				this.searchKeyWord=options.searchKeyWord
+			}
 			this.TabCur = options.TabCur
 			this.TabCur = options.TabCur
 			if(this.searchKeyWord){
 			if(this.searchKeyWord){
 				this.isShowKeywordList=true
 				this.isShowKeywordList=true
@@ -176,6 +180,16 @@
 			blur(){
 			blur(){
 				uni.hideKeyboard()
 				uni.hideKeyboard()
 			},
 			},
+			emptysearch1(){
+				if(this.content=='取消'){
+					this.searchKeyWord=''
+					this.content='搜索'
+				}
+			},
+			emptysearch(){
+				this.searchKeyWord=''
+				this.content='搜索'
+			},
 			loadHotKeyword(){
 			loadHotKeyword(){
 				this.$api.doRequest('get', '/searchRecordsInfo/selectRecommendedSearchRecordsInfo',{pageSize:this.pageSize,
 				this.$api.doRequest('get', '/searchRecordsInfo/selectRecommendedSearchRecordsInfo',{pageSize:this.pageSize,
 				currentPage:this.currentPage,commonId:this.userInfo.id}).then(res => {
 				currentPage:this.currentPage,commonId:this.userInfo.id}).then(res => {
@@ -489,7 +503,10 @@
 	.keyword-box .keyword-block .keyword {width:94%;padding:3px 3%;display:flex;flex-flow:wrap;justify-content:flex-start;}
 	.keyword-box .keyword-block .keyword {width:94%;padding:3px 3%;display:flex;flex-flow:wrap;justify-content:flex-start;}
 	.keyword-box .keyword-block .hide-hot-tis {display:flex;justify-content:center;font-size:28upx;color:#6b6b6b;}
 	.keyword-box .keyword-block .hide-hot-tis {display:flex;justify-content:center;font-size:28upx;color:#6b6b6b;}
 	.keyword-box .keyword-block .keyword>view {display:flex;justify-content:center;align-items:center;border-radius:60upx;padding:0 20upx;margin:10upx 20upx 10upx 0;height:60upx;font-size:28upx;background-color:rgb(242,242,242);color:#6b6b6b;}
 	.keyword-box .keyword-block .keyword>view {display:flex;justify-content:center;align-items:center;border-radius:60upx;padding:0 20upx;margin:10upx 20upx 10upx 0;height:60upx;font-size:28upx;background-color:rgb(242,242,242);color:#6b6b6b;}
-
+	.cuIcon-roundclosefill{
+		position:absolute;
+		right:80px;
+	}
 	.tag1 {
 	.tag1 {
 		background:#F5F6F9;
 		background:#F5F6F9;
 		padding: 5px;
 		padding: 5px;

+ 5 - 2
pageD/myRelease/sellGrain.vue

@@ -76,7 +76,7 @@
 			<view class="c-row b-b">
 			<view class="c-row b-b">
 				<text class="tit">卖方手机号</text>
 				<text class="tit">卖方手机号</text>
 				<view class="con-list">
 				<view class="con-list">
-					<input placeholder="请输入方手机号" name="input" v-model="deptList.sellerPhone"></input>
+					<input placeholder="请输入方手机号" name="input" v-model="deptList.sellerPhone"></input>
 				</view>
 				</view>
 			</view>
 			</view>
 			<!-- <view class="c-row ">
 			<!-- <view class="c-row ">
@@ -484,7 +484,10 @@
 					this.$api.msg('卖方手机号不能为空')
 					this.$api.msg('卖方手机号不能为空')
 					return
 					return
 				}
 				}
-
+				if (this.deptList.sellerPhone.length!=11) {
+					this.$api.msg('卖方手机号输入错误')
+					return
+				}
 				if (this.checked == false) {
 				if (this.checked == false) {
 					if (this.deptList.waterContent && this.deptList.waterContent < 1 ||
 					if (this.deptList.waterContent && this.deptList.waterContent < 1 ||
 						this.deptList.waterContent && this.deptList.waterContent > 40) {
 						this.deptList.waterContent && this.deptList.waterContent > 40) {