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

pages/carSource/index.vue

@@ -15,8 +15,11 @@
 					{{title1 ? title1 : "请选择地址"}}
 				</view>
 				<itmister-address-picker ref="addressElone" @confirmChange="confirmChangeOne"></itmister-address-picker>
-				<u--image :showLoading="true" class="exchange" src="../../static/images/carSource/exchange.png"
+				<view class="" style="width: 20%;">
+					<u--image :showLoading="true" class="exchange" src="../../static/images/carSource/exchange.png"
 					width="43px" height="43px" @click="replace"></u--image>
+				</view>
+				
 				<view @click="selectAddress(2)" class="screen_item">
 					<view class="screen_sign sign2">卸</view>
 					{{title2 ? title2 : "请选择地址"}}
@@ -663,8 +666,8 @@
 			}
 
 			.exchange {
-				line-height: 200rpx;
-				margin-left: -108rpx;
+				// line-height: 200rpx;
+				margin-top: 72rpx;
 				transform: rotate(90deg);
 			}
 		}

pages/mine/company/addcompany.vue

@@ -102,14 +102,15 @@
 				</view>
 			</view>
 		<view class="flex row">
-			<view class="left-text">身份证有效期</view>
+			<view class="left-text" style="width: 50%;">身份证有效期</view>
 			<view style='font-size:14px;width:50%;' class='flex flex-space-between'
 				@click="selectData(1)">
 				<view :style="{'color':dataDetails.cardValidityDate ? '#000':'#C6CBD5'}">
-					{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择期限截止日期'}}
+					{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证有效期'}}
 				</view>
+				<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
 				<view>
-					<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+					
 				</view>
 			</view>
 		</view>
@@ -632,8 +633,6 @@
 																.licenseName
 															console.log(res)
 															_this.$forceUpdate()
-														}else{
-															uni.$u.toast('请上传营业执照');
 														}
 													}
 

pages/mine/company/editcompany.vue

@@ -93,14 +93,15 @@
 					</view>
 				</view>
 			<view class="flex row">
-				<view class="left-text">身份证有效期</view>
+				<view class="left-text" style="width:50%;">身份证有效期</view>
 				<view style='font-size:14px;width:50%;' class='flex flex-space-between'
 					@click="selectData(1)">
 					<view :style="{'color':dataDetails.cardValidityDate ? '#000':'#C6CBD5'}">
 						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择期限截止日期'}}
 					</view>
-					<view>
 						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+					<view>
+					
 					</view>
 				</view>
 			</view>

pages/mine/company/index.vue

@@ -53,6 +53,8 @@
 			if (!this.hasLogin) {
 				uni.$u.route('/pages/public/login');
 			}
+		},
+		onShow() {
 			this.getList()
 		},
 		methods: {

pages/mine/settings/editPassword.vue

@@ -8,7 +8,6 @@
 					<u--input v-model="registerData.phone" border="none" maxlength="11" placeholder="请输入手机号码">
 					</u--input>
 				</u-form-item>
-
 				<u-form-item label="验证码" prop="code" borderBottom>
 					<u--input v-model="registerData.verifyCode" border="none" placeholder="请填写验证码"></u--input>
 					<button :disabled="disabled1" class="code-style code-small" @tap="getCode">{{tips}}</button>
@@ -23,11 +22,8 @@
 			</u--form>
 			<button class="code-style reset" @click="reset">重置密码</button>
 		</view>
-
-
 	</view>
 </template>
-
 <script>
 	import {
 		mapState
@@ -138,7 +134,6 @@
 								if (res.code == 200) {
 									uni.clearStorageSync();
 									this.$request.baseRequest('post', '/auth/api/logout').then(res => {
-
 									})
 									this.$store.commit('logout')
 									// this.$api.logout()

pages/order/index.vue

@@ -183,11 +183,14 @@
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
 			:closeOnClickOverlay='true' :showCancelButton='showCancelButton' @confirm="confirmClick"
 			@close="cancelClick" @cancel="cancelClick" class="modal">
-			<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">
 				</u-radio>
 			</u-radio-group>
+			</view>
+			
 			<u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
 				v-if='isShowTerminationReason'>
 			</u--textarea>