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

pages/mine/often/addRoute.vue

@@ -195,6 +195,20 @@
 					});
 			},
 			submit() {
+				if(!this.title1){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请选择发货城市",
+					})
+					return
+				}
+				if(!this.title2){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请选择卸货城市",
+					})
+					return
+				}
 				this.routeData.commonId = uni.getStorageSync("userInfo").id
 				let name = this.driverData.driverCall.slice(0, 1)
 				this.routeData.driverNickname = name + "师傅"

pages/mine/often/oftenRoute.vue

@@ -25,12 +25,13 @@
 			<u-loadmore :status="status" :nomore-text="nomoreText" />
 		</view>
 		<u-toast ref="uToast"></u-toast>
-		<u-modal :show="tipsShow" :title="tipsText" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="delSubmit" @close="cancelClick" @cancel="cancelClick"></u-modal>
+		
 		<view class="bottom_add">
 			<view class="add_btn" @click="addRoute(1)">添加常用路线</view>
 			<span class="tips">最多可创建50条</span>
 		</view>
+		<u-modal :show="tipsShow" :title="tipsText" :closeOnClickOverlay='true' :showCancelButton='true'
+			confirmColor='#2772FB' @confirm="delSubmit" @close="cancelClick" @cancel="cancelClick"></u-modal>
 	</view>
 
 </template>
@@ -143,7 +144,6 @@
 
 <style lang="scss" scoped>
 	.center {
-		height: calc(100vh - 25vh);
 		padding: 30rpx 30rpx 200rpx;
 		background: #F2F4F7;
 		position: flex;
@@ -151,7 +151,7 @@
 	}
 
 	.route {
-
+		// margin-bottom: 40rpx;
 		.route_css {
 			background: #FFFFFF;
 			margin-bottom: 40rpx;

pages/order/index.vue

@@ -166,11 +166,14 @@
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
 			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
 			@cancel="cancelClick">
-			<u-radio-group v-model="radiovalue1" placement="" v-if='isShowTerminationReason' class='row'>
+			<view style="margin: 0 auto;">
+				<u-radio-group v-model="radiovalue1" placement="" v-if='isShowTerminationReason' >
 				<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
-					:label="item.name" :name="item.name" @change="radioChange">
+					:label="item.name" :name="item.name" @change="radioChange" >
 				</u-radio>
 			</u-radio-group>
+			</view>
+			
 			<u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
 				v-if='isShowTerminationReason'>
 			</u--textarea>