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

config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	// baseUrlNew: 'http://192.168.1.122:9100/',
 	baseUrl: 'https://www.zthymaoyi.com',
-	// baseUrlNew: 'http://192.168.1.120:8090/',
-	  baseUrlNew: 'http://api.eliangeyun.com/',
+	baseUrlNew: 'http://192.168.1.120:8090/',
+	  // baseUrlNew: 'http://api.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pageA/product/detail.vue

@@ -1,8 +1,11 @@
 <template>
 	<!--采购详情-->
 	<view class="container">
-		<view class="back-btn cuIcon-back" @click="navBack"></view>
+		<view class="">
+			<view class="back-btn cuIcon-back" @click="navBack"></view>
 		<view class='title1'>采购详情</view>
+		</view>
+		
 		<image style='width:100%;' src='../../static/img/jiaoyi/bg@3x.png'></image>
 		<view class="introduce-section">
 			<view style='height:70px;'>
@@ -570,8 +573,10 @@
 		left:50%;
 		transform: translateX(-50%);
 		top: 40upx;
+		padding-top: var(--status-bar-height);
 		z-index:9999;
 		color:#fff;
+		font-size: 36rpx;
 	}
 	page {
 		background: #F5F6FA;

pageA/product/sales_detail.vue

@@ -1,8 +1,10 @@
 <!--销售详情-->
 <template>
 	<view class="container">
-		<view class="back-btn cuIcon-back" @click="navBack"></view>
-		<view class='title1'>销售详情</view>
+		<view>
+			<view class="back-btn cuIcon-back" @click="navBack"></view>
+			<view class='title1'>销售详情</view>
+		</view>
 		<image style='width:100%;' src='../../static/img/jiaoyi/bg@3x.png'></image>
 		<view class="introduce-section">
 			<view style='height:70px;'>
@@ -549,9 +551,11 @@
 		position:absolute;
 		left:50%;
 		transform: translateX(-50%);
-		top: 80upx;
+		top: 40upx;
+		padding-top: var(--status-bar-height);
 		z-index:9999;
 		color:#fff;
+		font-size: 36rpx;
 	}
 	page {
 		background: #F5F6FA;

pageB/contract/contract.vue

@@ -6,7 +6,8 @@
 					<text class="tit" v-if="item.orderType == '采购'">{{item.orderType}}</text>
 					<text class="tit2" v-if="item.orderType == '销售'">{{item.orderType}}</text>
 					<view class="enterprise">
-						编号{{item.contractNo}}({{item.procurementPlanType}})
+						<text v-if='item.status!="待审核"'>编号{{item.contractNo}}({{item.procurementPlanType}})</text>
+						<text v-if='item.status=="待审核"'>合同编号待定</text>
 					</view>
 					<!-- <text class="status status1" v-if="item.status == '已挂单'">{{item.status}}</text>
 					<text class="status status2" v-if="item.status == '已成交'">{{item.status}}</text>
@@ -32,16 +33,16 @@
 				<view class="title">基差:￥<text>{{item.basis}}</text></view>
 			</view>
 			<view class="c-row flex annius">
-				<text class="anniu" @click="commit(item)"> 附件</text>
+				<text v-if='item.status!="待审核"' class="anniu" @click="commit(item)"> 附件</text>
 				<text class="anniu" @click="someprice(item)"
 					v-if="item.procurementPlanType == '期货' && (item.status == '已成交' || item.status == '已挂单')"> 点价</text>
-				<text class="anniu1" @click="commit1(item)" v-if="item.orderType == '采购'"> 发货</text>
+				<text class="anniu1" @click="commit1(item)" v-if="item.orderType == '采购'&&item.status!='待审核'"> 发货</text>
 
 			<!-- 	<text class="anniu" @click="commit"> 附件</text>
 				<text class="anniu" @click="someprice(item)" v-if="item.procurementPlanType == '期货' && (item.status == '已成交' || item.status == '已挂单')"> 点价</text>
 				<text class="anniu1" @click="commit1(item)" v-if="item.orderType == '采购'&&item.status != '待审核'"> 发货</text> -->
 
-				<text class="anniu1" @click="commit2(item)" v-if="item.orderType == '销售'"> 收货</text>
+				<text class="anniu1" @click="commit2(item)" v-if="item.orderType == '销售'&&item.status!='待审核'"> 收货</text>
 			</view>
 		</view>
 		<view v-if='pricestatus' class='shade'>

pageD/warehousings/warehousings.vue

@@ -677,7 +677,6 @@ import upload from '@/components/upload.vue';
 				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
 				this.WarehouseInOutInfo.statusFlag = 3
 				this.WarehouseInOutInfo.pcFlag = 0
-				debugger
 				for(let i = 0 ;i < this.warehouselist.length ; i++){
 					if(this.warehouselist[i].warehouseName == this.WarehouseInOutInfo.warehouseName){
 						this.WarehouseInOutInfo.baseId = this.warehouselist[i].id
@@ -689,13 +688,14 @@ import upload from '@/components/upload.vue';
 				})
 				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
 					if(res.data.code==200){
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none'
-						})
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 1000)
+						uni.showToast({
+							title: '提交成功',
+							icon: 'none',
+							duration: 2000
+						})
 					}else{
 						uni.showToast({
 							title: res.data.message,

pages/attestation/indexThree.vue

@@ -82,7 +82,9 @@
 
 
 		</view>
-		<button class="btn btns" @click="Add">新增</button>
+		<view>
+			<button class="btn btns" @click="Add">新增</button>
+		</view>
 	</view>
 </template>
 
@@ -236,43 +238,6 @@
 								})
 							}
 						})
