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

# Conflicts:
#	pageD/warehousings/ex_warehouse.vue

config/index.js

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

pageD/warehousings/ex_warehouse.vue

@@ -371,7 +371,6 @@
 				}
 			},
 			getImgUrl(res) {
-				console.log("res",res)
 				this.imgUrls.push(res.data);
 			},
 			onRemove(index) {

pageD/warehousings/ex_warehouse_detail.vue

@@ -97,13 +97,8 @@
 					<text class="tit">磅单照片</text>
 				</view>
 				<view style="width: 90px;height: 90px; margin-left: 16px;" >
-					<image src="../../static/img/authentication/business@3x.png" mode="" style="width: 90px; height: 90px;" class="picture"></image>
-					<image src="../../static/img/authentication/xiangji-2@3x.png" mode="" class="xiangji"></image>
-					<!-- <image src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/4f284ec4444f497e9aee0a2c90a1b400.png" mode=""></image> -->
+					<image src="https://liangxin.zthymaoyi.com/file/upload/cf17d321762d4064886cc9688433f003.png" mode=""></image>
 				</view>
-				<!-- <upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-					:size-type="['compressed']" @on-success="getImgUrl" @on-remove="onRemove"
-					@on-uploaded="isAdd = true" :before-upload="filterFileType"></upload> -->
 			</view>
 			<view class="center">
 				<view class="title_c ">化验信息</view>

pages/attestation/indexThree.vue

@@ -3,7 +3,7 @@
 		<view v-for="(item , index) in drivers" :Key="index" class="forList">
 			<view class='flex' @click="navToDetailPage(item)">
 				<view class="logo">
-					粮商
+					{{item.logo}}
 				</view>
 				<view class="company">{{item.driverName}}</view>
 				
@@ -131,7 +131,9 @@
 						commonId: this.userInfo.id,
 						pcFlag: 0
 					}, 'application/json;charset=UTF-8').then(res => {
-						console.log("成功连接")
+						for(var i = 0 ; i < res.data.data.records.length ; i++){
+							res.data.data.records[i].logo = res.data.data.records[i].driverName.substr(0,1)
+						}
 						this.drivers = res.data.data.records
 					})
 					.catch(res => {
@@ -346,8 +348,10 @@
 	.logo {
 		width: 35px;
 		height: 35px;
-		background-color: #E9F8F0;
-		color: #22C572;
+		background-color: #FEECE6;
+		color: #FE6430;
+		font-weight: 600;
+		font-size: 16px;
 		text-align: center;
 		line-height: 35px;
 		padding: 0 3px;

pages/attestation/indexTwo.vue

@@ -237,8 +237,7 @@
 
 							// uni.hideLoading()
 						} else {
-							// uni.hideLoading()
-							console.log(res.data.message, "aaaaa")
+							// uni.hideLoading()1
 							uni.showToast({
 								title: res.data.message,
 								icon: 'none',
@@ -256,7 +255,6 @@
 			},
 			getcode() {
 				if (!this.price) {
-					console.log(this.$api)
 					uni.showToast({
 						title: '请填写手机号！',
 						icon: 'none',