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
 }

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'>