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

config/index.js

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

pageB/contract/collectLook.vue

@@ -40,7 +40,6 @@
 					<text class="tit">净重(吨)</text>
 					<view style="font-size: 18px;margin-left: 80px;">{{item.loadNetWeight}}<text class="hair">发</text></view>
 					<view class="con-list">
-						
 						<view v-if="item.confirmFlag == 1" style="color: #FE6430;">未收货</view>
 						<view v-if="item.confirmFlag == 3" style="color: #22C572;">已收货</view>
 					</view>