-					// 	if (res.data.code == 200) {
-					// 		that.$api.doRequest('post',
-					// 			'/identityAuthenticationInfo/api/modifyIdentityPhone',
-					// 			that.identityAuthenticationInfo).then(
-					// 			res => {
-					// 				uni.showToast({
-					// 					title: '提交成功',
-					// 					icon: 'none',
-					// 					duration: 2000
-					// 				})
-					// 				uni.navigateTo({
-					// 					url: `/pages/attestation/indexTwo`,
-					// 				})
-					// 			}).catch(res => {
-					// 			uni.showToast({
-					// 				title: res.data.message,
-					// 				icon: 'none',
-					// 				duration: 2000
-					// 			})
-					// 		})
-					// 	} else {
-					// 		uni.showToast({
-					// 			title: res.data.message,
-					// 			icon: 'none',
-					// 			duration: 2000
-					// 		})
-					// 		return
-					// 	}
-					// })
-					// .catch(res => {
-					// 		uni.showToast({
-					// 			title: res.data.message,
-					// 			icon: 'none',
-					// 			duration: 2000
-					// 		})
-					// 		return
-					// });
 			},
 			getcode() {
 					if (!this.price) {
@@ -292,7 +257,6 @@
 					return
 				}
 				this.pricestatusTwo = true
-				// this.pricestatusTwo = !this.pricestatusTwo
 				var that = this
 				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.price)) {
 					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {

pages/business/business.vue

@@ -3,7 +3,12 @@
 		<view class="top-style">
 			<view style='background:#fff;border-bottom:1px solid #EEE;padding-bottom:10px;'>
 				<view class="cu-bar search">
-					<view style='position:absolute;left:30px;top:50%;transform: translateY(-50%);'>
+					<view style='position:absolute;left:30px;top:50%;transform: translateY(-50%);' @click='status=true'>
+						{{location}}<image style='width:10px;height:6px;margin-left:4px;position:relative;top:-2px;'
+							src='../../static/img/jiaoyi/down.png'></image>
+					</view>
+					<u-picker mode="selector" @confirm='locationChange' v-model="status" :range="locationType"></u-picker>
+					<!-- <view>
 						<picker style='display:inline-block;' @change="locationChange" :value="location"
 							:range="locationType">
 							<view class="picker">
@@ -12,7 +17,8 @@
 						</picker>
 						<image style='width:10px;height:6px;margin-left:4px;position:relative;top:-2px;'
 							src='../../static/img/jiaoyi/down.png'></image>
-					</view>
+					</view> -->
+					
 					<view class="search-form round" @click="naviageToPage('/pageA/product/lookup?TabCur=')">
 						<text style='color: #ccc;text-indent:56px;' class="cuIcon-search"></text>
 						<input type="text" placeholder="请输入货名或标题" confirm-type="search"></input>
@@ -93,9 +99,10 @@
 				isLoadMore: false, //是否加载中
 				showTran: true,
 				scrollTop: 0,
+				status:false,
 				pageSize: 10,
 				searchKeyWord: '',
-				receivePrivate: '',
+				receivePrivate: '全国',
 				currentPage: 1,
 				categoryList: [{
 					title: '我要买粮',
@@ -106,7 +113,10 @@
 				}],
 				TabCur: 0,
 				current: 1,
-				location: 0,
+				location: '全国',
+				params:{
+					province: true,
+				},
 				locationType: ['全国', '黑龙江', '河南', '山东', '安徽', '吉林', '河北', '江苏', '内蒙古', '四川', '湖南', '湖北', '辽宁',
 					'江西', '云南', '新疆', '山西', '广西', '陕西', '广东', '甘肃', '重庆', '贵州', '浙江', '福建',
 					'宁夏', '天津', '海南', '青海', '西藏', '上海', '北京'
@@ -203,8 +213,9 @@
 				})
 			},
 			locationChange(e) {
-				this.location = e.detail.value
-				this.receivePrivate = e.detail.value
+				console.log(e)
+				this.location = this.locationType[e[0]]
+				this.receivePrivate = this.locationType[e[0]]
 				this.currentPage = 1
 				this.loadData()
 			},
@@ -246,7 +257,7 @@
 						showFlag: 1,
 						currentPage: this.currentPage,
 						searchKeyWord: this.searchKeyWord,
-						receivePrivate: this.receivePrivate =="0" ? '':this.locationType[this.receivePrivate]
+						receivePrivate: this.receivePrivate
 					}).then(res => {
 						uni.hideLoading()
 						this.buyInfo = res.data.data.records