Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

# Conflicts:
#	config/index.js
#	pages/mine/driverCertificationNext.vue

config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	// baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'http://192.168.110.9:8099',
-	baseUrlNew: 'http://192.168.110.82:8099',
-	// baseUrlNew: 'http://192.168.110.67:8999',
+	// baseUrlNew: 'http://192.168.110.82:8099',
+	baseUrlNew: 'https://api.changyuntong56.com',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false,
 	//部网络货运 持续定位

pages/mine/index.vue

@@ -19,7 +19,6 @@
 					<view @click="toLogin" class="phone" v-if="hasLogin">{{starUserphone}}</view>
 				</view>
 			</view>
-			<view></view>
 		</view>
 		<view class="content1">
 			<view @click="goDetailPage('/pages/mine/driverCertification',1)" class="left">

pages/mine/manageBankCards/addBankCard.vue

@@ -88,9 +88,7 @@
 					payeeName: '',
 				},
 				imagesrc: '',
-				columns: [
-
-				],
+				columns: [],
 				isShowBank: false,
 				isShowManualInput: false,
 				index: ''
@@ -244,7 +242,8 @@
 										if (res.data.bankName) {
 											_this.dataDetails.bankDeposit = res.data.bankName
 										}
-										// 开户支行LIst
+										// 开户支行List
+										_this.columns=[]
 										if (res.data.bankNameZhihang) {
 											_this.columns.push(res.data
 												.bankNameZhihang)

pages/mine/manageVehicles/addVehicle.vue

@@ -505,7 +505,6 @@
 					// carWidth: '',
 					// carHeight: '',
 					// addressUrl: ''
-
 				},
 				startYear: 1980,
 				carTypeList: [

pages/mine/settings/editPassword.vue

@@ -275,8 +275,9 @@
 		width: 100vw;
 		height:calc(100vh - 85px);
 		overflow: hidden;
-			background: url('~@/static/images/mine/bg@2x.png');
-		background-size:100%;
+		background: url('~@/static/images/mine/bg@2x.png');
+		background-size:100% 100vh;
+		background-repeat: no-repeat;
 	}
 
 	.wrapper {

pages/news/index.vue

@@ -8,7 +8,7 @@
 		<view class="top-bgc"></view>
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
 			style="background-color: #F5F6FA;">
-			<view class="content">
+			<view class="content" v-if="news.length > 0">
 				<view class="info-item flex" v-for="(item,index) in news" :key="index" @click="read(item)">
 					<view class="left">
 						<image src="@/static/images/news/cy.png" class="img" v-if="item.newsType=='承运通知'">

pages/order/confirmLoading.vue

@@ -398,7 +398,6 @@
 								this.detailData.freight = res.data.estimatedFreight
 							}
 						})
-
 						// this.detailData.contractNo = ''
 						// this.detailData.id = this.detailData.carrierId
 						// this.detailData.carrierInfo.loadingDate = ''
@@ -418,9 +417,7 @@
 						// 	this.status2 = true
 						// }
 					}
-
 				})
-
 			},
 			//车牌号弹出键盘
 			handleShowKeyboard() {

pages/order/orderDetails.vue

@@ -79,12 +79,10 @@
 			<view class="flex flex-space-between border">
 				<view class="flex s-row item1">
 					<view class="fontsize-46 fontweight-500 text">{{dataObj.sendCity}}</view>
-
 					<view class="fontsize-28 gray">发货地</view>
 				</view>
 				<image class="change-btn" src="@/static/images/common/jt.png" mode='widthFix'></image>
 				<view class="flex s-row item2">
-
 					<view class="fontsize-46 fontweight-500 text" @click="">{{dataObj.unloadCity}}</view>
 					<view class="fontsize-28 gray text-align-right">卸货地</view>
 				</view>